1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636 7637 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 7704 7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 8012 8013 8014 8015 8016 8017 8018 8019 8020 8021 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176 8177 8178 8179 8180 8181 8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 8417 8418 8419 8420 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 8484 8485 8486 8487 8488 8489 8490 8491 8492 8493 8494 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530 8531 8532 8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 8577 8578 8579 8580 8581 8582 8583 8584 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 8607 8608 8609 8610 8611 8612 8613 8614 8615 8616 8617 8618 8619 8620 8621 8622 8623 8624 8625 8626 8627 8628 8629 8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 8645 8646 8647 8648 8649 8650 8651 8652 8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678 8679 8680 8681 8682 8683 8684 8685 8686 8687 8688 8689 8690 8691 8692 8693 8694 8695 8696 8697 8698 8699 8700 8701 8702 8703 8704 8705 8706 8707 8708 8709 8710 8711 8712 8713 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 8730 8731 8732 8733 8734 8735 8736 8737 8738 8739 8740 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809 8810 8811 8812 8813 8814 8815 8816 8817 8818 8819 8820 8821 8822 8823 8824 8825 8826 8827 8828 8829 8830 8831 8832 8833 8834 8835 8836 8837 8838 8839 8840 8841 8842 8843 8844 8845 8846 8847 8848 8849 8850 8851 8852 8853 8854 8855 8856 8857 8858 8859 8860 8861 8862 8863 8864 8865 8866 8867 8868 8869 8870 8871 8872 8873 8874 8875 8876 8877 8878 8879 8880 8881 8882 8883 8884 8885 8886 8887 8888 8889 8890 8891 8892 8893 8894 8895 8896 8897 8898 8899 8900 8901 8902 8903 8904 8905 8906 8907 8908 8909 8910 8911 8912 8913 8914 8915 8916 8917 8918 8919 8920 8921 8922 8923 8924 8925 8926 8927 8928 8929 8930 8931 8932 8933 8934 8935 8936 8937 8938 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955 8956 8957 8958 8959 8960 8961 8962 8963 8964 8965 8966 8967 8968 8969 8970 8971 8972 8973 8974 8975 8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 8998 8999 9000 9001 9002 9003 9004 9005 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 9045 9046 9047 9048 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 9117 9118 9119 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 9364 9365 9366 9367 9368 9369 9370 9371 9372 9373 9374 9375 9376 9377 9378 9379 9380 9381 9382 9383 9384 9385 9386 9387 9388 9389 9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438 9439 9440 9441 9442 9443 9444 9445 9446 9447 9448 9449 9450 9451 9452 9453 9454 9455 9456 9457 9458 9459 9460 9461 9462 9463 9464 9465 9466 9467 9468 9469 9470 9471 9472 9473 9474 9475 9476 9477 9478 9479 9480 9481 9482 9483 9484 9485 9486 9487 9488 9489 9490 9491 9492 9493 9494 9495 9496 9497 9498 9499 9500 9501 9502 9503 9504 9505 9506 9507 9508 9509 9510 9511 9512 9513 9514 9515 9516 9517 9518 9519 9520 9521 9522 9523 9524 9525 9526 9527 9528 9529 9530 9531 9532 9533 9534 9535 9536 9537 9538 9539 9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 9558 9559 9560 9561 9562 9563 9564 9565 9566 9567 9568 9569 9570 9571 9572 9573 9574 9575 9576 9577 9578 9579 9580 9581 9582 9583 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606 9607 9608 9609 9610 9611 9612 9613 9614 9615 9616 9617 9618 9619 9620 9621 9622 9623 9624 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641 9642 9643 9644 9645 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657 9658 9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 9671 9672 9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 9716 9717 9718 9719 9720 9721 9722 9723 9724 9725 9726 9727 9728 9729 9730 9731 9732 9733 9734 9735 9736 9737 9738 9739 9740 9741 9742 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 9760 9761 9762 9763 9764 9765 9766 9767 9768 9769 9770 9771 9772 9773 9774 9775 9776 9777 9778 9779 9780 9781 9782 9783 9784 9785 9786 9787 9788 9789 9790 9791 9792 9793 9794 9795 9796 9797 9798 9799 9800 9801 9802 9803 9804 9805 9806 9807 9808 9809 9810 9811 9812 9813 9814 9815 9816 9817 9818 9819 9820 9821 9822 9823 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 9834 9835 9836 9837 9838 9839 9840 9841 9842 9843 9844 9845 9846 9847 9848 9849 9850 9851 9852 9853 9854 9855 9856 9857 9858 9859 9860 9861 9862 9863 9864 9865 9866 9867 9868 9869 9870 9871 9872 9873 9874 9875 9876 9877 9878 9879 9880 9881 9882 9883 9884 9885 9886 9887 9888 9889 9890 9891 9892 9893 9894 9895 9896 9897 9898 9899 9900 9901 9902 9903 9904 9905 9906 9907 9908 9909 9910 9911 9912 9913 9914 9915 9916 9917 9918 9919 9920 9921 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9954 9955 9956 9957 9958 9959 9960 9961 9962 9963 9964 9965 9966 9967 9968 9969 9970 9971 9972 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010 10011 10012 10013 10014 10015 10016 10017 10018 10019 10020 10021 10022 10023 10024 10025 10026 10027 10028 10029 10030 10031 10032 10033 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 10049 10050 10051 10052 10053 10054 10055 10056 10057 10058 10059 10060 10061 10062 10063 10064 10065 10066 10067 10068 10069 10070 10071 10072 10073 10074 10075 10076 10077 10078 10079 10080 10081 10082 10083 10084 10085 10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 10098 10099 10100 10101 10102 10103 10104 10105 10106 10107 10108 10109 10110 10111 10112 10113 10114 10115 10116 10117 10118 10119 10120 10121 10122 10123 10124 10125 10126 10127 10128 10129 10130 10131 10132 10133 10134 10135 10136 10137 10138 10139 10140 10141 10142 10143 10144 10145 10146 10147 10148 10149 10150 10151 10152 10153 10154 10155 10156 10157 10158 10159 10160 10161 10162 10163 10164 10165 10166 10167 10168 10169 10170 10171 10172 10173 10174 10175 10176 10177 10178 10179 10180 10181 10182 10183 10184 10185 10186 10187 10188 10189 10190 10191 10192 10193 10194 10195 10196 10197 10198 10199 10200 10201 10202 10203 10204 10205 10206 10207 10208 10209 10210 10211 10212 10213 10214 10215 10216 10217 10218 10219 10220 10221 10222 10223 10224 10225 10226 10227 10228 10229 10230 10231 10232 10233 10234 10235 10236 10237 10238 10239 10240 10241 10242 10243 10244 10245 10246 10247 10248 10249 10250 10251 10252 10253 10254 10255 10256 10257 10258 10259 10260 10261 10262 10263 10264 10265 10266 10267 10268 10269 10270 10271 10272 10273 10274 10275 10276 10277 10278 10279 10280 10281 10282 10283 10284 10285 10286 10287 10288 10289 10290 10291 10292 10293 10294 10295 10296 10297 10298 10299 10300 10301 10302 10303 10304 10305 10306 10307 10308 10309 10310 10311 10312 10313 10314 10315 10316 10317 10318 10319 10320 10321 10322 10323 10324 10325 10326 10327 10328 10329 10330 10331 10332 10333 10334 10335 10336 10337 10338 10339 10340 10341 10342 10343 10344 10345 10346 10347 10348 10349 10350 10351 10352 10353 10354 10355 10356 10357 10358 10359 10360 10361 10362 10363 10364 10365 10366 10367 10368 10369 10370 10371 10372 10373 10374 10375 10376 10377 10378 10379 10380 10381 10382 10383 10384 10385 10386 10387 10388 10389 10390 10391 10392 10393 10394 10395 10396 10397 10398 10399 10400 10401 10402 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 10415 10416 10417 10418 10419 10420 10421 10422 10423 10424 10425 10426 10427 10428 10429 10430 10431 10432 10433 10434 10435 10436 10437 10438 10439 10440 10441 10442 10443 10444 10445 10446 10447 10448 10449 10450 10451 10452 10453 10454 10455 10456 10457 10458 10459 10460 10461 10462 10463 10464 10465 10466 10467 10468 10469 10470 10471 10472 10473 10474 10475 10476 10477 10478 10479 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 10512 10513 10514 10515 10516 10517 10518 10519 10520 10521 10522 10523 10524 10525 10526 10527 10528 10529 10530 10531 10532 10533 10534 10535 10536 10537 10538 10539 10540 10541 10542 10543 10544 10545 10546 10547 10548 10549 10550 10551 10552 10553 10554 10555 10556 10557 10558 10559 10560 10561 10562 10563 10564 10565 10566 10567 10568 10569 10570 10571 10572 10573 10574 10575 10576 10577 10578 10579 10580 10581 10582 10583 10584 10585 10586 10587 10588 10589 10590 10591 10592 10593 10594 10595 10596 10597 10598 10599 10600 10601 10602 10603 10604 10605 10606 10607 10608 10609 10610 10611 10612 10613 10614 10615 10616 10617 10618 10619 10620 10621 10622 10623 10624 10625 10626 10627 10628 10629 10630 10631 10632 10633 10634 10635 10636 10637 10638 10639 10640 10641 10642 10643 10644 10645 10646 10647 10648 10649 10650 10651 10652 10653 10654 10655 10656 10657 10658 10659 10660 10661 10662 10663 10664 10665 10666 10667 10668 10669 10670 10671 10672 10673 10674 10675 10676 10677 10678 10679 10680 10681 10682 10683 10684 10685 10686 10687 10688 10689 10690 10691 10692 10693 10694 10695 10696 10697 10698 10699 10700 10701 10702 10703 10704 10705 10706 10707 10708 10709 10710 10711 10712 10713 10714 10715 10716 10717 10718 10719 10720 10721 10722 10723 10724 10725 10726 10727 10728 10729 10730 10731 10732 10733 10734 10735 10736 10737 10738 10739 10740 10741 10742 10743 10744 10745 10746 10747 10748 10749 10750 10751 10752 10753 10754 10755 10756 10757 10758 10759 10760 10761 10762 10763 10764 10765 10766 10767 10768 10769 10770 10771 10772 10773 10774 10775 10776 10777 10778 10779 10780 10781 10782 10783 10784 10785 10786 10787 10788 10789 10790 10791 10792 10793 10794 10795 10796 10797 10798 10799 10800 10801 10802 10803 10804 10805 10806 10807 10808 10809 10810 10811 10812 10813 10814 10815 10816 10817 10818 10819 10820 10821 10822 10823 10824 10825 10826 10827 10828 10829 10830 10831 10832 10833 10834 10835 10836 10837 10838 10839 10840 10841 10842 10843 10844 10845 10846 10847 10848 10849 10850 10851 10852 10853 10854 10855 10856 10857 10858 10859 10860 10861 10862 10863 10864 10865 10866 10867 10868 10869 10870 10871 10872 10873 10874 10875 10876 10877 10878 10879 10880 10881 10882 10883 10884 10885 10886 10887 10888 10889 10890 10891 10892 10893 10894 10895 10896 10897 10898 10899 10900 10901 10902 10903 10904 10905 10906 10907 10908 10909 10910 10911 10912 10913 10914 10915 10916 10917 10918 10919 10920 10921 10922 10923 10924 10925 10926 10927 10928 10929 10930 10931 10932 10933 10934 10935 10936 10937 10938 10939 10940 10941 10942 10943 10944 10945 10946 10947 10948 10949 10950 10951 10952 10953 10954 10955 10956 10957 10958 10959 10960 10961 10962 10963 10964 10965 10966 10967 10968 10969 10970 10971 10972 10973 10974 10975 10976 10977 10978 10979 10980 10981 10982 10983 10984 10985 10986 10987 10988 10989 10990 10991 10992 10993 10994 10995 10996 10997 10998 10999 11000 11001 11002 11003 11004 11005 11006 11007 11008 11009 11010 11011 11012 11013 11014 11015 11016 11017 11018 11019 11020 11021 11022 11023 11024 11025 11026 11027 11028 11029 11030 11031 11032 11033 11034 11035 11036 11037 11038 11039 11040 11041 11042 11043 11044 11045 11046 11047 11048 11049 11050 11051 11052 11053 11054 11055 11056 11057 11058 11059 11060 11061 11062 11063 11064 11065 11066 11067 11068 11069 11070 11071 11072 11073 11074 11075 11076 11077 11078 11079 11080 11081 11082 11083 11084 11085 11086 11087 11088 11089 11090 11091 11092 11093 11094 11095 11096 11097 11098 11099 11100 11101 11102 11103 11104 11105 11106 11107 11108 11109 11110 11111 11112 11113 11114 11115 11116 11117 11118 11119 11120 11121 11122 11123 11124 11125 11126 11127 11128 11129 11130 11131 11132 11133 11134 11135 11136 11137 11138 11139 11140 11141 11142 11143 11144 11145 11146 11147 11148 11149 11150 11151 11152 11153 11154 11155 11156 11157 11158 11159 11160 11161 11162 11163 11164 11165 11166 11167 11168 11169 11170 11171 11172 11173 11174 11175 11176 11177 11178 11179 11180 11181 11182 11183 11184 11185 11186 11187 11188 11189 11190 11191 11192 11193 11194 11195 11196 11197 11198 11199 11200 11201 11202 11203 11204 11205 11206 11207 11208 11209 11210 11211 11212 11213 11214 11215 11216 11217 11218 11219 11220 11221 11222 11223 11224 11225 11226 11227 11228 11229 11230 11231 11232 11233 11234 11235 11236 11237 11238 11239 11240 11241 11242 11243 11244 11245 11246 11247 11248 11249 11250 11251 11252 11253 11254 11255 11256 11257 11258 11259 11260 11261 11262 11263 11264 11265 11266 11267 11268 11269 11270 11271 11272 11273 11274 11275 11276 11277 11278 11279 11280 11281 11282 11283 11284 11285 11286 11287 11288 11289 11290 11291 11292 11293 11294 11295 11296 11297 11298 11299 11300 11301 11302 11303 11304 11305 11306 11307 11308 11309 11310 11311 11312 11313 11314 11315 11316 11317 11318 11319 11320 11321 11322 11323 11324 11325 11326 11327 11328 11329 11330 11331 11332 11333 11334 11335 11336 11337 11338 11339 11340 11341 11342 11343 11344 11345 11346 11347 11348 11349 11350 11351 11352 11353 11354 11355 11356 11357 11358 11359 11360 11361 11362 11363 11364 11365 11366 11367 11368 11369 11370 11371 11372 11373 11374 11375 11376 11377 11378 11379 11380 11381 11382 11383 11384 11385 11386 11387 11388 11389 11390 11391 11392 11393 11394 11395 11396 11397 11398 11399 11400 11401 11402 11403 11404 11405 11406 11407 11408 11409 11410 11411 11412 11413 11414 11415 11416 11417 11418 11419 11420 11421 11422 11423 11424 11425 11426 11427 11428 11429 11430 11431 11432 11433 11434 11435 11436 11437 11438 11439 11440 11441 11442 11443 11444 11445 11446 11447 11448 11449 11450 11451 11452 11453 11454 11455 11456 11457 11458 11459 11460 11461 11462 11463 11464 11465 11466 11467 11468 11469 11470 11471 11472 11473 11474 11475 11476 11477 11478 11479 11480 11481 11482 11483 11484 11485 11486 11487 11488 11489 11490 11491 11492 11493 11494 11495 11496 11497 11498 11499 11500 11501 11502 11503 11504 11505 11506 11507 11508 11509 11510 11511 11512 11513 11514 11515 11516 11517 11518 11519 11520 11521 11522 11523 11524 11525 11526 11527 11528 11529 11530 11531 11532 11533 11534 11535 11536 11537 11538 11539 11540 11541 11542 11543 11544 11545 11546 11547 11548 11549 11550 11551 11552 11553 11554 11555 11556 11557 11558 11559 11560 11561 11562 11563 11564 11565 11566 11567 11568 11569 11570 11571 11572 11573 11574 11575 11576 11577 11578 11579 11580 11581 11582 11583 11584 11585 11586 11587 11588 11589 11590 11591 11592 11593 11594 11595 11596 11597 11598 11599 11600 11601 11602 11603 11604 11605 11606 11607 11608 11609 11610 11611 11612 11613 11614 11615 11616 11617 11618 11619 11620 11621 11622 11623 11624 11625 11626 11627 11628 11629 11630 11631 11632 11633 11634 11635 11636 11637 11638 11639 11640 11641 11642 11643 11644 11645 11646 11647 11648 11649 11650 11651 11652 11653 11654 11655 11656 11657 11658 11659 11660 11661 11662 11663 11664 11665 11666 11667 11668 11669 11670 11671 11672 11673 11674 11675 11676 11677 11678 11679 11680 11681 11682 11683 11684 11685 11686 11687 11688 11689 11690 11691 11692 11693 11694 11695 11696 11697 11698 11699 11700 11701 11702 11703 11704 11705 11706 11707 11708 11709 11710 11711 11712 11713 11714 11715 11716 11717 11718 11719 11720 11721 11722 11723 11724 11725 11726 11727 11728 11729 11730 11731 11732 11733 11734 11735 11736 11737 11738 11739 11740 11741 11742 11743 11744 11745 11746 11747 11748 11749 11750 11751 11752 11753 11754 11755 11756 11757 11758 11759 11760 11761 11762 11763 11764 11765 11766 11767 11768 11769 11770 11771 11772 11773 11774 11775 11776 11777 11778 11779 11780 11781 11782 11783 11784 11785 11786 11787 11788 11789 11790 11791 11792 11793 11794 11795 11796 11797 11798 11799 11800 11801 11802 11803 11804 11805 11806 11807 11808 11809 11810 11811 11812 11813 11814 11815 11816 11817 11818 11819 11820 11821 11822 11823 11824 11825 11826 11827 11828 11829 11830 11831 11832 11833 11834 11835 11836 11837 11838 11839 11840 11841 11842 11843 11844 11845 11846 11847 11848 11849 11850 11851 11852 11853 11854 11855 11856 11857 11858 11859 11860 11861 11862 11863 11864 11865 11866 11867 11868 11869 11870 11871 11872 11873 11874 11875 11876 11877 11878 11879 11880 11881 11882 11883 11884 11885 11886 11887 11888 11889 11890 11891 11892 11893 11894 11895 11896 11897 11898 11899 11900 11901 11902 11903 11904 11905 11906 11907 11908 11909 11910 11911 11912 11913 11914 11915 11916 11917 11918 11919 11920 11921 11922 11923 11924 11925 11926 11927 11928 11929 11930 11931 11932 11933 11934 11935 11936 11937 11938 11939 11940 11941 11942 11943 11944 11945 11946 11947 11948 11949 11950 11951 11952 11953 11954 11955 11956 11957 11958 11959 11960 11961 11962 11963 11964 11965 11966 11967 11968 11969 11970 11971 11972 11973 11974 11975 11976 11977 11978 11979 11980 11981 11982 11983 11984 11985 11986 11987 11988 11989 11990 11991 11992 11993 11994 11995 11996 11997 11998 11999 12000 12001 12002 12003 12004 12005 12006 12007 12008 12009 12010 12011 12012 12013 12014 12015 12016 12017 12018 12019 12020 12021 12022 12023 12024 12025 12026 12027 12028 12029 12030 12031 12032 12033 12034 12035 12036 12037 12038 12039 12040 12041 12042 12043 12044 12045 12046 12047 12048 12049 12050 12051 12052 12053 12054 12055 12056 12057 12058 12059 12060 12061 12062 12063 12064 12065 12066 12067 12068 12069 12070 12071 12072 12073 12074 12075 12076 12077 12078 12079 12080 12081 12082 12083 12084 12085 12086 12087 12088 12089 12090 12091 12092 12093 12094 12095 12096 12097 12098 12099 12100 12101 12102 12103 12104 12105 12106 12107 12108 12109 12110 12111 12112 12113 12114 12115 12116 12117 12118 12119 12120 12121 12122 12123 12124 12125 12126 12127 12128 12129 12130 12131 12132 12133 12134 12135 12136 12137 12138 12139 12140 12141 12142 12143 12144 12145 12146 12147 12148 12149 12150 12151 12152 12153 12154 12155 12156 12157 12158 12159 12160 12161 12162 12163 12164 12165 12166 12167 12168 12169 12170 12171 12172 12173 12174 12175 12176 12177 12178 12179 12180 12181 12182 12183 12184 12185 12186 12187 12188 12189 12190 12191 12192 12193 12194 12195 12196 12197 12198 12199 12200 12201 12202 12203 12204 12205 12206 12207 12208 12209 12210 12211 12212 12213 12214 12215 12216 12217 12218 12219 12220 12221 12222 12223 12224 12225 12226 12227 12228 12229 12230 12231 12232 12233 12234 12235 12236 12237 12238 12239 12240 12241 12242 12243 12244 12245 12246 12247 12248 12249 12250 12251 12252 12253 12254 12255 12256 12257 12258 12259 12260 12261 12262 12263 12264 12265 12266 12267 12268 12269 12270 12271 12272 12273 12274 12275 12276 12277 12278 12279 12280 12281 12282 12283 12284 12285 12286 12287 12288 12289 12290 12291 12292 12293 12294 12295 12296 12297 12298 12299 12300 12301 12302 12303 12304 12305 12306 12307 12308 12309 12310 12311 12312 12313 12314 12315 12316 12317 12318 12319 12320 12321 12322 12323 12324 12325 12326 12327 12328 12329 12330 12331 12332 12333 12334 12335 12336 12337 12338 12339 12340 12341 12342 12343 12344 12345 12346 12347 12348 12349 12350 12351 12352 12353 12354 12355 12356 12357 12358 12359 12360 12361 12362 12363 12364 12365 12366 12367 12368 12369 12370 12371 12372 12373 12374 12375 12376 12377 12378 12379 12380 12381 12382 12383 12384 12385 12386 12387 12388 12389 12390 12391 12392 12393 12394 12395 12396 12397 12398 12399 12400 12401 12402 12403 12404 12405 12406 12407 12408 12409 12410 12411 12412 12413 12414 12415 12416 12417 12418 12419 12420 12421 12422 12423 12424 12425 12426 12427 12428 12429 12430 12431 12432 12433 12434 12435 12436 12437 12438 12439 12440 12441 12442 12443 12444 12445 12446 12447 12448 12449 12450 12451 12452 12453 12454 12455 12456 12457 12458 12459 12460 12461 12462 12463 12464 12465 12466 12467 12468 12469 12470 12471 12472 12473 12474 12475 12476 12477 12478 12479 12480 12481 12482 12483 12484 12485 12486 12487 12488 12489 12490 12491 12492 12493 12494 12495 12496 12497 12498 12499 12500 12501 12502 12503 12504 12505 12506 12507 12508 12509 12510 12511 12512 12513 12514 12515 12516 12517 12518 12519 12520 12521 12522 12523 12524 12525 12526 12527 12528 12529 12530 12531 12532 12533 12534 12535 12536 12537 12538 12539 12540 12541 12542 12543 12544 12545 12546 12547 12548 12549 12550 12551 12552 12553 12554 12555 12556 12557 12558 12559 12560 12561 12562 12563 12564 12565 12566 12567 12568 12569 12570 12571 12572 12573 12574 12575 12576 12577 12578 12579 12580 12581 12582 12583 12584 12585 12586 12587 12588 12589 12590 12591 12592 12593 12594 12595 12596 12597 12598 12599 12600 12601 12602 12603 12604 12605 12606 12607 12608 12609 12610 12611 12612 12613 12614 12615 12616 12617 12618 12619 12620 12621 12622 12623 12624 12625 12626 12627 12628 12629 12630 12631 12632 12633 12634 12635 12636 12637 12638 12639 12640 12641 12642 12643 12644 12645 12646 12647 12648 12649 12650 12651 12652 12653 12654 12655 12656 12657 12658 12659 12660 12661 12662 12663 12664 12665 12666 12667 12668 12669 12670 12671 12672 12673 12674 12675 12676 12677 12678 12679 12680 12681 12682 12683 12684 12685 12686 12687 12688 12689 12690 12691 12692 12693 12694 12695 12696 12697 12698 12699 12700 12701 12702 12703 12704 12705 12706 12707 12708 12709 12710 12711 12712 12713 12714 12715 12716 12717 12718 12719 12720 12721 12722 12723 12724 12725 12726 12727 12728 12729 12730 12731 12732 12733 12734 12735 12736 12737 12738 12739 12740 12741 12742 12743 12744 12745 12746 12747 12748 12749 12750 12751 12752 12753 12754 12755 12756 12757 12758 12759 12760 12761 12762 12763 12764 12765 12766 12767 12768 12769 12770 12771 12772 12773 12774 12775 12776 12777 12778 12779 12780 12781 12782 12783 12784 12785 12786 12787 12788 12789 12790 12791 12792 12793 12794 12795 12796 12797 12798 12799 12800 12801 12802 12803 12804 12805 12806 12807 12808 12809 12810 12811 12812 12813 12814 12815 12816 12817 12818 12819 12820 12821 12822 12823 12824 12825 12826 12827 12828 12829 12830 12831 12832 12833 12834 12835 12836 12837 12838 12839 12840 12841 12842 12843 12844 12845 12846 12847 12848 12849 12850 12851 12852 12853 12854 12855 12856 12857 12858 12859 12860 12861 12862 12863 12864 12865 12866 12867 12868 12869 12870 12871 12872 12873 12874 12875 12876 12877 12878 12879 12880 12881 12882 12883 12884 12885 12886 12887 12888 12889 12890 12891 12892 12893 12894 12895 12896 12897 12898 12899 12900 12901 12902 12903 12904 12905 12906 12907 12908 12909 12910 12911 12912 12913 12914 12915 12916 12917 12918 12919 12920 12921 12922 12923 12924 12925 12926 12927 12928 12929 12930 12931 12932 12933 12934 12935 12936 12937 12938 12939 12940 12941 12942 12943 12944 12945 12946 12947 12948 12949 12950 12951 12952 12953 12954 12955 12956 12957 12958 12959 12960 12961 12962 12963 12964 12965 12966 12967 12968 12969 12970 12971 12972 12973 12974 12975 12976 12977 12978 12979 12980 12981 12982 12983 12984 12985 12986 12987 12988 12989 12990 12991 12992 12993 12994 12995 12996 12997 12998 12999 13000 13001 13002 13003 13004 13005 13006 13007 13008 13009 13010 13011 13012 13013 13014 13015 13016 13017 13018 13019 13020 13021 13022 13023 13024 13025 13026 13027 13028 13029 13030 13031 13032 13033 13034 13035 13036 13037 13038 13039 13040 13041 13042 13043 13044 13045 13046 13047 13048 13049 13050 13051 13052 13053 13054 13055 13056 13057 13058 13059 13060 13061 13062 13063 13064 13065 13066 13067 13068 13069 13070 13071 13072 13073 13074 13075 13076 13077 13078 13079 13080 13081 13082 13083 13084 13085 13086 13087 13088 13089 13090 13091 13092 13093 13094 13095 13096 13097 13098 13099 13100 13101 13102 13103 13104 13105 13106 13107 13108 13109 13110 13111 13112 13113 13114 13115 13116 13117 13118 13119 13120 13121 13122 13123 13124 13125 13126 13127 13128 13129 13130 13131 13132 13133 13134 13135 13136 13137 13138 13139 13140 13141 13142 13143 13144 13145 13146 13147 13148 13149 13150 13151 13152 13153 13154 13155 13156 13157 13158 13159 13160 13161 13162 13163 13164 13165 13166 13167 13168 13169 13170 13171 13172 13173 13174 13175 13176 13177 13178 13179 13180 13181 13182 13183 13184 13185 13186 13187 13188 13189 13190 13191 13192 13193 13194 13195 13196 13197 13198 13199 13200 13201 13202 13203 13204 13205 13206 13207 13208 13209 13210 13211 13212 13213 13214 13215 13216 13217 13218 13219 13220 13221 13222 13223 13224 13225 13226 13227 13228 13229 13230 13231 13232 13233 13234 13235 13236 13237 13238 13239 13240 13241 13242 13243 13244 13245 13246 13247 13248 13249 13250 13251 13252 13253 13254 13255 13256 13257 13258 13259 13260 13261 13262 13263 13264 13265 13266 13267 13268 13269 13270 13271 13272 13273 13274 13275 13276 13277 13278 13279 13280 13281 13282 13283 13284 13285 13286 13287 13288 13289 13290 13291 13292 13293 13294 13295 13296 13297 13298 13299 13300 13301 13302 13303 13304 13305 13306 13307 13308 13309 13310 13311 13312 13313 13314 13315 13316 13317 13318 13319 13320 13321 13322 13323 13324 13325 13326 13327 13328 13329 13330 13331 13332 13333 13334 13335 13336 13337 13338 13339 13340 13341 13342 13343 13344 13345 13346 13347 13348 13349 13350 13351 13352 13353 13354 13355 13356 13357 13358 13359 13360 13361 13362 13363 13364 13365 13366 13367 13368 13369 13370 13371 13372 13373 13374 13375 13376 13377 13378 13379 13380 13381 13382 13383 13384 13385 13386 13387 13388 13389 13390 13391 13392 13393 13394 13395 13396 13397 13398 13399 13400 13401 13402 13403 13404 13405 13406 13407 13408 13409 13410 13411 13412 13413 13414 13415 13416 13417 13418 13419 13420 13421 13422 13423 13424 13425 13426 13427 13428 13429 13430 13431 13432 13433 13434 13435 13436 13437 13438 13439 13440 13441 13442 13443 13444 13445 13446 13447 13448 13449 13450 13451 13452 13453 13454 13455 13456 13457 13458 13459 13460 13461 13462 13463 13464 13465 13466 13467 13468 13469 13470 13471 13472 13473 13474 13475 13476 13477 13478 13479 13480 13481 13482 13483 13484 13485 13486 13487 13488 13489 13490 13491 13492 13493 13494 13495 13496 13497 13498 13499 13500 13501 13502 13503 13504 13505 13506 13507 13508 13509 13510 13511 13512 13513 13514 13515 13516 13517 13518 13519 13520 13521 13522 13523 13524 13525 13526 13527 13528 13529 13530 13531 13532 13533 13534 13535 13536 13537 13538 13539 13540 13541 13542 13543 13544 13545 13546 13547 13548 13549 13550 13551 13552 13553 13554 13555 13556 13557 13558 13559 13560 13561 13562 13563 13564 13565 13566 13567 13568 13569 13570 13571 13572 13573 13574 13575 13576 13577 13578 13579 13580 13581 13582 13583 13584 13585 13586 13587 13588 13589 13590 13591 13592 13593 13594 13595 13596 13597 13598 13599 13600 13601 13602 13603 13604 13605 13606 13607 13608 13609 13610 13611 13612 13613 13614 13615 13616 13617 13618 13619 13620 13621 13622 13623 13624 13625 13626 13627 13628 13629 13630 13631 13632 13633 13634 13635 13636 13637 13638 13639 13640 13641 13642 13643 13644 13645 13646 13647 13648 13649 13650 13651 13652 13653 13654 13655 13656 13657 13658 13659 13660 13661 13662 13663 13664 13665 13666 13667 13668 13669 13670 13671 13672 13673 13674 13675 13676 13677 13678 13679 13680 13681 13682 13683 13684 13685 13686 13687 13688 13689 13690 13691 13692 13693 13694 13695 13696 13697 13698 13699 13700 13701 13702 13703 13704 13705 13706 13707 13708 13709 13710 13711 13712 13713 13714 13715 13716 13717 13718 13719 13720 13721 13722 13723 13724 13725 13726 13727 13728 13729 13730 13731 13732 13733 13734 13735 13736 13737 13738 13739 13740 13741 13742 13743 13744 13745 13746 13747 13748 13749 13750 13751 13752 13753 13754 13755 13756 13757 13758 13759 13760 13761 13762 13763 13764 13765 13766 13767 13768 13769 13770 13771 13772 13773 13774 13775 13776 13777 13778 13779 13780 13781 13782 13783 13784 13785 13786 13787 13788 13789 13790 13791 13792 13793 13794 13795 13796 13797 13798 13799 13800 13801 13802 13803 13804 13805 13806 13807 13808 13809 13810 13811 13812 13813 13814 13815 13816 13817 13818 13819 13820 13821 13822 13823 13824 13825 13826 13827 13828 13829 13830 13831 13832 13833 13834 13835 13836 13837 13838 13839 13840 13841 13842 13843 13844 13845 13846 13847 13848 13849 13850 13851 13852 13853 13854 13855 13856 13857 13858 13859 13860 13861 13862 13863 13864 13865 13866 13867 13868 13869 13870 13871 13872 13873 13874 13875 13876 13877 13878 13879 13880 13881 13882 13883 13884 13885 13886 13887 13888 13889 13890 13891 13892 13893 13894 13895 13896 13897 13898 13899 13900 13901 13902 13903 13904 13905 13906 13907 13908 13909 13910 13911 13912 13913 13914 13915 13916 13917 13918 13919 13920 13921 13922 13923 13924 13925 13926 13927 13928 13929 13930 13931 13932 13933 13934 13935 13936 13937 13938 13939 13940 13941 13942 13943 13944 13945 13946 13947 13948 13949 13950 13951 13952 13953 13954 13955 13956 13957 13958 13959 13960 13961 13962 13963 13964 13965 13966 13967 13968 13969 13970 13971 13972 13973 13974 13975 13976 13977 13978 13979 13980 13981 13982 13983 13984 13985 13986 13987 13988 13989 13990 13991 13992 13993 13994 13995 13996 13997 13998 13999 14000 14001 14002 14003 14004 14005 14006 14007 14008 14009 14010 14011 14012 14013 14014 14015 14016 14017 14018 14019 14020 14021 14022 14023 14024 14025 14026 14027 14028 14029 14030 14031 14032 14033 14034 14035 14036 14037 14038 14039 14040 14041 14042 14043 14044 14045 14046 14047 14048 14049 14050 14051 14052 14053 14054 14055 14056 14057 14058 14059 14060 14061 14062 14063 14064 14065 14066 14067 14068 14069 14070 14071 14072 14073 14074 14075 14076 14077 14078 14079 14080 14081 14082 14083 14084 14085 14086 14087 14088 14089 14090 14091 14092 14093 14094 14095 14096 14097 14098 14099 14100 14101 14102 14103 14104 14105 14106 14107 14108 14109 14110 14111 14112 14113 14114 14115 14116 14117 14118 14119 14120 14121 14122 14123 14124 14125 14126 14127 14128 14129 14130 14131 14132 14133 14134 14135 14136 14137 14138 14139 14140 14141 14142 14143 14144 14145 14146 14147 14148 14149 14150 14151 14152 14153 14154 14155 14156 14157 14158 14159 14160 14161 14162 14163 14164 14165 14166 14167 14168 14169 14170 14171 14172 14173 14174 14175 14176 14177 14178 14179 14180 14181 14182 14183 14184 14185 14186 14187 14188 14189 14190 14191 14192 14193 14194 14195 14196 14197 14198 14199 14200 14201 14202 14203 14204 14205 14206 14207 14208 14209 14210 14211 14212 14213 14214 14215 14216 14217 14218 14219 14220 14221 14222 14223 14224 14225 14226 14227 14228 14229 14230 14231 14232 14233 14234 14235 14236 14237 14238 14239 14240 14241 14242 14243 14244 14245 14246
|
commit 640314e5322f93dd20c77db9e66e3e68c3c6577c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 22 13:14:18 2012 +0000
Release Clutter 1.10.0 (stable)
NEWS | 45 +++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 ++--
2 files changed, 47 insertions(+), 2 deletions(-)
commit 15e548ad4a41bdbcf107215c5335f45efe5b4392
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 22 13:20:55 2012 +0000
build: Remove disabling Clutter's deprecation warnings while building it
Now that we have deprecation warnings and not full on symbol removal
from the headers, we can just skip Clutter's own, and use only GLib's.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ffa484e732bcee5c53df14fcad3ec238fa9f72bc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 21 14:01:31 2012 +0000
osx: Fix compilation warnings
https://bugzilla.gnome.org/show_bug.cgi?id=672536
clutter/osx/clutter-stage-osx.c | 44 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 39 insertions(+), 5 deletions(-)
commit c0a02349800b2809832d593b897dbee00f33a3a0
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed Mar 21 10:42:32 2012 -0400
table-layout: Remove dead code
If a column/row is expanding, n_expand has to be greater than 1.
https://bugzilla.gnome.org/show_bug.cgi?id=672557
clutter/clutter-table-layout.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
commit 0e2399e79dfd2d7900fa90f1616646a08b07022c
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed Mar 21 10:36:42 2012 -0400
table-layout: Fix x/y-expand for spanning actors
Ported to ClutterTableLayout from MxTable:
https://github.com/clutter-project/mx/commit/239e53146a678ae753b1fb9a862f4030c66a1d9b
https://bugzilla.gnome.org/show_bug.cgi?id=672557
clutter/clutter-table-layout.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 890bf1438691273dee1f13c5cfe70bd9e43f5573
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed Mar 21 09:36:07 2012 -0400
table-layout: Fix column visibility for spanning actors
Ported to ClutterTableLayout from MxTable:
https://github.com/clutter-project/mx/commit/6633f185fcfb7ce8a6ef85276d09e4ee92f584b8
https://bugzilla.gnome.org/show_bug.cgi?id=672557
clutter/clutter-table-layout.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit 6bb486798639c65daae5000a0b725729a56db30c
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed Mar 21 09:35:37 2012 -0400
table-layout: Remove unused 'shrink' field.
Ported to ClutterTableLayout from MxTable:
https://github.com/clutter-project/mx/commit/053a1b04290e6ac307f90033babf761179d1db89
https://bugzilla.gnome.org/show_bug.cgi?id=672557
clutter/clutter-table-layout.c | 1 -
1 file changed, 1 deletion(-)
commit 6751056439e38fe4701a3fbd4940ed329e2b7f05
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu Feb 16 14:06:25 2012 -0500
actor: Freeze property change notifications on destroy
clutter/clutter-actor.c | 4 ++++
1 file changed, 4 insertions(+)
commit a8b8bd89e56447e2609372a6b1112530a19d8ba2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 21 14:01:11 2012 +0000
Fix fallback profile counter macro
clutter/clutter-profile.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7a7151519f369d3e1686d7fd3de0d231ecc93ae0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 21 13:30:28 2012 +0000
docs: Clean up the animations sections of the Actor reference
clutter/clutter-actor.c | 147 ++++++++++++++++++++++++++++--------------------
1 file changed, 86 insertions(+), 61 deletions(-)
commit 7afc3b2fca6ffbfb160e1f32bbfcfe01a83c7867
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 21 12:57:26 2012 +0000
interactive/scrolling: Use the implicit animation API
tests/interactive/test-scrolling.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
commit ae3a4c3cfbad506c4a3df52a392a3c20a96a2da5
Author: Rico Tzschichholz <ricotz@t-online.de>
Date: Wed Mar 21 13:59:54 2012 +0100
build: Remove superfluous ','
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8678cb74e8868d0d7ad8614a401227f113982801
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 20 16:18:20 2012 +0000
conform: Set harsher environment for running tests
Set the MALLOC_CHECK_ and MALLOC_PERTURB_ environment variables to catch
allocation issues.
tests/conform/run-tests.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 133e663878f958e5cafe8d09bb1ffef9956dcd31
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 20 16:11:52 2012 +0000
paint-node: Initialize ClutterPaintOperation
Don't leave it to the compiler.
clutter/clutter-paint-node-private.h | 2 ++
clutter/clutter-paint-node.c | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
commit e9b05f48607b4a7095d7aeb96dc8f6b1c2b34c54
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Mar 20 14:06:10 2012 +0000
clutter-wayland-compositor.h: Adds missing header guards
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-compositor.h | 5 +++++
1 file changed, 5 insertions(+)
commit e00384826dc5358b17de784922f09f1129b385d9
Author: Neil Roberts <neil@linux.intel.com>
Date: Fri Mar 9 18:24:14 2012 +0000
wayland: Fix some missing includes
The commit 90e5088 added some extra compiler warning options that were
triggering warnings when enabling the wayland build due to missing
header includes. This adds those header includes in.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-backend.c | 4 ++++
clutter/evdev/clutter-device-manager-evdev.c | 1 +
clutter/wayland/clutter-event-wayland.c | 1 +
clutter/wayland/clutter-input-device-wayland.c | 1 +
clutter/wayland/clutter-stage-wayland.c | 1 +
5 files changed, 8 insertions(+)
commit dea90d2fe394d724e569f1558322bc7a9b35061f
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Mar 20 13:50:42 2012 +0000
include standalone cogl-wayland-server/client headers
Because the wayland-server-protocol.h header includes symbols that
collide with wayland-client-protocol.h Cogl now provides top level
<cogl/cogl-wayland-server.h> and <cogl/cogl-wayland-client.h> headers so
that applications can ensure they only include one of the wayland
protocol headers in a particular compilation unit. This updates clutter
accordingly to include those headers.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-backend.c | 2 ++
clutter/wayland/clutter-backend-wayland.c | 1 +
clutter/wayland/clutter-stage-wayland.c | 2 ++
clutter/wayland/clutter-wayland-surface.c | 3 +--
4 files changed, 6 insertions(+), 2 deletions(-)
commit fabf2ddf0f390d5ac21090e37ed4c96a1ac9d468
Author: Rob Bradford <rob@linux.intel.com>
Date: Tue Mar 20 13:31:28 2012 +0000
wayland: Only try and resize the framebuffer if there is a valid framebuffer
clutter/wayland/clutter-stage-wayland.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 2fc9934d2dd0bb1afc65dc951c3363f689d55cd1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 20 13:06:48 2012 +0000
docs: Reorganize the API reference index
doc/reference/clutter/clutter-docs.xml.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 31ec4faa8f61462cc0b9ab4be4df0d3f569bcca4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 20 12:06:21 2012 +0000
docs: Fix typo
clutter/clutter-transition.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cf5ac39552e59a84d3891531c3abd8af027bef70
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 20 11:55:41 2012 +0000
docs: Add a section on actor animations
Detail the implicit and explicit animation models used by ClutterActor.
clutter/clutter-actor.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 71 insertions(+), 1 deletion(-)
commit 4f62137302483537a30725aba1ae9d3fb0e9d0f4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 20 11:47:41 2012 +0000
property-transition: Remove animatable from the ctor
Should not have been there in the first place: the animatable will be
set either using ClutterTransition API, or when adding the transition
to a ClutterActor.
clutter/clutter-actor.c | 5 +++--
clutter/clutter-property-transition.c | 8 +++-----
clutter/clutter-property-transition.h | 3 +--
3 files changed, 7 insertions(+), 9 deletions(-)
commit 5694b8031e0cb257ba618d266255637468365352
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 20 11:22:07 2012 +0000
Use g_clear_object() instead of unref() + NULL
clutter/clutter-actor.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
commit 48ca103de183fadb53017657cb1afd8f3295265a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 20 11:17:53 2012 +0000
actor: Clarify and improve memory management of transitions
When adding a transition to a ClutterActor, the actor should hold a
reference on it, and release it only when we remove it. This makes
transitions just like other objects held by ClutterActor.
clutter/clutter-actor.c | 44 +++++++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 13 deletions(-)
commit 9b1b554c1ab0dab0654bb3e661b632d4b740f568
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Mar 20 16:36:51 2012 +0800
Update Visual C++ property sheets
-"Install" the newly-introduced headers
-Fix the situation when the Clutter sources are not unpacked in the root
folder of a drive (ex: Clutter is unpacked in c:\blah or d:\blah, instead
of c:\ or d:\)
build/win32/vs10/clutter.props | 28 +++++++++++++++++++++++++---
build/win32/vs9/clutter.vsprops | 23 +++++++++++++++++++----
2 files changed, 44 insertions(+), 7 deletions(-)
commit a1b8cc4b3b1f816d1f9d0c0b9af2b3f4a20e877a
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Mar 20 16:16:57 2012 +0800
Update test-interactive Visual C++ projects
Link to GDK-Pixbuf as well.
build/win32/vs10/test-interactive-clutter.vcxprojin | 8 ++++----
build/win32/vs9/test-interactive-clutter.vcprojin | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
commit 073ec80c05c27a36d2412f9d6784c12c01417bc5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 18:10:26 2012 +0000
cookbook/examples: Use real implicit animations
Instead of clutter_actor_animate().
doc/cookbook/examples/animations-moving-implicit.c | 42 +++++++++++-----------
1 file changed, 21 insertions(+), 21 deletions(-)
commit 65cf2039d89f00811beacea4ce98b5003df49f94
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 18:05:29 2012 +0000
timeline: Increment current-repeat after ::completed
The ::completed signal emission is part of the current cycle; repeating,
like the automatic reverse of the timeline's direction, happens after
the ::completed chain of handlers has been called.
clutter/clutter-timeline.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1dbb1db1837f18ad59a1c4f4830fcdfe0f434299
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date: Mon Mar 19 23:45:28 2012 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 607 ++++++++++++++++++++++++++++++++++++------------------------
po/zh_TW.po | 607 ++++++++++++++++++++++++++++++++++++------------------------
2 files changed, 732 insertions(+), 482 deletions(-)
commit 03c504efc9f45917f84d11dbe7eb982380738487
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 15:23:08 2012 +0000
Post-release version bump to 1.9.17
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit aa6ba2c706a5d53d8a994694d021edb0c07f03f2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 15:10:04 2012 +0000
Release Clutter 1.9.16 (1.10 release candidate 1)
NEWS | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 65 insertions(+), 1 deletion(-)
commit 28266a59ed9082fbf5ce453a498b61e833644786
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 14:57:46 2012 +0000
docs: Fixes for the API reference
clutter/clutter-event.h | 9 ++++-----
doc/reference/clutter/clutter-sections.txt | 5 +++++
2 files changed, 9 insertions(+), 5 deletions(-)
commit 767b14fb2d1cc639cd65604049cfe3fc0abb108f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 14:47:55 2012 +0000
conform/anchors: Fix a dubious test
Changing the scale gravity should not affect the scale factors as well;
it was just a side-effect of the wrong implementation of the setter.
tests/conform/actor-anchors.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 5a77f814abfee368e4322d5dacbfce1869bc3149
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 14:40:46 2012 +0000
x11/keymap: Silence deprecation warnings around a fallback
We still use XKeycodeToKeysym() in a fallback path in case we're not
running on a decent enough system; XKeycodeToKeysym() is deprecated as
of version 1.12 of the X server, but since I don't want to copy a bunch
of code from GDK or, god forbid, from Xlib, for a fallback path, it's
probably more reasonable to just silence the compiler warnings - at
least until we can drop all the X compatibility crap, and just use
modern, or semi-modern, API.
clutter/x11/clutter-keymap-x11.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
commit 09a317d23dc7d4785c31f8393b54392b5f473f60
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 14:28:34 2012 +0000
x11: Add support for touch events
For the time being, we just relay everything we get from the X server to
the Clutter application.
clutter/clutter-event-private.h | 3 +
clutter/clutter-event.c | 12 +++
clutter/x11/clutter-backend-x11.c | 5 +
clutter/x11/clutter-backend-x11.h | 1 +
clutter/x11/clutter-device-manager-xi2.c | 177 ++++++++++++++++++++++++++++++-
clutter/x11/clutter-input-device-xi2.c | 10 ++
6 files changed, 207 insertions(+), 1 deletion(-)
commit d15b828cc5749772a46bee07277aa1694c67a1fd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 13:47:19 2012 +0000
event: Add ClutterTouchEvent
The ClutterTouchEvent structure contains the data relative to a touch
event.
clutter/clutter-enums.h | 18 ++++++++-
clutter/clutter-event.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-event.h | 55 ++++++++++++++++++++++++++++
clutter/clutter-main.c | 9 +++++
clutter/clutter.symbols | 1 +
5 files changed, 179 insertions(+), 1 deletion(-)
commit ab3582be1cca307350389ca6bcb326b4fce35d73
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 12:19:26 2012 +0000
gdk: Relay scroll delta from GDK
clutter/gdk/clutter-event-gdk.c | 3 +++
clutter/gdk/clutter-stage-gdk.h | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 1c500f7de9d02c826e333e7dfd90aa8bb677d484
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 14:27:54 2012 +0000
x11: Reset scroll valuators
We need to clear up the state on enter and leave, as well as when the X
server tells us that the device has changed.
clutter/x11/clutter-device-manager-xi2.c | 3 +++
1 file changed, 3 insertions(+)
commit 676a31743993915437da419551d7c5193f0b9f43
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 12:16:53 2012 +0000
x11: Add support for scroll valuators on XInput2.2
clutter/clutter-device-manager-private.h | 23 +++++++
clutter/clutter-input-device.c | 96 ++++++++++++++++++++++++++
clutter/x11/clutter-backend-x11.c | 5 ++
clutter/x11/clutter-device-manager-xi2.c | 111 ++++++++++++++++++++++++++++++-
4 files changed, 233 insertions(+), 2 deletions(-)
commit 6b07f8a3df5647e752165af44bdea31619f7e8d1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 12:15:41 2012 +0000
event: Expose precise scrolling information
Some events may contain precise scrolling information coming from
devices like trackpads and touchscreens. ClutterEvent should allow
setting and getting this information.
clutter/clutter-enums.h | 7 ++++-
clutter/clutter-event.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-event.h | 8 ++++++
clutter/clutter.symbols | 2 ++
4 files changed, 87 insertions(+), 1 deletion(-)
commit 4fcd32025580c35b2133369159f411ea508e3d3b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 19 12:13:01 2012 +0000
Check for XInput 2.2 extension
configure.ac | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
commit 28bfebc7ec27f01000c3ec1591d3117e8d7f0052
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date: Mon Mar 19 01:15:12 2012 +0100
[l10n]Updated Catalan (Valencian) translation
po/ca@valencia.po | 1693 +++++++++++++++++++++++++++++++----------------------
1 file changed, 984 insertions(+), 709 deletions(-)
commit 36f8314e320fcb2c489d76c53855a3d582b2ac79
Author: Gil Forcada <gforcada@gnome.org>
Date: Mon Mar 19 01:15:07 2012 +0100
[l10n] Updated Catalan translation
po/ca.po | 334 +++++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 209 insertions(+), 125 deletions(-)
commit ff10941ac752b5c662fb7983c532fac2599c051e
Author: Bruno Brouard <annoa.b@gmail.com>
Date: Sun Mar 18 21:41:05 2012 +0100
Updated French translation
po/fr.po | 1861 ++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 1069 insertions(+), 792 deletions(-)
commit b0a0e5e177c8e5b76d3eb9a305ac3fb58305bf27
Author: Alexander Shopov <ash@kambanaria.org>
Date: Sun Mar 18 20:29:17 2012 +0200
Updated Bulgarian translation
po/bg.po | 442 +++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 263 insertions(+), 179 deletions(-)
commit bf7f0a492eb1443e48fe6eb133ee92851e69de62
Author: Daniel Nylander <po@danielnylander.se>
Date: Sun Mar 18 11:04:34 2012 +0100
Updated Swedish translation
po/sv.po | 1926 ++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 1125 insertions(+), 801 deletions(-)
commit 103438cfe2b51f479c6f6ccce4afc1ba1b0406f0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sun Mar 18 08:07:56 2012 +0000
actor: Add ::transitions-completed signal
While you can get a per-transition notification of completion, it can be
convenient to also have a way to notify that all the transitions
involving an actor are complete. A simple signal triggered by the
removal of the last transition fits the bill pretty neatly.
clutter/clutter-actor.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
commit a37ec4bd34f549ac7c3614616940f2aef2de1ff1
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Mar 18 03:07:31 2012 -0400
script-parser: Fix build
clutter/clutter-script-parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4da8001cac3ba14286f99bc9e35e2ec24dee0421
Author: Marek Černocký <marek@manet.cz>
Date: Sun Mar 18 07:57:52 2012 +0100
Updated Czech translation
po/cs.po | 1181 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 643 insertions(+), 538 deletions(-)
commit 5b6d9e0f2b10ac1abad22415493333a5e223ea31
Author: Adam Matoušek <adydas95@gmail.com>
Date: Sun Mar 18 07:38:15 2012 +0100
Updated Czech translation
po/cs.po | 1866 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 1033 insertions(+), 833 deletions(-)
commit 4d42904fcc748df33adaa3b76f6d6fc664bf1842
Author: Lionel Landwerlin <llandwerlin@gmail.com>
Date: Sat Mar 17 23:52:48 2012 +0000
x11/stage: fix multi-stage support
When handling Configure events from the X server we update the
internal copy of the window size. Unfortunately we may be updating the
wrong stage implementation because we use the one related to the event
translator (which is the first created stage).
This patch fix flickering/redrawning issues with multi-stage by
looking for the right stage implementation associated with an XEvent.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com>
clutter/x11/clutter-stage-x11.c | 37 +++++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 12 deletions(-)
commit efac119cabe99425aeeb05e970cf4c2b76a45cab
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date: Sun Mar 18 00:19:04 2012 +0000
Updated Portuguese translation
po/pt.po | 1686 ++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 986 insertions(+), 700 deletions(-)
commit d5738b6bd4e40f36ca09cfd730968c8035d3ad62
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat Mar 17 22:55:33 2012 +0000
script: Add 'context' to the translatable definitions
This should cover all the possible options.
clutter/clutter-script-parser.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
commit 837b6cf756f8683a8c69184d32d3ea10e41191b1
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date: Sat Mar 17 20:45:56 2012 +0100
Updated Serbian translation
po/sr.po | 463 ++++++++++++++++++++++++++++++++++-----------------------
po/sr@latin.po | 463 ++++++++++++++++++++++++++++++++++-----------------------
2 files changed, 558 insertions(+), 368 deletions(-)
commit 05f78306d18a5107d194445882cae5afae3eab7f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Mar 17 16:49:35 2012 +0000
actor: Avoid popping the easing state stack once too many
If restore_easing_state() is called on the last easing state on the
stack, clean up the stack, so that we don't leave stale pointers
around to later segfault on.
clutter/clutter-actor.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit 229241b8757a0192f2c2ade3f0ce50f311aeea99
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Mar 17 16:46:38 2012 +0000
actor: Remove the implicit easing state save
When setting the easing mode, duration, or delay without having ever
called clutter_actor_save_easing_state(). It's confusing, and not
really nice.
In the future, we'll have a default easing state implicitly created by
the actor itself, but for the time being explicitly opting in is
preferrable.
clutter/clutter-actor.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
commit b3b1994c132743c7f68f5aec811170ecc51b6c6c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Mar 17 16:38:06 2012 +0000
Use G_VALUE_INIT instead of { 0, }
The macro avoids warnings from anal-retentive compilers.
clutter/clutter-actor.c | 2 +-
clutter/clutter-alpha.c | 4 ++--
clutter/clutter-animation.c | 12 ++++++------
clutter/clutter-animator.c | 6 +++---
clutter/clutter-binding-pool.c | 9 +++++++--
clutter/clutter-container.c | 4 ++--
clutter/clutter-interval.c | 6 +++---
clutter/clutter-layout-manager.c | 4 ++--
clutter/clutter-list-model.c | 4 ++--
clutter/clutter-model.c | 4 ++--
clutter/clutter-script-parser.c | 6 +++---
clutter/clutter-shader-effect.c | 2 +-
clutter/clutter-state.c | 10 +++++-----
13 files changed, 39 insertions(+), 34 deletions(-)
commit be5921e6fb8dc25db8c8da327c07c63d8ca3b2c3
Author: Aurimas Černius <aurisc4@gmail.com>
Date: Sat Mar 17 18:30:43 2012 +0200
Updated Lithuanian translation
po/lt.po | 1096 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 607 insertions(+), 489 deletions(-)
commit 82bc7285847ef50aae3d4e48907309ec509105ad
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Mar 17 16:29:09 2012 +0000
Add initializer utilities for ClutterVertex
Similar to what we did for ClutterActorBox.
clutter/clutter-actor.c | 26 ++++++++++++++++++++++++--
clutter/clutter-types.h | 20 ++++++++++++++++++++
clutter/clutter.symbols | 1 +
doc/reference/clutter/clutter-sections.txt | 2 ++
4 files changed, 47 insertions(+), 2 deletions(-)
commit 63f3eaab62ddd42af5b0d3511d3930232c496485
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Mar 17 16:17:39 2012 +0000
actor: Fix set_scale_with_gravity()
Add a scale-gravity internal setter, and make set_scale_with_gravity()
call it, along with the scale factor.
clutter/clutter-actor.c | 67 ++++++++++++++++++++++---------------------------
1 file changed, 30 insertions(+), 37 deletions(-)
commit 5e9d6f72577c788c24049d8057f856a0f669fa59
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Mar 17 15:27:26 2012 +0000
Add some utility initializers to ClutterActorBox
clutter/clutter-actor-box.c | 58 +++++++++++++++++++++++++++---
clutter/clutter-types.h | 28 +++++++++++++++
clutter/clutter.symbols | 2 ++
doc/reference/clutter/clutter-sections.txt | 3 ++
4 files changed, 86 insertions(+), 5 deletions(-)
commit e1a31bb587b7e5b18d169c2db1c910cf323a9186
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Sat Mar 17 15:04:38 2012 +0100
Updated Galician translations
po/gl.po | 296 +++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 174 insertions(+), 122 deletions(-)
commit b6f5609b2f3cc582e499e6d24ed05fe08807592d
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Mar 16 23:10:28 2012 +0000
osx/stage: Synthesize an enter event on show
If the pointer is inside the window frame when it's shown then we need
to synthesize and emit a NSMouseEnterEvent ourselves, as Quartz won't
do it for us.
This is a bit of a blind commit - but it's taken from an equivalent
patch that has been verified to work in GDK.
clutter/osx/clutter-stage-osx.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
commit f7735ff1ad66444ede0fbc8e45447e7e0b4ce895
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 18:10:34 2012 +0000
docs: Change the short description of ClutterActor
The Actor class is not abstract any more.
clutter/clutter-actor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e5e10b6a04486f6936265727b099390fd99f2f5a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 17:30:26 2012 +0000
Annotate functionality added in 1.10
clutter/clutter-canvas.h | 3 +++
clutter/clutter-content.h | 3 +++
clutter/clutter-image.h | 6 ++++++
clutter/clutter-paint-node.h | 13 +++++++++++++
clutter/clutter-paint-nodes.h | 10 ++++++++++
clutter/clutter-property-transition.h | 4 ++++
clutter/clutter-transition.h | 7 +++++++
7 files changed, 46 insertions(+)
commit 1df14c1bac2c903466d975946a4c29a892ed28c1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 16:16:40 2012 +0000
Debugging cleanups
Add some more debugging notes to the layout and paint node output.
clutter/clutter-actor.c | 51 ++++++++++++++++++++----------------
clutter/clutter-paint-node-private.h | 2 +-
clutter/clutter-paint-nodes.c | 38 +++++++++++++++++++++++++--
3 files changed, 66 insertions(+), 25 deletions(-)
commit a7714e294ee26f52cabb96694ce871d2dffebe7e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 16:13:11 2012 +0000
actor: Remove an has_allocation() check
The get_content_box() method should always succeed; if the actor does
not have an allocation, we are just going to return a 0-box.
clutter/clutter-actor.c | 3 ---
1 file changed, 3 deletions(-)
commit de32ba1ddfa73901fea0146ec462754a420659b0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 15:05:42 2012 +0000
interactive/image-box: Clarify the label contents
tests/interactive/test-image-box.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
commit 800b5b6ef7f45c280347a521c16682b16f051657
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 14:26:28 2012 +0000
actor: Restore a lost queue_relayout()
It got lost during a rebase conflict resolution.
clutter/clutter-actor.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 72b202c7ed268ae3f5fe9d8b1a0d3b7a9b646ad5
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Fri Mar 16 15:25:30 2012 +0100
Updated Polish translation
po/pl.po | 296 +++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 174 insertions(+), 122 deletions(-)
commit 9ac9fa903a3ff41790ed5442cf5e475b25d68dd5
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date: Fri Mar 16 14:18:12 2012 +0000
Updated British English translation
po/en_GB.po | 443 ++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 264 insertions(+), 179 deletions(-)
commit 045beaff5a8d31e2a4e42ace9ad811ec1558720f
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Fri Mar 16 15:12:38 2012 +0100
Updated POTFILES.in
po/POTFILES.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit b05717575cf17fec578ce0a4c26de788324ad08a
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date: Fri Mar 16 19:30:46 2012 +0530
Assamese translation updated
po/as.po | 322 +++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 189 insertions(+), 133 deletions(-)
commit cb69be6b97eaa62418d60540b4de532f544e631b
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Fri Mar 16 14:58:09 2012 +0100
Updated Slovenian translation
po/sl.po | 307 +++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 181 insertions(+), 126 deletions(-)
commit a7b076b7aaba761705ff861aaf70d26e0577efb5
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Fri Mar 16 14:13:57 2012 +0100
Updated Spanish translation
po/es.po | 310 +++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 183 insertions(+), 127 deletions(-)
commit a3007b9847e0ff527c1a11f111c6dfa491378858
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 12:21:19 2012 +0000
build: Remove maintainer flags from cookbook/examples
The code should be a tad more relaxed.
doc/cookbook/examples/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cbed0484c01471e06a2302097e6f632d1e427c5b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 12:19:33 2012 +0000
po: Update POTFILES.in
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
commit ae554a5061b64ee7b4d157f91467c19ce74495fa
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 12:05:11 2012 +0000
Rename 'bilinear' scaling filter to 'trilinear'
Yes, it's not really the proper GL name for a linear-on-every-axis of a
texture plus linear-between-mipmap-levels minification filter, but it
has three redeeming qualities as a name:
- LINEAR_MIPMAP_LINEAR sucks, as it introduces GL concepts like
mipmaps in the API naming, while we're trying to avoid that;
- people using GL already know what 'trilinear' means in this context
without going all Khronos on their asses;
- we're using 2D textures anyway, so 'linear on two axes and linear
between mipmap levels' can be effectively approximated to
'trilinear'.
I mean, if even the OpenGL official wiki says:
Unfortunately, what most people think of as "trilinear" is not linear
filtering of a 3D texture, but what in OpenGL terms is GL_LINEAR mag
filter and GL_LINEAR_MIPMAP_LINEAR in the min filter in a 2D texture.
That is, it is bilinear filtering of each appropriate mipmap level,
and doing a third linear filter between the adjacent mipmap levels.
Hence the term "trilinear".
-- http://www.opengl.org/wiki/Texture
then the horse has already been flogged to death, and I don't intend to
be accused of necrophilia and sadism by flogging it some more.
Prior art: every single GL tutorial in the history of ever;
CoreAnimation's scaling filter enumerations.
If people want to start using 1D or 3D textures they they are probably
going to be using Cogl API directly, and that has the GL naming scheme
for minification and magnification filters anyway.
clutter/clutter-actor.c | 2 +-
clutter/clutter-enums.h | 7 ++++---
clutter/clutter-paint-nodes.c | 2 +-
tests/interactive/test-canvas.c | 2 +-
tests/interactive/test-image-box.c | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
commit b44290c4369e86f8fff19bf4ccbb0cb7a5268cdc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 12:01:28 2012 +0000
docs: Add ClutterActorClass.paint_node() description
clutter/clutter-actor.h | 2 ++
1 file changed, 2 insertions(+)
commit 8904f7cbe4525d0d458dbb9ad8c011113f13074a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 16 11:57:34 2012 +0000
paint-nodes: Make part of the API internal
At least for the time being, we only expose the parts of the API that we
want to use internally and for new, out-of-tree Content implementations.
The full PaintNode tree API will be made public in 1.12 once we branch
master.
clutter/clutter-paint-node-private.h | 50 +++++++++++++++++++++++++++++-
clutter/clutter-paint-node.c | 11 ++++++-
clutter/clutter-paint-node.h | 15 ---------
clutter/clutter-paint-nodes.c | 36 +++++++++++----------
clutter/clutter-paint-nodes.h | 23 --------------
clutter/clutter.symbols | 11 -------
doc/reference/clutter/clutter-sections.txt | 18 -----------
7 files changed, 78 insertions(+), 86 deletions(-)
commit 74f5bbe5aa7a6a577666a672fd2b67b046c284a0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 19:08:20 2012 +0000
docs: Fixes for ClutterImage's API reference
clutter/clutter-image.c | 2 ++
doc/reference/clutter/clutter-docs.xml.in | 1 +
2 files changed, 3 insertions(+)
commit d123e4b701a458b8674bd5f3dca20de8dc70f017
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 19:02:39 2012 +0000
Update release notes
README.in | 6 ++++++
1 file changed, 6 insertions(+)
commit 0a2ee1709b644cbead9a4540950e7a0d34ae1861
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 18:26:42 2012 +0000
docs: Fixes for the API reference
clutter/clutter-image.h | 16 ++++++++++++++++
doc/reference/clutter/clutter-sections.txt | 16 +++++++---------
2 files changed, 23 insertions(+), 9 deletions(-)
commit 90784a025af679a9c40c14ee90549dea4929497d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 13 17:19:15 2012 +0000
interactive/image-box: Remove unneeded stuff
tests/interactive/test-image-box.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 10e2f551f5d7a3f67b1481fefd673fef5da9a11e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 12 16:19:08 2012 +0000
actor: Unconditionally emit ::paint
It's a bit late in the game for changing the emission of the paint
signal with actors that use paint nodes - mostly because we have both
implicit paint nodes (background color, content) and explicit paint
nodes (the paint_node virtual).
When we branch for 1.12 we can revert this change.
clutter/clutter-actor.c | 14 +++++++++++---
tests/conform/test-conform-main.c | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
commit d1fd53b29d7761e79b77c64c4b15dd339b1a3a84
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 12 16:07:55 2012 +0000
po: Update POTFILES.in
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
commit 5432775eff1b8cacc895d8511b90c51cb441cddd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 12 15:52:55 2012 +0000
paint-node: Make texture template pipeline clamp to edge
It's safer, and consistent with the rest of Clutter, to make sure that
the template pipeline we use for ClutterTextureNode has its wrap mode
set to clamp-to-edge.
clutter/clutter-paint-nodes.c | 2 ++
1 file changed, 2 insertions(+)
commit 75e6560160034ac831965aa7870d710fc558641a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 12 15:46:34 2012 +0000
image: Add set_area() method
This method allows replacing an area inside the texture data used by a
ClutterImage.
clutter/clutter-image.c | 92 ++++++++++++++++++++++++++++++
clutter/clutter-image.h | 22 ++++---
clutter/clutter.symbols | 1 +
doc/reference/clutter/clutter-sections.txt | 1 +
4 files changed, 108 insertions(+), 8 deletions(-)
commit 2be850f441f0c2da4df3b843b432472a8565d3ec
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 12 15:25:38 2012 +0000
image: Add get_texture()
Allow retrieving the Cogl texture used by the ClutterImage.
clutter/clutter-image.c | 25 +++++++++++++++++++++++++
clutter/clutter-image.h | 4 ++++
clutter/clutter.symbols | 1 +
doc/reference/clutter/clutter-sections.txt | 1 +
4 files changed, 31 insertions(+)
commit 9845ce9d89655882a19b3079d76397fbcd35e677
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 9 16:26:44 2012 +0000
actor: Fix RESIZE_ASPECT mode for the content box
clutter/clutter-actor.c | 58 ++++++++++++++++++++++++++++----------
tests/interactive/test-image-box.c | 20 +++++++++----
2 files changed, 58 insertions(+), 20 deletions(-)
commit b6403b01a14677d0ec88928f292aa1aa08b39283
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 9 17:11:19 2012 +0000
Documentation fixes
clutter/clutter-actor.c | 19 +++++++++-----
clutter/clutter-enums.h | 12 +++++++++
clutter/clutter-image.c | 40 ++++++++++++++++++++++++++++--
doc/reference/clutter/clutter-sections.txt | 20 +++++++++++++++
4 files changed, 83 insertions(+), 8 deletions(-)
commit 1b4bfb04e5dc5f0a173b18d7c54b4d111f298604
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 9 16:26:34 2012 +0000
interactive/image-box: Add a pure Image test, suitable for docs
tests/interactive/Makefile.am | 4 +-
tests/interactive/test-image-box.c | 100 +++++++++++++++++++++++++++++++++++++
2 files changed, 103 insertions(+), 1 deletion(-)
commit 6c181b96e9f0699aea33fc27aa0e31819be7d326
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 9 14:58:17 2012 +0000
interactive/image: Test ClutterImage
Load up the image content using a GdkPixbuf; this means that the test is
not compiled when --disable-gdk-pixbuf is passed.
tests/interactive/Makefile.am | 8 +-
tests/interactive/test-image.c | 252 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 258 insertions(+), 2 deletions(-)
commit 6cb94b2de2b6fb575770123b276dfed556296a45
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 9 14:56:58 2012 +0000
build: Check for gdk-pixbuf
Some tests may need to load image data without going through
ClutterTexture or Cogl, so let's add a configure switch and a
conditional for gdk-pibxuf.
configure.ac | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
commit f90330867e2677394283bc6c6a3a30b9252b5f13
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 17:37:00 2012 +0000
Update clutter.symbols
clutter/clutter.symbols | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
commit 23fad8589ca67696ef5328ff1c7c5a3cb28bc296
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 17:19:58 2012 +0000
interactive/canvas: Set the scaling filters
tests/interactive/test-canvas.c | 3 +++
1 file changed, 3 insertions(+)
commit fb106ece058ee43673f425b997e34886540ac751
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 17:19:12 2012 +0000
Use the content scaling filters
Both ClutterCanvas and ClutterImage should use the minification and
magnification filters set on the actor, just like the use the content
box and the paint opacity.
clutter/clutter-canvas.c | 4 ++-
clutter/clutter-image.c | 4 ++-
clutter/clutter-paint-nodes.c | 58 +++++++++++++++++++++++++++++--------------
clutter/clutter-paint-nodes.h | 4 ++-
4 files changed, 49 insertions(+), 21 deletions(-)
commit 77729c73624537021da731250a82937a8216a995
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 17:18:17 2012 +0000
actor: Add minification/magnification filters
These settings are informative, and will only be used by the eventual
content of an actor.
clutter/clutter-actor.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++-
clutter/clutter-actor.h | 8 ++++
clutter/clutter-enums.h | 6 +++
3 files changed, 133 insertions(+), 1 deletion(-)
commit cadae5b3257b5f3c1455554036bd85e04e5dc399
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 16:38:45 2012 +0000
Add ClutterImage, and image data content
clutter/Makefile.am | 2 +
clutter/clutter-image.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-image.h | 101 +++++++++++++++++++++++++
clutter/clutter.h | 1 +
4 files changed, 294 insertions(+)
commit f2b9c17a78d539dafbab2ad4922b22bb1978fd30
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 16:38:30 2012 +0000
canvas: Fix single header inclusion guard
clutter/clutter-canvas.h | 4 ++++
1 file changed, 4 insertions(+)
commit 0eeb61f3a890dbed51fa8d82c016572f5d3442b7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 15:47:16 2012 +0000
canvas: Add canvas size to the ::draw signal
Instead of requiring a call to clutter_content_get_preferred_size(), we
can simply pass the canvas size to the Canvas::draw signal.
clutter/clutter-canvas.c | 24 +++++++++++++++---------
clutter/clutter-canvas.h | 4 +++-
clutter/clutter-content.c | 4 ++--
clutter/clutter-marshal.list | 1 +
tests/interactive/test-canvas.c | 11 ++++++-----
5 files changed, 27 insertions(+), 17 deletions(-)
commit 07bb35bbe38392e46f92ad17049893ef752f5c55
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 10:31:21 2012 +0000
Add ClutterCanvas, a drawing content
clutter/Makefile.am | 2 +
clutter/clutter-cairo-texture.h | 20 --
clutter/clutter-canvas.c | 507 +++++++++++++++++++++++++++++
clutter/clutter-canvas.h | 91 ++++++
clutter/clutter-macros.h | 20 ++
clutter/clutter.h | 1 +
clutter/clutter.symbols | 3 +
doc/reference/clutter/clutter-docs.xml.in | 6 +
doc/reference/clutter/clutter-sections.txt | 17 +
doc/reference/clutter/clutter.types | 1 +
tests/interactive/Makefile.am | 3 +-
tests/interactive/test-canvas.c | 135 ++++++++
12 files changed, 785 insertions(+), 21 deletions(-)
commit e2f1153c462d955dbbab8bc981dc2fc77cae1cde
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 14:06:20 2012 +0000
paint-node: Remove redundant declarations
clutter/clutter-paint-node.c | 2 ++
clutter/clutter-paint-nodes.c | 6 ------
2 files changed, 2 insertions(+), 6 deletions(-)
commit 546a14ec3b7e17d51537ac19d83c1d7a86366fa5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 14:05:48 2012 +0000
content: Make get_preferred_size() public
clutter/clutter-actor.c | 9 ++++++---
clutter/clutter-content-private.h | 4 ----
clutter/clutter-content.c | 14 +++++++++-----
clutter/clutter-content.h | 3 +++
4 files changed, 18 insertions(+), 12 deletions(-)
commit 74765404dd93feeb3d0fde70a102f9fc843f293e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 19:02:16 2012 +0000
conform: Skip actor-offscreen-redirect
Until we figure out a way to make it succeed even without the paint
signal emission.
tests/conform/test-conform-main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 485b720a543002c2d1344452fb6d2de6ec418303
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 19:01:30 2012 +0000
conform/text-cache: Use the stage paint signal
The stage's paint signal is guaranteed to be emitted; ClutterText's
paint signal is not.
tests/conform/text-cache.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit e54ee64380fa186b59538327c49dbcf6f7efd7a8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 18:32:16 2012 +0000
actor: Make paint_node() and ::paint mutually exclusive
The ::paint signal is the old way to paint an actor; the paint_node()
virtual function is the new way. It's still not possible to traverse the
whole scene graph and build a render tree of PaintNode instances, but
with this change we simultaneously cut out the ::paint signal emission
from the critical path for actors that are using the new PaintNode-based
API, and we retain backward compatibility in the interim period between
1.10 and 2.0.
clutter/clutter-actor.c | 96 ++++++++++++++++++++++++++++---------------------
1 file changed, 56 insertions(+), 40 deletions(-)
commit a58be8aad15b0248578de11405832b23332a7d99
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 18:32:02 2012 +0000
paint-nodes: Fix compiler warning
clutter/clutter-paint-nodes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ff7eb6c0a9b1920678bac45de039331c71f553c1
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Feb 20 10:09:58 2012 +0000
interactive/content: Define the size of the text geometry
So that Clutter can decide whether or not to clip the text properly.
tests/interactive/test-content.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 51cca132e0d91a5cc9db8407d8eee42992acd1e6
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Feb 20 10:09:05 2012 +0000
paint-nodes: Use logical extents for the TextNode::draw
When we decide if we ought to clip, we should use the logical extents of
the PangoLayout, just like we do for ClutterText.
clutter/clutter-paint-nodes.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit fa77274e808e84f83f856e0d0a5ab997eb091d25
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Feb 4 12:58:40 2012 +0000
content: Turn attached and detached into signals
The attached and detached virtual functions are now informative, and not
normative - which means it's a good idea to provide them as signals.
clutter/clutter-content.c | 54 +++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 52 insertions(+), 2 deletions(-)
commit 2f0d29ad75f7d616e4d368d6da758d4b6b72c376
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Feb 4 12:49:49 2012 +0000
content: Make vfuncs optional
The virtual functions on the ClutterContent interface should provide
hooks for application code, not be the actual implementation.
clutter/clutter-content.c | 83 ++++++++++++++++++++++++-----------------------
clutter/clutter-content.h | 11 +++----
2 files changed, 47 insertions(+), 47 deletions(-)
commit f4d8fb054a911aaa69aef9fa40ff4fec4e385b4c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Feb 3 13:51:29 2012 +0000
paint-node: Use JSON-GLib for debug serialization
Instead of our homegrown string building; this at least ensures that
we're generating proper data, instead of random strings. Plus, using
JsonNode and JsonBuilder, we can ask the PaintNode subclasses to
serialize themselves in a sensible way.
clutter/clutter-paint-node-private.h | 3 +
clutter/clutter-paint-node.c | 201 ++++++++++++++++-------------------
clutter/clutter-paint-nodes.c | 83 +++++++++++++++
3 files changed, 175 insertions(+), 112 deletions(-)
commit 2ee58519709eff8fd24b4a378f143f8377b8143b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 2 14:51:17 2012 +0000
docs: Update the API reference
Add all the new symbols.
clutter/clutter-content.c | 2 +-
doc/reference/clutter/Makefile.am | 1 +
doc/reference/clutter/clutter-docs.xml.in | 10 ++
doc/reference/clutter/clutter-sections.txt | 266 +++++++++++++++++++++--------
doc/reference/clutter/clutter.types | 2 +
5 files changed, 205 insertions(+), 76 deletions(-)
commit 6cddd697475cfd0610622b21a970f7c755968b0f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 1 19:26:15 2012 +0000
docs: Update documentation on the paint sequence
clutter/clutter-actor.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
commit be4746b15f339c7959ff5a3df94b8f289c274ab3
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 1 18:33:55 2012 +0000
Add ClutterContent
ClutterContent is an interface for creating delegate objects that handle
what an actor is going to paint.
Since they are a newly added type, they only hook into the new PaintNode
based API.
The position and size of the content is controlled in part by the
content's own preferred size, and by the ClutterContentGravity
enumeration.
clutter/Makefile.am | 3 +
clutter/clutter-actor.c | 417 +++++++++++++++++++++++++++++++++++++-
clutter/clutter-actor.h | 15 ++
clutter/clutter-content-private.h | 47 +++++
clutter/clutter-content.c | 248 +++++++++++++++++++++++
clutter/clutter-content.h | 100 +++++++++
clutter/clutter-enums.h | 36 ++++
clutter/clutter-types.h | 1 +
clutter/clutter.h | 1 +
tests/interactive/Makefile.am | 3 +-
tests/interactive/test-content.c | 223 ++++++++++++++++++++
11 files changed, 1091 insertions(+), 3 deletions(-)
commit 6f0782e0a41deb34e8eeedd492d33f1efa8b3a90
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 1 17:47:15 2012 +0000
actor: Add paint_node virtual function
The ::paint-node virtual inside ClutterActor is what we want people to
use when painting their actors.
Right now, it's a new code path, that gets called while painting; the
paint_node() implementation should only paint the actor itself, and not
its children — they will get their own paint_node() called when needed.
Internally, ClutterActor will automatically create a dummy PaintNode and
paint the background color; then control will be handed out to the
implementation on the class. This is required to maintain compatibility
with the old ::paint signal emission.
Once we are able to get rid of the paint (and pick) sequences, we'll
switch to a fully retained render tree.
clutter/clutter-actor.c | 69 ++++++++++++++++++++++++++++++++++++++-----------
clutter/clutter-actor.h | 7 +++--
2 files changed, 59 insertions(+), 17 deletions(-)
commit b83dc6abfaed4ac16af2cad412d6382f5b0aa427
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 1 15:51:27 2012 +0000
Add PaintNode, an element on the render object tree
Now that we have a proper scene graph API, we should split out the
rendering part from the logical and event handling part.
ClutterPaintNode is a lightweight fundamental type that encodes only the
paint operations: pipeline state and geometry. At its most simple, is a
way to structure setting up the programmable pipeline using a
CoglPipeline, and submitting Cogl primitives. The important take away
from this API is that you are not allowed to call Cogl API like
cogl_set_source() or cogl_primitive_draw() directly.
The interesting approach to this is that, in the future, we should be
able to move to a purely retained mode: we will decide which actors need
to be painted, they will update their own branch of the render graph,
and we'll take the render graph and build all the rendering commands
from that.
For the 1.x API, we will have to maintain invariants and the existing
behaviour, but as soon as we can break API, the old paint signal will
just go away, and Actors will only be allowed to manipulate the render
tree.
clutter/Makefile.am | 5 +
clutter/clutter-paint-node-private.h | 115 ++++
clutter/clutter-paint-node.c | 1137 ++++++++++++++++++++++++++++++++++
clutter/clutter-paint-node.h | 95 +++
clutter/clutter-paint-nodes.c | 1124 +++++++++++++++++++++++++++++++++
clutter/clutter-paint-nodes.h | 161 +++++
clutter/clutter-types.h | 1 +
clutter/clutter.h | 2 +
8 files changed, 2640 insertions(+)
commit 696017edf25bb2ae4c92cacb699e0c784cfc115d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Fri Mar 16 13:04:34 2012 +0100
Updated Spanish translation
po/es.po | 394 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 214 insertions(+), 180 deletions(-)
commit 0316dfc21303037843d9c1b9d0408dc06edb36b8
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date: Fri Mar 16 12:54:23 2012 +0530
Assamese translation updated
po/as.po | 396 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 215 insertions(+), 181 deletions(-)
commit 024ebfc0cfd3eabe7c1d2793600e79f355877f15
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Fri Mar 16 01:56:03 2012 +0100
Updated Galician translations
po/gl.po | 388 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 210 insertions(+), 178 deletions(-)
commit 291ec65a535fb4b4f883347e0fe4b5f325611185
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Thu Mar 15 21:57:19 2012 +0100
Updated Slovenian translation
po/sl.po | 390 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 210 insertions(+), 180 deletions(-)
commit d56feaa523b1d5c03842bf437c0a39c11dba6a7c
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Thu Mar 15 20:53:33 2012 +0100
Updated Polish translation
po/pl.po | 280 +++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 156 insertions(+), 124 deletions(-)
commit bbb6f09bcf5e4dd4377b3f9e5f24fc4fa5ec9551
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Thu Mar 15 20:47:06 2012 +0100
Updated POTFILES.in
po/POTFILES.in | 2 ++
1 file changed, 2 insertions(+)
commit cbcc84022e3174e8cb3f0d08f93900666be8116d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 17:51:22 2012 +0000
animator: Fix NULL check
clutter/clutter-animator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fa9be0ba738d16a0b2330ad329c2484c357be70b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 17:42:42 2012 +0000
interactive/texture-async: Use implicit animations
tests/interactive/test-texture-async.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
commit 7f1f9a50c1a631894f4292773ef135421fc7a65b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 17:41:28 2012 +0000
actor: Remove G_SIGNAL_NO_RECURSE
As it turns out, we do end up recursing inside the ::paint signal
emission - especially inside the conformance test suite.
This thoroughly sucks - and we'll only be able to fix it properly
when we bump API for 2.0.
clutter/clutter-actor.c | 3 ---
1 file changed, 3 deletions(-)
commit 6a8d67a8ad292d68f9cf59467cf92bf4e7b49abe
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 17:32:53 2012 +0000
I should compile the changes I make
clutter/clutter-actor.c | 1 +
1 file changed, 1 insertion(+)
commit 5e652b91d65f2daa3c9bb88ec4d2fdfe9e71ac4f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 17:31:36 2012 +0000
actor: Fix get_transition() method
We now store a closure, not directly a ClutterTransition instance.
clutter/clutter-actor.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 9e1ec8283894e4f4b354381cd989ab4c0df56af6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 16:57:18 2012 +0000
doc: Reference fixes
clutter/clutter-actor.c | 2 +-
doc/reference/clutter/clutter-sections.txt | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
commit 0cf9ad82c4c8b9d4c1b6b1d6f9206303a43b3534
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 16:53:19 2012 +0000
symbols: Update
clutter/clutter.symbols | 1 +
1 file changed, 1 insertion(+)
commit 4bd3583dbf59d1882d2b7704d6a1416176df80d6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 16:40:41 2012 +0000
actor: Add generic transition support
ClutterActor should be able to hold all transitions, even the ones that
have been explicitly created.
This will allow to add new transitions types in the future, like the
keyframe-based one, or the transition group.
clutter/clutter-actor.c | 187 ++++++++++++++++++++++++-----
clutter/clutter-actor.h | 18 +++
clutter/clutter.symbols | 3 +
doc/reference/clutter/clutter-sections.txt | 3 +
4 files changed, 179 insertions(+), 32 deletions(-)
commit 3638c1efed449a07fb7e6d052ce4110db4b4feeb
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 13:53:56 2012 +0000
transition: Clear the animatable member when removing on complete
clutter/clutter-transition.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 514466601e93421fad985975c7a1938452a60188
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 13:52:09 2012 +0000
transition: Check the repeat count to remove on complete
We can now ask the timeline for the current repeat, and if it's the last
one, then we can safely detach the transition from the animatable
instance.
clutter/clutter-transition.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
commit 388f818f419b9aa745ca1d6ad6bd300c4b859df7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 13:50:28 2012 +0000
timeline: Add more state accessors
It should be possible to ask a timeline what is its duration, taking
into account eventual repeats, and which repeat is the one currently
in progress.
These two functions allow writing animations that depend on the current
state of another timeline.
clutter/clutter-timeline.c | 54 ++++++++++++++++++++++++++++++
clutter/clutter-timeline.h | 5 +++
clutter/clutter.symbols | 2 ++
doc/reference/clutter/clutter-sections.txt | 2 ++
4 files changed, 63 insertions(+)
commit 1511e588df3366034de9115741e23b5d43923ab2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 12:24:02 2012 +0000
actor: Add delay to the easing state
It should be possible to set up the delay of a transition, but since
we start the Transition instance before returning control to the caller,
we cannot use clutter_actor_get_transition() to do it without something
extra-awkward, like:
transition = clutter_actor_get_transition (actor, "width");
clutter_timeline_stop (transition);
clutter_timeline_set_delay (transition, 1000);
clutter_timeline_start (transition);
for each property involved. It's much easier to add a delay to the
easing state of an actor.
clutter/clutter-actor-private.h | 1 +
clutter/clutter-actor.c | 60 ++++++++++++++++++++++++++++++
clutter/clutter-actor.h | 3 ++
clutter/clutter.symbols | 2 +
doc/reference/clutter/clutter-sections.txt | 11 ++++++
5 files changed, 77 insertions(+)
commit 303ebaea88778d8b184b2a63572d4a0eb323318a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:25:52 2012 +0000
interactive/bin-layout: Use implicit animations
tests/interactive/test-bin-layout.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
commit 389ee457472ed9e32bb78fed3ae9b2b5c2dc4585
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:25:26 2012 +0000
interactive/actor: Do not use clutter_actor_animate()
Use implicit animations instead.
tests/interactive/test-actor.c | 59 +++++++++++++++++++++++-------------------
1 file changed, 33 insertions(+), 26 deletions(-)
commit cb8dea0379d3d2fc8a7df0962eaadff8b245d5ad
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:24:46 2012 +0000
interactive/transitions: An easing demo without animate()
Use the newly added implicit animations support in ClutterActor.
tests/interactive/Makefile.am | 3 +-
tests/interactive/test-transitions.c | 225 +++++++++++++++++++++++++++++++++++
2 files changed, 227 insertions(+), 1 deletion(-)
commit 043cf6b284d970fdf1555d95056d08b7e8a2900e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:24:27 2012 +0000
docs: Update the API reference
doc/reference/clutter/clutter-docs.xml.in | 2 ++
doc/reference/clutter/clutter-sections.txt | 41 ++++++++++++++++++++++++++++++
doc/reference/clutter/clutter.types | 2 ++
3 files changed, 45 insertions(+)
commit dda4db378c39dd50e41afd16c1a6697150b85395
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:24:07 2012 +0000
symbols: Update
clutter/clutter.symbols | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
commit 67113ed690bed69fe182f675d0951bf21047e026
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:09:11 2012 +0000
actor: Implement implicit animatable properties
Clutter is meant to be, and I quote from the README, a toolkit:
for creating fast, compelling, portable, and dynamic graphical
user interfaces
and yet the default mode of operation for setting an actor's state on
the scene graph (position, size, opacity, rotation, scaling, depth,
etc.) is *not* dynamic. We assume a static UI, and then animate it.
This is the wrong way to design an API for a toolkit meant to be used to
create animated user interfaces. The default mode of operation should be
to implicitly animate every state transition, and only allow skipping
the animation if the user consciously decides to do so — i.e. the design
tenet of the API should be to make The Right Thing™ by default, and make
it really hard (or even impossible) to do The Wrong Thing™.
So we should identify "animatable" properties, i.e. those properties
that should be implicitly animated by ClutterActor, and use the
animation framework we provide to tween the transitions between the
current state and the desired state; the implicit animation should
happen when setting these properties using the public accessors, and not
through some added functionality. For instance, the following:
clutter_actor_set_position (actor, newX, newY);
should not make the actor jump to the (newX, newY) point; it should
tween the actor's position between the current point and the desired
point.
Since we have to maintain backward compatibility with existing
applications, we still need to mark the transitions explicitly, but we
can be smart about it, and treat transition states as a stack that can
be pushed and popped, e.g.:
clutter_actor_save_easing_state (actor);
clutter_actor_set_easing_duration (actor, 500);
clutter_actor_set_position (actor, newX, newY);
clutter_actor_set_opacity (actor, newOpacity);
clutter_actor_restore_easing_state (actor);
And we can even start stacking animations, e.g.:
clutter_actor_save_easing_state (actor);
clutter_actor_set_easing_duration (actor, 500);
clutter_actor_set_position (actor, newX, newY);
clutter_actor_save_easing_state (actor);
clutter_actor_set_easing_duration (actor, 500);
clutter_actor_set_easing_mode (actor, CLUTTER_LINEAR);
clutter_actor_set_opacity (actor, newOpacity);
clutter_actor_set_depth (actor, newDepth);
clutter_actor_restore_easing_state (actor);
clutter_actor_restore_easing_state (actor);
And so on, and so forth.
The implementation takes advantage of the newly added Transition API,
which uses only ClutterTimeline sub-classes and ClutterInterval, to cut
down the amount of signal emissions and memory management of object
instances; as well of using the ClutterAnimatable interface for custom
properties and interpolation of values.
clutter/clutter-actor-private.h | 29 +
clutter/clutter-actor.c | 1242 +++++++++++++++++++++++++++++++++++----
clutter/clutter-actor.h | 12 +
clutter/clutter-private.h | 2 +
4 files changed, 1167 insertions(+), 118 deletions(-)
commit 40bcbf9c0d5db711b2bce47459cca40e2cf27266
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:06:00 2012 +0000
Add ClutterPropertyTransition
ClutterPropertyTransition is a ClutterTransition that animates a
property of a ClutterAnimatable implementation.
clutter/Makefile.am | 2 +
clutter/clutter-property-transition.c | 291 ++++++++++++++++++++++++++++++++++
clutter/clutter-property-transition.h | 88 ++++++++++
clutter/clutter.h | 1 +
4 files changed, 382 insertions(+)
commit 0c8443f71a49b72fcea68e14cb30f6d381fdbc78
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:04:31 2012 +0000
Add ClutterTransition
ClutterTransition is a Timeline sub-class that allows interpolation of a
value between the initial and final states held by a ClutterInterval.
clutter/Makefile.am | 4 +-
clutter/clutter-transition.c | 451 +++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-transition.h | 110 +++++++++++
clutter/clutter.h | 1 +
4 files changed, 565 insertions(+), 1 deletion(-)
commit e546d28771e4c001f9451efa04dae2226237c032
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:08:38 2012 +0000
types: Declare new Transition classes
clutter/clutter-types.h | 2 ++
1 file changed, 2 insertions(+)
commit beb91d76763b3b3aede1be1da8bc3c1f8184ed8a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 11:02:30 2012 +0000
interval: Add variadic arguments for initial/final setters
As a convenience for the C API.
Language bindings should already be using the GValue variants.
This commit also moves the custom progress functions out of the
clutter-interval.c, as they are meant to be generic interpolation
functions and not ClutterInterval-specific.
clutter/clutter-interval.c | 277 ++++++++++++++++++++++-----------------------
clutter/clutter-interval.h | 33 +-----
clutter/clutter-private.h | 7 ++
clutter/clutter-types.h | 28 +++++
clutter/clutter-util.c | 148 ++++++++++++++++++++++++
5 files changed, 322 insertions(+), 171 deletions(-)
commit 06314e9ed8d85fc8fcebc418278b60f7a18c133c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 15 17:00:38 2012 +0000
docs: Update reference symbols
doc/reference/clutter/clutter-sections.txt | 4 ++++
1 file changed, 4 insertions(+)
commit 8e48afd06644b9e258ea12ef76569d545686adfe
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Mar 15 16:55:55 2012 +0800
Fix "install" paths in VS 2010 property sheets
build/win32/vs10/clutter.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 708d385866645a9c7d6b90d477aff7b693879bb2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 14 11:33:55 2012 +0000
actor: Annotate signals to enable some optimization
The ::paint, ::queue-redraw, and ::queue-relayout signals should be
marked as no-recurse and no-hooks; these signals are emitted *a lot*
during each frame, and since GLib has a bunch of optimizations for
signals with no closures, we should try and squeeze every single CPU
cycle we can.
clutter/clutter-actor.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
commit 5d26aeca34c83589cac6be0d7754316e16d045fd
Author: Stefano Facchini <stefano.facchini@gmail.com>
Date: Tue Mar 13 18:22:19 2012 +0100
Install clutter-version.h
clutter/Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit c4de95f27557f729a09e2ed9a86022d0b98229f2
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Mar 5 10:32:44 2012 +0800
Dist clutter-version.h
Dist clutter-version.h for use under non-autotools-based build
environments (e.g. MSVC) as this header is now generic under the
systems Clutter supports
Checked with Emmanuele Bassi on IRC.
clutter/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 53e16b6019e49dd0c24d5f05187648ef2abfa6b7
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Mar 8 17:11:35 2012 +0800
clutter-master-clock.c: Set frame_budget conditionally
The frame_budget member of ClutterMasterClock is only enabled when
CLUTTER_ENABLE_DEBUG is enabled, so fix the build with this.
Checked with Emmanuele Bassi on IRC.
clutter/clutter-master-clock.c | 2 ++
1 file changed, 2 insertions(+)
commit eaecd1efef6abbf6d344a56f1e02fda95c8ffd5a
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date: Tue Mar 13 09:08:31 2012 +0100
Updated Danish translation
po/da.po | 886 +++++++++++++++++++++++++++++++++------------------------------
1 file changed, 460 insertions(+), 426 deletions(-)
commit 80b4e7513273b38efbda187954a1773676c59490
Author: Antonio Fernandes C. Neto <fernandesn@gnome.org>
Date: Fri Mar 9 10:29:33 2012 -0300
Updated Brazilian Portuguese translation
po/pt_BR.po | 758 +++++++++++++++++++++++++++++++-----------------------------
1 file changed, 393 insertions(+), 365 deletions(-)
commit 945caff989ab30598ebd74c0d19c9bbdcf6a71c1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 12 14:23:35 2012 +0000
Bump up the GDK dependency
Commit ac6ce79aa389982c3e7113f6192f492a6e21b4b1 introduced a dependency
on the latest GDK symbols, so we need to bump up the required version of
GDK.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ac6ce79aa389982c3e7113f6192f492a6e21b4b1
Author: Stefano Facchini <stefano.facchini@gmail.com>
Date: Sat Mar 10 16:39:16 2012 +0100
gdk: add new device types (GDK_SOURCE_TOUCHSCREEN, GDK_SOURCE_TOUCHPAD)
https://bugzilla.gnome.org/show_bug.cgi?id=671779
clutter/gdk/clutter-input-device-gdk.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 440c47e9410532df8ba70cc84ab65dffee4c02d5
Author: ManojKumar Giri <mgiri@redhat.com>
Date: Mon Mar 12 17:44:54 2012 +0530
Updated Odia Translation
po/or.po | 1774 +++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 1011 insertions(+), 763 deletions(-)
commit a3be0e091986b8b027dea25970f5dfff1fa4c0df
Author: Timo Jyrinki <timo@debian.org>
Date: Mon Mar 12 11:29:54 2012 +0200
Add partial Finnish translation
po/fi.po | 2323 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2323 insertions(+)
commit 66d1e311d698072b6d3af8c64325951c59071262
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date: Sun Mar 11 23:36:53 2012 +0400
Updated Russian translation
po/ru.po | 1915 +++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 1074 insertions(+), 841 deletions(-)
commit 9707822eba76583abe35a71d3ffe3ddc4d92ba50
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date: Sat Mar 10 23:07:27 2012 +0100
Updated Serbian translation
po/sr.po | 783 +++++++++++++++++++++++++++++----------------------------
po/sr@latin.po | 783 +++++++++++++++++++++++++++++----------------------------
2 files changed, 810 insertions(+), 756 deletions(-)
commit 1ee842116ab44f488b9003ee5ca89631f14bd547
Author: Khoem Sokhem <khoemsokhem@khmeros.info>
Date: Sat Mar 10 13:53:53 2012 +0100
Add initial Khmer translation
po/km.po | 2276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2276 insertions(+)
commit 8216d961e710c3d32bd72ec8a4914116c0c15e85
Author: Gil Forcada <gforcada@gnome.org>
Date: Sat Mar 10 13:44:09 2012 +0100
Updated Catalan translation
po/ca.po | 1614 +++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 912 insertions(+), 702 deletions(-)
commit 639a82ed01796f181c7a22e197d4087a5dbd73a0
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri Mar 9 21:55:55 2012 +0300
Updated Belarusian translation.
po/be.po | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
commit ffc8fd2455301e0c5423a25fdcf235896d985825
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Fri Mar 9 19:09:40 2012 +0100
Updated Polish translation
po/pl.po | 1717 +++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 967 insertions(+), 750 deletions(-)
commit 52b1d7186c4004d52ff652ddb5ed7443b343be7a
Author: Florian Müllner <fmuellner@gnome.org>
Date: Fri Mar 9 16:17:52 2012 +0100
Add skeleton translations for RTL locales
RTL locales need to translate the "default:LTR" string to have
clutter_actor_get_text_direction() return the expected result;
as GNOME Shell now makes use of that API, users of RTL locales
would be up for an unpleasant surprise, so add all locales that
translate "default:LTR" to "default:RTL" in GTK+.
https://bugzilla.gnome.org/show_bug.cgi?id=671736
po/ar.po | 2359 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/az_IR.po | 2358 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/fa.po | 2358 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ps.po | 2357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ur.po | 2357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/yi.po | 2357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 14146 insertions(+)
commit 52f142c14c89357c6333ee1fa55fc5184f6551dc
Author: Florian Müllner <fmuellner@gnome.org>
Date: Fri Mar 9 16:34:54 2012 +0100
Update Hebrew translations
RTL locales need to translate the "default:LTR" string to have
clutter_actor_get_text_direction() return the expected result;
as GNOME Shell now makes use of that API, users of RTL locales
would be up for an unpleasant surprise, so add the required
translation.
https://bugzilla.gnome.org/show_bug.cgi?id=671736
po/he.po | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
commit d303fdc22ddffe6782298e5b4de6c371b0584dac
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Mar 9 17:32:46 2012 +0000
po: Update bug tracker in Makevars
po/Makevars | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2b22b60e6ea1ca22d7052d9bfb1fc8acfec4ca81
Author: Tristan Van Berkom <tristan.van.berkom@gmail.com>
Date: Sat Mar 10 02:06:10 2012 +0900
Fixed leaking GValue content in clutter_animation_setup_valist().
Normally this leak goes unnoticed because basic fundamental types
are typically used with clutter_actor_animate(), the leak shows up
if boxed or object types are passed (such as ClutterVertex in the
case I stumbled upon).
clutter/clutter-animation.c | 3 +++
1 file changed, 3 insertions(+)
commit 620e57ac1334424bd47579417815e67080d802c2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 8 14:07:15 2012 +0000
text: Use CoglFramebuffer API for the path-based clip
clutter/clutter-text.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 4b0badba4aca44b4fcd52e2f26ec5608f4e93011
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date: Fri Mar 9 16:24:35 2012 +0000
Updated British English translation
po/en_GB.po | 1726 +++++++++++++++++++++++++++++++++--------------------------
1 file changed, 973 insertions(+), 753 deletions(-)
commit 610ed1e1c510240ea54328d7dc36a9bad7ed80e8
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Thu Mar 8 23:25:57 2012 +0100
Updated Galician translations
po/gl.po | 530 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 273 insertions(+), 257 deletions(-)
commit 4ff1cc08f8bf8c8962ac541c1a090f99331176ab
Author: Alexander Shopov <ash@kambanaria.org>
Date: Thu Mar 8 22:45:17 2012 +0200
Updated Bulgarian translation
po/bg.po | 530 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 273 insertions(+), 257 deletions(-)
commit 7b33f2fa1f6e1c4783c36f2316d4f0c852fb3d23
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Thu Mar 8 15:42:14 2012 +0100
Updated Slovenian translation
po/sl.po | 682 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 349 insertions(+), 333 deletions(-)
commit e1c99ed3c487d6e441cb8155feee4768542bb913
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Mar 8 17:44:02 2012 +0800
Fixup VS 2010 property sheets
There are some properties which were not correctly set. My bad for not
fixing these sooner.
build/win32/vs10/clutter.props | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit e2e49253b607a37d082f20a26b062513c2d29fa3
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Thu Mar 8 10:29:08 2012 +0100
Updated Spanish translation
po/es.po | 637 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 328 insertions(+), 309 deletions(-)
commit d279a1393855fb6d8230cd92c71603b5e8cb641a
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Mar 8 17:07:34 2012 +0800
Update VS property sheets
"Install" the new headers that were introduced lately.
build/win32/vs10/clutter.props | 4 ++++
build/win32/vs9/clutter.vsprops | 2 ++
2 files changed, 6 insertions(+)
commit 9a551689c21cc3de35253c7b2c90a4843aba59ad
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date: Thu Mar 8 14:12:50 2012 +0530
Assamese translation completed
po/as.po | 637 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 328 insertions(+), 309 deletions(-)
commit 86e8f35d66c4c5baca753066f75173491236a7c9
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date: Thu Mar 8 15:53:04 2012 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 912 +++++++++++++++++++++++++++++++-----------------------------
po/zh_TW.po | 910 ++++++++++++++++++++++++++++++-----------------------------
2 files changed, 953 insertions(+), 869 deletions(-)
commit 734a26fe97e6ff2270745504ab52152dcff27014
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Thu Mar 8 00:04:55 2012 +0100
Updated POTFILES.in
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
commit 009b0297f1b3df08d73305466fbb0bbf01138d89
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed Mar 7 23:40:08 2012 +0300
Updated Belarusian translation.
po/be.po | 758 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 384 insertions(+), 374 deletions(-)
commit 32f57595feef4859ac506cb81a2f17781d554d83
Author: Joseph Scheuhammer <clown@alum.mit.edu>
Date: Thu Feb 2 16:23:00 2012 -0500
Add brightness/contrast effect
The ClutterBrightnessContrastEffect effect class allows changing the
brightness and contrast levels of an actor.
Modified-by: Emmanuele Bassi <ebassi@linux.intel.com>
Modified-by: Neil Roberts <neil@linux.intel.com>
https://bugzilla.gnome.org/show_bug.cgi?id=656156
clutter/Makefile.am | 2 +
clutter/clutter-brightness-contrast-effect.c | 643 +++++++++++++++++++++++++++
clutter/clutter-brightness-contrast-effect.h | 80 ++++
clutter/clutter.h | 1 +
clutter/clutter.symbols | 8 +
doc/reference/clutter/clutter-docs.xml.in | 1 +
doc/reference/clutter/clutter-sections.txt | 20 +
doc/reference/clutter/clutter.types | 1 +
8 files changed, 756 insertions(+)
commit 41f06138b451bbe51949d818fdc9963077eff59c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:59:25 2012 +0000
cally/text: Constify string members
clutter/cally/cally-text.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 90e5088a512e723c41dd59aeaace7e4f87ca14ac
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:35:57 2012 +0000
build: Increase the anal-retentiveness of the maintainer flags
The new rules have already caught a couple of issues.
configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit de90be9586bdab941c4174a8a3fa74bd480d2555
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:34:48 2012 +0000
build: Remove maintainer flags from test build
Part of the test infrastructure relies on relaxed build conditions, so
there's no point to enforce the anal retentive maintainer flags.
tests/conform/Makefile.am | 2 +-
tests/interactive/Makefile.am | 2 +-
tests/performance/Makefile.am | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
commit 2567049ce3899ab8045afd540a333bcd22f6332c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:34:06 2012 +0000
Fix missing/redundant declarations
clutter/clutter-actor.c | 13 ++++++++-----
clutter/clutter-animatable.c | 2 ++
clutter/clutter-animation.c | 2 ++
clutter/clutter-backend.c | 2 ++
clutter/clutter-bin-layout.c | 2 ++
clutter/clutter-box-layout.c | 2 ++
clutter/clutter-cairo-texture.c | 2 ++
clutter/clutter-constraint.c | 1 +
clutter/clutter-deform-effect.c | 16 ++++++++--------
clutter/clutter-feature.c | 6 +++---
clutter/clutter-keysyms-table.c | 2 ++
clutter/clutter-list-model.c | 2 ++
clutter/clutter-main.c | 2 +-
clutter/clutter-script.c | 2 +-
clutter/clutter-settings.c | 1 +
clutter/clutter-stage-manager.c | 2 ++
clutter/clutter-table-layout.c | 2 ++
clutter/clutter-texture.c | 5 +++--
clutter/clutter-timeline.c | 5 ++++-
clutter/clutter-util.c | 4 +++-
clutter/deprecated/clutter-frame-source.c | 6 ++++--
21 files changed, 57 insertions(+), 24 deletions(-)
commit 266ea8a3d99c877fb70b7d86fcfd6ad0cdf0b113
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:32:32 2012 +0000
cally: Fix redundant declarations
clutter/cally/cally-actor.c | 2 --
clutter/cally/cally-clone.c | 3 ---
clutter/cally/cally-group.c | 2 --
clutter/cally/cally-rectangle.c | 3 ---
clutter/cally/cally-root.c | 2 --
clutter/cally/cally-stage.c | 3 ---
clutter/cally/cally-text.c | 2 --
clutter/cally/cally-texture.c | 3 ---
clutter/cally/cally-util.c | 3 ---
9 files changed, 23 deletions(-)
commit 4da1c3efb8fcea58854ce6ff57856fec4ec1a427
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:31:25 2012 +0000
snap-constraint: Fix typo that broke the get_edges() method
We were declaring a get_edges() method, but the definition was called
get_edge().
clutter/clutter-snap-constraint.c | 6 +++---
clutter/clutter.symbols | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
commit 3a86d88b431e381d6b4ed50e38018ca545a975e7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:07:41 2012 +0000
x11/device-manager-core: Avoid a signed/unsigned comparison
clutter/x11/clutter-device-manager-core-x11.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit f5065059b7ab21b8ad28d30a006a038e3275b3b1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:07:15 2012 +0000
x11/keymap: Avoid a signed/unsigned comparison
clutter/x11/clutter-keymap-x11.c | 6 +++---
clutter/x11/clutter-keymap-x11.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
commit f54a4532a4e703c4e925390ccdebeb5270da4272
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:06:24 2012 +0000
x11/backend: Ensure that pre/post parse hooks are not exposed
Not even as private methods.
clutter/x11/clutter-backend-x11.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
commit e3aea910b1524933e6ea3ef95a19a6c970d46677
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:04:44 2012 +0000
Try to avoid duplicate declarations for profile macros
We can use the __COUNTER__ macro or, failing that, the __LINE__ macro to
ensure that we don't declare dummy variables more than once with the
same name.
clutter/clutter-profile.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 9bc8c05db8500f435da057710000b21244cc5735
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Mar 7 12:04:25 2012 +0000
gdk: Add missing declaration of clutter_gdk_get_default_display()
clutter/gdk/clutter-gdk.h | 1 +
1 file changed, 1 insertion(+)
commit fc12c591c324a6070a1763e9d0c6ab9aeadbba52
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Wed Mar 7 12:54:09 2012 +0100
Updated Galician translations
po/gl.po | 558 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 284 insertions(+), 274 deletions(-)
commit ee0f43b701124b929b806e2f4a963a229bf92f9b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Wed Mar 7 11:33:52 2012 +0100
Updated Spanish translation
po/es.po | 638 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 323 insertions(+), 315 deletions(-)
commit ca550bc5cd9f4b6056a43f32f48396db05b7813a
Author: Alexander Shopov <ash@kambanaria.org>
Date: Wed Mar 7 06:36:27 2012 +0200
Updated Bulgarian translation
po/bg.po | 558 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 284 insertions(+), 274 deletions(-)
commit 05813872f9179d8fbe6c4be6cea8f86a89edf3ff
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 27 12:30:04 2012 +0000
osx: Call finishLaunching on post-parse
https://bugzilla.gnome.org/show_bug.cgi?id=668801
clutter/osx/clutter-backend-osx.c | 3 +++
1 file changed, 3 insertions(+)
commit cc25deade04b8f06d460292915f3ab6d2369d33c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 15:39:29 2012 +0000
texture: Fix the async loop ceiling
The comment says that we're going to load textures in a loop until we
still have work to do, or if one iteration took more than 5
milliseconds, to avoid blowing up our frame budget, but the check is for
5 seconds, which is hardly a sensible value.
clutter/clutter-texture.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4849c02e330ce9db52564c812dc4a0316498b979
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date: Tue Mar 6 21:07:26 2012 +0530
Assamese translation completed
po/as.po | 366 ++++++++++++++++++++++++++++++---------------------------------
1 file changed, 174 insertions(+), 192 deletions(-)
commit 4db4471528a33cc07c2b98e0d84e34018c6ee1ec
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 15:07:55 2012 +0000
interactive/text-field: Use :background-color
Instead of a custom paint signal handler.
tests/interactive/test-text-field.c | 31 +++----------------------------
1 file changed, 3 insertions(+), 28 deletions(-)
commit 477d399c31dc2c5e5af91ee3c561f0a40f21155b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 15:06:52 2012 +0000
text: Use the background color when painting
If the ClutterActor:background-color-set property is set to TRUE.
clutter/clutter-text.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit 663d6179ffdb27ef25ee67e4b7d2e05a5d1216aa
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 15:05:36 2012 +0000
text: Center the cursor caret
We remove 2 pixels from the height of the cursor, but we should also
remove the same amount from the position on the y axis, so that the
cursor caret appears centered in the allocated height.
https://bugzilla.gnome.org/show_bug.cgi?id=655491
clutter/clutter-text.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 812fbee7ecba813b2d8c5511b974b15b004a975d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Tue Mar 6 15:43:08 2012 +0100
Updated Slovenian translation
po/sl.po | 458 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 234 insertions(+), 224 deletions(-)
commit 764640419607b4918515f42722bb0950ea23d90c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 14:23:33 2012 +0000
script: Support translatable strings for properties
ClutterScript should be able to automatically call gettext() and friends
on strings loaded from a UI definition, prior to passing the string to
the object it is constructing.
The basic implementation is trivial:
- set a translation domain on the ClutterScript instance
- mark the translatable strings inside the JSON data, like:
"property" : {
"translatable" : true,
"string" : "a translatable string"
}
The hard part is now getting the tools we use to extract the
translatable strings to understand the JSON format we use inside
ClutterScript.
clutter/clutter-script-parser.c | 58 +++++++++++++++++++++++++
clutter/clutter-script-private.h | 3 ++
clutter/clutter-script.c | 93 ++++++++++++++++++++++++++++++++++++++++
clutter/clutter-script.h | 6 +++
tests/data/test-script.json | 4 +-
5 files changed, 162 insertions(+), 2 deletions(-)
commit 4a9414ff870ce74d3194425d30709124558eacd2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 14:22:43 2012 +0000
Annotate clutter_threads_add_repaint_func_full()
clutter/clutter-main.h | 1 +
1 file changed, 1 insertion(+)
commit 1ac655b3942a51ff0b24228d9ecf264a51d52c87
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 14:21:04 2012 +0000
Add missing enumeration type to clutter.symbols
clutter/clutter.symbols | 3 +++
1 file changed, 3 insertions(+)
commit c2e7704151be86bf26a47c63f2735f45394a08bd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 13:50:10 2012 +0000
master-clock: Add frame budget diagnostic messages
Let's keep a budget of 16.6 milliseconds per frame, and reduce it by the
amount of time spent in each phase of the frame processing. If any phase
goes over the allocated budget then we use the diagnostic mode
facilities to warn the app developer.
clutter/clutter-master-clock.c | 55 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 54 insertions(+), 1 deletion(-)
commit bdf9f4958825fa7a9adf0bea16d4d079becb896f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 12:55:27 2012 +0000
master-clock: Clean up the frame processing
Split out every phase into its own function, to ensure that the sequence
of operation is clear and easy to follow.
clutter/clutter-master-clock.c | 237 +++++++++++++++++++++--------------------
clutter/clutter-master-clock.h | 1 -
2 files changed, 124 insertions(+), 114 deletions(-)
commit 229607464b287d6ea1ed1633d4e982768ccb18cc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Mar 6 12:09:00 2012 +0000
Improve repaint functions
It is sometimes useful to be able to have better control on when a
repaint function is called. Currently, all repaint functions are called
prior to the stages update phase of the frame processing.
We can introduce flags to represent the point in the frame update
process in which we wish Clutter called the repaint function.
As a bonus, we can also add a flag that causes adding a repaint function
to spin the master clock.
clutter/clutter-enums.h | 19 +++++++
clutter/clutter-main.c | 91 +++++++++++++++++++++++++++---
clutter/clutter-main.h | 4 ++
clutter/clutter-master-clock.c | 8 ++-
clutter/clutter-private.h | 2 +-
clutter/clutter.symbols | 1 +
doc/reference/clutter/clutter-sections.txt | 1 +
7 files changed, 113 insertions(+), 13 deletions(-)
commit afda0c955e57bd511725bc8704a4e8cfec52462c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 23:57:01 2012 +0000
Post-release version bump to 1.9.15
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 59affd808824d43d2fbb288c17587536243645cd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 23:41:52 2012 +0000
Release Clutter 1.9.14 (snapshot)
NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 43 insertions(+), 1 deletion(-)
commit a8d800580017b474fabc6b6322ccbdc6c8da504e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 23:34:27 2012 +0000
docs: Updates to the API reference
clutter/wayland/clutter-wayland-surface.h | 5 +++--
doc/reference/clutter/clutter-sections.txt | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
commit 9813a874992ff6215e71d580856284154c4bc65e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 22:02:01 2012 +0000
Update the release notes
README.in | 7 +++++++
1 file changed, 7 insertions(+)
commit 155f7741fed2138d64ec0b06d8ec160c67ca12b3
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 21:59:53 2012 +0000
actor: Ensure static scope to allocation-changed arguments
In theory, handlers connected to the ::allocation-changed signal may be
able to modify the actor's real allocation and allocation flags,
especially now that we use STATIC_SCOPE; let's avoid this, so that we
don't regret it later.
clutter/clutter-actor.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
commit 762e0de2c60dff77b36e9fefefc3ad263c33ce90
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Mar 5 19:23:46 2012 +0000
tests: Remove test-cogl-pixel-buffer
This has been converted to a Cogl-based test in the cogl source tree
so there is no need to maintain it here anymore.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
tests/conform/Makefile.am | 1 -
tests/conform/test-cogl-pixel-buffer.c | 329 ---------------------------------
tests/conform/test-conform-main.c | 1 -
3 files changed, 331 deletions(-)
commit 7d64693de265e0d00e783b7ae164abd06d75a68d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 17:45:23 2012 +0000
conformance/invariants: Test that visibility is not recursive
The show and hide methods should not recurse; that is the job of
show_all and hide_all, which are deprecated.
tests/conform/actor-invariants.c | 42 +++++++++++++++++++++++++++++++++++++++
tests/conform/test-conform-main.c | 1 +
2 files changed, 43 insertions(+)
commit 720fbd3bec522f200396f206242bc76285492f15
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 17:38:27 2012 +0000
stage: Fix up a copy-and-paste train wreck
The show and hide implementation inside ClutterStage ended up being
recursive, and the hide implementation would actually show the children
of the stage unconditionally.
Whoopsie.
clutter/clutter-stage.c | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
commit add274c447f1d4a2d9c269754c019882738662c1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 17:26:09 2012 +0000
conform/actor-invariants: Add tests for show-on-set-parent
The show-on-set-parent flag is mental, but it needs to be tested better
than just checking for it always been set to TRUE.
tests/conform/actor-invariants.c | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
commit a882b20b26222f537becfbedf9af2d12e74691a3
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date: Mon Mar 5 19:56:42 2012 +0530
Assamese translation completed
po/as.po | 1711 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 952 insertions(+), 759 deletions(-)
commit 2aaa39e0080a180689f53f82bccda36bc400f885
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Mar 5 10:36:03 2012 +0000
actor: Annotate the allocation-changed signal
The ActorBox passed to the ::allocation-changed signal should be
annotated as STATIC_SCOPE, given that it's a pointer to a structure
inside ClutterActorPrivate - hence there's no risk of it actually being
freed from a signal handler. This allows the GSignal machinery to avoid
a costly copy/free for each signal emission.
clutter/clutter-actor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 796cf67503cce01f303b59d5280def4b8bdfd0b9
Author: Krishnababu Krothapalli <email>
Date: Fri Mar 2 13:47:57 2012 +0530
Updated Telugu Translations
po/te.po | 2489 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 1350 insertions(+), 1139 deletions(-)
commit 018ede2b24079089e2c4e84698776a1235dbde20
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Thu Mar 1 22:58:39 2012 +0100
ClutterActor: clear redraw entry before emitting signals
If the redraw entry is not cleared, queueing a redraw from a signal
handler could reinsert the same object in the stage redraw list,
causing the segfault later (as the object is immediately freed)
https://bugzilla.gnome.org/show_bug.cgi?id=671173
clutter/clutter-actor.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
commit 251d3b545e4df6c55dd596424dda3470564f16cf
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 1 15:11:59 2012 +0000
input: Add a check on the argument
clutter/clutter-input-device.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 23e8e43d666a9237dc0096924c2e1d30d1027128
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 1 15:11:36 2012 +0000
symbols: Add missing InputDevice symbol
clutter/clutter.symbols | 1 +
1 file changed, 1 insertion(+)
commit b248fbd010d428ec103f2b5cde906403d1eac3f0
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Mar 1 11:06:04 2012 +0000
Make clutter-stage-window.h a private header
It should have never been public in the first place; nothing can
implement the ClutterStageWindow interface and use it, so this is
not a break.
clutter/Makefile.am | 2 +-
clutter/clutter-stage-window.c | 2 ++
clutter/clutter-stage-window.h | 23 +++++------------------
clutter/clutter.h | 1 -
clutter/clutter.symbols | 1 -
5 files changed, 8 insertions(+), 21 deletions(-)
commit a1ec559d14a5baafc45e663e8d62d2109d8a8e90
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Mar 1 15:07:05 2012 +0000
Fix compilation
Hide a symbol if we're not compiling with Wayland compositor support.
clutter/clutter-backend.c | 2 ++
1 file changed, 2 insertions(+)
commit cfbb7a0fa0fcd1014984e2b70a8c2a5d12e3ad79
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Feb 29 19:20:18 2012 +0000
clutter-wayland-surface: Add padding to the class struct
This just adds some padding pointers so that we can later add more
virtual functions without breaking ABI.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.h | 4 ++++
1 file changed, 4 insertions(+)
commit 5f654069feff8361509e5fc832f335d653e70726
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Feb 29 17:50:22 2012 +0000
clutter-input-device-wayland: Include clutter-stage-private.h
This was giving a warning about using _clutter_stage_update_state
without declaring it.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-input-device-wayland.c | 1 +
1 file changed, 1 insertion(+)
commit b5c90f6caaf0457c0f81720060f4a69cf2bd59fb
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Feb 13 13:20:02 2012 +0000
wayland-surface: don't queue redraw on buffer attach
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 3c6a0cdc610ba434beed733bde548175d665cc36
Author: Robert Bragg <robert@linux.intel.com>
Date: Sun Jan 22 15:36:17 2012 +0000
evdev: Adds api to release/reclaim the evdev devices
Clutter applications using evdev are typically fullscreen applications
associated with a single virtual termainal. When switching away from
the applications associated tty then Clutter should stop managing all
evdev devices and re-probe for devices when the application regains
focus by switching back to the tty. To facilitate this, this patch
adds clutter_evdev_release_devices() and clutter_evdev_reclaim_devices()
functions.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/Makefile.am | 5 +
clutter/evdev/clutter-device-manager-evdev.c | 144 +++++++++++++++++++++++++--
clutter/evdev/clutter-evdev.h | 38 +++++++
3 files changed, 177 insertions(+), 10 deletions(-)
commit 1f7968e5f99adbc28e5c6bf7495169687d00f4d1
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Feb 29 16:35:48 2012 +0000
wayland/x11: Set constraints on the CoglRenderer
When using the Wayland backend this sets a constraint that the
CoglRenderer selects the Wayland EGL winsys.
When a Wayland compositor display is set it now also sets a constraint
that the render should use EGL because only EGL renderers will set up
the required wl_drm global object.
The X11 backend now sets the X11 constraint.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-backend.c | 6 ++++++
clutter/wayland/clutter-backend-wayland.c | 2 ++
clutter/x11/clutter-backend-x11.c | 2 ++
3 files changed, 10 insertions(+)
commit a0d3b01aa967e3740bc22c925864acac1829da62
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Jan 17 17:29:18 2012 +0000
device-manager-core-x11: Create core input devices as x11
The core input devices when XInput doesn't work were being created as
generic ClutterInputDevices instead of ClutterInputDeviceX11s. This
meant the keycode_to_evdev virtual wouldn't work.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/x11/clutter-device-manager-core-x11.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 13e3f9e5f1f1f648280a154fe1900fce4a26500a
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Jan 17 15:40:08 2012 +0000
Add an input device function to convert keycodes to evdev codes
This adds a virtual function to ClutterInputDevice to translate a
keycode from the hardware_keycode member of ClutterKeyEvent to an
evdev keycode. The function can fail so that input backends that don't
have a sensible way to translate to evdev keycodes can return FALSE.
There are implementations for evdev, wayland and X. The X
implementation assumes that the X server is using an evdev driver in
which case the hardware keycodes are the evdev codes plus 8.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-device-manager-private.h | 3 +++
clutter/clutter-input-device.c | 31 ++++++++++++++++++++++++++
clutter/clutter-input-device.h | 4 ++++
clutter/evdev/clutter-input-device-evdev.c | 12 ++++++++++
clutter/wayland/clutter-input-device-wayland.c | 12 ++++++++++
clutter/x11/clutter-input-device-core-x11.c | 15 +++++++++++++
clutter/x11/clutter-input-device-xi2.c | 15 +++++++++++++
doc/reference/clutter/clutter-sections.txt | 1 +
8 files changed, 93 insertions(+)
commit a3bbcff946295f6e7232697fd167437baef6b785
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Jan 17 13:37:26 2012 +0000
evdev: Associate devices with the first created stage
Because evdev isn't associated with the display system, it doesn't
have any easy way to associate an input device with a stage.
Previously Clutter would never set a stage for an input device and
leave it up to the application to set it. To make it easier for
applications which just have a single fullscreen stage (which is
probably the most common use case for evdev) the device manager now
associates all input devices with the first stage that is created
unless something has already set a stage.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/evdev/clutter-device-manager-evdev.c | 106 ++++++++++++++++++++++++++-
1 file changed, 105 insertions(+), 1 deletion(-)
commit 1bfd1d85eb2dd4e2093c5c7e6833da4196110177
Author: Robert Bragg <robert@linux.intel.com>
Date: Thu Jan 12 20:36:16 2012 +0000
Updates in line with latest wayland protocol
The shm buffer format enum values were renamed and the explicitly
premultiplied format was dropped since it's now assumed if the buffer
has an alpha component then it's premultiplied.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
commit 6cc58f7d7d01418eb61622afcb7e322a8645d5d6
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Jan 11 18:11:51 2012 +0000
clutter-wayland-surface: Remove the pick method
The pick method doesn't do anything special over the default pick
method provided by ClutterActor so there's no need to implement it.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 13 -------------
1 file changed, 13 deletions(-)
commit 560f92b69849eb671ac539df16c1d3f4797d9032
Author: Robert Bragg <robert@linux.intel.com>
Date: Wed Jan 11 00:16:10 2012 +0000
wayland-surface: removes unused origin variable
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 1 -
1 file changed, 1 deletion(-)
commit c1aac36d35638b00691f20b538289eae9a7cf68a
Author: Robert Bragg <robert@linux.intel.com>
Date: Wed Jan 11 00:08:05 2012 +0000
wayland-surface: Adds queue-damage-redraw signal
This adds a signal that's emitted whenever a wayland surface is damaged
that allows sub-classes to override the default handler to change
how clipped redraws are queued if the sub-class doesn't simply draw
a rectangle. The signal can also be used just to track damage.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 50 ++++++++++++++++++++++++++-----
clutter/wayland/clutter-wayland-surface.h | 7 +++++
2 files changed, 50 insertions(+), 7 deletions(-)
commit b89af8efa3931bb0cb5a7c5c6a01823ab5d6be78
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Jan 10 22:39:53 2012 +0000
wayland-surface: Add cogl-texture property
This adds a "cogl-texture" gobject property so that a compositor may
listen for notifications of changes to the texture used to paint.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 36 +++++++++++++++++++++++++------
clutter/wayland/clutter-wayland-surface.h | 1 +
2 files changed, 30 insertions(+), 7 deletions(-)
commit 8ac2200aac44d481f2b069554e85976ad1f47372
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Jan 9 16:13:03 2012 +0000
clutter-wayland-surface: Rename the width/height properties
This patch renames the width/height properties to
surface-width/surface-height so that they won't override the
width/height properties of ClutterActor which have different
semantics.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit 1b77565e63d6bfc2dd4edd6961e39044d536b08b
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Jan 10 17:04:50 2012 +0000
configure: Adds xkb-utils automake conditional
This adds a NEEDS_XKB_UTILS automake conditional that's set to true if
either the wayland backend is enabled or the evdev input backend is
enabled since they both depend on clutter-xkb-utils.c and we need
to avoid listing the file twice since that leads to duplicate symbols
and the build fails.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/Makefile.am | 7 +++++--
configure.ac | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
commit 612bde3c4a00800c12fb20e287cb32eefed12ffd
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Jan 9 19:03:59 2012 +0000
wayland-surface: Set actor size on buffer attach
When a new buffer is attached and we update the width and height
properties for the surface we now also call clutter_actor_set_size()
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 2 ++
1 file changed, 2 insertions(+)
commit 0ba6127edc16db16884a27efcfdefc422eaac382
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Jan 9 19:16:21 2012 +0000
wayland-surface: Adds _get_surface function
This adds a clutter_wayland_surface_get_surface() function for querying
the struct wl_surface * associated with a ClutterWaylandSurface.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 9 ++++++++-
clutter/wayland/clutter-wayland-surface.h | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
commit 83b94ec27d3073cbfaec92e9f1b4c7568081d568
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Jan 9 19:14:09 2012 +0000
wayland-surface: Make _set_surface api public
This exposes a clutter_wayland_surface_set_surface() function. The
implementation ignores requests to re-set the same surface and since now
has code to cleanup old surface state before setting the new surface.
(previously the surface was construct only so this wasn't necessary)
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 14 +++++++++++++-
clutter/wayland/clutter-wayland-surface.h | 2 ++
2 files changed, 15 insertions(+), 1 deletion(-)
commit 862eebceb6f0a3faa407e953e69eeb9ccc133036
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Jan 9 19:11:43 2012 +0000
wayland-surface: Cleanup properly in _dispose
When disposing a ClutterWaylandSurface we now make sure to unref any
pipeline we created and unref any surface buffer textures we created.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
commit c7e10024d86acdfbafbc3159fa479e03e71d425d
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Jan 9 19:09:43 2012 +0000
wayland-surface: remove unused damage array
There was a GArray member named damage that wasn't being used which this
patch removes.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/wayland/clutter-wayland-surface.c | 8 --------
1 file changed, 8 deletions(-)
commit 3839cf13a2f2184e22d41b6cddc461d4128e5be0
Author: Robert Bragg <robert@linux.intel.com>
Date: Sat Jan 7 21:44:32 2012 +0000
configure: fix --enable-evdev-input documentation
The --help documentation for ./configure was listing a spurious
--with-evdev option when it should list --enable-evdev-input.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2c9ec271e2a42d52e00da7a3c98af4da5fa532ac
Author: Robert Bragg <robert@linux.intel.com>
Date: Thu Jan 5 14:33:35 2012 +0000
wayland: install wayland compositor headers + pkgconfig file
If wayland compositor support has been enabled then we make sure to
install the corresponding public headers and a
clutter-wayland-compositor.pc pkgconfig file.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/Makefile.am | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
commit b0fc4c1dff80b0ec761f3037b77676fa8119543f
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Feb 29 16:18:07 2012 +0000
Remove test-wayland-surface
In a separate branch, this test has become quite complicated and
involves multiple files and its own configure options. Instead of
cluttering up the clutter source tree it has now been moved to its own
repo at:
http://github.com/clutter-project/test-wayland-surface
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
tests/interactive/Makefile.am | 4 -
tests/interactive/test-wayland-surface.c | 567 -------------------------------
2 files changed, 571 deletions(-)
commit c42be83d698ea2795564f8c5ec451c290d809b7b
Author: Jonh Wendell <jwendell@gnome.org>
Date: Wed Feb 29 14:03:44 2012 -0300
Updated Brazilian Portuguese translation
po/pt_BR.po | 1691 +++++++++++++++++++++++++++++++++--------------------------
1 file changed, 941 insertions(+), 750 deletions(-)
commit c46588172629574abb900ea1851d7248780f9597
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 29 15:12:55 2012 +0000
docs: Refresh the layout managers example image
Drop the window decoration and pointer; drop the double image for the
FlowLayout class; add an image for the TableLayout class.
clutter/clutter-flow-layout.c | 12 ++----------
clutter/clutter-table-layout.c | 6 ++++++
doc/reference/clutter/Makefile.am | 6 +++---
doc/reference/clutter/bin-layout.png | Bin 12890 -> 13424 bytes
doc/reference/clutter/box-layout.png | Bin 5119 -> 10557 bytes
doc/reference/clutter/flow-layout-horizontal.png | Bin 5888 -> 0 bytes
doc/reference/clutter/flow-layout-vertical.png | Bin 5333 -> 0 bytes
doc/reference/clutter/flow-layout.png | Bin 0 -> 1850 bytes
doc/reference/clutter/table-layout.png | Bin 0 -> 20058 bytes
9 files changed, 11 insertions(+), 13 deletions(-)
commit 7713d3bbdc0f360f9f0e8d782d0a3215441bb6f5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 29 15:05:44 2012 +0000
docs: Update the actor example image
clutter/clutter-actor.c | 4 ++--
doc/reference/clutter/Makefile.am | 4 ++--
doc/reference/clutter/actor-example.png | Bin 0 -> 4966 bytes
doc/reference/clutter/test-actor.png | Bin 5081 -> 0 bytes
4 files changed, 4 insertions(+), 4 deletions(-)
commit 3f5d63b5227fa401367142e0f4b774d8e039dc88
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 29 15:02:59 2012 +0000
interactive/actor: Add margin usage example
tests/interactive/test-actor.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
commit fde094dce2d1801ce1000671966f2acbad26d9c5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 29 14:46:01 2012 +0000
build: Remove clutter-version.h.win32.in
The clutter-version.h header file is now completely generic, and does
not need to be masked by a Windows-specific header when building under
MSVC.
.gitignore | 1 -
build/win32/vs10/clutter.props | 7 -
build/win32/vs9/clutter.vsprops | 4 -
clutter/Makefile.am | 2 -
clutter/clutter-version.h.win32.in | 277 -------------------------------------
configure.ac | 1 -
6 files changed, 292 deletions(-)
commit 38bcd86c51c42bd4f71ed5bbdb09345c2af4652c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 29 14:43:01 2012 +0000
Annotate the exported version variables
When using MSVC we need to annotate the variables that are going to be
exported.
clutter/clutter-version.h.in | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
commit 80626e75842a24c3d0a45068e241ba309f6ec138
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 28 15:45:24 2012 +0000
actor: Do not check for child destruction in add_child_internal()
We currently check for the IN_DESTRUCTION flag inside the
add_child_internal() function.
This check disallows calling methods that change the stacking order
within the destruction sequence, by triggering a critical warning first,
and leaving the actor in an undefined state, which then ends up being
caught by an assertion.
The reproducible sequence is:
- actor gets destroyed;
- another actor, linked to the first, will try to change the
stacking order of the first actor;
- changing the stacking order is a composite operation composed
by the following steps:
1. ref() the child;
2. remove_child_internal(), which removes the reference;
3. add_child_internal(), which adds a reference;
- the state of the actor is not changed between (2) and (3), as
it could be an expensive recomputation;
- if (3) bails out, then the actor is in an undefined state, but
still alive;
- the destruction sequence terminates, but the actor is unparented
while its state indicates being parented instead.
- assertion failure.
The obvious fix would be to decompose each set_child_*_sibling() method
into proper remove_child()/add_child(), with state validation; this may
cause excessive work, though, and trigger a cascade of other bugs in
code that assumes that a change in the stacking order is an atomic
operation.
Another potential fix is to just remove this check here, and let code
doing stacking order changes inside the destruction sequence of an actor
continue doing the work.
The third fix is to silently bail out early from every
set_child_*_sibling() and set_child_at_index() method, and avoid doing
work.
I have a preference for the second solution, since it involves the least
amount of work, and the least amount of code duplication.
See bug: https://bugzilla.gnome.org/show_bug.cgi?id=670647
clutter/clutter-actor.c | 58 +++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 54 insertions(+), 4 deletions(-)
commit 6e78ebca957fe838508e6a02f6c9c312edd40f21
Author: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Wed Feb 29 15:49:23 2012 +0100
a11y: Not compute extents for actors without an stage
This solves a crash on GNOME Shell, as compute the extents
for some StWidgets could lead to call st_widget_get_theme_node,
and it is a fatal error to call this on a widget that it not
beed added to a stage.
clutter/cally/cally-actor.c | 7 +++++++
1 file changed, 7 insertions(+)
commit dde5da1dd8f75c3522f3b89417f3e5eb5a414a25
Author: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Wed Feb 29 15:47:36 2012 +0100
a11y: Stop to use ClutterActor::name as default accessible-name
ClutterActor::name is mostly used for debugging purposes
clutter/cally/cally-actor.c | 25 -------------------------
1 file changed, 25 deletions(-)
commit 9d9afc0f05f4e476305f29cfc0447775c7fe9134
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Feb 29 18:09:29 2012 +0800
Update VS property sheets
Update the "installation" of headers...
build/win32/vs10/clutter.props | 16 ++++++++++++++--
build/win32/vs9/clutter.vsprops | 8 +++++++-
2 files changed, 21 insertions(+), 3 deletions(-)
commit b689737a4353e382bf7195d655307d7645781505
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Feb 29 18:03:15 2012 +0800
Update clutter-version.h.win32(.in)
Make it like the clutter-version.h.in template. Since we aren't having
Windows-specific items in here (such as CLUTTER_FLAVOUR), perhaps we
could get the dllexport stuff in clutter-version.h.in, where it can be
used when necessary, and this file would be gone.
clutter/clutter-version.h.win32.in | 137 +++++++++++++++++++++++++++++--------
1 file changed, 108 insertions(+), 29 deletions(-)
commit a22d7ac1b569ea2cfb4ffe30e738db9887c06002
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Feb 29 09:27:01 2012 +0000
interactive: Remove test-shader
ClutterShader is deprecated, and we already have various tests for the
shader API, both for Cogl and for ClutterShaderEffect.
tests/interactive/Makefile.am | 1 -
tests/interactive/test-shader.c | 411 ----------------------------------------
2 files changed, 412 deletions(-)
commit f292550d0602fba97aab4e081da9a0a4d1f1fe76
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Feb 29 09:25:51 2012 +0000
interactive: Remove test-fullscreen
The stage state test also has a fullscreen option, and it's a better
test all around.
tests/interactive/Makefile.am | 1 -
tests/interactive/test-fullscreen.c | 109 ------------------------------------
2 files changed, 110 deletions(-)
commit caf759f72fdf78340dadbf62cf00c3c00c8a5b0e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Feb 29 09:24:34 2012 +0000
interactive: Remove test-actor-clone
Another clone of the venerable test-actors - but test-actor already uses
ClutterClone, so there's really little point in it.
tests/interactive/Makefile.am | 1 -
tests/interactive/test-actor-clone.c | 301 -----------------------------------
2 files changed, 302 deletions(-)
commit bd2f5d0e383bdf61a757a9f405f23ed0cf48edcb
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Feb 29 09:23:40 2012 +0000
interactive: Remove test-behave
ClutterBehaviour and friends are deprecated, there's no point in having
an interactive test, and it may be misleading.
tests/interactive/Makefile.am | 1 -
tests/interactive/test-behave.c | 212 ----------------------------------------
2 files changed, 213 deletions(-)
commit b9553083e03417eb4b6d4fca072bc423dbc1ac4a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 16:47:53 2012 +0000
docs: Document the versioning macros
clutter/clutter-version.h.in | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
commit fb9df4bef27a45de5471ee2937156ec5191bc201
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 16:31:53 2012 +0000
Annotate all functions available since 1.10
clutter/clutter-actor.h | 43 ++++++++++++++++++++++++++++++++++++++
clutter/clutter-event.h | 1 +
clutter/clutter-input-device.h | 3 +++
clutter/clutter-offscreen-effect.h | 1 +
clutter/clutter-script.h | 1 +
clutter/clutter-text-buffer.h | 24 ++++++++++++---------
clutter/clutter-text.c | 6 +++---
clutter/clutter-text.h | 4 ++++
clutter/clutter-timeline.h | 6 +++++-
clutter/clutter-types.h | 1 +
10 files changed, 76 insertions(+), 14 deletions(-)
commit 7d4fa54a4b7a8c19d493da187a14081202c41271
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 16:03:09 2012 +0000
docs: Add new macros to the sections file
doc/reference/clutter/clutter-sections.txt | 33 ++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
commit 0ee7170dbb56dba21e7404acc1e2151a1558e38c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 15:56:12 2012 +0000
Move clutter-util.h into the deprecated section
clutter/Makefile.am | 4 ++--
clutter/clutter-deprecated.h | 1 +
clutter/clutter-util.c | 2 +-
clutter/clutter.h | 1 -
clutter/{ => deprecated}/clutter-util.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
commit 2daf2e8e6bca403b24d8a79a02bc7d3a5006f7b4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 15:47:46 2012 +0000
Add a deprecated header for ClutterCairoTexture
clutter/Makefile.am | 1 +
clutter/clutter-cairo-texture.h | 10 ------
clutter/clutter-deprecated.h | 1 +
clutter/deprecated/clutter-cairo-texture.h | 51 ++++++++++++++++++++++++++++++
4 files changed, 53 insertions(+), 10 deletions(-)
commit 45d61d795bcb401eb78d03d6009f51831be39027
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 15:44:38 2012 +0000
Add a deprecated header for ClutterTexture
clutter/Makefile.am | 1 +
clutter/clutter-deprecated.h | 1 +
clutter/clutter-texture.h | 11 ---------
clutter/deprecated/clutter-texture.h | 48 ++++++++++++++++++++++++++++++++++++
4 files changed, 50 insertions(+), 11 deletions(-)
commit 3c12b3575d077a87683e0f906cebfbb253f49791
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 15:29:50 2012 +0000
Add deprecated header for ClutterAnimation
clutter/Makefile.am | 1 +
clutter/clutter-actor.c | 3 +-
clutter/clutter-animatable.c | 1 +
clutter/clutter-animation.h | 78 +++++++++++++---------------------
clutter/clutter-deprecated.h | 1 +
clutter/clutter-interval.h | 3 +-
clutter/clutter-types.h | 1 +
clutter/deprecated/clutter-animation.h | 57 +++++++++++++++++++++++++
8 files changed, 93 insertions(+), 52 deletions(-)
commit 4ae36f1e5f2374d10f683720c0c876e952636755
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 15:21:07 2012 +0000
Add a deprecated header for ClutterAnimatable
clutter/Makefile.am | 1 +
clutter/clutter-animatable.h | 9 -------
clutter/clutter-deprecated.h | 1 +
clutter/deprecated/clutter-animatable.h | 47 +++++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+), 9 deletions(-)
commit 9613374c73984a76e8d7780105004dde2ac3448e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 15:16:38 2012 +0000
Add deprecated header for ClutterStageManager
clutter/Makefile.am | 1 +
clutter/clutter-deprecated.h | 1 +
clutter/clutter-stage-manager.h | 7 +----
clutter/deprecated/clutter-stage-manager.h | 42 ++++++++++++++++++++++++++++++
4 files changed, 45 insertions(+), 6 deletions(-)
commit d5b565f7b939fcf3d65e310442f91cada3a9b8e2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 15:10:13 2012 +0000
Update the deprecation macros
Use the new versioned macros instead of the generic ones.
clutter/clutter-animation.h | 8 +++---
clutter/clutter-backend.c | 2 +-
clutter/deprecated/clutter-actor.h | 30 ++++++++++----------
clutter/deprecated/clutter-backend.h | 14 +++++-----
clutter/deprecated/clutter-behaviour-depth.h | 6 ++--
clutter/deprecated/clutter-behaviour-ellipse.h | 34 +++++++++++------------
clutter/deprecated/clutter-behaviour-opacity.h | 6 ++--
clutter/deprecated/clutter-behaviour-path.h | 10 +++----
clutter/deprecated/clutter-behaviour-rotate.h | 18 ++++++------
clutter/deprecated/clutter-behaviour-scale.h | 6 ++--
clutter/deprecated/clutter-behaviour.h | 20 +++++++-------
clutter/deprecated/clutter-box.h | 20 +++++++-------
clutter/deprecated/clutter-container.h | 24 ++++++++--------
clutter/deprecated/clutter-fixed.h | 6 ++--
clutter/deprecated/clutter-frame-source.h | 4 +--
clutter/deprecated/clutter-group.h | 8 +++---
clutter/deprecated/clutter-main.h | 32 +++++++++++-----------
clutter/deprecated/clutter-rectangle.h | 16 +++++------
clutter/deprecated/clutter-score.h | 28 +++++++++----------
clutter/deprecated/clutter-shader.h | 38 +++++++++++++-------------
clutter/deprecated/clutter-stage.h | 18 ++++++------
clutter/deprecated/clutter-timeline.h | 6 ++--
clutter/deprecated/clutter-timeout-pool.h | 6 ++--
23 files changed, 180 insertions(+), 180 deletions(-)
commit 780a11b926ec8eacd58d9ba57be8d88beacdd726
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 14:59:00 2012 +0000
Add flexible versioning scheme
GLib introduced macros that allows defining the lower and upper bounds
of the API to be used by application code.
The lower bound allows to define the minimum version that will trigger
deprecation warnings; the upper bound defines the maximum version that
will trigger compiler warnings for unavailable symbols.
This scheme allows gradually porting application code to a new version
of the API, especially in case of resynchronization after multiple
development cycles.
clutter/clutter-macros.h | 209 +++++++++++++++++++++++++++++++++++++++++--
clutter/clutter-version.h.in | 108 +++++++++++++---------
2 files changed, 269 insertions(+), 48 deletions(-)
commit eb42127cf0039f9ac5a2fe111ed863cd7b0a5660
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 14:35:53 2012 +0000
Require GLib ≥ 2.31.19
For the new deprecation and versioning macros.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a6b1972d71b17c813625b72973eefda406306e79
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 14:03:57 2012 +0000
Move macros to their own headers
clutter/Makefile.am | 1 +
clutter/clutter-macros.h | 56 ++++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-types.h | 27 +--------------------
clutter/clutter-version.h.in | 4 ++++
clutter/clutter.h | 1 +
5 files changed, 63 insertions(+), 26 deletions(-)
commit 4e6ff76a77ab61562891612cd4137b63202bf552
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 13:08:31 2012 +0000
conformance: Clean up
Remove the last inconsistent bits.
tests/conform/Makefile.am | 2 +-
tests/conform/actor-layout.c | 8 ++++----
tests/conform/actor-offscreen-redirect.c | 4 ++--
tests/conform/actor-pick.c | 2 +-
tests/conform/{shader-effect.c => actor-shader-effect.c} | 4 ++--
tests/conform/path.c | 2 +-
tests/conform/test-conform-main.c | 12 ++++++------
7 files changed, 17 insertions(+), 17 deletions(-)
commit 60e2f8ed5bd90c99218f90393c7c1db1119f5fa7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 13:02:01 2012 +0000
conformance: Rename the source files
It's the conformance test suite: there's no need to namespace the files,
just like there's no need to namespace the units.
This commit does not change the Cogl tests: they will be moved to Cogl
over time, and it's easier to do if we leave them as they are.
tests/conform/Makefile.am | 64 +++++++++++-----------
tests/conform/{test-anchors.c => actor-anchors.c} | 0
.../{test-actor-destroy.c => actor-destroy.c} | 0
.../conform/{test-actor-graph.c => actor-graph.c} | 0
...{test-actor-invariants.c => actor-invariants.c} | 0
tests/conform/{test-actor-iter.c => actor-iter.c} | 0
.../{test-actor-layout.c => actor-layout.c} | 0
...creen-redirect.c => actor-offscreen-redirect.c} | 0
...{test-paint-opacity.c => actor-paint-opacity.c} | 0
tests/conform/{test-pick.c => actor-pick.c} | 0
tests/conform/{test-actor-size.c => actor-size.c} | 0
tests/conform/{test-animator.c => animator.c} | 0
tests/conform/{test-behaviours.c => behaviours.c} | 0
.../{test-binding-pool.c => binding-pool.c} | 0
.../{test-cairo-texture.c => cairo-texture.c} | 0
tests/conform/{test-cally-text.c => cally-text.c} | 0
tests/conform/{test-color.c => color.c} | 0
tests/conform/{test-group.c => group.c} | 0
tests/conform/{test-model.c => model.c} | 0
tests/conform/{test-path.c => path.c} | 0
tests/conform/{test-rectangle.c => rectangle.c} | 0
tests/conform/{test-score.c => score.c} | 0
.../{test-script-parser.c => script-parser.c} | 0
.../{test-shader-effect.c => shader-effect.c} | 0
tests/conform/{test-state.c => state.c} | 0
tests/conform/{test-text-cache.c => text-cache.c} | 0
tests/conform/{test-text.c => text.c} | 0
.../conform/{test-texture-fbo.c => texture-fbo.c} | 0
tests/conform/{test-texture.c => texture.c} | 0
...meline-interpolate.c => timeline-interpolate.c} | 0
.../{test-timeline-rewind.c => timeline-rewind.c} | 0
tests/conform/{test-timeline.c => timeline.c} | 0
tests/conform/{test-units.c => units.c} | 0
33 files changed, 32 insertions(+), 32 deletions(-)
commit d16f2ac3b545a6b853f5ab3190c6aad07b7b6b1a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 12:54:23 2012 +0000
conform: Clean up test names
Drop the 'test-' prefix: it's the conformance test suite, we know it's
full of tests.
tests/conform/Makefile.am | 64 ++++++------
tests/conform/test-animator.c | 10 +-
tests/conform/test-behaviours.c | 2 +-
tests/conform/test-binding-pool.c | 4 +-
...lutter-cairo-texture.c => test-cairo-texture.c} | 4 +-
tests/conform/test-color.c | 20 ++--
tests/conform/test-conform-main.c | 107 +++++++++++----------
tests/conform/test-group.c | 4 +-
tests/conform/test-model.c | 24 ++---
tests/conform/test-paint-opacity.c | 12 +--
.../{test-clutter-rectangle.c => test-rectangle.c} | 4 +-
tests/conform/test-score.c | 2 +-
tests/conform/test-script-parser.c | 28 +++---
tests/conform/test-state.c | 4 +-
tests/conform/{test-clutter-text.c => test-text.c} | 2 +-
tests/conform/test-texture-fbo.c | 4 +-
.../{test-clutter-texture.c => test-texture.c} | 4 +-
tests/conform/test-timeline.c | 6 +-
.../conform/{test-clutter-units.c => test-units.c} | 12 +--
19 files changed, 157 insertions(+), 160 deletions(-)
commit e4c948b1502707630f15cb4ef12c6b73f3298a34
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 27 11:59:57 2012 +0000
actor: Add a method for computing the default paint volume
Now that ClutterActor has a default paint volume, subclasses may wish
to retrieve it without chaining up to the parent's implementation of
the get_paint_volume() function.
The get_default_paint_volume() returns a ClutterPaintVolume pointer
to the paint volume as computed by the default implementation of the
get_paint_volume() virtual function; it can only be used immediately,
as it's not guaranteed to survive across multiple frames.
clutter/clutter-actor.c | 125 ++++++++++++++++++++++-------
clutter/clutter-actor.h | 1 +
clutter/clutter.symbols | 1 +
doc/reference/clutter/clutter-sections.txt | 1 +
4 files changed, 99 insertions(+), 29 deletions(-)
commit 6a09bf5b52c97668d280357b03720956f83ad79a
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Feb 13 22:40:19 2012 +0000
paint-volume: Add a union method for boxes
Creating PaintVolume instances is not possible, and it's not recommended
anyway. It is, though, necessary to union paint volumes, especially with
2D boxes, in some cases.
Clutter should provide a simple convenience function that allows
unioning volumes to boxes in a moderately efficient way.
https://bugzilla.gnome.org/show_bug.cgi?id=670021
clutter/clutter-paint-volume.c | 36 ++++++++++++++++++++++++++++++
clutter/clutter-types.h | 2 ++
clutter/clutter.symbols | 1 +
doc/reference/clutter/clutter-sections.txt | 1 +
4 files changed, 40 insertions(+)
commit 618e04e9ccb14c5a920b0d0974b539267d64a2b7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Feb 24 15:42:11 2012 +0000
cookbook/examples: Modernize the code
Use new and non-deprecated methods.
doc/cookbook/examples/cb-button.c | 5 +++--
doc/cookbook/examples/effects-basic.c | 7 +++----
doc/cookbook/examples/events-pointer-motion-crossing.c | 11 ++++++-----
doc/cookbook/examples/layouts-stacking.c | 12 ++++++------
4 files changed, 18 insertions(+), 17 deletions(-)
commit aadbc6df3ec63d65653c30089eb7bd79efcc3e99
Author: Alexander Shopov <ash@kambanaria.org>
Date: Mon Feb 27 06:53:05 2012 +0200
Updated Bulgarian translation
po/bg.po | 600 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 304 insertions(+), 296 deletions(-)
commit fe45b9c4a47cdfa023f6a20b0d9ac4278c3bb758
Author: Daniel Korostil <ted.korostiled@gmail.com>
Date: Sun Feb 26 14:07:44 2012 +0200
Uploaded Ukranian
po/uk.po | 1924 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 1043 insertions(+), 881 deletions(-)
commit 8afe002fa96824314c921a00c692ed98e1767f06
Author: Gheyret Kenji <gheyret@gmail.com>
Date: Sun Feb 26 11:12:37 2012 +0900
Uyghur translation
po/ug.po | 2343 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2343 insertions(+)
commit 59ba4f5eb0e3f9b43119fe59bd082671bb3c181b
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat Feb 25 22:33:41 2012 +0300
Updated Belarusian translation.
po/be.po | 600 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 304 insertions(+), 296 deletions(-)
commit 0382bbbc9bfa56ae51bb16b4a12ca87904a1488c
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Sat Feb 25 13:49:07 2012 +0100
Updated Galician translations
po/gl.po | 600 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 304 insertions(+), 296 deletions(-)
commit 5a84952747d606e75f093a71b0f68c111ec54c47
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Thu Feb 23 21:04:59 2012 +0100
Updated Slovenian translation
po/sl.po | 612 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 310 insertions(+), 302 deletions(-)
commit 076d803bb23a7b9b55fea70f795f097f2bb32307
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date: Thu Feb 23 20:54:23 2012 +0100
Updated Serbian translation
po/sr.po | 517 +++++++++++++++++++++++++++++----------------------------
po/sr@latin.po | 517 +++++++++++++++++++++++++++++----------------------------
2 files changed, 528 insertions(+), 506 deletions(-)
commit f27e575ad43b98f393895f419898dcced6489b37
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 14:34:26 2012 +0000
build: Make abicheck.sh backend-aware
It should be possible to adapt the abicheck.sh script so that it
actually tests the ABI of libclutter-1.0.so taking into account
the backends that were compiled into Clutter, and avoid expected
failures if Clutter was not built with a specific backend.
https://bugzilla.gnome.org/show_bug.cgi?id=670680
clutter/Makefile.am | 2 +-
clutter/abicheck.sh | 25 +++++++++++++++++++------
2 files changed, 20 insertions(+), 7 deletions(-)
commit 78b237b535b58332f41252679c03b91bdc5281d1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 17:21:57 2012 +0000
Clean up the included headers
Especially inside ClutterStage.
clutter/clutter-cairo-texture.c | 1 +
clutter/clutter-cairo-texture.h | 1 -
clutter/clutter-stage.h | 6 +++---
clutter/clutter-text.c | 1 +
clutter/clutter-texture.c | 1 +
clutter/deprecated/clutter-box.c | 1 +
6 files changed, 7 insertions(+), 4 deletions(-)
commit 630282ac77070d43022c912061d15200aeb4ecea
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 17:01:40 2012 +0000
build: Fix the header order
The "keep the list sorted" comment on the list of headers is there not
for fun, or because I'm anal-retentive like that.
clutter/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a4a35b443f2e5462dbf6fceb92f20cff2dcebc5b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Thu Feb 23 14:00:35 2012 +0100
Updated Spanish translation
po/es.po | 490 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 250 insertions(+), 240 deletions(-)
commit 8f0003f6f0a9dfa9eeb07dc84007824061a6f3a2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 12:15:41 2012 +0000
Post-release version bump to 1.9.13
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 12d74cebb95e0a2439a4b418dbf9807de7867b43
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 12:04:29 2012 +0000
Release Clutter 1.9.12 (snapshot)
NEWS | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
commit 39a75436bf93ef5349449feb6e19c27b3088d9c9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 12:01:11 2012 +0000
docs: Documentation fixes
clutter/clutter-actor-meta.h | 6 +++++-
clutter/clutter-actor.c | 2 +-
clutter/clutter-text-buffer.h | 12 +++++++++---
clutter/gdk/clutter-backend-gdk.c | 13 +++++++++++++
4 files changed, 28 insertions(+), 5 deletions(-)
commit 2b35b2a0816155903a2fed663b0a456ee3e74241
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 11:54:41 2012 +0000
docs: Document ClutterTextBuffer structures
clutter/clutter-text-buffer.h | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
commit 0099bbf7d98f3de32a653e5618112f89657c7c5c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 11:50:43 2012 +0000
docs: Fix unused symbols
doc/reference/clutter/Makefile.am | 2 ++
doc/reference/clutter/clutter-sections.txt | 1 +
2 files changed, 3 insertions(+)
commit 115f6ee008d2305b068fdd2fe9aa16a5e3468b5d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 11:44:21 2012 +0000
build: Bump up Cogl dependency
We use the latest stable snapshot.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cf435f9512d41139ddb3f6f7eb07bce24289d561
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 23 11:31:26 2012 +0000
Fix compiler warning
clutter/clutter-actor.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
commit 6575f25e3258970f68ff4b3391e9c55843be1671
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 21 15:14:26 2012 +0000
docs: "Soft" deprecation of ClutterAlpha
We cannot deprecate ClutterAlpha yet. We cannot also implement
ClutterAlpha in terms of ClutterTimeline, because multiple Alpha
instances can be attached to the same Timeline. So we can start
with a "soft" deprecation: just a warning in the documentation
stating that ClutterAlpha will be deprecated, and removed, in the
future, and that newly-written code should use ClutterTimeline
instead.
clutter/clutter-alpha.c | 6 ++++++
1 file changed, 6 insertions(+)
commit e5f410d4dfd86e3b67896b8961cfdc690c04c2c2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 21 12:34:57 2012 +0000
Fix the progress function scope annotation
clutter/clutter-timeline.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f98bb306337f8577f820b1c1e1e28f0e5bf4755d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 10 11:25:40 2011 +0100
animation: Deprecate Alpha usage
We can use ClutterTimeline and its progress mode inside
ClutterAnimation; obviously, we have to maintain the invariants because
of the ClutterAnimation:alpha property, but if all you set is the :mode
property using one of the Clutter animation modes then we can skip the
ClutterAlpha entirely.
clutter/clutter-animation.c | 322 ++++++++++++++++++++++++++------------------
clutter/clutter-animation.h | 30 +++--
2 files changed, 208 insertions(+), 144 deletions(-)
commit 7ec975ed3d60c8861dc0a89e873ed928628f5270
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Feb 17 16:06:28 2012 +0000
timeline: Add progress functions
The whole progress computation should not be done using a separate
class: it should be part of the Timeline class.
clutter/clutter-timeline.c | 249 +++++++++++++++++++++++++++--
clutter/clutter-timeline.h | 29 +++-
clutter/clutter.symbols | 3 +
doc/reference/clutter/clutter-sections.txt | 3 +
4 files changed, 270 insertions(+), 14 deletions(-)
commit 59bd20a94b1644887117e4b96e446567def32a0f
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Jul 12 12:32:18 2011 +0100
Move the easing functions to their own file
Instead of having the easing functions be dependent of ClutterAlpha, and
static to the clutter-alpha.c source file, we should make them generic
and move them to their own internal header and source files. This will
allow to re-use them in the near future.
clutter/Makefile.am | 2 +
clutter/clutter-alpha.c | 586 +++++++----------------------------------------
clutter/clutter-easing.c | 380 ++++++++++++++++++++++++++++++
clutter/clutter-easing.h | 115 ++++++++++
4 files changed, 575 insertions(+), 508 deletions(-)
commit 1e3debbd9e125d4e318ba91ff1f80131ed18bdfd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 21 11:08:43 2012 +0000
drag-action: Use the motion event when passing the drag threshold
This avoids a critical warning, but it also makes the dragging more
fluid in case of threshold crossing.
https://bugzilla.gnome.org/show_bug.cgi?id=670402
clutter/clutter-drag-action.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a8e631543e6e34b40b4a7ae1e345a80db23e6b4d
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Feb 21 15:55:51 2012 +0000
Reduce our internal dependence on the Cogl 1.x api
Since Cogl has started restricting what cogl 1.x api is exposed when
COGL_ENABLE_EXPERIMENTAL_2_0_API is defined and since we build all
Clutter internals with COGL_ENABLE_EXPERIMENTAL_2_0_API defined this
patch makes a first pass at reducing our internal use of the Cogl 1.x
api.
The most notable api that's no longer exposed to us internally is
the cogl_material_ api so this switches all Clutter internals to use the
cogl_pipeline_ api instead. This patch also makes quite a bit of
progress removing internal uses of CoglHandle although there is still
more to go.
clutter/Makefile.am | 1 +
clutter/clutter-cogl-compat.h | 52 ++++++
clutter/clutter-offscreen-effect.c | 24 +--
clutter/clutter-offscreen-effect.h | 1 +
clutter/clutter-path.c | 13 +-
clutter/clutter-shader-effect.c | 10 +-
clutter/clutter-stage-window.h | 12 ++
clutter/clutter-texture.c | 277 ++++++++++++++++++-------------
clutter/deprecated/clutter-fixed.c | 4 +
clutter/deprecated/clutter-shader.c | 4 +
clutter/x11/clutter-x11-texture-pixmap.c | 21 +--
tests/conform/test-cogl-materials.c | 8 +
12 files changed, 270 insertions(+), 157 deletions(-)
commit eff95eba4a2e15124eb38a3d1984c6725efcbe4d
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Feb 21 14:23:44 2012 +0000
Pass context to cogl_texture_pixmap_x11_new() api
The experimental cogl_texture_pixmap_x11_new() api was recently changed
to take an explicit context argument and return a GError on failures.
This updates Clutter's use of the api accordingly.
clutter/x11/clutter-x11-texture-pixmap.c | 26 ++++++++++++++++++++------
tests/conform/test-cogl-texture-pixmap-x11.c | 7 ++++++-
2 files changed, 26 insertions(+), 7 deletions(-)
commit 66cc330c0b4db8de6c819926318744c7f83e1b15
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Feb 21 14:01:22 2012 +0000
Loosen the guard around clutter_backend_get_cogl_context
We were only exposing clutter_backend_get_cogl_context() if
COGL_ENABLE_EXPERIMENTAL_2_0_API had been defined but the CoglContext
api is also available if COGL_ENABLE_EXPERIMENTAL_API has been defined.
As it was it meant that code opting into the experimental Cogl api
but not limiting to the 2.0 only api would have to #define
COGL_ENABLE_EXPERIMENTAL_2_0_API before including clutter.h but make
sure it wasn't defined when including cogl.h which was particularly
awkward.
clutter/clutter-backend.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 671ead6681db8e23708396dd8707ece82aaa4326
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Feb 21 13:37:55 2012 +0000
Rename cogl_framebuffer_swap_* apis to cogl_onscreen_swap_*
Recently the cogl_framebuffer_swap_* apis were moved into the
cogl_onscreen_* namespace since only CoglOnscreen framebuffers can be
double buffered. This renames all uses of the cogl_framebuffer_swap_*
apis in Clutter.
clutter/cogl/clutter-stage-cogl.c | 27 +++++++++++++--------------
clutter/win32/clutter-stage-win32.c | 2 +-
2 files changed, 14 insertions(+), 15 deletions(-)
commit fbf94310fc175491090076de887d4bcc02a772ee
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Feb 21 13:22:17 2012 +0000
Pass a CoglContext when calling cogl_pipeline_new
The experimental cogl_pipeline_new() api was recently changed so it
explicitly takes a CoglContext. This updates all calls to
cogl_pipeline_new() in clutter accordingly.
clutter/clutter-actor.c | 6 ++++-
clutter/clutter-blur-effect.c | 6 ++++-
clutter/clutter-colorize-effect.c | 6 ++++-
clutter/clutter-deform-effect.c | 41 +++++++++++++++++--------------
clutter/clutter-desaturate-effect.c | 6 ++++-
clutter/clutter-offscreen-effect.c | 29 +++++++++++++---------
clutter/cogl/clutter-stage-cogl.c | 10 +++++---
clutter/wayland/clutter-wayland-surface.c | 4 ++-
8 files changed, 69 insertions(+), 39 deletions(-)
commit 89518071f10ac937b739810c5165225d5644d3c2
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Tue Feb 21 11:38:18 2012 +0100
Updated Galician translations
po/gl.po | 544 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 276 insertions(+), 268 deletions(-)
commit fd334e652bb42a0e23ad56bb858148c219ca2200
Author: Alexander Shopov <ash@kambanaria.org>
Date: Tue Feb 21 10:22:48 2012 +0200
Updated Bulgarian translation
po/bg.po | 800 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 456 insertions(+), 344 deletions(-)
commit b5369e1e401007cf61d46369956ad71b55001aca
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date: Mon Feb 20 22:55:26 2012 +0100
Updated Danish translation
po/da.po | 1529 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 844 insertions(+), 685 deletions(-)
commit c0e685cd871c31deabf9826246b77ff6efa8e0bc
Author: Kasia Bondarava <kasia.bondarava@gmail.com>
Date: Sat Feb 18 00:04:55 2012 +0200
Updated Belarusian translation
po/be.po | 2368 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2368 insertions(+)
commit 4e345f6edc82a1254124ad56298e9c438bd4d05d
Author: Stefano Facchini <stefano.facchini@gmail.com>
Date: Sun Feb 19 17:56:12 2012 +0100
clutter-drop-action: annotation fixes for some signals
https://bugzilla.gnome.org/show_bug.cgi?id=670433
clutter/clutter-drop-action.c | 4 ++++
1 file changed, 4 insertions(+)
commit 2cee6a8efacd4753874c88488435b3a8d1708ff7
Author: Aurimas Černius <aurisc4@gmail.com>
Date: Sat Feb 18 00:04:55 2012 +0200
Updated Lithuanian translation
po/lt.po | 1568 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 872 insertions(+), 696 deletions(-)
commit 958fbf5f66026f38bf2292765b6dbc629d2da42b
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date: Wed Feb 15 20:56:43 2012 +0100
Updated Slovenian translation
po/sl.po | 545 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 277 insertions(+), 268 deletions(-)
commit 493461e7989fc036b13cf44580c316b42b0c53a6
Author: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Wed Feb 15 19:09:04 2012 +0100
a11y: remove Container explanation
That explanation is outdated after the last changes on clutter
clutter/cally/cally-actor.c | 34 ----------------------------------
1 file changed, 34 deletions(-)
commit c1d43b70c51744dabccfa9040c71a2ea517513aa
Author: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Thu Feb 9 12:32:44 2012 +0100
a11y: proper ATK role for ClutterStage
ATK_ROLE_CANVAS is not a suitable role, as the user (in general) can't
draw on the Stage. CallyStage implements AtkWindow, so the proper role
is ATK_ROLE_WINDOW
clutter/cally/cally-stage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cc126f55eb948a528211bc1649cd20bc7a7c0ed7
Author: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Wed Feb 8 18:46:11 2012 +0100
a11y: redoing focus stuff
Removing atkcomponent, focus_tracker, etc. Emitting focus state change
from the stage. Now things are more simple, and stop to use some
of the soon-to-be-deprecated signals on ATK.
clutter/cally/cally-actor.c | 114 +++-----------------------------------------
clutter/cally/cally-actor.h | 17 ++++---
clutter/cally/cally-stage.c | 47 ++++++++++++++++++
3 files changed, 61 insertions(+), 117 deletions(-)
commit 5b4d29bc4af6a92eb3ad700ec150c5764be1115f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 15 17:43:31 2012 +0000
docs: Note when new ClutterBindCoordinate values were added
The shorthands for position and size were added in 1.6.
clutter/clutter-enums.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit f97ffe544fb148c5acd2bb60ac38784de76b469b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 15 15:58:36 2012 +0000
interactive/layout: Update to modern API
No need to override Container. Actually, no need to use the Container
API at all. This also removes a bunch of leaks.
tests/interactive/test-layout.c | 216 +++++++---------------------------------
1 file changed, 35 insertions(+), 181 deletions(-)
commit 851d2a42c4e840f01d67e6fb8400835e3bb28c37
Author: Adel Gadllah <adel.gadllah@gmail.com>
Date: Wed Feb 15 17:54:45 2012 +0100
ClutterBindConstraint: Add CLUTTER_BIND_ALL coordinate
Add a CLUTTER_BIND_ALL that binds both size and position.
clutter/clutter-bind-constraint.c | 7 +++++++
clutter/clutter-enums.h | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
commit b8e5603a8585f6a4429263e6110a94132a7ad93d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 15 14:20:59 2012 +0000
x11/stage: Allow setting fullscreen hint before realize
It should be possible to do:
clutter_stage_set_fullscreen (stage, TRUE);
clutter_actor_show (stage);
and have the stage be full screen as soon as it is shown.
Currently, we need to call clutter_actor_realize() prior to calling
set_fullscreen(), otherwise the backing X window will not be set,
and ClutterStageX11 will silently discard the change.
If set_fullscreen() was called prior to realization, ClutterStageX11
should delay setting the fullscreen hint until the realize() chain
has been successfully executed.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2515
clutter/x11/clutter-stage-x11.c | 205 +++++++++++++++++++++-------------------
clutter/x11/clutter-stage-x11.h | 11 ++-
2 files changed, 114 insertions(+), 102 deletions(-)
commit c62b69bb14b12617179e81987835099bdffd2ffc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 15 13:43:15 2012 +0000
conform/invariants: Clean up
Use modern API, and add a minimal check that hiding an actor will cause
it to unmap.
tests/conform/test-actor-invariants.c | 158 ++++++++++++++++++++--------------
tests/conform/test-conform-main.c | 18 ++--
2 files changed, 103 insertions(+), 73 deletions(-)
commit ffc526044845e34c1e1210f63478342815621fbd
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Wed Feb 15 12:59:01 2012 +0100
Updated Spanish translation
po/es.po | 538 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 270 insertions(+), 268 deletions(-)
commit d31bd6fe927dc5fd8a9c48695efc88d3e8ddabb5
Author: Lionel Landwerlin <llandwerlin@gmail.com>
Date: Tue Jan 24 12:45:52 2012 +0000
x11: adjust size to minimal size when realizing
If you execute the following sequence :
stage = clutter_stage_new ();
clutter_actor_set_size (stage, 1280, 800);
clutter_actor_realize (stage);
Then you end up creating an onscreen buffer of size 1280x800 but
ClutterStageX11 storing the stage size at 640x480.
This patch resync the 2 implementation by using the ClutterStage's
size in both classes when realizing.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
https://bugzilla.gnome.org/show_bug.cgi?id=667540
clutter/x11/clutter-stage-x11.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit b1ff53d98017089667e29135c49bf451446a4f74
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Feb 15 09:30:18 2012 +0000
effects: Delay the creation of the base pipeline
Unconditionally creating CoglPipeline and CoglSnippets inside the class
initialization functions does not seem to be enough when dealing with
headless builds.
Our last resort is to lazily create the base pipeline the first time we
try to copy it, during the instance initialization.
clutter/clutter-blur-effect.c | 37 ++++++++++++++++++----------------
clutter/clutter-colorize-effect.c | 40 ++++++++++++++++++-------------------
clutter/clutter-desaturate-effect.c | 39 ++++++++++++++++++------------------
3 files changed, 60 insertions(+), 56 deletions(-)
commit d81ae9dd650f0a780cbd0ccedfe38d3150e2ac22
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date: Wed Feb 15 10:17:45 2012 +0100
Updated Serbian translation
po/sr.po | 529 ++++++++++++++++++++++++++++-----------------------------
po/sr@latin.po | 529 ++++++++++++++++++++++++++++-----------------------------
2 files changed, 512 insertions(+), 546 deletions(-)
commit 84632d9c1d54d6902bee42bb9a1aa9f4bf773a90
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue Feb 14 15:43:38 2012 -0500
actor: Correct get_paint_volume for an actor with no children and no clip
We do not need to repaint the entire stage if an actor has no children
and no clip.
clutter/clutter-actor.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
commit 114250e329b71cbcdd46ff8788afb87c5ea70c6d
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue Feb 14 16:17:07 2012 -0500
clutter.symbols: Fix up symbols
clutter/clutter.symbols | 1 +
1 file changed, 1 insertion(+)
commit c1a57e537b07e0036cec491044d92b5becdbc4b8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 14 17:14:25 2012 +0000
Do not check for features inside class initialization
The class initialization function may be called when Clutter hasn't been
fully initialized — for instance, when scanning the source with gtk-doc
or with the introspection scanner.
clutter/clutter-blur-effect.c | 19 +++++++------------
clutter/clutter-colorize-effect.c | 16 ++++++----------
clutter/clutter-desaturate-effect.c | 16 ++++++----------
3 files changed, 19 insertions(+), 32 deletions(-)
commit 553f446315f6d6122fd75277e4fde1d9526532f5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 14 16:50:52 2012 +0000
interactive/actor: Add more animations
Rotation along the Y axis and depth change.
tests/interactive/test-actor.c | 74 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 68 insertions(+), 6 deletions(-)
commit c44ffb02f52682080f73e827ecaf06d520f8125d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 14 15:48:15 2012 +0000
interactive/actor: Use a BoxLayout
As it was intended.
tests/interactive/test-actor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f854619bc976775af7c2a7ab7d52cec7cc0c490c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 14 15:39:15 2012 +0000
box-layout: Fix allocation brain farts
The allocation code for BoxLayout contains a sequence of brain farts
that make it barely working since the synchronization of the layout
algorithm to the one in GtkBox.
The origin of the layout is inverted, and it doesn't take into
consideration a modified allocation origin (for actors the provide
padding or margin).
The pack-start property is broken, and it only works because we walk the
children list backwards; this horribly breaks when a child changes
visibility. Plus, we count invisible children, which leads to
allocations getting insane origins (either close to -MAX_FLOAT or
MAX_FLOAT).
Finally, the allocation is applied twice even for non-animated cases.
https://bugzilla.gnome.org/show_bug.cgi?id=669291
clutter/clutter-box-layout.c | 67 ++++++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 28 deletions(-)
commit dbd603c5046254b555293b376dfbb59f80521311
Author: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Tue Feb 14 16:37:51 2012 +0100
ClutterStage: notify "key-focus" change on clutter_stage_emit_key_focus_event
clutter/clutter-stage.c | 2 ++
1 file changed, 2 insertions(+)
commit 0f5ddb6d6c05e08f1c5c74f2ac867f2f6ec30077
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon Feb 13 22:40:15 2012 -0500
actor: Add freeze/thaw when changing the first/last child
This should improve performance when adding/removing lots
of children.
clutter/clutter-actor.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
commit cf735b54df4bce53cac6e3ae9d41f4c88037f3a7
Author: Rob Bradford <rob@linux.intel.com>
Date: Fri Feb 10 16:46:45 2012 +0000
wayland: Add accessor API to permit access to underlying Wayland structures
* clutter_wayland_input_device_get_wl_input_device for the input device
* clutter_wayland_stage_get_wl_surface for the Wayland surface
* clutter_wayland_stage_get_wl_shell_surface for the shell surface
clutter/Makefile.am | 4 ++
clutter/wayland/clutter-input-device-wayland.c | 29 +++++++++++++
clutter/wayland/clutter-stage-wayland.c | 58 ++++++++++++++++++++++++++
clutter/wayland/clutter-wayland.h | 48 +++++++++++++++++++++
4 files changed, 139 insertions(+)
commit 84362a8257e0ce06fecf7b23c1adb6f15f4649c9
Author: Rob Bradford <rob@linux.intel.com>
Date: Fri Feb 10 16:44:32 2012 +0000
build: Install a clutter-wayland pkg-config file
clutter/Makefile.am | 5 +++++
1 file changed, 5 insertions(+)
commit 3218cd686580d0c0e15d4ef88199e6f90e6e23b1
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Nov 28 13:46:30 2011 +0000
Convert all of the internal shader-based effects to use snippets
This converts the blur, colorize and desaturate effects to use
snippets instead of CoglPrograms. Cogl can handle the snippets much
more efficiently than programs so this should be a performance win. It
also fixes the problem that Cogl would end up recompiling the program
for every instance of the effects because Clutter was not reusing the
same program.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-blur-effect.c | 197 ++++++++++++++++--------------------
clutter/clutter-colorize-effect.c | 178 ++++++++++++++++----------------
clutter/clutter-desaturate-effect.c | 175 ++++++++++++++++----------------
3 files changed, 260 insertions(+), 290 deletions(-)
commit b4887c3699e70a221b4e3b68ff2996d8c541f714
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Feb 13 15:11:44 2012 +0000
blur-effect: Use the texture size to work out the x/y step
The blur effect needs to pass a uniform to the GLSL shader so that it
can know the texture coordinate offset from one texel to another. To
calculate this the blur effect was previously using the allocation
size of the actor rounded up to the next power of two. Presumably the
assumption was that Cogl would round up the size of the texture to the
next power of two when allocating the texture. However this is not be
true if the driver supports NPOT textures. Also it doesn't take into
account the paint volume of the actor which may cause the texture to
be a completely different size. This patch just changes to directly
use the size of the texture.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-blur-effect.c | 41 +++++++++++++++--------------------------
1 file changed, 15 insertions(+), 26 deletions(-)
commit 041ac40056f8f2e882b37ce51c9c0baed18e1f83
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Nov 28 11:53:54 2011 +0000
offscreen-effect: Add clutter_offscreen_effect_get_texture
Sometimes a subclass of ClutterOffscreenEffect wants to paint with a
completely custom material. In that case it is awkward to modify the
material returned owned by ClutterOffscreenEffect so it makes more
sense to just get the texture and manage its own material.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-offscreen-effect.c | 88 ++++++++++++++++++++----------
clutter/clutter-offscreen-effect.h | 2 +
doc/reference/clutter/clutter-sections.txt | 1 +
3 files changed, 61 insertions(+), 30 deletions(-)
commit 0f04a1cd11500c943b41351ea603331f0bc6d746
Author: Neil Roberts <neil@linux.intel.com>
Date: Fri Feb 10 10:46:25 2012 +0000
tests: Remove conformance tests that have been ported to Cogl
A lot of the conformance tests that were just testing Cogl
functionality have been ported to be standalone Cogl tests in the Cogl
source tree. This patch removes those from Clutter so we don't have to
maintain them in two places.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
tests/conform/Makefile.am | 11 -
tests/conform/test-cogl-backface-culling.c | 340 -------------------
tests/conform/test-cogl-blend-strings.c | 433 -------------------------
tests/conform/test-cogl-depth-test.c | 336 -------------------
tests/conform/test-cogl-just-vertex-shader.c | 138 --------
tests/conform/test-cogl-offscreen.c | 163 ----------
tests/conform/test-cogl-path.c | 235 --------------
tests/conform/test-cogl-pipeline-user-matrix.c | 146 ---------
tests/conform/test-cogl-primitive.c | 245 --------------
tests/conform/test-cogl-sub-texture.c | 368 ---------------------
tests/conform/test-cogl-texture-3d.c | 230 -------------
tests/conform/test-cogl-wrap-modes.c | 319 ------------------
tests/conform/test-conform-main.c | 13 -
13 files changed, 2977 deletions(-)
commit 0e542aa30615353e4279e5ee3ef6430872584c4e
Author: Neil Roberts <neil@linux.intel.com>
Date: Thu Feb 9 17:22:24 2012 +0000
clutter-texture: Don't create a dummy texture
All of the pipelines used for ClutterTexture actors share a common
pipeline ancestor created with cogl_pipeline_copy. Previously this
ancestor had a dummy 1x1 texture attached to it so that it would end
up with the same state as the child pipelines that will render with a
texture. Cogl now has a mechanism to specify that a texture will be
used with a pipeline layer without having to create an actual texture.
This patch makes it use that to avoid having an unused texture.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-texture.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
commit f861c788c9c9df4d5eaa62639c2cbde743b8118c
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Feb 14 09:52:14 2012 +0800
Update VS property sheets
"Install" the "new" deprecated/clutter-timeline.h header
build/win32/vs10/clutter.props | 2 ++
build/win32/vs9/clutter.vsprops | 1 +
2 files changed, 3 insertions(+)
commit e3151228958e66fc8a0271c6cffd26234aa9ab69
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon Feb 13 17:12:41 2012 -0500
actor: Allow insert_child_at_index to add a child at the end with an index
If we have N children and the user passes N (or a number beyond N) to
clutter_actor_insert_child_at_index, we should respond by adding the
child at the end, not silently doing nothing.
clutter/clutter-actor.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit bbb7da03ac56a600b72dd81708db3f2af2113887
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 18:19:48 2012 +0000
Add a note on the paint volume origin
This should avoid trying to fix the origin of a paint volume set from
the allocation's origin, and thus breaking everything.
A PaintVolume for an actor is defined to be relative to the actor's
modelview unless specifically modified by internal functions; the origin
of an actor's allocation is, on the other hand, parent-relative.
clutter/clutter-actor.c | 5 ++++-
clutter/clutter-paint-volume.c | 8 ++++++--
clutter/clutter-types.h | 5 ++++-
3 files changed, 14 insertions(+), 4 deletions(-)
commit 8512dd2336f6583e52cbc46d0133ab47dd75b30a
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon Feb 13 12:43:08 2012 -0500
actor: Only care about a child's paint volume when clip_to_allocation isn't set
If we're clipping to the allocation, then the child can paint wherever it
wants, and we don't care. The paint volume is the allocation here.
clutter/clutter-actor.c | 67 ++++++++++++++++++++++++++-----------------------
1 file changed, 35 insertions(+), 32 deletions(-)
commit b5aa666dcd853b063c44f279e41b73e2f792e1aa
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 17:56:12 2012 +0000
actor: Remove stray cogl_object_unref()
The outline primitive is static, so unref'ing it makes Clutter crash.
clutter/clutter-actor.c | 1 -
1 file changed, 1 deletion(-)
commit 3996ae4348e4545c36a14f2aa6d57bb68c2023b9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 17:26:37 2012 +0000
actor: Add destroy_all_children()
There are times when we don't want to remove all children and count of
the reference count to drop to 0 to ensure destruction; there are cases,
such as managed environments, where it's preferable to ensure that the
children of an actor get actually destroyed.
clutter/clutter-actor.c | 51 ++++++++++++++++++++++++++++++
clutter/clutter-actor.h | 1 +
clutter/clutter.symbols | 1 +
doc/reference/clutter/clutter-sections.txt | 4 ++-
4 files changed, 56 insertions(+), 1 deletion(-)
commit 83119966a4216813cb8b641fd827b07be6bc7bfd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 16:58:30 2012 +0000
interactive/depth: Drop deprecated API
tests/interactive/test-depth.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
commit 5b17b4e41bf861ceb35ca887293db23ae13fe9a2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 16:47:17 2012 +0000
interactive/*: Update the API usage
Drop some deprecated methods.
tests/interactive/test-actor-clone.c | 4 ++--
tests/interactive/test-actors.c | 4 ++--
tests/interactive/test-animation.c | 2 +-
tests/interactive/test-behave.c | 4 ++--
tests/interactive/test-bin-layout.c | 2 +-
tests/interactive/test-cairo-clock.c | 2 +-
tests/interactive/test-cairo-flowers.c | 4 ++--
tests/interactive/test-depth.c | 2 +-
tests/interactive/test-devices.c | 2 +-
tests/interactive/test-easing.c | 2 +-
tests/interactive/test-fbo.c | 4 +---
tests/interactive/test-flow-layout.c | 2 +-
tests/interactive/test-layout.c | 2 +-
tests/interactive/test-multistage.c | 6 +++---
tests/interactive/test-paint-wrapper.c | 4 ++--
tests/interactive/test-pixmap.c | 2 +-
tests/interactive/test-scale.c | 9 +++------
tests/interactive/test-shader-effects.c | 4 ++--
tests/interactive/test-shader.c | 2 +-
tests/interactive/test-state.c | 2 +-
tests/interactive/test-text-field.c | 2 +-
tests/interactive/test-text.c | 2 +-
tests/interactive/test-texture-async.c | 2 +-
tests/interactive/test-texture-quality.c | 2 +-
tests/interactive/test-threads.c | 4 ++--
25 files changed, 36 insertions(+), 41 deletions(-)
commit bc7959069b6755052b76eccfc22d6543d77116cc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 16:05:21 2012 +0000
Deprecate ClutterStage:color
ClutterActor has a background-color property, now; we should use it for
the Stage, re-implement the color property in terms of background-color.
and deprecate the Stage property.
clutter/clutter-stage.c | 57 +++++++++++++++++++-------------------
clutter/clutter-stage.h | 4 ---
clutter/deprecated/clutter-stage.h | 27 ++++++++++++------
3 files changed, 47 insertions(+), 41 deletions(-)
commit d808367fe451005cf1e7923434cf08d2afc0c29c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 15:26:26 2012 +0000
docs: Use ClutterTimeline:repeat-count instead of :loop
doc/reference/clutter/clutter-animation-tutorial.xml | 15 +++++++++++----
doc/reference/clutter/migrating-ClutterBehaviour.xml | 2 +-
2 files changed, 12 insertions(+), 5 deletions(-)
commit cf9c4e651d0527be08f889a246c3366171437e4b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 15:04:18 2012 +0000
timeline: Move deprecated methods into a separate header
clutter/Makefile.am | 1 +
clutter/clutter-deprecated.h | 1 +
clutter/clutter-timeline.h | 10 ---------
clutter/deprecated/clutter-timeline.h | 41 +++++++++++++++++++++++++++++++++++
4 files changed, 43 insertions(+), 10 deletions(-)
commit cf1abda709f0eadb30a25bdf74efafcf4f46f4f0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 15:04:00 2012 +0000
animation: Do not use deprecated timeline methods
clutter/clutter-animation.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 657e0ce093198b83851f90ac47809b1732e3fa6e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 14:58:47 2012 +0000
cookbook: Use clutter_timeline_set_repeat_count()
doc/cookbook/animations.xml | 8 ++++----
doc/cookbook/examples/animations-looping-animator.c | 2 +-
doc/cookbook/examples/animations-looping-implicit.c | 2 +-
doc/cookbook/examples/animations-path-circle.c | 2 +-
doc/cookbook/examples/animations-path.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
commit 97feb06a6f4fbfb40af09e3436c81ec9a253ba4c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 14:45:06 2012 +0000
timeline: Add repeat-count
Being able to easily set the number of repeats has been a request for
the animation framework for some time now. The usual way to implement
this is: connect to the ::completed signal, use a static counter, and
stop the timeline when the counter hits a specific spot.
In the same light as the :auto-reverse property, we can make it easier
to implement this common functionality by adding a :repeat-count
property that, when set, limits the amount of loops that a Timeline can
perform before stopping itself.
In fact, we can implement the :loop property in terms of the
:repeat-count property just by using a sentinel value mapping to
"infinity", and map loop=FALSE to repeat-count=0, and loop=TRUE to
repeat-count=-1.
clutter/clutter-timeline.c | 181 +++++++++++++++++++++++------
clutter/clutter-timeline.h | 13 ++-
clutter/clutter.symbols | 2 +
doc/reference/clutter/clutter-sections.txt | 6 +-
4 files changed, 163 insertions(+), 39 deletions(-)
commit 42774689282a5d13210ab5943bbb75e6a3a0e047
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 13:44:52 2012 +0000
timeline: Deprecate the clone() method
The clutter_timeline_clone() method was a pretty dumb idea when it was
introduced, back when we still had the ClutterEffectTemplate and the
clutter_effect_* animation API. It has since become an API wart: we
cannot change or add new properties to be cloned without the risk of
breaking existing code. All in all, cloning a GObject is just a matter
of calling g_object_new() with the wanted properties.
Let's deprecate this throwback of the Olden Days™, so that we can remove
it for good once we break for 2.0.
clutter/clutter-timeline.c | 19 +++++++++++++------
clutter/clutter-timeline.h | 1 +
2 files changed, 14 insertions(+), 6 deletions(-)
commit bc2e4ac6c2ebdf00996f472f6583b582c5250a94
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 13:39:47 2012 +0000
Clean up clutter-timeline.h
Re-align everything to allow expansion, and move the only "protected"
function to the clutter-master-clock.h private header.
clutter/clutter-master-clock.h | 20 +++++-----
clutter/clutter-timeline.h | 90 ++++++++++++++++++++----------------------
2 files changed, 54 insertions(+), 56 deletions(-)
commit aec65c91980888fca45d367ec8c33a32352de686
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu Feb 9 15:45:14 2012 -0500
actor-meta: Correct annotations for vfuncs
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-actor-meta.h | 5 +++++
1 file changed, 5 insertions(+)
commit 96031a4f6f53dfb1067e1e3a176ac5103fd7d59d
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu Feb 9 08:48:18 2012 -0500
actor: Fix some broken annotations
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-actor.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 3adcbb265c7f592abd6a7a98a257cbb610235d52
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 13 11:43:26 2012 +0000
Update the Clutter moduleset
build/clutter.modules | 459 ++++++++++++++++++++++++++++++--------------------
1 file changed, 272 insertions(+), 187 deletions(-)
commit d8a51726e13e98cdce2a57782e33a12e570086d9
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Feb 13 08:59:09 2012 +0000
actor: Implement remove_all_children using ActorIter
The remove_all_children() method is an ideal candidate for using the
ActorIter API; the end result is more compact and easy to follow.
clutter/clutter-actor.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
commit 8f6da170bc2e8fb9ca02970ca864add9f7722c5d
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Feb 13 08:52:08 2012 +0000
input-device: Do not use weak references with actors
Use the ClutterActor::destroy signal.
clutter/clutter-input-device.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
commit f024b852f9bb90d4efeba78ae255bfa6c25aa27e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Feb 13 08:45:22 2012 +0000
stage: Do not use weak refs with actors
ClutterActor provides a signal for notifying destruction: using weak
references is neither indicated nor recommended.
clutter/clutter-stage.c | 38 ++++++++++++++------------------------
1 file changed, 14 insertions(+), 24 deletions(-)
commit 519da376f070f8688a41b672601779aa99bec28a
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Feb 13 08:44:40 2012 +0000
stage: Clean up
Remove some ifdeffed out dead code, and some duplication.
clutter/clutter-stage.c | 95 +++++++++----------------------------------------
1 file changed, 16 insertions(+), 79 deletions(-)
commit cd118f0dc0172be089519b47da721eeca67bbc30
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat Feb 11 16:02:31 2012 +0000
text: Fix regression
When the ClutterTextBuffer support inside ClutterText was merged, it
introduced a regression that was identified and fixed in bug 659116.
The optimization to not paint empty ClutterText actors is only valid
is the actor is not editable, or if the cursor is not visible.
clutter/clutter-text.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
commit f770cce7a5b0efaac3ae5732fe9673d68528b8d3
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Feb 10 12:26:43 2012 +0000
build: Fix platform_linux check
Missing * at the end.
As a side effect, this commit enables the ABI check when running make
check inside the clutter/ directory.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 66451e75d31e79e3c25f6dcbb8cf0a1b10d91d99
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Feb 10 16:15:06 2012 +0800
Update config.h.win32(.in)
Make it more like the config.h(.in) in terms of the entries to check.
config.h.win32.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit ca9b27615dcd79573ac94d670f905b39bf1bd3e5
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Feb 10 16:10:47 2012 +0800
Update Visual C++ property sheets
-Stop installing the cookbook items for now
-Reflect on newly added and deprecated public headers
build/win32/vs10/clutter.props | 22 ++++++++--------------
build/win32/vs9/clutter.vsprops | 12 ++++--------
2 files changed, 12 insertions(+), 22 deletions(-)
commit 5220d659e0b9f2cffb246019ee19605f255e1af7
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Feb 10 15:50:55 2012 +0800
Update Clutter Visual C++ projects
Link also to GIO as the GResource APIs from GIO is now being used
build/win32/vs10/clutter.vcxprojin | 8 ++++----
build/win32/vs9/clutter.vcprojin | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
commit 001e83940156d083696781cdce09a6906283f868
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 18:42:27 2012 +0000
Add abicheck.sh
Courtesy of GLib and GTK+. The abicheck.sh is a simple, Linux-only,
script to check that we're not leaking private symbols, or that the
clutter.symbols file hasn't been updated.
In theory, it should go inside the distcheck phase.
clutter/Makefile.am | 18 ++++++++++++++++++
clutter/abicheck.sh | 11 +++++++++++
2 files changed, 29 insertions(+)
commit de9efd98a70bfc1aa652b2758eb3d02fc6ad58af
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 18:41:55 2012 +0000
symbols: Update
Add a bunch of missing public symbols, and remove some cruft.
clutter/clutter.symbols | 72 +++++++++++++++++++++----------------------------
1 file changed, 31 insertions(+), 41 deletions(-)
commit 92f6b520cb27e45f6682b0b06d76fed36ad43cfa
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 18:41:19 2012 +0000
build: Identify the Linux hosts
This gives us a nice conditional, like the one we have on Windows and
OSX.
configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
commit 910b09d70a41ab58a14d316143a5354c332d2cc1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 18:40:03 2012 +0000
Mark internal symbol as private
A bunch of private symbols have escaped into the SO; let's rectify this
situation by using the '_' private prefix, or making them static as they
should have been.
clutter/clutter-actor.c | 6 ++--
clutter/clutter-list-model.c | 20 +++++++-------
clutter/clutter-master-clock.c | 2 ++
clutter/clutter-master-clock.h | 4 +--
clutter/clutter-model-private.h | 59 ++++++++++++++++++++++++++++------------
clutter/clutter-model.c | 52 +++++++++++++++++------------------
clutter/clutter-script-parser.c | 2 ++
clutter/clutter-script-private.h | 4 +--
8 files changed, 89 insertions(+), 60 deletions(-)
commit 8ba0351c7ab8f1c9e0d76c78fb56c3b9e8fe4210
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 16:44:28 2012 +0000
conform/actor: Add unit for the Container signals
ClutterActor should be emitting signals defined on the ClutterContainer
interface, as well as ensuring that manipulating the scene graph is
still possible from within them.
The new unit checks that we're emitting signals, by implementing
something similar to the Bin class available in toolkits like gtk, st,
and mx — i.e. a container that can only hold one child at any given
point.
tests/conform/test-actor-graph.c | 74 +++++++++++++++++++++++++++++++++++++++
tests/conform/test-conform-main.c | 1 +
2 files changed, 75 insertions(+)
commit fee53a2993db3795bd7ffbb4e878c807ccdaa80c
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Dec 21 15:13:53 2011 +0000
clutter-backend: Use the Cogl main loop mechanism
Cogl now requires that all applications integrate their main loop with
Cogl so that it can listen for events from winsys. This patch just
adds Cogl's GSource to the main loop.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
Reviewed-by: Robert Bragg <robert@linux.intel.com>
clutter/clutter-backend-private.h | 1 +
clutter/clutter-backend.c | 6 ++++++
2 files changed, 7 insertions(+)
commit bace07c0a02198a97f89c516849e5161e20d26c3
Author: Robert Bragg <robert@linux.intel.com>
Date: Thu Feb 9 16:04:19 2012 +0000
Updates use of Cogl in line with api changes
Some of Cogl's experimental apis have changed so that the buffer apis
now need to be passed a context argument and some drawing apis have been
replaced with cogl_framebuffer_ drawing apis that take explicit
framebuffer and pipeline arguments.
These changes were made as part of Cogl moving towards a more stateless
api that doesn't rely on a global context.
This patch updates Clutter to work with the latest Cogl api and bumps
the required Cogl version to 1.9.5.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>
clutter/clutter-actor.c | 18 ++++++----
clutter/clutter-deform-effect.c | 27 ++++++++-------
configure.ac | 2 +-
tests/conform/test-cogl-pixel-buffer.c | 12 +++++--
tests/conform/test-cogl-primitive.c | 60 +++++++++++++++++++++-------------
5 files changed, 75 insertions(+), 44 deletions(-)
commit d0e945fb70814ce1f75afef3baebd1b3cd352cb9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 15:49:30 2012 +0000
actor: Add ClutterActorIter.destroy()
Similar to the clutter_actor_iter_remove(), but it'll call destroy()
instead of remove_child().
We can also reimplement the ::destroy default handler using it, and make
it more compact.
clutter/clutter-actor.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
clutter/clutter-actor.h | 1 +
2 files changed, 43 insertions(+), 7 deletions(-)
commit 59bb19a4494d4be2b431cf62ccb34efc894cd027
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 15:43:25 2012 +0000
actor: Add a default handler for ::destroy
Now that ClutterActor can be instantiated, we need to do the right
thing, and destroy its children when it is destroyed.
clutter/clutter-actor.c | 54 ++++++++++++++++++++++++++++++++-----------------
1 file changed, 35 insertions(+), 19 deletions(-)
commit 630e602eac37b831677376c33b208a5c536f8260
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 15:38:11 2012 +0000
docs: Update the Container interface documentation
The API reference should be more explicit about which parts of the
interface should be overridden, and which are deprecated.
clutter/clutter-container.c | 58 +++++++++++++++++++++++++++++++++++++++++----
1 file changed, 53 insertions(+), 5 deletions(-)
commit 0c715d00264241307b53a7d167352b127b46d314
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 9 14:22:31 2012 +0000
conform/actor-graph: Add more cases
The actor-insert unit is not exercising the whole API and its allowed
arguments; this let sneak in the buglet found in bug 669730.
tests/conform/test-actor-graph.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
commit a023bb341201b0dbb438efaef8d9d03ce99269de
Author: Florian Müllner <fmuellner@gnome.org>
Date: Thu Feb 9 02:13:50 2012 +0100
actor: Fix add_child_at_index() for negative index
There is a typo in the check for a negative index: the index variable
should be index_, not index - unfortunately, the latter can still be
resolved to index(3), so compiler and linker are perfectly happy.
https://bugzilla.gnome.org/show_bug.cgi?id=669730
clutter/clutter-actor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 74821f61c0f0880545dd12fd96be1539a9e72894
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date: Wed Feb 8 21:40:54 2012 +0100
Updated Serbian translation
po/sr.po | 1520 +++++++++++++++++++++++++++++++-------------------------
po/sr@latin.po | 1520 +++++++++++++++++++++++++++++++-------------------------
2 files changed, 1710 insertions(+), 1330 deletions(-)
commit e7511dd4695a0b817e439743d2263275814de72e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 7 11:36:27 2012 +0000
text: Avoid changing the contents when possible
An editable ClutterText will reset the selection and cursor whenever the
contents are changed — even if those contents are the same. As this may
confuse the user, we should check if we're setting the exact same string,
and bail out if necessary.
clutter/clutter-text.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit d509455de0f95fc804eb91776ec9e051df7cbca5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 7 11:33:12 2012 +0000
text: Fix annotations
Both set_text() and set_markup() have relaxed their preconditions on a
non-NULL string as their argument, so we need to update the annotations.
clutter/clutter-text.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 15441bb28029d3d328c4a450a384fa822c5fd023
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 7 11:31:28 2012 +0000
text: Style cleanups
Inline wrapper functions, and remove deep nested if's.
clutter/clutter-text.c | 70 ++++++++++++++++++++++++++------------------------
1 file changed, 37 insertions(+), 33 deletions(-)
commit 1d55af9dfacb7cc3bad2e36644b8933ddd6f87ca
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 7 11:30:43 2012 +0000
interactive/text-field: Modernize
tests/interactive/test-text-field.c | 79 ++++++++++++++++++++-----------------
1 file changed, 42 insertions(+), 37 deletions(-)
commit 7ba9774572e44ad0049ecc8acb5dd093c9b0bbd1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 6 18:23:21 2012 +0000
text: Add the coords_to_position() method
The reverse of position_to_coords().
While providing documentation on how to implement it using the
PangoLayout API, I realized that the verbosity of it all, plus the usage
of the Pango API, was not worth it, and decided to expose the method we
are using internally.
clutter/clutter-text.c | 30 +++++++++++++++++++++---------
clutter/clutter-text.h | 3 +++
clutter/clutter.symbols | 1 +
doc/reference/clutter/clutter-sections.txt | 1 +
4 files changed, 26 insertions(+), 9 deletions(-)
commit 3305105a8cf69dcc4ced98a896264559ef9d0f42
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 6 17:34:26 2012 +0000
docs: Fix up Since annotation
We only use stable releases for "since" tags.
clutter/clutter-text.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit de64ccb45150d9f7cbaf1ec8f7c6de2680083a01
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 6 16:45:15 2012 +0000
Post-release version bump to 1.9.11
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0d7ec670f1fccddc2666b53b0947a2ff77805634
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 6 16:40:00 2012 +0000
Release 1.9.10 (snapshot)
NEWS | 39 +++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 40 insertions(+), 1 deletion(-)
commit 8b904aa626a3b67a2058c86ee5bc7ef14aac024d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 6 16:34:18 2012 +0000
docs: Update release notes
README.in | 11 +++++++++++
1 file changed, 11 insertions(+)
commit ad276865d2874b53311840eee79dd4d41ef2dc77
Author: Tristan Van Berkom <tristan.van.berkom@gmail.com>
Date: Sun Jan 29 21:29:38 2012 +0900
Fixed clutter_state_remove_key_internal() to propagate the is_inert state
This was causing warnings when calling g_object_weak_unref on an
already finalized object.
https://bugzilla.gnome.org/show_bug.cgi?id=668951
clutter/clutter-state.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
commit 047f60b13829bc8fee66c9107e90f1aacf40cf93
Author: Tristan Van Berkom <tristanvb@openismus.com>
Date: Sat Feb 4 22:43:51 2012 +0900
Fix Makefile to properly include clutter-backend-eglnative.h in the disted tarball
https://bugzilla.gnome.org/show_bug.cgi?id=669360
clutter/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit ce9564e5584381794ea6b8fae379ad2c3b499bef
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 6 15:34:13 2012 +0000
model: Drop GValueArray usage
We can use a plain C array of GValues when deserializing a ClutterModel
implementation from a ClutterScript description.
clutter/clutter-model.c | 49 ++++++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 21 deletions(-)
commit d699328f7fbefc49df5bcfe6703a707e9478d7a5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 6 14:37:49 2012 +0000
list-model: Migrate from GValueArray
GValueArray is on its way to deprecation in GLib; as far as the
ListModel class is concerned, a plain C array of GValue is a perfectly
suitable replacement for the GValueArray usage. It actually is an
improvement, given that it's going to take less memory.
clutter/clutter-list-model.c | 63 ++++++++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 28 deletions(-)
commit bfe71293757468f56922b138ba299dfda449fa2d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sun Feb 5 08:47:17 2012 +0000
Clean up clutter-actor.h
It's time, we delayed far too long.
clutter/clutter-actor.h | 623 +++++++++++++++++++++++-------------------------
1 file changed, 301 insertions(+), 322 deletions(-)
commit ad62075378259e301e78620a7cfe5bc9ddc4164f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 2 14:07:38 2012 +0000
interactive/actor: Show event and animation API
tests/interactive/test-actor.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
commit 9872d7eb1b31112f3f72855ef00334f39cdb949f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 2 11:18:00 2012 +0000
docs: Clarify actor map and unmap methods
ClutterActor stopped requiring to override the map and unmap virtual
functions some time ago.
Now that ClutterActor implements the Container interface, overriding map
and unmap to control the MAPPED state of the children is pretty much
going to be a source of bugs and misunderstandings.
Plus, the ordering of the unmap, destroy, dispose, and finalize calls
should be be documented properly.
The documentation should clarify all that.
clutter/clutter-actor.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
commit 242de47c032eb750bd825a1d26b4b911e80527b9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 2 11:07:14 2012 +0000
docs: Update the actor invariants
• Clear up what's deprecated.
• Remove mentions of set_parent/unparent, and use add_child/remove_child
instead.
• Clarify that reparent may not touch the MAPPED state.
doc/actor-invariants.txt | 55 ++++++++++++++----------------------------------
1 file changed, 16 insertions(+), 39 deletions(-)
commit 4b6156a57a00214297c696f20e374ad645b97019
Author: Evan Nemerson <evan@coeus-group.com>
Date: Thu Jan 12 18:15:55 2012 -0800
introspection: add some missing annotations
https://bugzilla.gnome.org/show_bug.cgi?id=667840
clutter/clutter-actor.c | 20 ++++++++++----------
clutter/clutter-list-model.c | 4 ++--
clutter/deprecated/clutter-timeout-pool.c | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
commit 2475443a873fdf57226c470caa964124c7a9547a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 17:03:14 2012 +0000
Clean up the clutter API reference Makefile.am
doc/reference/clutter/Makefile.am | 68 +++++++++++++--------------------------
1 file changed, 23 insertions(+), 45 deletions(-)
commit bb2d807d2ab4ee13eea02bda7c65b562b7f503ae
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 16:44:43 2012 +0000
docs: Add an image for the XIncluded code
clutter/clutter-actor.c | 4 ++++
doc/reference/clutter/Makefile.am | 6 ++++--
doc/reference/clutter/test-actor.png | Bin 0 -> 5081 bytes
3 files changed, 8 insertions(+), 2 deletions(-)
commit 59f3488fa954b98220d1ec6298214b38cd402cfb
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 16:44:07 2012 +0000
docs: Add private macro CLUTTER_PRIVATE_FIELD
doc/reference/clutter/clutter-sections.txt | 1 +
1 file changed, 1 insertion(+)
commit 76c8b17144a26bb9cca712e8349d23f3df9b493a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 16:32:48 2012 +0000
docs: XInclude test-actor inside the Actor's description
clutter/clutter-actor.c | 5 +++++
1 file changed, 5 insertions(+)
commit 5974cfc97be14bed6aade7f6e85622d3f72e138f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 16:30:05 2012 +0000
docs: Add an example to the Actor description
clutter/clutter-actor.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
commit 341faaa0898c19a0c2c569460a0c4f08a7b8e23c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 12:45:08 2012 +0000
actor: Add diagnostic message for "behaviours" in ClutterScript
Behaviours have long since been deprecated; we should notify the user
that still uses behaviours in ClutterScript definitions.
clutter/clutter-actor.c | 7 +++++++
1 file changed, 7 insertions(+)
commit 11239d8da650ecf5d467fd8a131b30691e28dcbd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 12:35:17 2012 +0000
actor: Do not unmap/unrealize twice on destruction
When calling clutter_actor_destroy(), ClutterActor calls
update_map_state() on itself to unset the REALIZED and MAPPED states,
prior to running the dispose() implementation.
The default dispose() will call remove_child() (either directly or
through the Container implementation), which will check for the MAPPED
state and then run update_map_state() again. We use the previously set
MAPPED state to decide whether or not the parent should queue for a
relayout/redraw when removing a visible children.
If the MAPPED flag was cleared prior to remove_child(), though, it'll
always be unset by the time we get to remove_child(), and this will
cause missing redraws/relayouts; we were ignoring this prior the
post-First Apocalypse changes because we were doing:
if (was_mapped)
clutter_actor_queue_relayout (parent);
clutter_actor_queue_redraw (parent);
which is obviously wrong. Once I removed that glaring brain damage from
the remove_child() implementation, bugs started appearing — bugs that
were probably the reason why we introduced that brain damage in the
first place, instead of checking the source of those bugs.
The obvious fix is to avoid clearing up the actor's state on destroy()
until we remove the actor from its parent. This also reduces the amount
of work we do, and the code paths that can potentially go wrong.
clutter/clutter-actor.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
commit 8ee6d106812788c0465845fccb9216c50fe8c27f
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 22:52:49 2011 +0000
actor: Move ClutterShader-related code out of clutter-actor.c
Since the code dealing with ClutterShader is pretty self-contained, now,
we can safely move it outside of the main ClutterActor source file and
into its own. This will allow us to just drop a bunch of files when
branching for 2.0.
clutter/Makefile.am | 1 +
clutter/clutter-actor-private.h | 4 +
clutter/clutter-actor.c | 320 +-------------------------
clutter/deprecated/clutter-actor-deprecated.c | 318 +++++++++++++++++++++++++
4 files changed, 326 insertions(+), 317 deletions(-)
commit 2ed9e0d557bab241b1a824a3c9ee154b617a1fd0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 10:34:45 2012 +0000
x11: Remove CLUTTER_DISABLE_DEPRECATED usage
Switch to CLUTTER_DEPRECATED and CLUTTER_DEPRECATED_FOR.
clutter/x11/clutter-glx-texture-pixmap.h | 8 ++++----
clutter/x11/clutter-x11.h | 4 ----
2 files changed, 4 insertions(+), 8 deletions(-)
commit 1d84bf2b04e614a93527f6c36f5a7d686a5f7cfd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 10:28:04 2012 +0000
texture: Deprecate YUV setter
The YUV support depends on the driver support, and not only not many
drivers support YUV natively: the supported colorspaces are pretty much
useless.
The proper way to do YUV to RGB colorspace conversion on the GPU is to
use a fragment shader; for that, ClutterTexture and Cogl provide enough
API to achieve a good result - see the Clutter-GStreamer implementation,
for instance.
clutter/clutter-texture.c | 11 +++++++++++
clutter/clutter-texture.h | 15 +++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
commit c95b1265711bb845013f209b7e594b79c5a68eef
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 31 10:23:48 2012 +0000
texture: It's bytes per pixel, not bits
Clarify the error message when checking the bpp argument.
clutter/clutter-texture.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit 986307f5e4abc5c1c86207bcdb6bb998e67b5364
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Jan 30 10:55:30 2012 +0000
Use ClutterActorIter inside layout managers
Whenever it is possible, or convenient.
clutter/clutter-bin-layout.c | 42 ++++------
clutter/clutter-box-layout.c | 179 ++++++++++++++++++++++--------------------
clutter/clutter-flow-layout.c | 18 ++---
3 files changed, 119 insertions(+), 120 deletions(-)
commit 8b47ddbce6ac10e4f06f7b5e865492f022e5f54e
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date: Sun Jan 29 22:52:55 2012 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 1741 +++++++++++++++++++++++++++++++----------------------------
po/zh_TW.po | 1733 ++++++++++++++++++++++++++++++----------------------------
2 files changed, 1842 insertions(+), 1632 deletions(-)
commit 7165342948f01665f54ab5647083c82de6c2050c
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Sat Jan 28 20:59:17 2012 +0100
Updated Slovenian translation
po/sl.po | 780 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 444 insertions(+), 336 deletions(-)
commit 842ff82d77b020f6033f418232c7a662fbfae078
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 27 17:07:33 2012 +0000
docs: Mention the DELEGATE_LAYOUT flag in set_allocation()
With code examples.
clutter/clutter-actor.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 45 insertions(+), 1 deletion(-)
commit 534ec4ac7a60a2d86d5562ed03eb5968b0000536
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 27 15:48:46 2012 +0000
group: Set the NO_LAYOUT flag
Since FixedLayout won't do that for us any more, and we have Group users
and Group subclasses that may be relying on it.
clutter/deprecated/clutter-group.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
commit 31341986b114ac1df3ccce5e4e9553b97742f7d4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 27 15:45:11 2012 +0000
fixed-layout: Remove the NO_LAYOUT flag set
ClutterFixedLayout is the default layout manager for ClutterActor.
Existing subclasses of ClutterActor will get a fixed layout manager
regardless of whether they are going to use it, but since it sets the
CLUTTER_ACTOR_NO_LAYOUT flag, it will introduce regressions on actors
that perform their own layout management.
The CLUTTER_ACTOR_NO_LAYOUT flag was a bit of a mistake in the first
place, as it was introduced as a last minute workaround in the 1.0
process to deal with broken stuff in Moblin. It's going to be a target
for deprecation towards a removal when we start the 2.0 process.
clutter/clutter-fixed-layout.c | 37 -------------------------------------
1 file changed, 37 deletions(-)
commit 4360fcccf44fe17bb385a9780bb9b2d6f5e19bb7
Author: Kerrick Staley <mail@kerrickstaley.com>
Date: Thu Dec 29 03:15:05 2011 -0600
Fix spelling in Clutter Cookbook: ouest -> west
doc/cookbook/examples/textures-split-go.c | 26 +++++++++++++-------------
doc/cookbook/examples/textures-sub-texture.c | 2 +-
doc/cookbook/textures.xml | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
commit 5c9c5d24b23a3ddb365bd4ce0c5e2014d89a412e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 26 17:10:18 2012 +0000
box: Use the ActorIter API
And remove a useless override of the pick() virtual function while we're
at it.
https://bugzilla.gnome.org/show_bug.cgi?id=668669
clutter/deprecated/clutter-box.c | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
commit c6e14914740f0ac274cf92a294634b8955d85349
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jan 25 15:31:51 2012 +0000
stage: Use the iterator API instead of the DOM one
Whenever we're iterating over the children of the Stage we can now use
the ClutterActorIter API.
https://bugzilla.gnome.org/show_bug.cgi?id=668669
clutter/clutter-stage.c | 54 +++++++++++++++++++------------------------------
1 file changed, 21 insertions(+), 33 deletions(-)
commit 58ffcfb10ed8b7fc0e299035c8b049967f8fc0ef
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jan 25 15:27:57 2012 +0000
actor: Add ClutterActorIter
Iterating over children and ancestors of an actor is a relatively common
operation. Currently, you only have one option: start a for() loop, get
the first child of the actor, and advance to the next sibling for the
list of children; or start a for() loop and advance to the parent of the
actor.
These operations can be easily done through the ClutterActor API, but
they all require going through the public API, and performing multiple
type checks on the arguments.
Along with the DOM API, it would be nice to have an ancillary, utility
API that uses an iterator structure to hold the state, and can be
advanced in a loop.
https://bugzilla.gnome.org/show_bug.cgi?id=668669
clutter/clutter-actor.c | 186 +++++++++++++++++++++++++++++
clutter/clutter-actor.h | 29 +++++
clutter/clutter-types.h | 13 ++
clutter/clutter.symbols | 4 +
doc/reference/clutter/clutter-sections.txt | 7 ++
tests/conform/Makefile.am | 1 +
tests/conform/test-actor-iter.c | 129 ++++++++++++++++++++
tests/conform/test-conform-main.c | 31 ++---
8 files changed, 386 insertions(+), 14 deletions(-)
commit fa856e3f5ed71a3dbf022525aafbd27ad63410fe
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 27 11:48:14 2012 +0000
box: Restore the ::destroy handler
During the gutting of ClutterBox, the destroy and dispose implementation
were removed. The former, especially, destroyed all children - which
usually meant that the redraw queues for the childre was cleared as
well. The removal introduced crashes when a Box was destroyed while its
children were still queueing redraws.
clutter/deprecated/clutter-box.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
commit 9d355f12c6d1c804a3e0d205e2ff1c8e3f5e7538
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 27 11:42:33 2012 +0000
conform: Avoid a deadlock
Something is causing a deadlock when using clutter_threads_* API inside
the offscreen redirect conformance test. The conformance tests are
pretty insane anyway, so for the time being, let's put g_timeout_add()
back in while we figure out the issue.
tests/conform/test-offscreen-redirect.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ccc70a911d1314941d95b68a263a60c9b3c30a3e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jan 27 09:47:25 2012 +0000
tests: Update to use the symbolic button names
https://bugzilla.gnome.org/show_bug.cgi?id=668692
tests/interactive/test-box-layout.c | 2 +-
tests/interactive/test-clip.c | 4 ++--
tests/interactive/test-easing.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
commit 54c9257f28f6ecb8cbbef0215357a62e2dfe4731
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jan 27 09:46:51 2012 +0000
docs: Update to show the symbolic button names
https://bugzilla.gnome.org/show_bug.cgi?id=668692
doc/cookbook/events.xml | 12 +++++++++---
doc/cookbook/examples/animations-scaling-zoom.c | 4 ++--
doc/reference/clutter/clutter-sections.txt | 3 +++
3 files changed, 14 insertions(+), 5 deletions(-)
commit 12a79a66d8f3466084088389f111729f0cc834b1
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jan 27 09:46:10 2012 +0000
drag-action: Use the symbolic constants for the button
https://bugzilla.gnome.org/show_bug.cgi?id=668692
clutter/clutter-drag-action.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 60cddbd28e403abe17d22d96b7b8f2f9418abd2b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jan 27 09:43:06 2012 +0000
event: Add symbolic names for left, middle, and right buttons
Symbolic names are better than magic numbers, even if they are
well-established and won't likely change.
This maps to a commit in GTK+ that introduced the same names; it
was decided to go for PRIMARY, MIDDLE, and SECONDARY because of
the confusion that may arise when the button order gets flipped
in left-handed configurations - the "left" button (i.e. 1) becomes
the right-most button, and the "right" button (i.e. 3) becomes
the left-most button.
https://bugzilla.gnome.org/show_bug.cgi?id=668692
clutter/clutter-event.h | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)
commit 90397bf06c1ed2de1740f5e659d2a819df5e4aec
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Jan 27 07:30:02 2012 +0000
doc/cookbook: Remove dead link
doc/cookbook/actors.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit bacd4dd6a0ae770c1c850963cefefa0c88d2a230
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 26 17:11:27 2012 +0000
Remove unused variable
clutter/x11/clutter-stage-x11.c | 2 --
1 file changed, 2 deletions(-)
commit 78533cfd1a06a751582d3867f8a6c157dbb2501f
Author: Rob Bradford <rob@linux.intel.com>
Date: Thu Jan 26 15:39:16 2012 +0000
wayland: Correctly support fullscreening before the stage is realized
Rather than just call into wl_shell_surface_set_fullscreen we must repeat all
the steps to correctly fullscreen the surface.
clutter/wayland/clutter-stage-wayland.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 797336762e40baf9c187b99883aa893c1f5de92a
Author: Rob Bradford <rob@linux.intel.com>
Date: Thu Jan 26 14:23:57 2012 +0000
wayland: Force a redraw of the stage to get the new sized buffer attached
clutter/wayland/clutter-stage-wayland.c | 5 +++++
1 file changed, 5 insertions(+)
commit 65e27a830b341606dd1834fa442675eeebdc97c0
Author: Rob Bradford <rob@linux.intel.com>
Date: Thu Jan 26 14:23:16 2012 +0000
wayland: Use new stage state manipulation functions
clutter/wayland/clutter-stage-wayland.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
commit 0094350467941139a53a173c725bed7a74d39e7b
Author: Rob Bradford <rob@linux.intel.com>
Date: Mon Jan 23 13:07:13 2012 +0000
wayland: Refine fullscreen/unfullscreen to emit the state change events
Also update the code to set the size of the stage to set it to the size of the
output. In future versions of the Wayland protocol we'll get a configure
message advising of us of the size we can be to achieve fullscreen.
clutter/wayland/clutter-stage-wayland.c | 35 +++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
commit dd64ad1e4209793c436ad1cb90ba18ec85bbe936
Author: Rob Bradford <rob@linux.intel.com>
Date: Fri Jan 20 15:49:16 2012 +0000
wayland: Support programmatically resizing the stage
This will call into Cogl and ask it to resize the framebuffer which will then
update the underlying EGL surface.
clutter/wayland/clutter-stage-wayland.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
commit 838fc6276feb746e66a50b38a560f3b5e33fb273
Author: Rob Bradford <rob@linux.intel.com>
Date: Thu Jan 12 15:25:02 2012 +0000
wayland: Support setting fullscreen before the stage is realized
clutter/wayland/clutter-stage-wayland.c | 8 ++++++++
clutter/wayland/clutter-stage-wayland.h | 1 +
2 files changed, 9 insertions(+)
commit da19c3dfca17c93e2e4ffa18c73dc177f94d3003
Author: Rob Bradford <rob@linux.intel.com>
Date: Fri Dec 9 16:54:52 2011 +0000
wayland: Implement set_fullscreen vfunc in ClutterStageWayland
clutter/wayland/clutter-stage-wayland.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
commit cb4b9d758feae876aa660a9222f5d1d5233cf6f1
Author: Rob Bradford <rob@linux.intel.com>
Date: Fri Dec 9 16:52:29 2011 +0000
wayland: Include the Wayland surface and shell surface in ClutterStageWayland
clutter/wayland/clutter-stage-wayland.c | 3 +++
clutter/wayland/clutter-stage-wayland.h | 3 +++
2 files changed, 6 insertions(+)
commit 737c5e104512cf7319588b1921f26783e97c5e36
Author: Rob Bradford <rob@linux.intel.com>
Date: Fri Jan 20 18:22:50 2012 +0000
wayland: Save the output mode so that it can be used to fullscreen windows
clutter/wayland/clutter-backend-wayland.c | 52 +++++++++++++++++++++++++++++--
clutter/wayland/clutter-backend-wayland.h | 3 ++
2 files changed, 52 insertions(+), 3 deletions(-)
commit 3780e3e4f065e0f43ba007369e08878821f2dc5b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 26 10:29:50 2012 +0000
x11: Unbreak the build
The stage wrapper is on the ClutterStageCogl instance.
clutter/x11/clutter-stage-x11.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
commit fdf89a9e06859f38453196f97e7b5ea692113729
Merge: 9206bd762 9dab33401
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 26 08:42:00 2012 +0000
Merge branch 'stage-state'
* stage-state:
docs: Update ClutterStageState flags
wayland: Use the Stage state tracking
gdk: Use the Stage state tracking
win32: Use the Stage state tracking
x11: Use the Stage state tracking
osx: Use the Stage state tracking
stage: Add state tracking
commit 9dab33401f69c7b03c7205ab3a521ec90a98b1e7
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 26 08:33:45 2012 +0000
docs: Update ClutterStageState flags
clutter/clutter-enums.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit 2b547442a373794fd0b3dbb5799ad732bf091d03
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 26 08:27:39 2012 +0000
wayland: Use the Stage state tracking
clutter/wayland/clutter-input-device-wayland.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
commit 8c184f53cb3d01ef8cbefbf856e173b7f6555a45
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 26 08:27:25 2012 +0000
gdk: Use the Stage state tracking
clutter/gdk/clutter-event-gdk.c | 32 +++++++++++---------------------
1 file changed, 11 insertions(+), 21 deletions(-)
commit e73c2bf4ea3dcc72e32e1814e5cc6d64ed377e0f
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 26 08:27:08 2012 +0000
win32: Use the Stage state tracking
clutter/win32/clutter-event-win32.c | 28 ++++++++--------------------
clutter/win32/clutter-stage-win32.c | 31 ++++++++++++++++---------------
clutter/win32/clutter-stage-win32.h | 1 -
3 files changed, 24 insertions(+), 36 deletions(-)
commit 12e4f300a7d360b4efda714ce038da7057fb3ed9
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Jan 25 21:36:55 2012 +0000
x11: Use the Stage state tracking
clutter/x11/clutter-stage-x11.c | 72 +++++++++++++++--------------------------
clutter/x11/clutter-stage-x11.h | 2 --
2 files changed, 26 insertions(+), 48 deletions(-)
commit 2c9a693c14fb97dfb091ff00109e084de4b9caca
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Jan 25 21:25:59 2012 +0000
osx: Use the Stage state tracking
clutter/osx/clutter-stage-osx.c | 60 ++++++++++++++++-------------------------
clutter/osx/clutter-stage-osx.h | 2 --
2 files changed, 23 insertions(+), 39 deletions(-)
commit 19ff11ac933cbfcc1f87c5914d36a85ee014f8e9
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Jan 25 21:24:47 2012 +0000
stage: Add state tracking
State changes on the Stage are currently deferred to the windowing
system backends, but the code is generally the same, and it should
be abstracted neatly inside the Stage class itself.
There's also the extra caveat for backends that state changes on a
Stage must also emit a ClutterEvent of type CLUTTER_STAGE_STATE, a
requirement that needlessly complicates the backend code.
clutter/clutter-stage-private.h | 7 +++
clutter/clutter-stage.c | 121 ++++++++++++++++++++++++++++++++++------
2 files changed, 111 insertions(+), 17 deletions(-)
commit 9206bd7627e64a26784a4d6e3d66056f14db12e8
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Jan 25 23:09:38 2012 +0000
tests/*: Use symbolic constants for sources and events
And make sure to use clutter_threads_add_* instead of the bare
g_*_add().
tests/conform/test-anchors.c | 4 ++--
tests/conform/test-clutter-cairo-texture.c | 4 ++--
tests/conform/test-cogl-backface-culling.c | 4 ++--
tests/conform/test-cogl-blend-strings.c | 4 ++--
tests/conform/test-cogl-depth-test.c | 4 ++--
tests/conform/test-cogl-materials.c | 4 ++--
tests/conform/test-cogl-multitexture.c | 4 ++--
tests/conform/test-cogl-npot-texture.c | 4 ++--
tests/conform/test-cogl-offscreen.c | 4 ++--
tests/conform/test-offscreen-redirect.c | 4 ++--
tests/conform/test-pick.c | 7 +++---
tests/conform/test-texture-fbo.c | 4 ++--
tests/conform/test-timeline-rewind.c | 12 +++++-----
tests/interactive/test-cogl-point-sprites.c | 7 +++---
tests/interactive/test-cogl-shader-arbfp.c | 20 ++++++++---------
tests/interactive/test-cogl-shader-glsl.c | 35 +++++++++++++++--------------
tests/interactive/test-depth.c | 10 ++++-----
tests/interactive/test-pixmap.c | 12 +++++-----
tests/interactive/test-shader.c | 6 ++---
tests/micro-bench/test-text-perf.c | 4 ++--
tests/micro-bench/test-text.c | 4 ++--
tests/performance/test-common.h | 4 ++--
tests/performance/test-text-perf.c | 5 +++--
23 files changed, 88 insertions(+), 82 deletions(-)
commit b2bf2dbb089a0e4784586d40c7f28e02082a7734
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Jan 25 23:09:03 2012 +0000
docs: Use symbolic constants for sources and events
doc/cookbook/examples/textures-split-go.c | 8 ++---
.../clutter/clutter-animation-tutorial.xml | 40 +++++++++++-----------
2 files changed, 24 insertions(+), 24 deletions(-)
commit 71323b8bfc942a20952c2152485ed0f23b5a834f
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Jan 25 23:17:42 2012 +0000
x11/stage: Use symbolic constants for source function
And make sure to use the clutter_threads_add_timeout(), so that the
function is called under the Clutter lock.
clutter/x11/clutter-stage-x11.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit a4d571aaf91541bf66b46949d1445a58d37f483d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 24 15:42:20 2012 +0000
Post-release version bump to 1.9.9
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7179bd44c869ffce17b6a135735dbaec5f5c4411
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 24 15:20:35 2012 +0000
Release Clutter 1.9.8 (snapshot)
NEWS | 24 ++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
commit 18ec12a3b7d7a764c569c37aa280694f76403b41
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 24 15:12:41 2012 +0000
cookbook: Start migrating to the new API
Drop mentions of deprecated classes and API, and update the inline
example code.
Still some way to go, and the cookbook would probably benefit from
having a recipe on how to use ClutterActor to build a scene.
doc/cookbook/actors.xml | 9 ++----
doc/cookbook/animations.xml | 8 ++++--
doc/cookbook/events.xml | 4 +--
doc/cookbook/layouts.xml | 68 +++++++++++++++++++++------------------------
4 files changed, 42 insertions(+), 47 deletions(-)
commit 1c01554e6a06db0e6afc9a76deea99daa44f9fba
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 24 15:01:00 2012 +0000
cookbook: Begin porting examples to the new API
Start dropping the usage of deprecated classes and API.
doc/cookbook/examples/actors-composite-main.c | 2 +-
doc/cookbook/examples/animations-moving-animator.c | 43 ++++++++++++----------
doc/cookbook/examples/cb-button.c | 6 +--
doc/cookbook/examples/events-buttons-click.c | 18 +++++----
doc/cookbook/examples/events-mouse-scroll.c | 6 +--
.../examples/layouts-bind-constraint-allocation.c | 12 +++---
doc/cookbook/examples/layouts-box.c | 41 +++++++++++----------
7 files changed, 68 insertions(+), 60 deletions(-)
commit 75549456fd7697bf8ad1e5aaa1776b87554bcc37
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 24 14:52:33 2012 +0000
actor: use paint opacity to paint the background color
clutter/clutter-actor.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit 414f8c1a0f5fe66ed578ac32410b51e5c987d6d0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 24 14:20:07 2012 +0000
docs: Add missing function
doc/reference/clutter/clutter-sections.txt | 1 +
1 file changed, 1 insertion(+)
commit 825e1e62421e72d7fbfeb6d362264ca485ccf4de
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 24 14:13:53 2012 +0000
docs: Inlined examples break enums gtk-doc
clutter/clutter-enums.h | 35 ++---------------------------------
1 file changed, 2 insertions(+), 33 deletions(-)
commit 8d8d4ae7e59d869c05251f9ad351f85e6784d136
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Jan 16 11:27:08 2012 +0000
script: Add loading from a resource
GLib has gained support for compiling ancillary data files into the same
binary blob as a library or as an executable.
We should add this feature to ClutterScript, so that it's possible to
bundle UI definitions with an application.
clutter/clutter-script.c | 39 +++++++++++++++++++++++++++++++++++++++
clutter/clutter-script.h | 3 +++
clutter/clutter.symbols | 1 +
configure.ac | 2 +-
4 files changed, 44 insertions(+), 1 deletion(-)
commit 254ebd876556e1012947513d2855ab0c7fd83a1c
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Jan 24 09:36:31 2012 +0000
actor: Remove unused function
clutter/clutter-actor-private.h | 2 --
clutter/clutter-actor.c | 59 +----------------------------------------
2 files changed, 1 insertion(+), 60 deletions(-)
commit 4330f45d0579cc20ecf049226cd399f985024a3c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Jan 23 18:00:01 2012 +0000
Override Container inside ClutterStage
The only actor that results in a mix of the old Container API and the
new Actor API is ClutterStage. By inheritance, a Stage is a Group, but
we don't want it to behave like a Group - as it already overrides most
of the Actor API, and the reason why it was made as a Group in the
first place was convenience for adding/removing children.
Given that touching Group to make it aware of the new Actor API has
rapidly devolved into a struggle between a Demiurge that tries to
avoid breakage and a Chaos that finds new and interesting ways to
break ClutterGroup, let's declare API bankruptcy here and now.
ClutterStage should override ClutterContainer methods, and use the
layout management of ClutterFixedLayout as the proper class that it
was meant to be ages ago. Let ClutterGroup rot in pieces.
clutter/clutter-stage.c | 105 +++++++++++++++++++++++++++++++++++--
clutter/deprecated/clutter-group.c | 21 +-------
2 files changed, 102 insertions(+), 24 deletions(-)
commit cfac97ffe105477c83c13504d8dbfd0b9933ca5e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Sat Jan 21 23:06:49 2012 +0000
Allow mixing old and new API without falling apart
Now that we reinstated Group to its "former glory", we need to ensure
that applications using the deprecated containers with the new DOM API
in ClutterActor can actually work - or, at least, not break horribly.
This actually means making sure that ClutterStage and ClutterGroup can
cope with the DOM, while retaining their old implementations, as well as
their bizarre idiosyncrasies and their utter, utter brokenness.
clutter/clutter-actor-private.h | 2 +
clutter/clutter-actor.c | 546 +++++++++++++++++++++++++------------
clutter/clutter-enums.h | 49 +++-
clutter/clutter-stage.c | 3 +-
clutter/deprecated/clutter-group.c | 62 ++++-
5 files changed, 464 insertions(+), 198 deletions(-)
commit f5de10c05fdfa995108f6ce26a04f9ac08a3eb1e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 20 18:05:53 2012 +0000
interactive/actors: Update the venerable test-actors
tests/interactive/test-actors.c | 44 ++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 18 deletions(-)
commit c7d8c097ecc947ad5c56a8d9d3b68666c3a9880e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Mon Jan 23 00:34:20 2012 +0100
Updated Galician translations
po/gl.po | 438 +++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 241 insertions(+), 197 deletions(-)
commit 29384c114f5c27b47ce074e7fd36fea4d40a25dc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 20 17:15:20 2012 +0000
actor: NULL-ify sibling fields when removing
Let's try and avoid leaving around stale pointers.
clutter/clutter-actor.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
commit 27784de94166e7e507b7db7aaa16b5cec4826e4b
Author: Rob Bradford <rob@linux.intel.com>
Date: Mon Jan 16 11:55:32 2012 +0000
wayland: Update to changes in the SHM api
The enum value for the SHM formats has changed to be more explicit about the
format of the data.
clutter/wayland/clutter-backend-wayland.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7d7d753a49656d14c7ecf7461aaf4d39bbafb2af
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 20 16:00:19 2012 +0000
group: Restore previous implementation
Making Group just a proxy to Actor broke some behaviour that application
and toolkit code was relying on. Let's keep Group around to fight
another day.
This commit fixes gnome-shell as far as I can test it.
clutter/clutter-actor.c | 4 +-
clutter/deprecated/clutter-group.c | 373 +++++++++++++++++++++++++++++++++----
2 files changed, 340 insertions(+), 37 deletions(-)
commit 3ff502fbb2d4d43813190141181060dd79801cd4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 20 14:55:57 2012 +0000
stage: Restore the chain up inside allocate()
Group does not have a custom allocate() any more, so it would end up
calling the default allocate() implementation provided by ClutterActor
anyway.
clutter/clutter-stage.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 8ebf46d74c507055d741ac2c86fd6230b3e27515
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 20 14:55:13 2012 +0000
actor: Remove default layout-manager
It's creating more issues than what it's trying to solve. At least for
the time being, let's not set one.
clutter/clutter-actor.c | 51 ++++++-------------------------------------------
1 file changed, 6 insertions(+), 45 deletions(-)
commit bd348625c70a2f0f784d5780d3bda38f51fb347f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 20 14:53:41 2012 +0000
group: Gut the implementation
A Group is a just a ClutterActor with the layout-manager property set at
instance initialization time. It doesn't need anything else from
ClutterActor's vtable, except the slightly custom show_all/hide_all
implementation, and a simplified get_paint_volume.
clutter/deprecated/clutter-group.c | 138 +++++++++++--------------------------
1 file changed, 41 insertions(+), 97 deletions(-)
commit 1afd3827c7c9e2e343ad0e8165d9d2ff4bd62b7f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 20 12:04:48 2012 +0000
actor: Move underallocation warning to diagnostic mode
This should keep down the warning messages — at least for the time
being.
clutter/clutter-actor.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit c760657903b8d1599e25e54fcca01a5f546eb9aa
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 20 12:02:49 2012 +0000
actor: Use internal add/remove child in reparent()
Do not use the public API; reparent() used to use unparent() and
set_parent(), so we need to maintain the old behaviour.
clutter/clutter-actor.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
commit 683657cc301e928c1a9324d19285a3ecc2ea660e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 19 14:01:20 2012 +0000
Post-release version bump to 1.9.7
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 75d97ffdc509058915e2eee5c1480d83e6ee7776
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 19 13:42:37 2012 +0000
Release Clutter 1.9.6 (snapshot)
NEWS | 35 +++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
commit a222e75e332685e458d027a3ac4b1aa8bd763269
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 19 13:41:45 2012 +0000
build: Bump up the Cogl requirement
Clutter requires a new version of Cogl's API, but we never bumped the
requirement inside configure.ac.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 480514b721e985bad1c8aed69fbee1bbb24260c0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 19 13:40:02 2012 +0000
stage: Use clutter_actor_set_allocation()
Instead of chaining up, given that we want to bypass chaining up and
just set the allocation. This also allows us to bail out of the
overridden allocate vfunc check, given that we want the default Actor
behaviour to apply - including eventual layout manager delegates.
clutter/clutter-stage.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
commit f7bae2a064f4cdf17d854414d3a9acee690649b7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 19 13:39:14 2012 +0000
actor: Fix the has_overridden_allocate check
clutter/clutter-actor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit acf8aff6d5427ee3768057eb9de49612cb60793d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 19 13:14:47 2012 +0000
docs: Add clutter_actor_set_allocation()
doc/reference/clutter/clutter-sections.txt | 1 +
1 file changed, 1 insertion(+)
commit b206a3d025d416098d8e77f7e668d5ccd7dd3998
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 19 13:14:33 2012 +0000
symbols: Add clutter_actor_set_allocation()
clutter/clutter.symbols | 1 +
1 file changed, 1 insertion(+)
commit 67eeea6b6290ef916fde04d684ecb3bc3ac8656d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jan 19 12:40:32 2012 +0000
actor: Maintain behaviour of old allocate() implementations
The usual way to implement a container actor is to override the
allocate() virtual function, chain up, and then allocate the actor's
children.
Clutter now has the ability to delegate layout management to
ClutterLayoutManager directly; in the allocation, this is done by
checking whether the actor has children, and then call
clutter_layout_manager_allocate() from within the default implementation
of the ClutterActor::allocate() vfunc. The same vfunc that everyone, has
been chaining up to.
Whoopsie.
Well, we can check if there's a layout manager, and if it's NULL, we
bail out. Except that there's a default layout manager, and it's the
fixed layout manager, so that classes like Group and Stage work by
default.
Double whoopsie.
The fix for this scenario is a bit nasty; we have to check if the actor
class has overridden the allocate() vfunc or not, before actually
looking at the layout manager. This means that classes that override the
allocate() vfunc are expected to do everything that ClutterActor's
default implementation does - which I think it's a fair requirement to
have.
For newly written code, though, it would probably be best if we just
provided a function that does the right thing by default, and that
you're supposed to be calling from within the allocate() vfunc
implementation, if you ever chose to override it. This new function,
clutter_actor_set_allocation(), should come with a warning the size of
Texas, to avoid people thinking it's a way to override the whole "call
allocate() on each child" mechanism. Plus, it should check if we're
inside an allocation sequence, and bail out if not.
clutter/clutter-actor.c | 272 +++++++++++++++++++++++++++++++++++++-----------
clutter/clutter-actor.h | 3 +
2 files changed, 216 insertions(+), 59 deletions(-)
commit 70679dc68ca805f0669cf9f94b4e441a50ed82f9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jan 18 16:05:12 2012 +0000
actor: Be more conservative with the default paint volume
Check the allocation, when one is being used to initialize the paint
volume.
clutter/clutter-actor.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
commit eafb0ee734a6a5c04a92216b4425bd675c1c4999
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Wed Jan 18 12:39:55 2012 +0100
Updated Spanish translation
po/es.po | 288 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 164 insertions(+), 124 deletions(-)
commit 7e4260ee8a594aa7f32b68c231a5b152055fb593
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Jan 17 22:54:44 2012 +0000
build: Fix up the test rules for private deps
Thanks to diegoe for the help with testing.
configure.ac | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
commit f6ae8cf62180a6a9465b40f01129f15ddbefc2d5
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Tue Jan 17 23:24:14 2012 +0100
Updated POTFILES.in
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
commit d7e6deef9c448bfcd07cb33c5dc58667fcccdcb4
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Jan 17 21:59:37 2012 +0000
build: Add private deps to cflags and libs
If we go through the whole exercise of having private dependencies, we
should at least use the compiler flags and linker flags that those
dependencies give us when building Clutter.
https://bugzilla.gnome.org/show_bug.cgi?id=668137
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit f7d9eab36d187a16161dfb58230fd16cef17407b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 18:46:41 2012 +0000
actor: Add :first-child and :last-child properties
Toolkits tracking first and last children of a ClutterActor can use
these properties to get notification of hierarchy changes.
clutter/clutter-actor.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
commit bb8abe832ec11cdc9c336cc949ce913ef4e131e7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 18:13:42 2012 +0000
actor: Do not use ::constructed
If we want to set a default layout manager, we need to do so inside
init(), as it's not guaranteed that people subclassing Actor and
overriding ::constructed will actually chain up as they should.
clutter/clutter-actor.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
commit 7dd06de6d58c7d1ab9c3615ac87a45331244789d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 16:54:30 2012 +0000
interactive: Drop more deprecated classes
tests/interactive/test-constraints.c | 13 +++++++------
tests/interactive/test-depth.c | 21 +++++++++------------
tests/interactive/test-state.c | 10 +++++++---
3 files changed, 23 insertions(+), 21 deletions(-)
commit 8f1575b970936762039083df49925afaec9c48f7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 16:20:41 2012 +0000
interactive: Use ClutterActor instead of deprecated classes
tests/interactive/test-actors.c | 2 +-
tests/interactive/test-scrolling.c | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
commit 8492b17ae23bf154d11286a4ab530c42c31c107c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 16:20:19 2012 +0000
conform/actor-size: Do not use Rectangle
Use ClutterActor directly, instead.
tests/conform/test-actor-size.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 629ded568e30a845337e41f04b04b5fcc20a82d4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 16:13:55 2012 +0000
actor: Provide a better default pick() behaviour
The default pick() behaviour does not take into consideration the
children of a ClutterActor because the existing containter actors
usually override pick(), chain up, and then paint their children.
With ClutterActor now a concrete class, though, we need a way to pick
its children without requiring a sub-class; we could simply iterate over
the children inside the default pick() implementation, but this would
lead to double painting, which is not acceptable.
A moderately gross hack is to check if the Actor instance did override
the pick() implementation, and if it is not the case, paint the children
in pick mode.
clutter/clutter-actor.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
commit 0f39f20db6c906c3f32c9376a1cca94ce4c1a14f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 16:11:29 2012 +0000
actor: Deprecate show_all()/hide_all()
The hide_all() method is pretty much pointless, as hiding an actor will
automatically prevent its children from being painted. The show_all()
method would only be marginally useful, if actors weren't set to be
visible by default when added to another actor - which was the case when
we introduced show_all() and hide_all().
clutter/clutter-actor.c | 5 +++++
clutter/clutter-actor.h | 8 ++++----
clutter/deprecated/clutter-actor.h | 6 ++++++
3 files changed, 15 insertions(+), 4 deletions(-)
commit d363279fd308922af22c934d73715ea3833b7235
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Tue Jan 17 17:12:52 2012 +0100
Updated Spanish translation
po/es.po | 124 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 63 insertions(+), 61 deletions(-)
commit 41bef2b23ad8a75cce14b54a581527468790c3ad
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 14:44:28 2012 +0000
Post-release version bump to 1.9.5
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1854ce2d06d6c0badab174aa6c38dd6a46963284
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 14:32:19 2012 +0000
Release Clutter 1.9.4 (snapshot)
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 696f9e84c938808c645e66e3d2dd2a78ceafc154
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 14:21:02 2012 +0000
text: Fix the buffer length check on paint
clutter/clutter-text.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9f0ba2da0fece26167b3b2a44f3eb00ef1202702
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 14:17:20 2012 +0000
script: Fix a segfault
Accessing a variable before it is being set is not a great plan.
clutter/clutter-script-parser.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 37d94c6b870f79f0d3cce4a9dace36633cac9319
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 12:23:28 2012 +0000
text-buffer: Fix the Since annotations
clutter/clutter-text-buffer.c | 82 +++++++++++++++++++++++--------------------
1 file changed, 44 insertions(+), 38 deletions(-)
commit b03aa254692a47f60464d04e67f5a45ec842ede7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 12:19:35 2012 +0000
Update the NEWS file
NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
commit 5085c11bdec3ca772cff428833926a38efb5bf93
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 12:00:54 2012 +0000
Add ClutterTextBuffer to the API reference
clutter/clutter.symbols | 3 +++
doc/reference/clutter/clutter-docs.xml.in | 1 +
doc/reference/clutter/clutter-sections.txt | 32 ++++++++++++++++++++++++++++++
doc/reference/clutter/clutter.types | 1 +
4 files changed, 37 insertions(+)
commit 57f5813058137aa8f0f13547b8e64f539d1a6870
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 11:56:23 2012 +0000
Update clutter.symbols for TextBuffer
clutter/clutter.symbols | 13 +++++++++++++
1 file changed, 13 insertions(+)
commit 40b023a33eb154b7ef0288181920fd1527cf6044
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 11:52:37 2012 +0000
interactive/text: Remove spurious g_object_unref()
tests/interactive/test-text.c | 2 --
1 file changed, 2 deletions(-)
commit c073764369ee5969aa40ab90bcbbd1d9ffb22518
Author: Stef Walter <stefw@collabora.co.uk>
Date: Wed Jun 15 10:06:31 2011 +0100
text: Implement ClutterTextBuffer
* Abstracts the buffer for text in ClutterText
* Allows implementation of undo/redo.
* Allows use of non-pageable memory for text
in the case of sensitive passwords.
* Implement a test with two ClutterText using the same
buffer.
https://bugzilla.gnome.org/show_bug.cgi?id=652653
clutter/Makefile.am | 6 +-
clutter/clutter-marshal.list | 2 +
clutter/clutter-text-buffer.c | 764 ++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-text-buffer.h | 139 ++++++++
clutter/clutter-text.c | 693 ++++++++++++++++++++------------------
clutter/clutter-text.h | 6 +-
tests/interactive/test-text.c | 24 +-
7 files changed, 1304 insertions(+), 330 deletions(-)
commit d95bdf3a07ac82591886eb8f5bc4fab9fc98e62f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Tue Jan 17 12:52:01 2012 +0100
Updated Spanish translation
po/es.po | 766 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 415 insertions(+), 351 deletions(-)
commit 6b5b2910290dfe4afe494b8660bb65c4dba331bb
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 17 11:49:05 2012 +0000
Update clutter.symbols
clutter/clutter.symbols | 106 ++++++++++++++++--------------------------------
1 file changed, 36 insertions(+), 70 deletions(-)
commit 89e4bc3dcda824d687006e151e57effeaa3efd1c
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Tue Jan 17 01:44:53 2012 +0100
Updated Galician translations
po/gl.po | 537 +++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 300 insertions(+), 237 deletions(-)
commit 2d6ad03e863d0d0990d1b234a9e57de31a8669e3
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Tue Jan 17 01:29:26 2012 +0100
Updated POTFILES.in
po/POTFILES.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1dfc503df1085e197f291bc92a3af5495ec7f11d
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Jan 16 23:49:49 2012 +0000
Fix compiler warnings
When dereferencing GArray.data to a C structure you need a double cast
from guint8* to void*, and then from void* to the actual type. This
avoids compiler warnings, especially when using clang on OSX.
clutter/clutter-script-parser.c | 3 ++-
clutter/clutter-state.c | 31 ++++++++++++++++---------------
clutter/clutter-table-layout.c | 14 +++++++-------
clutter/clutter-timeline.c | 2 +-
4 files changed, 26 insertions(+), 24 deletions(-)
commit eb489a40debd05735f9eed6f54ac4cae19e8be6e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 3 14:51:37 2012 +0000
docs: Move deprecated sections to the proper location
doc/reference/clutter/clutter-docs.xml.in | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
commit f41061b8dfbe972bbd58d802b4191cdf86a3c4b4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 3 14:36:32 2012 +0000
actor: Deprecated push/pop internal methods
The concept of "internal child" only meant anything when we had a
separate API for containers and actors. Now that we plugged that
particular hole, we can drop all the hacks we used to have in place
to work around its design limitations.
clutter/clutter-actor.c | 12 +++++++++++-
clutter/clutter-actor.h | 3 ---
clutter/deprecated/clutter-actor.h | 6 ++++++
3 files changed, 17 insertions(+), 4 deletions(-)
commit ad2cfc01506ad08e91469bf269fcd50a0f337cfe
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 3 14:31:06 2012 +0000
docs: Fixes for the API reference
clutter/clutter-actor.c | 16 +++++++++++++++-
doc/reference/clutter/clutter-sections.txt | 22 ++++++++++------------
2 files changed, 25 insertions(+), 13 deletions(-)
commit ea6ddd15349da9d5088800905e54efbd1b955a15
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 3 14:29:39 2012 +0000
actor: Add boxed margin accessors
It can be convenient to be able to set, or get, all the components of an
actor's margin at the same time; since we already have a boxed type for
storing a margin, an accessors pair based on it is not a complicated
addition to the API.
clutter/clutter-actor.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-actor.h | 4 +++
2 files changed, 88 insertions(+)
commit 8de4b85175712785b754c339c5c49060e92616d2
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Dec 28 18:37:16 2011 +0000
docs: Update the release notes
README.in | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
commit 25ca2f135cca1b88f09ecaf6f5ca0fa6a555b350
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Dec 28 18:32:00 2011 +0000
build: Add inclusion guards and license notices
clutter/deprecated/clutter-actor.h | 28 ++++++++++++++++++++++++++++
clutter/deprecated/clutter-backend.h | 28 ++++++++++++++++++++++++++++
clutter/deprecated/clutter-container.h | 7 +++++--
clutter/deprecated/clutter-group.h | 27 ++++++++++++++++++++++++++-
clutter/deprecated/clutter-main.h | 25 +++++++++++++++++++++++++
clutter/deprecated/clutter-stage.h | 25 +++++++++++++++++++++++++
6 files changed, 137 insertions(+), 3 deletions(-)
commit 6f4578838ca89aa42cf7ac80c908c4c3868d4dd2
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Dec 27 19:28:47 2011 +0000
actor: Use proper internal API
Inside the set_child_[above|below]_sibling() and set_child_at_index() we
should be using the internal API for mutating the children list, instead
of the delegate functions. This ensures that we go through a single,
well-defined code path for all operations on the list of children of
an actor.
clutter/clutter-actor.c | 187 +++++++++++++++++++++++++++++-------------------
1 file changed, 113 insertions(+), 74 deletions(-)
commit b835e1f8c4101c668589c2c760e251853c20474a
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Dec 27 18:57:32 2011 +0000
Deprecate the old raise/lower API
We have a replacement in ClutterActor, now.
The old ClutterContainer API needs to be deprecated, and the raise() and
lower() virtual functions need a default implementation, so we can check
for implementations overriding them, by using the diagnostic mode like
we do for add(), remove(), and foreach().
The sort_depth_order() virtual function just doesn't do anything, as it
should have been made ages ago.
The Actor wrappers for the Container methods also need to be deprecated.
clutter/clutter-actor.c | 51 +++++----------
clutter/clutter-actor.h | 7 ---
clutter/clutter-container.c | 111 ++++++++++++++++++++++++++-------
clutter/clutter-container.h | 20 +++---
clutter/deprecated/clutter-actor.h | 14 +++++
clutter/deprecated/clutter-container.h | 47 +++++++++-----
6 files changed, 154 insertions(+), 96 deletions(-)
commit 9a66392d49f7403ac35d31edd96b580e4921600b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Dec 27 18:22:05 2011 +0000
actor: Add new methods for changing the paint sequence
ClutterActor provides four methods for changing the paint sequence order
of its children:
raise_top()
raise()
lower()
lower_bottom()
The first and last one being just wrappers around raise() and lower(),
respectively. These methods have various issues: they omit the parent,
preferring to retrieve it from the actor passed as the first argument;
this does not match the new style of API introduced to operate on the
list of children of an actor.
Additionally, the raise() and lower() methods of ClutterActor call into
the Container interface, and are not really aptly named (raise() in
particular collides with the completely unrelated 'raise' keyword in
Python, and usually needs to be wrapped in order to be used at all).
Furthermore, we need public methods that Container can call from its
default implementation, as well as methods to port current Container
implementations.
Finally, since we have insert_child_at_index(), we should also have an
equivalent set_child_at_index() as well.
clutter/clutter-actor.c | 102 +++++++++++++++++++++++++++++++++++++++
clutter/clutter-actor.h | 10 ++++
tests/conform/test-actor-graph.c | 10 ++--
3 files changed, 118 insertions(+), 4 deletions(-)
commit fa1792c3949c551763c812188429db447566d1ef
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Dec 27 11:28:36 2011 +0000
actor: Use flags to control add/remove child
The internal versions of add_child() and remove_child() currently use
boolean arguments to control things like the ChildMeta instances and
the emissions of signals; using more than one boolean argument is an
indication that you need flags to avoid readability issues, as well as
providing a way to add new behaviours without a combinatorial explosion
of arguments, later on.
clutter/clutter-actor.c | 124 +++++++++++++++++++++++++++++++-----------------
1 file changed, 80 insertions(+), 44 deletions(-)
commit 72fa75c034ad0a3d94f4966e6644626e85b5b0e7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Dec 21 17:07:25 2011 +0000
actor: Remove automagic "expand" flag
I don't feel comfortable with this feature, and its implementation
still has too many rough edges. We can safely punt it for now, and
introduce it at a later point, as it doesn't block existing features
or API.
clutter/clutter-actor.c | 471 +--------------------------------------
clutter/clutter-actor.h | 10 -
clutter/clutter-box-layout.c | 57 +----
clutter/clutter-layout-manager.c | 16 --
clutter/clutter-layout-manager.h | 10 +-
clutter/clutter-table-layout.c | 42 +---
6 files changed, 14 insertions(+), 592 deletions(-)
commit 72b523c9e9b9d5f7688090e181bd80e4ab94b83e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 18:42:53 2011 +0000
table-layout: Override compute_expand()
The TableLayout has two expansion flags that need to be taken into
consideration when computing the Actor expansion flags.
clutter/clutter-table-layout.c | 56 ++++++++++++++++++++++++++++++++++++------
1 file changed, 48 insertions(+), 8 deletions(-)
commit 5f79f6ee3715dad19d0b471bbea91a5363e29cf9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 18:41:51 2011 +0000
box-layout: Override compute_expand()
ClutterBoxLayout has an expansion flag, and we need to take that into
consideration when computing the Actor expansion flags.
clutter/clutter-box-layout.c | 57 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 55 insertions(+), 2 deletions(-)
commit 508f09f0a0c326b9a04cf021d134611e75690dd5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 18:40:11 2011 +0000
actor: Ask the LayoutManager to compute the expansion flags
If an actor has a layout manager, we want to involve the delegate object
into the lazy computation of the expansion flags state.
clutter/clutter-actor.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
commit 29561165611b6c76315664271cc130bf37cf5c1e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 18:38:47 2011 +0000
layout-manager: Add compute_expand() vfunc
This virtual function will let layout managers with legacy expansion
flags be able to influence the lazy computation of the expansion flags
on ClutterActor.
clutter/clutter-layout-manager.c | 16 ++++++++++++++++
clutter/clutter-layout-manager.h | 12 +++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)
commit fd5e422b9fc58bec4cd98d626226b0ae03766e98
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 17:05:48 2011 +0000
actor: Paint the background color in the paint class handler
We need to paint the background color in the default class handler for
two reasons: it's logically appropriate, and we don't want actor
subclasses overriding the ::paint class handler to change behaviour only
because somebody decided to set the background color.
clutter/clutter-actor.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
commit 2aaf359272aa3b7a38e472bed10aff69caa7303b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 15:59:15 2011 +0000
docs: Update the release notes
README.in | 11 +++++++++++
1 file changed, 11 insertions(+)
commit e6082fe42f9fbee6b3e01ca86118fab455cca4b0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 15:49:20 2011 +0000
docs: Clean up ClutterContainer's description
The API to add/remove/iterate over children is in ClutterActor, now.
clutter/clutter-container.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
commit 7f092af15b46daba025d41646bb18c5d7ebb4d03
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 15:21:06 2011 +0000
container: Add diagnostic warnings for deprecated vfuncs
The old add(), remove(), and foreach() virtual functions are deprecated;
ClutterContainer should warn if the public API detects that the vfuncs
have been overridden.
Strictly speaking, it's still legal to override those vfuncs: you can
chain up to the default vtable, or you could just provide an equivalent
implementation. The goal is to avoid having to override the Container
interface, until we can safely deprecate it and remove it in Clutter
2.0.
clutter/clutter-container.c | 51 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 48 insertions(+), 3 deletions(-)
commit 477c60c185fd666bf9ce207915cbffca4e8aaa02
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 15:04:24 2011 +0000
container: Provide default implementation of vfuncs
Instead of making ClutterActor implement the basic add/remove/foreach
virtual functions of ClutterContainer, we can simply do that from
within the ClutterContainer implementation.
clutter/clutter-actor.c | 49 ------------------------
clutter/clutter-container.c | 92 +++++++++++++++++++++++++++++----------------
2 files changed, 59 insertions(+), 82 deletions(-)
commit 959f875cbcfd5c5b11818b589aeb6a284d046695
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 14:58:08 2011 +0000
container: Deprecate more methods
The get_children(), foreach(), and foreach_with_internals() methods and
virtual functions are superceded by the Actor API, and should not be
used in newly written code.
clutter/clutter-container.c | 15 +++++++++++++--
clutter/clutter-container.h | 17 +++++------------
clutter/deprecated/clutter-container.h | 13 +++++++++++++
3 files changed, 31 insertions(+), 14 deletions(-)
commit 4eaa899871924304f4eb635fdaad3ef0663de51a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 14:57:38 2011 +0000
group: Use Actor.remove_all_children()
To implement the remove_all() method.
clutter/deprecated/clutter-group.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
commit 1979faee0065d34b211e205d64f5484a58285480
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 14:56:54 2011 +0000
cally: Use Actor.get_children()
Instead of the Container method, given that the new get_children() gives
us more actors by default.
clutter/cally/cally-actor.c | 65 +++++++++++++++++++--------------------------
1 file changed, 28 insertions(+), 37 deletions(-)
commit b42f17b2dcab6d750124afb90b01612311b672ad
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 14:47:35 2011 +0000
tests/interactive: Add a simple test for Actor
It's meant to be xincluded in the API reference.
tests/interactive/Makefile.am | 3 +-
tests/interactive/test-actor.c | 62 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
commit 425ead5bd7316c415cff8094d30dca89ac59e347
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 14:47:04 2011 +0000
actor: Add some debug spew
clutter/clutter-actor.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
commit 86152f478db1ad0f51f97f341bcd7b1f6397d965
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 13:32:37 2011 +0000
docs: Update the Actor API reference
Given the size and scope of the changes in ClutterActor, we ought to
rewrite the overall description of what an actor is, what it does, and
how are you supposed to use it and subclass it.
clutter/clutter-actor.c | 213 ++++---
doc/reference/clutter/Makefile.am | 16 +-
doc/reference/clutter/clutter-docs.xml.in | 5 +-
doc/reference/clutter/clutter-sections.txt | 65 +-
doc/reference/clutter/creating-behaviours.xml | 68 ---
doc/reference/clutter/subclassing-ClutterActor.xml | 672 ---------------------
6 files changed, 175 insertions(+), 864 deletions(-)
commit 59590994737e2d05013c9941ac64ddb8a6d734eb
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 19 18:48:02 2011 +0000
Deprecate Container add() and remove() methods
This will make things interesting.
We have better replacements in ClutterActor, that do The Right Thing™
instead of deferring control and requiring reimplementation in every
single container actor.
clutter/Makefile.am | 1 +
clutter/clutter-actor.c | 12 ++-
clutter/clutter-bin-layout.c | 3 +
clutter/clutter-box-layout.c | 3 +
clutter/clutter-container.c | 174 ++++++++++++++++++++-------------
clutter/clutter-container.h | 16 ---
clutter/clutter-deprecated.h | 1 +
clutter/clutter-flow-layout.c | 3 +
clutter/clutter-script-parser.c | 4 +-
clutter/clutter-table-layout.c | 3 +
clutter/deprecated/clutter-box.c | 3 +
clutter/deprecated/clutter-container.h | 64 ++++++++++++
12 files changed, 198 insertions(+), 89 deletions(-)
commit f61916fc5e81d9265896b42cf34d53c5af987d00
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 19 18:01:04 2011 +0000
actor: Add remove_all_children()
A simple method for removing all children of an actor in one fell swoop.
clutter/clutter-actor.c | 50 +++++++++++++++++++++++++++++++++++----
clutter/clutter-actor.h | 1 +
tests/conform/test-actor-graph.c | 28 ++++++++++++++++++++++
tests/conform/test-conform-main.c | 3 ++-
4 files changed, 76 insertions(+), 6 deletions(-)
commit 673961f40cb69ad28806dfe763d74bac3662a8ad
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 19 17:34:22 2011 +0000
docs: Clarify the Actor's iterator API behaviour
It should be noted in the documentation that it is not safe to operate
on the list of children of an Actor while iterating over it.
clutter/clutter-actor.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
commit 4f470b9231275c6966bde054f1eaf5f57bdd88f8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 19 14:37:42 2011 +0000
actor: Provide a proper implementation of replace_child()
The correct sequence of actions should be remove(old) → insert(new), not
insert(new) → remove(old). We can implement a simple delegate insertion
functions to insert the new child between the previous and next siblings
of the old child.
While we're at it, let's also add a unit test for replace_child().
clutter/clutter-actor.c | 72 +++++++++++++++++++++++++++++++++++++--
tests/conform/test-actor-graph.c | 60 ++++++++++++++++++++++++++++++++
tests/conform/test-conform-main.c | 1 +
3 files changed, 130 insertions(+), 3 deletions(-)
commit 5cba8012073e36677a86abd9ac22a69153aa9be9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 19 12:13:23 2011 +0000
actor: Fix get_paint_volume() default implementation
Providing a default get_paint_volume() that takes into account the
children of an actor was a goal of the whole First Apocalypse; if we
make all the containers rely on it, and yet we return a FALSE value
(meaning: we don't have a valid paint volume) even when we do have it,
then we are going to break the whole machinery, though.
clutter/clutter-actor.c | 1 +
1 file changed, 1 insertion(+)
commit 3ad77b417ce55a354945378e4a1aa22234540099
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 19 12:04:03 2011 +0000
stage: Use the Actor iteration API
clutter/clutter-stage.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
commit aa9e2a382c313d6b2ce13937268f9b1588ae5573
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 19 11:53:48 2011 +0000
Remove usage of Actor/Container.get_children()
ClutterBox and ClutterGroup are still using the get_children() method
instead of the child iteration API.
clutter/deprecated/clutter-box.c | 23 ++++++++++++-----------
clutter/deprecated/clutter-group.c | 10 +++++++---
2 files changed, 19 insertions(+), 14 deletions(-)
commit 62535bdc7350fd65310bf94aea3583577cf5b10e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Dec 19 07:20:20 2011 +0000
actor: Simplify first/last child updates
clutter/clutter-actor.c | 45 +++++++++++++++++++--------------------------
1 file changed, 19 insertions(+), 26 deletions(-)
commit ab429f4f4547863e5afa98ed622d478107dbb783
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 22:35:45 2011 +0000
Drop some more ClutterContainer.get_children() uses
clutter/clutter-layout-manager.c | 11 ++++-------
clutter/clutter-script-parser.c | 19 ++++++++-----------
2 files changed, 12 insertions(+), 18 deletions(-)
commit ec6873958b2fbf820686006677da1e44647b910c
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 22:34:51 2011 +0000
fixed-layout: Use the Actor iteration API
Forgot to migrate the FixedLayout layout manager like we did for the
other layout managers provided by Clutter.
clutter/clutter-fixed-layout.c | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
commit 4d75e7a0f45c336441bf4cd218d5d922c8fd9897
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 22:33:24 2011 +0000
cally: Use the Actor API instead of ClutterContainer
Cally is doing a bunch of list traversals through the list returned by
ClutterContainer.get_children(); this means a traversal already, plus
a bunch of allocations. We can do better than that, now that we have
a proper graph iteration API inside ClutterActor.
clutter/cally/cally-actor.c | 74 +++++++++++++++------------------------------
1 file changed, 25 insertions(+), 49 deletions(-)
commit bd58694678fc2f6cdd6b6727677c8370ea62493b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 22:14:36 2011 +0000
actor: Add replace_child() method
A simple method that atomically replaces a child actor with another one.
clutter/clutter-actor.c | 30 ++++++++++++++++++++++++++++++
clutter/clutter-actor.h | 3 +++
2 files changed, 33 insertions(+)
commit 238a6eb03de549249ff02dd3b3b82b9626f142cf
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 21:18:27 2011 +0000
actor: Deprecate the old parent modifiers
The old API should not be used in newly written code; we have better
methods for setting up and modifying the scene graph, now.
clutter/clutter-actor.c | 30 +++++++++++++++++++++---------
clutter/clutter-actor.h | 6 ------
clutter/deprecated/clutter-actor.h | 11 +++++++++++
3 files changed, 32 insertions(+), 15 deletions(-)
commit f2015baeb76b68eb5c5ac20f7f4bbf8dc43c8499
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 21:09:44 2011 +0000
conform/actor-graph: Add lower/raise units
Check that the lower_bottom(), lower(), raise(), and raise_top()
methods work as intended.
tests/conform/test-actor-graph.c | 106 ++++++++++++++++++++++++++++++++++++++
tests/conform/test-conform-main.c | 2 +
2 files changed, 108 insertions(+)
commit 419a6a38f20781439669339c7a970d653523c5e7
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 20:59:07 2011 +0000
conform: Add a suite for the Actor scene graph API
Verify that insertion and removal maintain a stable graph, with pointers
to the various children. This should help out tracking regressions in
the scene graph API.
tests/conform/Makefile.am | 1 +
tests/conform/test-actor-graph.c | 147 ++++++++++++++++++++++++++++++++++++++
tests/conform/test-conform-main.c | 7 +-
3 files changed, 153 insertions(+), 2 deletions(-)
commit 813eef432548dd8bd1acfd3def86543d5530e24d
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 20:57:02 2011 +0000
actor: Fix child insertion issues
The insert_child_at_index, insert_below and insert_above messed up the
first and last child pointers in various cases. This commit fixes all
the instances of first and last child pointers being stale or set to
NULL.
clutter/clutter-actor.c | 45 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 38 insertions(+), 7 deletions(-)
commit 7e377b5aeef1dbf970b7fba391ccc9957ecd8e90
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 11:26:29 2011 +0000
Port remaining layout managers to the new child iteration API
TableLayout and FlowLayout now use the ClutterActor API for iterating
over the children of an actor.
clutter/clutter-flow-layout.c | 38 ++++++++-------
clutter/clutter-table-layout.c | 104 ++++++++++++++++++++++++-----------------
2 files changed, 82 insertions(+), 60 deletions(-)
commit 9c9ab420600576d4b1ea127024f513a91c44bed0
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 10:29:01 2011 +0000
Begin porting layout managers to the new child iteration API
Instead of getting the list of children to iterate over it, let's use
the newly added child iteration API; this should save us a bunch of
allocations, as well as indirections.
Ported: ClutterBinLayout and ClutterBoxLayout.
clutter/clutter-bin-layout.c | 34 +++++++++---------
clutter/clutter-box-layout.c | 84 +++++++++++++++++++-------------------------
2 files changed, 52 insertions(+), 66 deletions(-)
commit 8b430507b5ba13f0caeae371251e0ae66da32b29
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Dec 18 10:26:35 2011 +0000
actor: Add children iteration methods
Instead of requiring every consumer of the ClutterActor API that wishes
to iterate over the children of an actor to use the get_children()
method, we should provide an iteration API directly inside ClutterActor
itself.
clutter/clutter-actor.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++--
clutter/clutter-actor.h | 15 ++++++---
2 files changed, 97 insertions(+), 7 deletions(-)
commit 22259e09656a88dc0c080a0c327244cbfd78085b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 16 18:41:38 2011 +0000
actor: Define the scene structure inside Actor
Instead of storing the list of children, let's turn Actor inside a
proper node of a tree.
This change adds the following members to the Actor private data
structure:
first_child
last_child
prev_sibling
next_sibling
and removes the "children" GList from it; iteration is performed through
the direct pointers to the siblings and children.
This change makes removal, insertion before a sibling, and insertion
after a sibling constant time operations, but it still retains the
feature of ClutterActor.add_child() to build the list of children while
taking into account the depth set on the newly added child, to allow the
default painter's algorithm we employ inside the paint() implementation
to at least try and cope with the :depth property (albeit in a fairly
naïve way). Changes in the :depth property will not change the paint
sequence any more: this functionality will be restored later.
clutter/clutter-actor.c | 512 ++++++++++++++++++++++++++----------------------
1 file changed, 278 insertions(+), 234 deletions(-)
commit 71545ae56f3d9cee09810bc4808d023807f25276
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 12 11:57:45 2011 +0000
actor: Use a cairo_rectangle_t instead of a ridiculous array
Make the code maintainable and readable.
clutter/clutter-actor.c | 69 ++++++++++++++++++++++---------------------------
1 file changed, 31 insertions(+), 38 deletions(-)
commit ea7111333b666338ed5e2c753ce186e012a8d0bd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 9 17:17:21 2011 +0000
actor: Document fields of ClutterActorPrivate
The private data structure members could do with more comments
documenting what they do.
clutter/clutter-actor.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit 9eed2f58a635bebf9066f188498e095599d0d76d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 9 14:38:25 2011 +0000
actor: Add TransformInfo
ClutterTransformInfo is a (private) ancillary data structure that
contains all the decomposed transformation data, i.e. rotation angles
and centers, scale factors and centers, and anchor point. This data
structure is stored in the GData of the actor instance instead of the
actor's private data. This change gives us:
• a smaller, cleaner private data structure;
• no size penalty for untransformed actors;
• static constant storage for the defaults, shared across all
instances;
• cache locality for all the decomposed transformation data,
given that the structure size is smaller.
At the end of the day, the only authoritative piece of information for
actor transformation is the CoglMatrix that we initialize in
apply_transform() from all the decomposed parameters, and that can stay
inside the private data structure of ClutterActor.
clutter/clutter-actor-private.h | 58 +++
clutter/clutter-actor.c | 857 +++++++++++++++++++++++++---------------
2 files changed, 589 insertions(+), 326 deletions(-)
commit 193af778663104bca0802821d5033f230eab91c0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Dec 8 14:33:06 2011 +0000
docs: Update the release notes
README.in | 9 +++++++++
1 file changed, 9 insertions(+)
commit 376bf4a99084138b4728a80ac17fa0c0001892a9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Dec 8 10:01:53 2011 +0000
actor: Tweak the underallocation warning
There are only two kinds of actors that allow underallocations,
according to the API contract:
• ClutterStage, as it is a viewport and it doesn't have an implicit
minimum size;
• Actors using the CLUTTER_ACTOR_NO_LAYOUT escape hatch, which allows
them to bail out from our layout management policies.
The warning about underallocations should take these two exceptions
under consideration.
clutter/clutter-actor.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
commit 6d268fe5ca5c0d97a64dc5a47cf29f549010c556
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 17:49:27 2011 +0000
Deprecate ClutterRectangle
A ClutterActor with a background color set covers 99% of the use cases
for a Rectangle.
clutter/Makefile.am | 8 ++++----
clutter/clutter-deprecated.h | 1 +
clutter/clutter.h | 1 -
clutter/{ => deprecated}/clutter-rectangle.c | 7 ++++++-
clutter/{ => deprecated}/clutter-rectangle.h | 14 ++++++++++++++
5 files changed, 25 insertions(+), 6 deletions(-)
commit 6237eb7892f9b14d4e42d7ac2262c0a42e5f8433
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 17:33:44 2011 +0000
Deprecate ClutterGroup
The Group functionality is now provided by ClutterActor.
Sadly, we need to keep the ClutterGroup structure definition in the
non-deprecated header because ClutterStage inherits from Group - an API
wart that was never fixed during the 0.x cycles, and that we'll have to
keep around until we can break API.
clutter/Makefile.am | 2 +-
clutter/clutter-group.h | 12 ++++++------
clutter/{ => deprecated}/clutter-group.c | 11 +++++++++++
clutter/deprecated/clutter-group.h | 14 ++++++++++++++
4 files changed, 32 insertions(+), 7 deletions(-)
commit b4d269705ea18a0374c120c5b2172e0f4060d269
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 17:18:23 2011 +0000
Deprecate ClutterBox
ClutterBox functionality has been implemented by ClutterActor, and
proxied by the Box subclass; with the removal of the abstract bit on
ClutterActor, we can safely deprecated ClutterBox.
clutter/Makefile.am | 4 ++--
clutter/clutter-deprecated.h | 1 +
clutter/clutter.h | 1 -
clutter/{ => deprecated}/clutter-box.c | 41 +++++++++++++++++++++++++++++-----
clutter/{ => deprecated}/clutter-box.h | 15 +++++++++++++
5 files changed, 53 insertions(+), 9 deletions(-)
commit a6df0b6a53ac7946acd758529403cebe64716d43
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 17:44:04 2011 +0000
cally: Do not use Group API
Avoids a deprecation warning.
clutter/cally/cally-group.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 7fd35edd3fae2bc6181de79f5d0be0d82034e9fe
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 16:09:53 2011 +0000
actor: Make Actor instantiatable
ClutterActor now has all the API and capabilities for being a concrete
class:
- layout management, through delegation
- container implementation and API
- background color
This means that a simple scene can be built straight out of actors
without using subclasses except for the Stage.
This is the first step towards the deprecation of most of the Actor
subclasses provided by Clutter.
clutter/clutter-actor.c | 40 ++++++++++++++++++++++++++++-----------
clutter/clutter-actor.h | 4 +++-
tests/conform/test-actor-layout.c | 24 +++++++++++++++--------
3 files changed, 48 insertions(+), 20 deletions(-)
commit 8caee3e97e27c4240c57f85c0381a4f11b8d959f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 16:00:49 2011 +0000
group: Proxy last few methods to Actor
At this point, ClutterGroup is basically just a shim layer on top of
ClutterActor.
clutter/clutter-group.c | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
commit 4acf8de8b460f87910e1d8c7105028546dce66d8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 16:00:08 2011 +0000
actor: Provide more children methods
Add a getter for the number of children, as well as a method to retrieve
the child at a given index.
clutter/clutter-actor-private.h | 1 -
clutter/clutter-actor.c | 36 +++++++++++++++++++++++++++++++++++-
clutter/clutter-actor.h | 5 ++++-
3 files changed, 39 insertions(+), 3 deletions(-)
commit b86cf3e2f3e240dde97838ff922d03d4e7004cd5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 5 13:08:41 2011 +0000
group: Use the default get_paint_volume()
ClutterActor does everything we did, and more.
clutter/clutter-group.c | 34 ----------------------------------
1 file changed, 34 deletions(-)
commit e62536fad67e8e8250c0828006edafd6190c3d7d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 5 12:45:08 2011 +0000
actor: Provide a better get_paint_volume() implementation
ClutterActor can do better by default than just giving up immediately.
An actor can check for the clip region, and for its children's paint
volume, for instance.
Just these two should give us a better default implementation for newly
written code.
clutter/clutter-actor.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 59 insertions(+), 1 deletion(-)
commit 7195d0fccf073f348177db6cb6aa495cf5a52181
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 5 10:25:42 2011 +0000
flow-layout: Fix minimum size request
The minimum preferred size of a Flow layout manager is the size of a
column or a row, as the whole point of the layout policy enforced by
the Flow layout manager is to reflow when needed.
clutter/clutter-flow-layout.c | 4 ++--
tests/interactive/test-flow-layout.c | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
commit ba093ed5e797c9ee52be4f43527dcfe2d9680a2c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 5 10:19:45 2011 +0000
box: Proxy the Actor's background color properties
ClutterBox's color and color-set properties can be implemented as
proxies for the ClutterActor's newly added background-color and
background-color-set properties, respectively.
This also allows us to get rid of the paint() implementation inside
ClutterBox altogether.
clutter/clutter-box.c | 112 +++++++++++++++-----------------------------------
1 file changed, 33 insertions(+), 79 deletions(-)
commit 98a8feae6414fcb427a242cdb86a91c1e07400f0
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Dec 5 08:41:51 2011 +0000
actor: Background color
Each actor should have a background color property, disabled by default.
This property allows us to cover 99% of the use cases for
ClutterRectangle, and brings us one step closer to being able to
instantiate ClutterActor directly.
clutter/clutter-actor.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++-
clutter/clutter-actor.h | 5 ++
2 files changed, 141 insertions(+), 1 deletion(-)
commit 7d88a70b7807db4897a8dad24e657d8ac459cc4a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 2 16:16:26 2011 +0000
actor: Cosmetic fixes to internal add/remove child
Avoid code duplication all over the place.
clutter/clutter-actor.c | 63 +++++++++++++++++++++++++++++--------------------
1 file changed, 38 insertions(+), 25 deletions(-)
commit 24a451b388c15c2f4d6987d4634ed5dae3cb91cd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 2 15:38:25 2011 +0000
conform/layout: Remove last Container.add_actor() usage
Use clutter_actor_add_child(), now that Stage falls back to the default
implementation of Container provided by the Actor class.
tests/conform/test-actor-layout.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3f877a3d7120854ab98f350f430d5f8a721a213e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 2 15:36:58 2011 +0000
group: Use the default paint() implementation
ClutterActor's paint implementation is perfectly fine for ClutterGroup:
it paints the actor's children, which is exactly what ClutteGroup does.
clutter/clutter-group.c | 19 -------------------
1 file changed, 19 deletions(-)
commit 798a2e5297646d9455a36400f4958fa5f7921f2a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 2 14:41:55 2011 +0000
actor: Minor cosmetic fixes to the header
clutter/clutter-actor.h | 104 +++++++++++++++++++++++-------------------------
1 file changed, 50 insertions(+), 54 deletions(-)
commit b869019eb27735ac170661f0c365dc817533129d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 2 12:12:40 2011 +0000
group: Do not override Container
Let ClutterActor do all the work.
clutter/clutter-group.c | 276 +++++++++---------------------------------------
1 file changed, 47 insertions(+), 229 deletions(-)
commit ef3dc2d1bac85b958b3bb8cf32d8045978c1a853
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Dec 2 11:51:15 2011 +0000
actor: Make Actor.add_child and Container.add_actor idempotent
And make sure that overriding Container and calling
clutter_actor_add_child() will result in the same sequence of operations
as the current set_parent()+queue_relayout()+signal_emit pattern.
Existing containers can continue using:
clutter_actor_set_parent (child, CLUTTER_ACTOR (container));
clutter_actor_queue_relayout (CLUTTER_ACTOR (container));
g_signal_emit_by_name (container, "actor-added", child);
and newly written containers overriding Container.add() can simply call:
clutter_actor_add_child (CLUTTER_ACTOR (container), child);
instead.
clutter/clutter-actor.c | 132 +++++++++++++++++++++++++++-----------
tests/conform/test-actor-layout.c | 12 ++--
2 files changed, 100 insertions(+), 44 deletions(-)
commit 2894587b221352241d8eb5fdb1136d9856c36b3c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 29 18:10:57 2011 +0000
actor: Do not leak the layout manager
clutter/clutter-actor.c | 7 +++++++
1 file changed, 7 insertions(+)
commit 038aadfa72c2c286e40564410a3b317f629180ea
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 29 18:03:05 2011 +0000
box: Drop Container interface overrides
And defer as much as possible to ClutterActor's default implementation
for basically everything.
clutter/clutter-box.c | 213 +++++---------------------------------------------
1 file changed, 19 insertions(+), 194 deletions(-)
commit b7737855338f6dbb9c647a47a69354d368bdda60
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 29 18:02:20 2011 +0000
actor: Implement Container::sort_depth_order
There's no reason this vfunc should be left out.
clutter/clutter-actor.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
commit 86ec629776a1fd0661bb298b46b8d706ca17ac3e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 29 17:41:33 2011 +0000
actor: Add child insertion methods
We should allow inserting children at given indices, and at given
stacking positions (relative or not to other children).
clutter/clutter-actor.c | 268 +++++++++++++++++++++++++++++++++++++++++++-----
clutter/clutter-actor.h | 18 +++-
2 files changed, 256 insertions(+), 30 deletions(-)
commit 8c2118542c565f6a81c0cda559eb979a766165b2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 28 17:42:49 2011 +0000
conform: Begin a test suite for layout options
A simple sampling check to validate that we're painting the right thing
at the right place.
tests/conform/Makefile.am | 3 +-
tests/conform/test-actor-layout.c | 288 ++++++++++++++++++++++++++++++++++++++
tests/conform/test-conform-main.c | 2 +
3 files changed, 292 insertions(+), 1 deletion(-)
commit 37d46649ce56ec55aaf23f7b745ae25224cf170a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 28 15:30:52 2011 +0000
actor: Adjust the preferred size too
Don't adjust just the allocation: we need to adjust the preferred size
of the actor to account for the margin.
clutter/clutter-actor.c | 346 +++++++++++++++++++++++++++++++-----------------
clutter/clutter-actor.h | 1 +
clutter/clutter-types.h | 4 +-
3 files changed, 230 insertions(+), 121 deletions(-)
commit bf275751879848ff90fafe05fe9eb1c58f4f6190
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 25 10:27:01 2011 +0000
actor: Maintain invariants in add_child/remove_child
We need to queue a relayout when removing a visible child from a visible
parent.
We also need to insert the child at the right position (depending on the
depth) so that newly added actors will be painted on top.
clutter/clutter-actor.c | 580 ++++++++++++++++++++++++++++++++++++++++++++++--
clutter/clutter-actor.h | 2 +
clutter/clutter-types.h | 11 +
3 files changed, 572 insertions(+), 21 deletions(-)
commit 9d9e98968f0373de795e0399c27c6c28dd9780cd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 24 14:34:18 2011 +0000
actor: More cleanups to the Private data structure
Try to document it properly. We can also remove some things that are
properly encapsulated through functions, like the redraw clip volume.
clutter/clutter-actor.c | 87 +++++++++++++++++++++++++------------------------
clutter/clutter-stage.c | 6 ++--
2 files changed, 46 insertions(+), 47 deletions(-)
commit 913276976789aba4f5b833d3bcb5d6fb0b260bd8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 24 14:13:29 2011 +0000
actor: Store the fixed sizes into LayoutInfo
Remove four more floats from ClutterActorPrivate.
The fixed minimum and natural sizes should be stored inside the
ClutterLayoutInfo structure, along with the fixed position.
clutter/clutter-actor-private.h | 9 ++
clutter/clutter-actor.c | 200 ++++++++++++++++++++++++++++------------
2 files changed, 152 insertions(+), 57 deletions(-)
commit b4d3b52b625717ee66c7e01d810559ac6ac8f8ef
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 24 14:11:00 2011 +0000
actor: Update the underallocations check
Add a failsafe against a NULL parent, to avoid a segfault when calling
clutter_actor_allocate() on the Stage.
We also need to deal with floating point values: straight comparison is
not going to cut it.
clutter/clutter-actor.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit 409c3ed8ff15352aa600e45efbb59360edf69513
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 23 18:16:29 2011 +0000
actor: Adjust the allocation prior to call allocate()
ClutterActor has various properties controlling the allocation:
- x-align, y-align
- margin-top, margin-bottom, margin-left, margin-right
These properties should adjust the ClutterActorBox passed from the
parent actor to its children when calling clutter_actor_allocate(),
so that the child can just allocate its children at the right origin
with the right available size.
clutter/clutter-actor-private.h | 32 ++++
clutter/clutter-actor.c | 402 +++++++++++++++++++++++++++++-----------
2 files changed, 329 insertions(+), 105 deletions(-)
commit a85c53ea0bce23a369c7e5225c0a36d500a460b7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 22 17:03:00 2011 +0000
actor: Clean up property installation
clutter/clutter-actor.c | 798 +++++++++++++++++++++++-------------------------
1 file changed, 377 insertions(+), 421 deletions(-)
commit a2a38ee7976c0c7e51eea89f3f12479a5afd5371
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 21 17:45:32 2011 +0000
actor: Add margin properties
The actor class should be able to hold the margin offsets like it does
for expand and alignment flags.
Instead of filling the private data structure with data, we should be
able to use an ancillary data structure, given that all this data is
optional and might never be set in the first place.
clutter/clutter-actor.c | 474 ++++++++++++++++++++++++++++++++++++++++++------
clutter/clutter-actor.h | 13 ++
clutter/clutter-types.h | 16 ++
3 files changed, 452 insertions(+), 51 deletions(-)
commit c8659b6ca562154734f10338136aa9d148e0c13f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 21 17:24:03 2011 +0000
actor: Add [xy]-align
Allow an actor to define how it should occupy the extra space given to
by its parent during the allocation.
clutter/clutter-actor.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-actor.h | 7 ++++
clutter/clutter-enums.h | 27 +++++++++++++
3 files changed, 135 insertions(+)
commit 4453ee7266944e82bce30a5d84e15d94db83df0b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 21 14:53:14 2011 +0000
actor: Provide Container::raise/lower implementations
clutter/clutter-actor.c | 67 +++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 57 insertions(+), 10 deletions(-)
commit 752151bc975bbaa0ecd8e67d5125e9051faa5eb8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 21 14:52:39 2011 +0000
actor: Remove is-a(Container) checks
All actors are now Container implementations, so there's no need to add
a type check.
clutter/clutter-actor.c | 37 ++++++++++++++-----------------------
1 file changed, 14 insertions(+), 23 deletions(-)
commit f2609dcca4ead9014dc81867b07c50666df4639b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Nov 20 22:00:01 2011 +0000
actor: Add [xy]-expand properties
clutter/clutter-actor.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-actor.h | 7 ++++
2 files changed, 106 insertions(+)
commit d5086da3fd3c32ddb5359c7d0dc5b64700138a98
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 17 17:26:15 2011 +0000
box: Defer to ClutterActor
Use the default implementation inside ClutterActor instead of our own,
wherever possible.
clutter/clutter-box.c | 158 ++++++--------------------------------------------
1 file changed, 17 insertions(+), 141 deletions(-)
commit 1c40151d0e38be7cc999febf126c0f151ed051d0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Dec 8 11:57:19 2011 +0000
actor: Default to a fixed layout manager
In case no layout manager was set during construction, we fall back to a
FixedLayout. The FixedLayout has the property of making the fixed
positioning and sizing API, as well as the various Constraints, work
out of the box.
clutter/clutter-actor.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
commit 11e876c86ba85e55c851201bedf8c5b6685091cc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 17 17:07:10 2011 +0000
actor: Add :layout-manager
Now that ClutterActor implements the Container contract we can actually
defer the size negotiation to a ClutterLayoutManager directly from the
default implementation of the Actor's virtual functions.
clutter/clutter-actor.c | 144 +++++++++++++++++++++++++++++++++++++++
clutter/clutter-actor.h | 4 ++
clutter/clutter-layout-manager.h | 1 -
clutter/clutter-types.h | 1 +
4 files changed, 149 insertions(+), 1 deletion(-)
commit b45d78e6a17dea19db4c3369f3062ee5a1ed3a1d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 17 16:32:05 2011 +0000
actor: Provide a default Container implementation
We can provide most of the ClutterContainer implementation directly
within ClutterActor — basically removing the need of having the
Container interface in the first place. For backward compatibility
reasons we can keep the interface, but let Actor implement it directly.
clutter/clutter-actor.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
commit 8462b5ba458bb6fff93ecf7c8b74c6cf3101fd3c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 17 15:23:05 2011 +0000
Do not use set_parent()/unparent() internally
Use add_child()/remove_child() instead.
clutter/clutter-actor.c | 12 ++++++------
clutter/clutter-box.c | 6 +++---
clutter/clutter-group.c | 4 ++--
clutter/clutter-texture.c | 25 +++++++++++++++----------
4 files changed, 26 insertions(+), 21 deletions(-)
commit 53aa64aeb9107ca0afc47a4aeb8667f5820c0190
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 17 15:03:32 2011 +0000
actor: Provide add/remove child and get children methods
Let's try and move away from the reverse implicit scene graph build API,
which we mutuated from GTK+, towards a more traditional node/child API.
The set_parent()/unparent() API is confusing, unless you know the
history; having a add_child()/remove_child() methods pair makes it more
explicit.
We can easily implement the old set_parent()/unparent() pair in terms of
the newly add_child()/remove_child() one.
clutter/clutter-actor.c | 180 +++++++++++++++++++++++++++++-------------------
clutter/clutter-actor.h | 5 ++
2 files changed, 116 insertions(+), 69 deletions(-)
commit 0396d3e7e6243037503d0bf220448caea13fea88
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Jan 16 15:22:43 2012 +0000
Remove use of CoglVector3
Cogl has removed the CoglVector3 type in favour of directly using an
array of 3 floats.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
clutter/clutter-paint-volume.c | 11 ++++++-----
clutter/clutter-private.h | 4 ++--
clutter/clutter-stage.c | 32 ++++++++++++++++----------------
3 files changed, 24 insertions(+), 23 deletions(-)
commit 7c14ba7d374db06db737b5b5e2df154ae5564df2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 13 16:21:15 2012 +0000
actor: Clean up the debug node for out-of-band transforms
Enclose the check inside a #ifdef CLUTTER_ENABLE_DEBUG ... #endif, so
that we can compile it out; also, use g_string_append() instead of the
g_string_append_printf() function, given that we're just concatenating
strings.
clutter/clutter-actor.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
commit f2a4aee41254ff9eb44655de4d2c5e8f7767e5cb
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Sun Jan 15 00:19:35 2012 +0100
Updated Galician translations
po/gl.po | 606 +++++++++++++++++++++++++++++++++------------------------------
1 file changed, 315 insertions(+), 291 deletions(-)
commit e0e6b72b67e9c8c258a8e78fccf3655204b4a9e1
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 23:20:59 2012 +0000
clutter.modules: Bump json-glib
build/clutter.modules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 646cf236a5dfba480f18f7dd82467ac3d2fe238f
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 13:31:21 2012 +0000
backend: Remove ClutterBackend::redraw
The ::redraw virtual function was a throwback from olden times, and has
been thoroughly replaced by the equivalent vfunc on the StageWindow
interface. We can safely remove it, now, and simplify the flow of the
redraw code inside ClutterStage.
clutter/clutter-backend-private.h | 81 +++++++++++++++++----------------------
clutter/clutter-backend.c | 39 -------------------
clutter/clutter-stage.c | 23 ++++++++++-
3 files changed, 58 insertions(+), 85 deletions(-)
commit 0c365f9f4c920274e1c1b8190b6bc804260355c6
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:49:16 2012 +0000
gesture-action: Protect against NULL pointers
clutter/clutter-gesture-action.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit 3b9b69ef54b0a90200477dd846921c46e01c2044
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:49:02 2012 +0000
gesture-action: Use the event propagation macros
clutter/clutter-gesture-action.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
commit d83fbd7bdf8cbeb5019e0be02ba4f0ac0aa5c436
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:44:28 2012 +0000
docs: Add the ::destroy change in the release notes
Given that I had to fix code inside Clutter that did not check for NULL
pointers, I assume other people may experience the same issues.
README.in | 6 ++++++
1 file changed, 6 insertions(+)
commit 99f7d627afd77852af0a038cab4a4e67c61450df
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:40:38 2012 +0000
text: Use the event and source symbolic macros
Instead of boolean values.
clutter/clutter-text.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
commit 21149adb12643b34b959aa6c889322dbae1a2fff
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:39:59 2012 +0000
drop-action: Use the event propagation macros
clutter/clutter-drop-action.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 81694d0dd969d41e8e9825f504c1e07603c2afd2
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:34:50 2012 +0000
drag-action: Use the new event propagation macros
clutter/clutter-drag-action.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
commit cce2e25ac7ef395d880352c93272256ea088c2dd
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:34:26 2012 +0000
deform-effect: Check against NULL pointers
Do not try to disconnect signal handlers from NULL pointers.
clutter/clutter-deform-effect.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 20e63532a4ed9b2a3476f0bf5e7cd45279ee2d13
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:27:17 2012 +0000
click-action: Use the new symbolic event propagation macros
clutter/clutter-click-action.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit dbf3b607bf1b295c782ab8edfb2d80bc25f74a37
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:26:47 2012 +0000
click-action: Be resilient against NULL pointers
Do not try to disconnect signal handlers from NULL pointers.
clutter/clutter-click-action.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit 8e6b3914ef77fc80af9fc5ca84b755c84551a245
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:17:01 2012 +0000
build: Remove a bunch of useless checks
Some pkg-config dependencies are still there from the days when Cogl
was in tree - and even then, they barely made sense.
.gitignore | 1 +
configure.ac | 33 +++++----------------------------
2 files changed, 6 insertions(+), 28 deletions(-)
commit 7ca37b6e58a8aed699fd2d461fcbb9a2704550a7
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Jan 12 10:10:09 2012 +0000
build: Fix the private pkg-config requirements
Private pkg-config requirements are conditional.
configure.ac | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
commit ed9c3ee54ebafb6e477cafc39d36cc96574938ee
Author: Rob Bradford <rob@linux.intel.com>
Date: Wed Jan 11 12:26:00 2012 +0000
wayland: Pull gdk-pixbuf in a private dependency
This means it will get tested for explicitly as well as appearing in the
Requires.private section of the pkg-config file.
configure.ac | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 4afe793eedc6b822ac2aa9465808239cacaa9cf8
Author: Rob Bradford <rob@linux.intel.com>
Date: Wed Jan 11 12:23:46 2012 +0000
build: Add infrastructure for inserting Requires.private into pkg-config files
clutter/clutter.pc.in | 2 ++
configure.ac | 5 +++++
2 files changed, 7 insertions(+)
commit a9e6137f4727750e391b105581b4fd17acb09c31
Author: Rob Bradford <rob@linux.intel.com>
Date: Tue Jan 10 17:25:35 2012 +0000
wayland: Attach cursor buffer to input device when it enters the surface
The Wayland semantics mean that we must attach a buffer to the input device
when the pointer enters the surface to provide a cursor.
clutter/wayland/clutter-input-device-wayland.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
commit e1434cebdb7b77ef39296eb80cb4b928a5267c2c
Author: Rob Bradford <rob@linux.intel.com>
Date: Tue Jan 10 16:40:59 2012 +0000
wayland: Load a buffer from well known location for the cursor
Semantic changes to Wayland means that we cannot rely on the compositor
setting a pointer buffer for us if set it to nil. The first part of fixing
this is to create an shm buffer containing the bytes for our cursor.
The best way to do this currently is to load the cursor from the well known
location where weston instals its cursor images. The code to implemente this
was derivedlifted from the Wayland backend in GTK+.
clutter/wayland/clutter-backend-wayland.c | 179 ++++++++++++++++++++++++++++++
clutter/wayland/clutter-backend-wayland.h | 3 +
2 files changed, 182 insertions(+)
commit 3c99fd2ddbdda96896acd2023cb2dbdeb7ff2544
Author: Ryan Lortie <desrt@desrt.ca>
Date: Mon Jan 9 16:04:08 2012 +0100
Prevent .po file updates on simple 'make'
https://bugzilla.gnome.org/show_bug.cgi?id=661128
autogen.sh | 4 +
po/clutter-1.0.pot | 2202 ----------------------------------------------------
2 files changed, 4 insertions(+), 2202 deletions(-)
commit de942120242ec1257670b624b64a0102e1090f8b
Author: Alexander Shopov <ash@kambanaria.org>
Date: Sun Jan 8 14:30:48 2012 +0200
Updated Bulgarian translation
po/bg.po | 1042 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 540 insertions(+), 502 deletions(-)
commit d8e855e5854f57053f6fad491e9860dcc7287e56
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat Jan 7 10:41:25 2012 +0000
osx: Use Lucida Grande as the default font
Instead of falling back to the generic "Sans".
clutter/osx/clutter-backend-osx.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
commit 95d3e0f962a896bdfa24945b50e82ccd6d4e1495
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 6 14:04:43 2012 +0000
actor: Change the point of emission of ::destroy
Currently, we're emitting the ClutterActor::destroy at the end of the
dispose implementation - right before we chain up to the parent
implementation.
The point of emission makes the ::destroy signal handlers able to just
use the actor pointer - as the actor state will have been mostly cleared
by the time application can run. This (undocumented) behaviour severely
limits the amount of things you can do inside a ::destroy signal
handler, thus making the ::destroy signal just a weird weak reference,
instead of a proper way to break application reference cycles.
Given that this change relaxes some of the conditions, this change
should be safe - obviously, if anything happens, we'll back it out; the
conformance and interactive tests confirm that, for common patterns of
usage, this change does not break existing code.
clutter/clutter-actor.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit fa39f67eab9af470cc815a8900806567cd966721
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jan 6 14:02:54 2012 +0000
actor: Use g_clear_object()
GLib has a nice, atomic object clearing function that allows us to drop
code looking like:
if (priv->object != NULL)
{
g_object_unref (priv->object);
priv->object = NULL;
}
from the ::dispose implementation.
clutter/clutter-actor.c | 34 +++++-----------------------------
1 file changed, 5 insertions(+), 29 deletions(-)
commit 88aaad9bdf22ae7d5d1c317d894faecc5d4a125c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 3 14:38:56 2012 +0000
docs: Add event propagation symbolic constants
doc/reference/clutter/clutter-sections.txt | 2 ++
1 file changed, 2 insertions(+)
commit e3511fcbac0eab551abd6038894ff2d17d8a1a23
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 3 14:00:40 2012 +0000
configure: Clean up help and configuration summary
configure.ac | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
commit f5fffb355b546cd36621b1de0bf15472da10f782
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 3 13:50:06 2012 +0000
Move Perspective and Fog definitions to clutter-types.h
Since we reference the types from multiple files.
clutter/clutter-stage.h | 7 -------
clutter/clutter-types.h | 4 ++++
2 files changed, 4 insertions(+), 7 deletions(-)
commit fd1196c7b5b70f4f827998b19189c05ad699ad36
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Jan 3 12:10:28 2012 +0000
docs/cookbook: Mention the event control macros
Now that we have symbolic names for event propagation values for signal
handlers, we ought to mention them in the cookbook.
doc/cookbook/events.xml | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
commit 6184bf1b6e19fb73d96f20aa4f6bdf26ec299a0e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 12:28:06 2011 +0000
Add symbolic constants for event propagation
I always have to think twice before returning a value from an event
signal handler, and I've been writing them for the past 10 years, so
it's conceivable that application developers that start with Clutter
will find them confusing as well.
Simple symbolic names should be easier to use.
clutter/clutter-event.h | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
commit 83c560db984d188bc814fa02f2ff81f2d8e10055
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Dec 30 10:34:54 2011 +0000
docs: Update the release notes
README.in | 7 +++++++
1 file changed, 7 insertions(+)
commit e689d0180056a2b02757c896910ff649187958fd
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Dec 30 10:23:15 2011 +0000
stage: Deprecate :use-fog and :fog
The depth cueing through GL fog has been broken for a long while, now.
The fog-related API in Clutter is ridiculously limited, and harks back
to simpler times; the ClutterFog structure is not enough to express all
the GL fog machinery, and required application code to connect to the
Stage's paint implementation and drop into Cogl directly.
Additionally, the fixed pipeline fog machinery in GL simply does not
work with premultiplied alpha, unless you use a shader - and in that
case it would only work for textures. Let's deprecate it, and just
don't do anything if somebody has the brilliant idea of setting the
:use-fog property to TRUE.
clutter/clutter-stage.c | 44 +++++++----
clutter/clutter-stage.h | 153 +++++++++++++++++--------------------
clutter/deprecated/clutter-stage.h | 14 ++++
3 files changed, 113 insertions(+), 98 deletions(-)
commit 65889fa075f6123caf0d47568413466e039b5eef
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Dec 30 09:51:36 2011 +0000
box: Remove the sentinel annotation
Sadly, we need to remove the G_GNUC_NULL_TERMINATED annotation from
ClutterBox packing API; the compiler will otherwise emit a warning
for perfectly legal statements like:
clutter_box_pack (box, child, NULL);
because of the missing sentinel.
See also: g_object_new().
clutter/clutter-box.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 180eecbce6b77539d112a19bb9887812546ef05e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Dec 27 21:39:13 2011 +0000
docs: Document CLUTTER_ENABLE_DIAGNOSTIC
Add a note in the API reference.
doc/reference/clutter/running-clutter.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit 7d4a9c6f1e8e6f77688a5d15fc2644769d2a60a1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 20 15:17:54 2011 +0000
Add diagnostic mode
GLib has a "diagnostic mode" switch that can be checked to enable debug
messages on deprecated properties and signals, as these are purely
run-time constructs, and as such cannot be caught by compiler warnings.
The diagnostic mode is toggled by a simple environment variable, and
can be used to ease porting of application code.
We can use something similar to mark deprecated virtual functions and
other run-time constructs; to avoid collisions, we should use our own
environment variable, CLUTTER_ENABLE_DIAGNOSTIC.
clutter/clutter-main.c | 31 +++++++++++++++++++++++++++++++
clutter/clutter-private.h | 4 ++++
2 files changed, 35 insertions(+)
commit db246569b78c500caf2e8c58921bee0fc47b6bf8
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Wed Dec 21 22:06:54 2011 +0100
Updated Norwegian bokmål translation
po/nb.po | 1046 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 542 insertions(+), 504 deletions(-)
commit b882fcd8258f02a968dca381e498a3f1877bda5c
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Dec 18 23:20:04 2011 -0500
clutter-text: Fix memory leak
clutter/clutter-text.c | 2 ++
1 file changed, 2 insertions(+)
commit 20bc5c2057f8bad1910c64e8ee49b6b798fbe8bc
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Sat Dec 17 18:59:49 2011 +0100
Updated Slovenian translation
po/sl.po | 114 ++++++++++++++++++++++++++++++++++++++-------------------------
1 file changed, 69 insertions(+), 45 deletions(-)
commit c4590e59c72ac4253c4ede1badd4684bb616b30c
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Dec 13 13:07:46 2011 +0800
Visual C++ 2008 projects update
Refines things a little bit from the last Visual C++ 2008 project updates.
build/win32/vs9/cally-atkcomponent-example.vcproj | 8 ++++----
build/win32/vs9/cally-atkeditabletext-example.vcproj | 8 ++++----
build/win32/vs9/cally-atkevents-example.vcproj | 8 ++++----
build/win32/vs9/cally-atktext-example.vcproj | 8 ++++----
build/win32/vs9/cally-clone-example.vcproj | 8 ++++----
build/win32/vs9/clutter.vsprops | 10 +++++-----
6 files changed, 25 insertions(+), 25 deletions(-)
commit 1dd28537c4a3af3fffbcc4d85ec1c98126524d7b
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Dec 13 13:05:16 2011 +0800
Update Visual C++ 2010 Projects
Disable deprecation warning messages for the accessibility, performance
and micro-bench programs.
build/win32/vs10/clutter.props | 8 ++++++--
build/win32/vs10/test-cogl-perf.vcxproj | 8 ++++----
build/win32/vs10/test-picking.vcxproj | 8 ++++----
build/win32/vs10/test-random-text.vcxproj | 8 ++++----
build/win32/vs10/test-text-perf.vcxproj | 8 ++++----
build/win32/vs10/test-text.vcxproj | 8 ++++----
6 files changed, 26 insertions(+), 22 deletions(-)
commit 91b0aadbd400f0df69f7c80f456cb0ca06c17f8b
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Dec 13 12:56:53 2011 +0800
Update Visual C++ 2008 Projects
Turn off the deprecation warnings for the accessibility, performance
and micro-bench programs.
build/win32/vs9/cally-atkcomponent-example.vcproj | 8 ++++----
build/win32/vs9/cally-atkeditabletext-example.vcproj | 8 ++++----
build/win32/vs9/cally-atkevents-example.vcproj | 8 ++++----
build/win32/vs9/cally-atktext-example.vcproj | 8 ++++----
build/win32/vs9/cally-clone-example.vcproj | 8 ++++----
build/win32/vs9/clutter.vsprops | 6 +++++-
build/win32/vs9/test-cogl-perf.vcproj | 8 ++++----
build/win32/vs9/test-picking.vcproj | 8 ++++----
build/win32/vs9/test-random-text.vcproj | 8 ++++----
build/win32/vs9/test-text-perf.vcproj | 8 ++++----
build/win32/vs9/test-text.vcproj | 8 ++++----
11 files changed, 45 insertions(+), 41 deletions(-)
commit 23960328d578d912162d52bc0c4096784add31cb
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Dec 13 12:44:27 2011 +0800
Update clutter.symbols...
...For the addition of queue_redraw_with_clip (commit f0a246cd)
clutter/clutter.symbols | 1 +
1 file changed, 1 insertion(+)
commit f0468cf828d933431ef4e18f3b60376f5df76cf6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 12 16:44:47 2011 +0000
wayland/surface: Use queue_redraw_with_clip()
Just like the X11 texture-pixmap actor.
https://bugzilla.gnome.org/show_bug.cgi?id=660997
clutter/wayland/clutter-wayland-surface.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
commit 30c464e68f302c5039421b5cc9b043bfa8dc2e9c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 31 11:56:23 2011 +0000
x11/texture-pixmap: Use ClutterActor.queue_redraw_with_clip()
Instead of using a PaintVolume for a 2D region, and an internal
function, use the newly added queue_redraw_with_clip() method.
This removes the last bit of internal API usage in the
ClutterX11TexturePixmap actor.
https://bugzilla.gnome.org/show_bug.cgi?id=660997
clutter/x11/clutter-x11-texture-pixmap.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
commit 749fe38fec090fcbf7cb0a7ea1c98028a08fcb4e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 31 11:55:35 2011 +0000
x11/stage: Use ClutterActor.queue_redraw_with_clip()
Instead of using a paint volume for a 2D region, use the newly added
queue_redraw_with_clip() method.
https://bugzilla.gnome.org/show_bug.cgi?id=660997
clutter/x11/clutter-stage-x11.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
commit f0a246cdc6f3ca35d409b82297d2a99c5e8c7b32
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 31 11:53:45 2011 +0000
actor: Add queue_redraw_with_clip()
Add a public version of the clipped queue redraw, using a 2D clip. This
allows implementing actors with trackable 2D clipped regions, like the
ClutterX11TexturePixmap, outside of Clutter itself.
https://bugzilla.gnome.org/show_bug.cgi?id=660997
clutter/clutter-actor.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
clutter/clutter-actor.h | 2 ++
clutter/clutter-types.h | 2 ++
3 files changed, 49 insertions(+), 2 deletions(-)
commit c3639fd798ddd195075a2edf1e37825deb5f5aa2
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Fri Dec 9 18:08:48 2011 +0100
Updated Spanish translation
po/es.po | 244 +++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 137 insertions(+), 107 deletions(-)
commit 79c04bd1335db04b5152130a027d2d22c9486f56
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Dec 8 10:01:06 2011 +0000
fixed-layout: Use a better quark name
The "fixed-container" name is far too generic, and it may very likely
lead to collisions with application code.
clutter/clutter-fixed-layout.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
commit 20b9ec8c6bd900960a811b38e968d2e976064821
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 17:43:13 2011 +0000
build: Disable deprecation warnings in tests/accessibility
Like we do in the other tests/ sections.
tests/accessibility/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9e3a8a678e44dd53f0a291a9d0e8e7d74e643d3c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 17:56:45 2011 +0000
build: Disable deprecation warnings in tests/micro-bench
tests/micro-bench/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit bedf1664a7232cec704566e55c7804354f633f52
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Dec 6 17:53:37 2011 +0000
build: Disable deprecation warnings in tests/performance
tests/performance/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit dc84557ac3af47b59f5145e68cddfe37ca910089
Author: Jovan Naumovski <jovan3.14@gmail.com>
Date: Thu Dec 8 21:22:38 2011 +0100
Updated Macedonian translation.
po/mk.po | 2226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2226 insertions(+)
commit 764343c4973179ffaff7c8c4822a77312e32d1cd
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Thu Dec 8 20:54:12 2011 +0100
Updated POTFILES.in
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
commit 320356e97f2312f8ad4285ca436dca71a69c7cec
Author: Rob Bradford <rob@linux.intel.com>
Date: Thu Dec 8 17:39:15 2011 +0000
wayland: Refine enter/leave event handling
The Wayland protocol now has events represent when a pointer enters the
surface and when it leaves again.
For leaves the surface is not set in the event, for enters the surface is set.
Simply use this to determine whether to emit CLUTTER_ENTER or CLUTTER_LEAVE.
clutter/wayland/clutter-input-device-wayland.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
commit 34cc45dae5f05be80e3eb389c55e40aed2e97bf4
Author: Rob Bradford <rob@linux.intel.com>
Date: Thu Dec 8 17:32:27 2011 +0000
wayland: Update to latest Wayland API (wl_shell_surface transition)
Previously the wl_shell object held the methods that allowed a client to
request changes to the shell's state associated with a surface. These methods
have now been moved to a wl_shell_surface object.
This change allows configure events to be handled inside the stage rather than
the backend.
clutter/wayland/clutter-backend-wayland.c | 30 +-------------------------
clutter/wayland/clutter-stage-wayland.c | 36 ++++++++++++++++++++++++++++++-
2 files changed, 36 insertions(+), 30 deletions(-)
commit af294aafe600145a2d891ad9a0ba5418f6583cc6
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Dec 6 21:53:57 2011 +0000
Add public CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT define
When clutter has been built with Wayland compositor support then we now
expose a public CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT define so that
applications can #ifdef code that depends on the api that this feature
implies.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
configure.ac | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 3e85ad6b95cfa41027d6fbf4a9caf0a7d84e8bce
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Dec 6 21:49:15 2011 +0000
build: make internal option_xkb_* symbols static
This makes the option_xkb_* symbols declared for the evdev device manager
and the wayland device manager private so we don't get symbol collisions
if both of these backends are enabled.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/evdev/clutter-device-manager-evdev.c | 6 +++---
clutter/wayland/clutter-device-manager-wayland.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
commit fd8965a710c313a968a7dc469b88778a7d55bf10
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Dec 6 21:46:37 2011 +0000
xkb-utils: Adds #ifdef guards for repeat includes
This adds #ifdef/#define repeat include guards for clutter-xkb-utils.h
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/evdev/clutter-xkb-utils.h | 5 +++++
1 file changed, 5 insertions(+)
commit d8e76c341558f852bb1c4a94959120eeee459f88
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Dec 5 14:01:30 2011 +0000
eglnative: fix building eglnative BE with evdev support
this fixes how clutter-device-manager-evdev.h is included to fix a build
problem caused by not being able to find the header.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/egl/clutter-backend-eglnative.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 602a89afa8f9ea548b8f98fb9e5ada3ef59f09f2
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Dec 5 13:59:12 2011 +0000
evdev: fixes evdev build issues + don't ref default stage
This updates the evdev input backend code to compile and also updates
the code to not refer to the default stage and instead check for a
stage to be associated with the input device. If no stage is currently
associated with a device generating events then the events are dropped
on the floor.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/evdev/clutter-device-manager-evdev.c | 63 +++++++++++++++-------------
configure.ac | 1 +
2 files changed, 36 insertions(+), 28 deletions(-)
commit 86f2aed570dcd83becfc91c5a076027c687c0dae
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Dec 5 13:49:28 2011 +0000
input: adds internal _clutter_input_device_get_stage api
This adds internal api to be able to query the stage currently
associated with a given input device so input backends shouldn't need to
refer to the default stage.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-device-manager-private.h | 1 +
clutter/clutter-input-device.c | 14 ++++++++++++++
2 files changed, 15 insertions(+)
commit e5bde0b0743f718904d53731ea30d414ad915f4c
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Dec 5 14:05:57 2011 +0000
tests: Adds a simple wayland compositor example
This adds an extremely minimal wayland compositor to tests/interactive
to test the ClutterWaylandSurface actor. Currently this minimal
compositor doesn't support any input, it simply paints client surfaces
fixed at the top-left of the stage.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
tests/interactive/Makefile.am | 4 +
tests/interactive/test-wayland-surface.c | 567 +++++++++++++++++++++++++++++++
2 files changed, 571 insertions(+)
commit 16ed7677e00fda9e9ef4e85ef7032a367e273e0c
Author: Robert Bragg <robert@linux.intel.com>
Date: Fri May 13 16:54:11 2011 +0100
Adds wayland-surface actor for wayland compositors
This adds a --enable-wayland-compositor configure option which will add
support for a ClutterWaylandSurface actor which can be used to aid in
writing Wayland compositors using Clutter by providing a ClutterActor to
represent Wayland client surfaces.
Notably this configure option isn't tied into any particular backend
since conceptually the compositor support can be used in conjunction
with any clutter backend that has corresponding Cogl support.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/Makefile.am | 8 +
clutter/clutter-backend.c | 41 ++
clutter/wayland/clutter-wayland-compositor.h | 43 ++
clutter/wayland/clutter-wayland-surface.c | 565 +++++++++++++++++++++++++++
clutter/wayland/clutter-wayland-surface.h | 94 +++++
configure.ac | 28 +-
doc/reference/clutter/clutter-sections.txt | 15 +
7 files changed, 792 insertions(+), 2 deletions(-)
commit 07c6f96cb43b1e0c788e50323f1184bd2906e3f7
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon May 9 22:45:33 2011 +0100
wayland: Updates client side wayland support
This updates Wayland support in line with upstream changes to the Wayland
API and protocol.
This update means we no longer use the Cogl stub winsys so a lot of code
that had to manually interact with EGL and implement a swap_buffers
mechanism could be removed and instead we now depend on Cogl to handle
those things for us.
This update also adds an input device manager consistent with other
clutter backends.
Note: to use the client side "wayland" clutter backend you need to have
built Cogl with --enable-wayland-egl-platform. If Cogl has been built
with support for multiple winsys backends then you should run
applications with COGL_RENDERER=EGL in the environment.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/Makefile.am | 49 +-
clutter/clutter-backend.c | 11 +
clutter/wayland/clutter-backend-wayland.c | 603 ++++-----------------
clutter/wayland/clutter-backend-wayland.h | 38 +-
clutter/wayland/clutter-device-manager-wayland.c | 226 ++++++++
clutter/wayland/clutter-device-manager-wayland.h | 75 +++
clutter/wayland/clutter-event-wayland.c | 6 +-
clutter/wayland/clutter-event-wayland.h | 37 ++
clutter/wayland/clutter-input-device-wayland.c | 156 ++----
clutter/wayland/clutter-input-device-wayland.h | 56 ++
clutter/wayland/clutter-stage-wayland.c | 634 +----------------------
clutter/wayland/clutter-stage-wayland.h | 65 +--
clutter/wayland/clutter-wayland.h | 61 ---
configure.ac | 19 +-
doc/reference/clutter/clutter-sections.txt | 6 -
15 files changed, 631 insertions(+), 1411 deletions(-)
commit 36c312cb241c5c87d3a8778ea376ab2b67601683
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Dec 8 17:58:17 2011 +0800
Update Clutter Visual C++ 2008 Project
Made up for missed pre-build command for x64/Release.
build/win32/vs9/clutter.vcprojin | 1 +
1 file changed, 1 insertion(+)
commit 6ad1afd8037cffc73617f39c7a668a493d295bee
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Dec 8 17:40:22 2011 +0800
clutter/Makefile.am: Update gen-enums.bat generation
It's $(srcdir)/win32/clutter-win32.h, not $(srcdir)/clutter-win32.h
Sorry!
clutter/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit b6c5c0602dfa152603d6345b0c2fc6a1d00b0cf4
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Dec 8 17:39:26 2011 +0800
Update VS property sheets
Generate clutter-marshal.[ch] before the clutter-enum-types.[ch].
Strangely Visual C++ does funny things if this was done the other way
around. :|
build/win32/vs10/clutter.props | 14 +++++++-------
build/win32/vs9/clutter.vsprops | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
commit 7a70e1f08b7755a7c3b79c21c49f746006ea7483
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Dec 8 17:04:46 2011 +0800
clutter/Makefile.am-Create batch to gen enums (VS Support)
Generate a .bat file to generate the clutter-enum-types.[ch] for use
during the Visual C++ build process, which will greatly simplify the
maintenanace of the VS build files as public headers are added or removed
during the development process.
clutter/Makefile.am | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 43 insertions(+), 3 deletions(-)
commit daf2b67ed28d3e6ef6d2b2ffa99c3ab86d67d0e6
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Dec 8 17:02:17 2011 +0800
Update VS property sheets
Use a pregenerated .bat file to generate the clutter-enum-types.[ch], which
will greatly simplify the maintenanace of the VS build files as public
headers are added or removed.
build/win32/vs10/clutter.props | 21 +++------------------
build/win32/vs9/clutter.vsprops | 14 +++-----------
2 files changed, 6 insertions(+), 29 deletions(-)
commit 075ab0cbe64d656de950b6a383fdcc8d1356877e
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Dec 7 18:14:17 2011 +0800
conform/Makefile.am: Update Win32 test .bat name
Rename to test-conformance-clutter.bat to make the file name clearer to
users
tests/conform/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 158245fda31e7adad38aa49e4c12efcad0e326e0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 5 11:43:48 2011 +0000
backend: Fix em computation for non-absolute fonts
If a font description is not set to have an absolute size then we were
using the wrong transformation for points to device units.
clutter/clutter-backend.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
commit 943a65b476431400bd0436e1be243a2917385866
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Dec 5 11:42:49 2011 +0000
backend: Return the correct default resolution
If ClutterSettings:font-dpi is set to -1 then the default resolution
should be returned by ClutterBackend — i.e. 96.0.
clutter/clutter-backend.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
commit 8d234d270a00abee8c46561903193097de78efe3
Author: Bastien Nocera <hadess@hadess.net>
Date: Thu Dec 1 19:29:58 2011 +0100
Fix Brazilian Portuguese translation
Once you add the missing translator comments, it makes a lot
more sense...
po/pt_BR.po | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit f7bb1e879ef083644acd4774dcb50c9edc018c6f
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Nov 26 05:15:17 2011 -0500
main: Fix keyboard event emission for non-reactive actors
This is an innocent copy-paste issue that ended up breaking a few things
https://bugzilla.gnome.org/show_bug.cgi?id=664582
clutter/clutter-main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1dc7c4543896bfc2f2cd460cdea9c417aefd7952
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Dec 1 13:41:45 2011 +0000
x11: Do not try to access private structures
ClutterInputDeviceX11 has been made private, so we cannot access it from
outside of clutter-input-device-core-x11.c. We should have simple
accessors for the min/max keycode, which is the only detail that we use.
clutter/x11/clutter-device-manager-core-x11.c | 5 +++--
clutter/x11/clutter-input-device-core-x11.c | 25 +++++++++++++++++++++++--
clutter/x11/clutter-input-device-core-x11.h | 6 ++++++
3 files changed, 32 insertions(+), 4 deletions(-)
commit 67cdbbaf514ca8b33e4e19014b935aea40e91822
Author: Manuel Osdoba <manuel.osdoba@acm.org>
Date: Sun Nov 13 21:49:23 2011 +0100
Currently Clutter only prints out a warning message in case some shader effects fail to compile
Clutter-WARNING **: Unable to compile the GLSL
shader: Fragment shader failed to compile with the following errors:
The attached patch (against current git) should print out more
information what makes it easier to answer user feedback.
https://bugzilla.gnome.org/show_bug.cgi?id=664252
clutter/clutter-shader-effect.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 6336883da7aa15ec06d9f3218ad5c617e57af0a5
Author: Bastian Winkler <buz@netbuz.org>
Date: Fri Nov 18 15:18:28 2011 +0100
path: Fix introspection annotations
Add out annotations for clutter_path_get_node() and
clutter_path_get_position()
https://bugzilla.gnome.org/show_bug.cgi?id=664336
clutter/clutter-path.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit dc77a5ef310c8da5a126f90a21a75520b5d925de
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Dec 1 10:39:11 2011 +0000
docs: Fix up the state.set_key() comment
clutter/clutter-state.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 1e05e8ceaff25dfb3600cf0798fbca23c1725e12
Author: Jeremy Moles <jeremy@emperorlinux.com>
Date: Thu Dec 1 10:36:38 2011 +0000
Adds (allow-none) as source_target for clutter_state_set_key
While working through the Python3/pygobject bindings, I came across a missing
(allow-none) in clutter_state_set_key(). This allows the API to specify to None
as the source_target.
https://bugzilla.gnome.org/show_bug.cgi?id=664996
clutter/clutter-state.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 627a1b19771b98864eb9e09a9537128a87dca05e
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Nov 28 14:19:28 2011 +0000
effects: Use effect_queue_repaint instead of actor_queue_redraw
The builtin effects ClutterColorizeEffect, ClutterDesaturateEffect and
ClutterShaderEffect all have properties which only affect the
rendering of the final texture not the contents of it. When these
properties are updated we should queue a repaint of the effect not
the actor so that we don't waste time repainting the contents of the
offscreen buffer.
https://bugzilla.gnome.org/show_bug.cgi?id=665052
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-colorize-effect.c | 10 +---------
clutter/clutter-desaturate-effect.c | 10 +---------
clutter/clutter-shader-effect.c | 2 +-
3 files changed, 3 insertions(+), 19 deletions(-)
commit c687ece72d8d613d8af62615374839b9302abafe
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Nov 28 16:27:57 2011 +0000
Fix building with profiling enabled
There was an #ifdef'd section of code for profiling that was using the
wrong variable name so it would not build.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a2774fb0dcce0c92036b69fb75092ec8dc80905d
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Nov 28 13:08:57 2011 +0000
offscreen-effect: Track the size of the actor separately
Previously the offscreen effect was keeping track of the size of the
texture so that it could detect when a different size is requested and
create a new texture. However this breaks if a subclass overrides
create_texture to make the texture bigger because in that case the
size of the texture will always be different from the calculated size
of the actor. This patch makes it also track the size of the fbo that
was requested before being passed through create_texture() and it
instead uses that to detect when a new FBO is needed.
https://bugzilla.gnome.org/show_bug.cgi?id=665040
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-offscreen-effect.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
commit 3f4bd0d9d4b619d8545a57ee6735eb136dacb1c4
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Nov 27 12:18:49 2011 +0000
conform: Add markers parsing to the timeline unit
We should check that the newly added custom parser for timeline
markers is working as intended.
tests/conform/test-conform-main.c | 1 +
tests/conform/test-timeline.c | 40 ++++++++++++++++++++++++++++
tests/data/Makefile.am | 1 +
tests/data/test-script-timeline-markers.json | 11 ++++++++
4 files changed, 53 insertions(+)
commit 24623c43a86fc00f5079994a0969e7689b01317b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun Nov 27 12:16:32 2011 +0000
timeline: Add custom parser for "markers"
It should be possible to define markers in ClutterScript when
describing a ClutterTimeline.
The syntax is a trivial:
"markers" : [
{ "name", <marker-name>, "time" : <msecs> }
]
While at it, we should document it inside the API reference, as well
as fleshing out the ClutterTimeline description.
clutter/clutter-timeline.c | 262 +++++++++++++++++++++++++++++++++++++++------
1 file changed, 230 insertions(+), 32 deletions(-)
commit 3c35653a0785c2dab5a36bc33ff40301740c46b5
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Fri Nov 25 21:21:46 2011 +0100
Updated Slovenian translation
po/sl.po | 892 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 453 insertions(+), 439 deletions(-)
commit d82bf70d49cedcc345ab8a409a812806ce3a57d6
Author: Bastian Winkler <buz@netbuz.org>
Date: Thu Nov 24 20:14:05 2011 +0100
script: Don't skip introspection for connect_signals_full()
To allow language bindings to properly override Script.connect_signals()
they'll need access access to Script.connect_signals_full().
Thanks to Jeremy Moles for reporting.
clutter/clutter-script.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 49355f3287b0044a76dfea48c1e58375645072f8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 23 17:29:23 2011 +0000
pc: Fix unexpanded variables
PkgConfig doesn't like those.
clutter/clutter.pc.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit c3b0db226f5a3d1de86cdf028d01dd64e6fa5605
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date: Tue Nov 22 20:25:02 2011 +0200
Updated Romanian translation
po/ro.po | 2262 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2262 insertions(+)
commit 8afeb0e099416132ac8ad5d227aeaf8a9bd1767e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 22 14:08:36 2011 +0000
Post-release version bump to 1.9.3
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1022aad97078dcbf5fde98bfee012c5428202dcd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 22 11:59:33 2011 +0000
Release Clutter 1.9.2 (snapshot)
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a13b095dc2beb9d4c1c3fe5cf15ebe02376e958c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 22 12:11:06 2011 +0000
build: Fix distcheck
clutter/Makefile.am | 40 +++++++++++++++++++---------------------
tests/conform/Makefile.am | 18 ++++++++----------
tests/interactive/Makefile.am | 27 +++++++++++++++------------
3 files changed, 42 insertions(+), 43 deletions(-)
commit cdd5f6142c767f76cd8a70274eda203b1a5a35b2
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Nov 22 01:20:48 2011 +0000
Update NEWS file
NEWS | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
commit a24ff882b6dd9eb3ab0a7cfdbb047b84a1bc5893
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Nov 22 01:00:58 2011 +0000
conform: Bail out GLSL-based tests
If we don't have GLSL support on the platform.
tests/conform/test-pick.c | 6 ++++++
tests/conform/test-shader-effect.c | 3 +++
2 files changed, 9 insertions(+)
commit 52ea1510a19233413a37801e1a72832027fcc548
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Nov 22 00:29:08 2011 +0000
docs: Fixes for the API reference
doc/reference/clutter/Makefile.am | 1 +
doc/reference/clutter/clutter-docs.xml.in | 1 +
doc/reference/clutter/clutter-sections.txt | 18 ++++++++++++++++++
3 files changed, 20 insertions(+)
commit 02a020a7fd4b58a815fa80578aa32d0aa6d0e4d9
Author: Florian Müllner <fmuellner@gnome.org>
Date: Fri Nov 18 22:04:31 2011 +0100
Add missing include
clutter-profile.h used to be included via clutter-debug.h, but no
more (8a4dc3c011) ...
clutter/cogl/clutter-stage-cogl.c | 1 +
1 file changed, 1 insertion(+)
commit 6e15fd930a2b5cfb83f0edaf03be4a7d2e6ab8d2
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 18 17:54:19 2011 +0000
debug: Simple whitespace cleanups
clutter/clutter-debug.h | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
commit 8a4dc3c011fb3dfe8157dfc228fedd72a81c3c12
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 18 17:44:42 2011 +0000
debug: Clean up profile/debug symbols
Since we have a _clutter_debug_message() function compiled in
unconditionally we have no further need for the equivalent conditional
version defined in clutter-profile.[ch]: we can simply do the work in
one function.
clutter/clutter-debug.h | 26 ++++++++++++--------------
clutter/clutter-main.c | 5 +++++
clutter/clutter-profile.c | 13 -------------
clutter/clutter-profile.h | 18 ++++++++----------
4 files changed, 25 insertions(+), 37 deletions(-)
commit 92585be4d805a1cb0b60df92a0b235fd1a2824be
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 18 17:32:01 2011 +0000
debug: Remove CLUTTER_GLERR
The macro hasn't been used in a long while, as Cogl had its own version
of it; and Clutter hasn't been using pure GL for some time now.
clutter/clutter-debug.h | 9 ---------
1 file changed, 9 deletions(-)
commit 2d76407016075df8f3b12ffb4429c37ae33ccd33
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 18 17:30:39 2011 +0000
debug: Remove CLUTTER_MARK
The debug macro is seldom used, and it's a bit lame at that.
clutter/clutter-debug.h | 3 ---
clutter/clutter-main.c | 4 ----
clutter/clutter-texture.c | 8 --------
3 files changed, 15 deletions(-)
commit ecdb12ecc3b5ab098173e580b693de1629ddc016
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 18 17:23:30 2011 +0000
conform/cogl-pixel-buffer: Remove unused variable
tests/conform/test-cogl-pixel-buffer.c | 5 -----
1 file changed, 5 deletions(-)
commit 90f37d5636f5a1cec3e8423625647f774af7141f
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 18 17:22:12 2011 +0000
cairo-texture: Skip ::draw emission for 0x0 surfaces
This also avoids an assertion failure.
clutter/clutter-cairo-texture.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 225820c4b4d5af5e619e941b67dbdba8e47a432d
Author: Rico Tzschichholz <ricotz@t-online.de>
Date: Fri Nov 18 18:08:01 2011 +0100
Fix 'make dist'
tests/interactive/Makefile.am | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
commit 516b5de7566a453d1009a5465e9452d9642d1fee
Author: Rico Tzschichholz <ricotz@t-online.de>
Date: Fri Nov 18 17:38:45 2011 +0100
tests: Remove some trailing spaces
tests/interactive/Makefile.am | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 73e7404652567a5a095021909b90507c1d7ed42e
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 18 15:12:45 2011 +0000
build: Clean up the VS build rules
Some minor cleanups of the Visual Studio rules in the interactive and
conformance test suites.
.gitignore | 1 +
build/win32/.gitignore | 1 +
tests/conform/Makefile.am | 35 +++++++++++++++++------------------
tests/interactive/Makefile.am | 28 +++++++++++++---------------
4 files changed, 32 insertions(+), 33 deletions(-)
commit b62216955ff768fb3ec4e8f3f99e6bdd1fd27fe2
Author: Rico Tzschichholz <ricotz@t-online.de>
Date: Fri Nov 18 13:39:06 2011 +0100
build: Make sure test-unit-names.h is generated
tests/interactive/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a69c4fdc59682579a05b157afa822f6fc9e7a336
Merge: d3a9bf201 ebf12a8cd
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Nov 17 22:17:01 2011 +0800
Merge branch 'master' into msvc-support-master
commit ebf12a8cd724ff5136021d4b3aaa6e61531620d4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 16 16:42:41 2011 +0000
docs: Document the DeformEffect wrap-mode change
The change from CoglVertexBuffer to CoglPrimitive led to a change of the
default wrap-mode for the pipeline. Since using REPEAT can introduce
artifacts when sampling outside the [ 0, 1 ] texture coordinates range,
and since the default wrap mode was not documented anyway, we want to
keep the change from REPEAT to CLAMP, but it's worth adding an entry in
the release notes.
README.in | 10 ++++++++++
1 file changed, 10 insertions(+)
commit ef02de19e8a351b0f38b05d19423dd4a4eb3012c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 16 14:50:36 2011 +0000
interactive: Remove test-model
The model API is already tested in the conformance test suite.
tests/interactive/Makefile.am | 1 -
tests/interactive/test-model.c | 237 -----------------------------------------
2 files changed, 238 deletions(-)
commit 15000307fdf06efda2b74889e021c63deb354a51
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 16 13:59:11 2011 +0000
interactive: Remove test-unproject
The coordinate transformation code is exercised throughout the
conformance and interactive tests, so there's no need to have a specific
interactive test that doesn't do anything more complicated than calling
clutter_actor_transform_stage_point().
tests/interactive/Makefile.am | 1 -
tests/interactive/test-unproject.c | 157 -------------------------------------
2 files changed, 158 deletions(-)
commit d3a9bf201b42f156d4743b8a194d0e03f41ff7ef
Merge: 39c3ccfca bf9339b8f
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Nov 16 09:15:16 2011 +0800
Merge branch 'master' into msvc-support-master
commit bf9339b8f468dfb12eee95472f0b284acbf56487
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 15 17:58:25 2011 +0000
Deprecate some more old, useless API
We still ship clutter_get_show_fps() and clutter_get_debug_enabled() as
public entry points. Yet another case of missing API review prior to the
1.0 release, so really the bucket stops around my desk.
Let's deprecate these two useless functions, and reduce the API
footprint of Clutter.
clutter/clutter-main.c | 28 +++++++++++++++++++---------
clutter/clutter-main.h | 2 --
clutter/clutter-private.h | 2 ++
clutter/clutter-stage.c | 4 ++--
clutter/deprecated/clutter-main.h | 6 ++++++
5 files changed, 29 insertions(+), 13 deletions(-)
commit 66d46fd55e15b7e882cbf99d7525475eb35c4322
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 15 17:47:00 2011 +0000
Deprecate clutter_get_timestamp()
This function should have never been made public in the first place; its
output depends on a configuration option of Clutter, and it's basically
useful only for internal debugging.
clutter/clutter-main.c | 16 ++++++++++++++--
clutter/clutter-main.h | 1 -
clutter/deprecated/clutter-main.h | 3 +++
3 files changed, 17 insertions(+), 3 deletions(-)
commit 59f395d856e46f6c6a2bc8901db3ecb3f73ee50a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 15 17:39:49 2011 +0000
Rework debug output
Make it consistent across the various build options (with or without
profiling enabled), and add a timestamp using the monotonic clock to
every debug message.
clutter/clutter-debug.h | 16 +++++++++-------
clutter/clutter-main.c | 26 ++++++++++++++++++++++++++
clutter/clutter-profile.c | 10 ++++------
clutter/clutter-profile.h | 41 +++++++++++++++--------------------------
4 files changed, 54 insertions(+), 39 deletions(-)
commit c6e487a5c121dc64604232eb971a4d959ea1b3d2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 15 16:07:13 2011 +0000
Remove CLUTTER_TIMESTAMP debug macro
It's pretty much unused, and it doesn't print out really informative
messages. We should make CLUTTER_NOTE print out a decent timestamp
instead.
clutter/clutter-debug.h | 16 ----------------
clutter/clutter-main.c | 2 +-
clutter/clutter-stage.c | 12 ++++++------
clutter/clutter-timeline.c | 6 +++---
4 files changed, 10 insertions(+), 26 deletions(-)
commit 8b2df7ced9e0be99cc9bc56678ad12ba614d75de
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 15 15:34:51 2011 +0000
Remove the GTimer used by clutter_get_timestamp()
Use g_get_monotonic_time() instead, which does the right thing.
clutter/clutter-main.c | 21 ++-------------------
clutter/clutter-private.h | 3 ---
2 files changed, 2 insertions(+), 22 deletions(-)
commit f63891f030f6cb7d72a911e15e8176cd6b27f50e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 15 14:59:50 2011 +0000
texture: Do not use clutter_get_timestamp()
The clutter_get_timestamp() output depends on whether Clutter was
compiled with debugging support — it's meant to be used only by the
debugging notes, and it should not be used for anything else.
clutter/clutter-texture.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
commit 58b6ad787b115f89eb8f1d982e00cb4e9e55b7a6
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Nov 8 15:45:14 2011 +0000
deform-effect: Use CoglPipeline instead of setting legacy state
Instead of calling cogl_set_depth_test_enabled and
cogl_set_backface_culling_enabled ClutterDeformEffect now uses the
experimental CoglPipeline API. Those global state functions will soon
be deprecated in Cogl and they are implemented by flushing a temporary
override pipline which isn't ideal.
Using the new culling API we can also avoid having a separate buffer
of indices for the back of the texture by just changing the culling
mode to cull front baces instead of the back.
https://bugzilla.gnome.org/show_bug.cgi?id=663636
clutter/clutter-deform-effect.c | 171 +++++++++++++++-------------------------
1 file changed, 63 insertions(+), 108 deletions(-)
commit 8a752d674b4b8711a3912ff18506bb13cf238034
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Nov 8 11:37:27 2011 +0000
deform-effect: Use CoglPrimitives instead of CoglVertexBuffers
This changes ClutterDeformEffect to use a CoglAttributeBuffer with a
CoglPrimitive instead of the old CoglVertexBuffer. The old vertex
buffer code is now implemented in terms of the attribute buffer code
and it will eventually be deprecated. Using CoglPrimitives should be
slightly more efficient.
This also changes the struct we store the vertices to be
CoglVertexP3T2C4 instead of CoglTextureVertex. The latter is
technically not compatible with neither vertex buffers nor attribute
buffers because it contains a CoglColor and the internal members of
that are private so it is not valid to assume it contains 4 bytes and
use that as an attribute. Also it contains padding so it ends up
redundantly creating a larger buffer. CoglTextureVertex is in the
public API for the deform_vertex virtual so we still have to maintain
that. Instead of directly manipulating the array to upload, the
application is now passed a stack allocated temporary struct which
gets converted to a CoglVertexP3T2C4. This also means that we can map
the buffer as write only and still let the application read-write the
vertex.
The paint debug code to draw line strips for the deform mesh was
previously trying to set a red source material. However this wasn't
working because the material color was being overwritten by the color
attribute in the vertex buffer. This patch fixes that by creating a
seperate primitive for the lines and not adding the color
attribute. The lines code was also drawing both the front and back
indices. I don't think that entirely makes sense so I've just changed
it to draw only the front indices. Maybe painting both would make more
sense if backface culling was still enabled.
https://bugzilla.gnome.org/show_bug.cgi?id=663636
clutter/clutter-deform-effect.c | 323 +++++++++++++++++++++++++---------------
1 file changed, 201 insertions(+), 122 deletions(-)
commit 39c3ccfca5dc3d10423cb3972a481bfdc915eadc
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Nov 15 17:18:51 2011 +0800
Visual C++ support update
Add Projects to compile the performance test files.
build/win32/vs10/Makefile.am | 14 ++
build/win32/vs10/clutter.props | 4 +
build/win32/vs10/clutter.sln | 70 +++++++++
build/win32/vs10/install.vcxproj | 28 ++++
build/win32/vs10/test-picking-performance.vcxproj | 169 +++++++++++++++++++++
.../vs10/test-picking-performance.vcxproj.filters | 23 +++
.../vs10/test-state-hidden-performance.vcxproj | 169 +++++++++++++++++++++
.../test-state-hidden-performance.vcxproj.filters | 23 +++
.../test-state-interactive-performance.vcxproj | 169 +++++++++++++++++++++
...t-state-interactive-performance.vcxproj.filters | 23 +++
.../win32/vs10/test-state-mini-performance.vcxproj | 169 +++++++++++++++++++++
.../test-state-mini-performance.vcxproj.filters | 23 +++
build/win32/vs10/test-state-performance.vcxproj | 169 +++++++++++++++++++++
.../vs10/test-state-performance.vcxproj.filters | 23 +++
.../win32/vs10/test-state-pick-performance.vcxproj | 169 +++++++++++++++++++++
.../test-state-pick-performance.vcxproj.filters | 23 +++
.../win32/vs10/test-text-perf-performance.vcxproj | 169 +++++++++++++++++++++
.../test-text-perf-performance.vcxproj.filters | 23 +++
build/win32/vs9/Makefile.am | 7 +
build/win32/vs9/clutter.sln | 98 ++++++++++++
build/win32/vs9/clutter.vsprops | 4 +
build/win32/vs9/test-picking-performance.vcproj | 166 ++++++++++++++++++++
.../win32/vs9/test-state-hidden-performance.vcproj | 166 ++++++++++++++++++++
.../vs9/test-state-interactive-performance.vcproj | 166 ++++++++++++++++++++
build/win32/vs9/test-state-mini-performance.vcproj | 166 ++++++++++++++++++++
build/win32/vs9/test-state-performance.vcproj | 166 ++++++++++++++++++++
build/win32/vs9/test-state-pick-performance.vcproj | 166 ++++++++++++++++++++
build/win32/vs9/test-text-perf-performance.vcproj | 166 ++++++++++++++++++++
28 files changed, 2731 insertions(+)
commit 2a54db4557a0e4b417535ef162590a414a8a3c5b
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Nov 15 16:29:35 2011 +0800
test-picking.c: Use G_PI rather than M_PI
M_PI is not universally available...
tests/performance/test-picking.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 2a86ecc4b9516222c4f74ba106d7c2275baa9ae2
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Nov 15 16:19:06 2011 +0800
Update interactive/conformance .bat names
Add a -clutter suffix to avoid confustion with others, such as COGL.
tests/conform/Makefile.am | 2 +-
tests/interactive/Makefile.am | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
commit 119169b4a16b739f833bd83b8484ae04ce30ae2b
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Nov 15 15:31:17 2011 +0800
Fix up VS property sheets
Should be ..\..\..\clutter\deprecated\clutter-keysyms.h, not
..\..\..\clutter\deprecated\clutter-keysyms-deprecated.h
build/win32/vs10/clutter.props | 2 +-
build/win32/vs9/clutter.vsprops | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 794b49990a726df15b43c0fe741b7067ee2a3f95
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Nov 15 15:19:09 2011 +0800
Update Visual C++ projects
Update output DLL/LIB names to be consistent with the autotools output,
due to the newl-introduced multi-backend feature (only the Win32 backend
is supported here for now, GDK3 support will be added when it stabilizes)
build/win32/vs10/clutter.vcxprojin | 16 ++++++++--------
build/win32/vs9/clutter.vcprojin | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
commit 8d0c68347a4ee33bb77c7c21760b63f15db9cf26
Merge: 96d4e527e b281f2090
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Nov 15 14:20:22 2011 +0800
Merge branch 'master' into msvc-support-master
commit b281f2090a8fb042cb471611eab54c26ceba8074
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 14 17:04:14 2011 +0000
Store the master clock pointer in the main context
Let's try and move all singletons into ClutterMainContext.
clutter/clutter-master-clock.c | 10 ++++------
clutter/clutter-private.h | 3 +++
2 files changed, 7 insertions(+), 6 deletions(-)
commit f1ebfe30cee518811454b2bea6558bcfd19a5eb7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 14 15:43:20 2011 +0000
stage-manager: Store the stage manager into the main context
Use the main context to store the stage manager singleton, instead of a
static pointer inside clutter-stage-manager.c.
clutter/clutter-private.h | 4 ++++
clutter/clutter-stage-manager.c | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
commit 96d4e527ea8bf0e7fd238ba6cafd578f86fea27f
Merge: 2628ba70c e7720c415
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 14 22:57:50 2011 +0800
Merge branch 'master' into msvc-support-master
commit e7720c415649cb67453b90764258f398f8e97107
Author: Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com>
Date: Wed Nov 9 02:04:31 2011 +0000
deform-effect: do not redraw actor on invalidate
When invalidating the deform effect, we are invalidating the vertices
shaping the deformation of an actor. Therefore, there is no need to
trigger a redraw of the associated actor, we can just repaint the
effect.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com>
https://bugzilla.gnome.org/show_bug.cgi?id=663720
clutter/clutter-deform-effect.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b5ac9277636bdeabcd3f2b6b62e234b085a5f49f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 14 11:46:02 2011 +0000
stage: Clean up
Improve the consistency of the code.
clutter/clutter-stage-manager.c | 14 ++++++--------
clutter/clutter-stage.c | 41 +++++++++++++++++++++++------------------
2 files changed, 29 insertions(+), 26 deletions(-)
commit b2d1dfa932d20d17c236f2646879a38876302190
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 14 11:45:14 2011 +0000
stage: Deprecate clutter_stage_queue_redraw()
It's a wrapper around clutter_actor_queue_redraw().
clutter/clutter-stage.c | 5 ++---
clutter/clutter-stage.h | 1 -
clutter/deprecated/clutter-stage.h | 3 +++
3 files changed, 5 insertions(+), 4 deletions(-)
commit f5d011cb67f06d35721c78f3e93389da7e550ebd
Merge: bbe54aa2e 213e6e4a1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Nov 14 11:07:54 2011 +0000
Merge branch 'deprecate-default-stage'
* deprecate-default-stage:
evdev: do not associate device with stage
evdev: don't even process events without a default stage
docs: Note default stage deprecation in README
docs: Remove clutter_stage_get_default()
stage: Deprecate the default stage
script: Do not use clutter_stage_get_default()
cally/actor: Do not use the default stage as a fallback
Try to mop up the default stage mess
performance/*: Do not use clutter_stage_get_default()
interactive/*: Do not use clutter_stage_get_default()
Merge with a11y
micro-bench/*: Do not use clutter_stage_get_default()
accessibility/*: Do not use clutter_stage_get_default()
conform/*: Do not use clutter_stage_get_default()
commit bbe54aa2ec61824ec05684bb2de6297edc289500
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 14 13:36:52 2011 +0800
Fix clutter-bakend-win32.c
The VBLANK environmental variable is done universally in clutter-main.c
as in commits e8562089 (main: Add a sync-to-vblank global flag) and
db211a21 (Remove per-backend CLUTTER_VBLANK envvar), so remove these things
here as well.
https://bugzilla.gnome.org/show_bug.cgi?id=663999
clutter/win32/clutter-backend-win32.c | 19 -------------------
1 file changed, 19 deletions(-)
commit 2628ba70cdd8dccd90a487466b42f0fe136f6860
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 14 13:36:52 2011 +0800
Fix clutter-bakend-win32.c
The VBLANK environmental variable is done universally in clutter-main.c
as in commits e8562089 (main: Add a sync-to-vblank global flag) and
db211a21 (Remove per-backend CLUTTER_VBLANK envvar), so remove these things
here as well.
clutter/win32/clutter-backend-win32.c | 19 -------------------
1 file changed, 19 deletions(-)
commit ebf3147a0054ebc577cf4822d85ff03ce5562f65
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 14 13:33:04 2011 +0800
clutter-config.h.win32: Add CLUTTER_INPUT_NULL
clutter/clutter-config.h.win32 | 1 +
1 file changed, 1 insertion(+)
commit c73a1fa7df9a4ec1a5c8db9b7d5f4d2169f40174
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 14 13:32:29 2011 +0800
Fix VS property sheets
Should be clutter-keysyms.compat.h that should land in deprecated/, not
clutter-keysyms.h
build/win32/vs10/clutter.props | 8 ++++----
build/win32/vs9/clutter.vsprops | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
commit 145685b099d86fd5d6a49225834dd40962a9e091
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 14 12:49:52 2011 +0800
Update config.h.win32.in/clutter-config.h.win32
-Make the contents of config.h.win32.in more like config.h.in
-Define CLUTTER_INPUT_WIN32 accordingly (no GDK3 defines yet, until
GDK3 on Windows is more stable)
clutter/clutter-config.h.win32 | 1 +
config.h.win32.in | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
commit 1b7249a2478b78a4242c766d85347e71c3a70ba4
Merge: c52d06a5b 65a07db5c
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 14 11:40:49 2011 +0800
Merge branch 'master' into msvc-support-master
commit 65a07db5c07b2601835565ce48db689f634203b4
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Sun Nov 13 18:52:21 2011 +0100
Updated Galician translations
po/clutter-1.0.pot | 1455 +++++++++++++++++++++++++++-------------------------
po/gl.po | 765 +++++++++++++--------------
2 files changed, 1141 insertions(+), 1079 deletions(-)
commit c52d06a5b9fe05b09836d364dba3a20d487f62b5
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Sat Nov 12 12:03:53 2011 +0800
Update clutter-config.h.win32
The CLUTTER_WINDOWING_WIN32 needs to be in-sync with what is in
configure.ac, due to the implementation of multiple backends.
clutter/clutter-config.h.win32 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a0c9d294b0c2784b1459a21e5d8dbf8af9705432
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Fri Nov 11 18:16:06 2011 +0100
Updated Spanish translation
po/es.po | 770 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 392 insertions(+), 378 deletions(-)
commit 028b716f3310c3c9cae34c4cd23bb00f27f0103d
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Thu Nov 10 19:54:53 2011 +0100
Updated POTFILES.in
po/POTFILES.in | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
commit 6d4f105ab251282e8d6453df5b585646e4bafdcf
Author: Rico Tzschichholz <ricotz@t-online.de>
Date: Thu Nov 10 19:02:19 2011 +0100
po: update POTFILES.in
po/POTFILES.in | 1 -
1 file changed, 1 deletion(-)
commit b12a94dc272b0b4c9c3ec5e9de5845cd24a2f09a
Author: Rico Tzschichholz <ricotz@t-online.de>
Date: Thu Nov 10 19:01:48 2011 +0100
docs: fix some headers paths
clutter/cex100/clutter-cex100.h.in | 2 +-
doc/reference/clutter/Makefile.am | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
commit 821ccef55562798bcda64ecc3d4b3f6252867d8b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 10 17:59:17 2011 +0000
build: Disable evdev input by default
It's an experimental input backend, so it should be enabled explicitly.
README.in | 4 ++--
configure.ac | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 213e6e4a1606945b1e2bbb93289da31aea5edcbe
Author: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Thu Nov 10 15:41:41 2011 +0000
evdev: do not associate device with stage
Their might not be any stage at that time, so this avoids to create a
default one.
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
https://bugzilla.gnome.org/show_bug.cgi?id=651718
clutter/evdev/clutter-device-manager-evdev.c | 5 -----
1 file changed, 5 deletions(-)
commit 5705d08b5d50901e2f752a505e7daab3e98696ae
Author: Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com>
Date: Fri Jun 17 11:31:34 2011 +0100
evdev: don't even process events without a default stage
The evdev system is a bit different from other input systems in
Clutter because it's completly decorrelated from anything graphic.
In the case of embedded devices with no proper windowing system, you
might want to not implicitly create a default stage when you're
receiving the first input event.
This patch changes this behavior by not forwarding any event if you
don't have a default stage.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com>
https://bugzilla.gnome.org/show_bug.cgi?id=651718
clutter/evdev/clutter-device-manager-evdev.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit b38773f4588f104e0dca8f235344d1599c0d560a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 10 15:09:04 2011 +0000
docs: Note default stage deprecation in README
Mention the behaviour of Clutter when creating more than one stage on
platforms that only support one stage instance.
README.in | 6 ++++++
1 file changed, 6 insertions(+)
commit 26aa4b5290c65984a0512a0ba4a30ab777628269
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 9 17:49:25 2011 +0000
docs: Remove clutter_stage_get_default()
A lot of the example code in the cookbook and the API reference still
uses the default stage — sometimes as if it were a non-default one,
which once again demonstrates how the default stage was a flawed concept
that just confused people.
clutter/clutter-actor.c | 2 +-
doc/cookbook/examples/animations-looping-animator.c | 2 +-
doc/cookbook/examples/animations-looping-implicit.c | 2 +-
doc/cookbook/examples/animations-looping-state.c | 2 +-
doc/cookbook/examples/animations-moving-animator.c | 2 +-
doc/cookbook/examples/animations-moving-implicit.c | 2 +-
doc/cookbook/examples/animations-moving-state.c | 2 +-
doc/cookbook/examples/animations-rotating.c | 2 +-
doc/cookbook/examples/animations-scaling-zoom.c | 2 +-
doc/cookbook/examples/animations-scaling.c | 2 +-
doc/cookbook/examples/events-buttons-click.c | 2 +-
doc/cookbook/examples/events-buttons-lasso.c | 2 +-
doc/cookbook/examples/events-buttons.c | 2 +-
doc/cookbook/examples/events-mouse-scroll.c | 3 ++-
doc/cookbook/examples/events-pointer-motion-crossing.c | 2 +-
doc/cookbook/examples/events-pointer-motion-scribbler.c | 3 ++-
doc/cookbook/examples/events-pointer-motion-stacked.c | 3 ++-
doc/cookbook/examples/events-pointer-motion.c | 3 ++-
doc/cookbook/examples/layouts-bind-constraint-allocation.c | 2 +-
doc/cookbook/examples/layouts-box-menu.c | 2 +-
doc/cookbook/examples/layouts-box-property-effects.c | 2 +-
doc/cookbook/examples/layouts-box.c | 2 +-
doc/cookbook/examples/layouts-stacking-diff-sized-actors.c | 3 ++-
doc/cookbook/examples/layouts-stacking.c | 3 ++-
doc/cookbook/examples/textures-crossfade-cogl.c | 2 +-
doc/cookbook/examples/textures-crossfade-slideshow.c | 2 +-
doc/cookbook/examples/textures-crossfade.c | 2 +-
doc/cookbook/examples/textures-split-go.c | 3 ++-
doc/cookbook/examples/textures-sub-texture.c | 3 ++-
doc/reference/clutter/clutter-animation-tutorial.xml | 3 ++-
30 files changed, 39 insertions(+), 30 deletions(-)
commit 0c18dc6bf90cf521327869738b206274584c695e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 9 17:12:45 2011 +0000
stage: Deprecate the default stage
Deprecate the clutter_stage_get_default() function, as well as the
clutter_stage_is_default() one, and replace its internal usage.
clutter/clutter-stage.c | 38 +++++++++++++++++++++++++-------------
clutter/clutter-stage.h | 2 --
clutter/deprecated/clutter-stage.h | 6 ++++++
3 files changed, 31 insertions(+), 15 deletions(-)
commit 2288d708e2f6ad9f8348f738a44cc7d29cf95530
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 9 17:09:37 2011 +0000
script: Do not use clutter_stage_get_default()
It's about to go away, so we should use the StageManager API instead.
clutter/clutter-script-parser.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit b1ccd262b1a8ba01d214090052f99ef408bff299
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 9 17:03:30 2011 +0000
cally/actor: Do not use the default stage as a fallback
Using the default stage as a fallback is wrong in all circumstances.
In this specific case, if an actor is not associated to a stage then it
cannot possibly be the key focus.
clutter/cally/cally-actor.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
commit 26f44673922bc3d0b854bdcb0c519f1a62bd433a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 9 14:04:05 2011 +0000
Try to mop up the default stage mess
The default stage was a neat concept when we started Clutter out,
somewhere in the Jurassic era; a singleton instance that gets created at
initialization time, and remains the same for the entire duration of the
process.
Worked well enough when Clutter was a small library meant to be used to
write fullscreen media browsers, but since the introduction of multiple
stages, and Clutter being used to create all sorts of applications, the
default stage is just a vestigial remainder of that past, like an
appendix; something that complicates the layout of the code and
introduces weird behaviour, so that you notice its existence only when
something goes wrong.
Some platforms we do support, though, only have one framebuffer, so it
makes sense for them to have only one stage.
At this point, the only sane thing to do is to go through the same code
paths on all platforms, and that code path is the stage instance
creation and initialization — i.e. clutter_stage_new() (or
g_object_new() with CLUTTER_TYPE_STAGE).
For platforms that support multiple stages, nothing has changed: the stage
created by clutter_stage_get_default() will be set as the default one;
if nobody calls it, the default stage is never created, and it just
lives on as a meaningless check.
For platforms that only support one stage, clutter_stage_new() and
clutter_stage_get_default() will behave exactly the same the first time
they are called: both will create a stage, and set it as the default.
Calling clutter_stage_new() a second time is treated as a programmer
error, and will result in Clutter aborting. This is a behavioural change
because the existing behaviour or creating a new ClutterStage instance
with the same ClutterStageWindow private implementation is, simply put,
utterly braindamaged and I should have *never* had written it, and I
apologize for it. In my defence, I didn't know any better at the time.
This is the first step towards the complete deprecation of
clutter_stage_get_default() and clutter_stage_is_default(), which will
come later.
clutter/clutter-backend.c | 5 --
clutter/clutter-stage.c | 114 ++++++++++++++++++++++++++++++++--------------
2 files changed, 79 insertions(+), 40 deletions(-)
commit 5903fcc36db8ea3115471aaf04322a7cae7cdfc2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 9 13:52:03 2011 +0000
performance/*: Do not use clutter_stage_get_default()
tests/performance/test-picking.c | 9 +++++----
tests/performance/test-state-hidden.c | 7 ++++---
tests/performance/test-state-interactive.c | 6 +++---
tests/performance/test-state-mini.c | 7 ++++---
tests/performance/test-state-pick.c | 7 ++++---
tests/performance/test-state.c | 7 ++++---
tests/performance/test-text-perf.c | 4 +++-
7 files changed, 27 insertions(+), 20 deletions(-)
commit 7c180a074275ce0eb06165bb6eba83273b5056d2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 9 13:41:15 2011 +0000
interactive/*: Do not use clutter_stage_get_default()
tests/conform/test-score.c | 4 +-
tests/conform/test-timeline.c | 5 ++-
tests/interactive/test-actor-clone.c | 34 +++++++++++----
tests/interactive/test-animation.c | 7 +--
tests/interactive/test-animator.c | 11 +++--
tests/interactive/test-bin-layout.c | 11 ++++-
tests/interactive/test-binding-pool.c | 9 +++-
tests/interactive/test-box-layout.c | 9 +++-
tests/interactive/test-cairo-flowers.c | 46 +++++++++++++-------
tests/interactive/test-clip.c | 10 ++++-
tests/interactive/test-cogl-multitexture.c | 17 ++++++--
tests/interactive/test-cogl-offscreen.c | 67 ++++++++++++++++++-----------
tests/interactive/test-cogl-point-sprites.c | 14 ++++--
tests/interactive/test-cogl-primitives.c | 11 ++++-
tests/interactive/test-cogl-tex-convert.c | 13 ++++--
tests/interactive/test-cogl-tex-foreign.c | 13 ++++--
tests/interactive/test-cogl-tex-getset.c | 13 ++++--
tests/interactive/test-cogl-tex-polygon.c | 11 ++++-
tests/interactive/test-cogl-tex-tile.c | 11 ++++-
tests/interactive/test-cogl-vertex-buffer.c | 38 +++++++++++-----
tests/interactive/test-events.c | 61 +++++++++++++-------------
tests/interactive/test-fbo.c | 10 ++++-
tests/interactive/test-flow-layout.c | 9 +++-
tests/interactive/test-fullscreen.c | 20 ++++++---
tests/interactive/test-grab.c | 14 ++++--
tests/interactive/test-layout.c | 10 ++++-
tests/interactive/test-main.c | 10 ++++-
tests/interactive/test-multistage.c | 6 ++-
tests/interactive/test-paint-wrapper.c | 27 ++++++++++--
tests/interactive/test-pixmap.c | 10 ++++-
tests/interactive/test-scale.c | 11 ++++-
tests/interactive/test-stage-read-pixels.c | 10 ++++-
tests/interactive/test-stage-sizing.c | 10 ++++-
tests/interactive/test-state-animator.c | 15 +++++--
tests/interactive/test-state.c | 23 +++++++---
tests/interactive/test-swipe-action.c | 11 ++++-
tests/interactive/test-table-layout.c | 5 ++-
tests/interactive/test-text.c | 20 ++++++---
tests/interactive/test-texture-quality.c | 14 ++++--
tests/interactive/test-texture-slicing.c | 9 +++-
tests/interactive/test-unproject.c | 14 +++---
41 files changed, 491 insertions(+), 182 deletions(-)
commit 6ed879b84cad6b8b69403813acdd811de98e9f00
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 9 10:55:49 2011 +0000
Merge with a11y
tests/accessibility/cally-atkcomponent-example.c | 2 ++
tests/accessibility/cally-atkeditabletext-example.c | 17 +++++++----------
tests/accessibility/cally-atkevents-example.c | 12 +++++-------
tests/accessibility/cally-atktext-example.c | 4 +---
tests/accessibility/cally-clone-example.c | 3 +--
5 files changed, 16 insertions(+), 22 deletions(-)
commit 93eb0bfe328598fe37a6469cd43ba8fa59ae147e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 8 17:23:52 2011 +0000
micro-bench/*: Do not use clutter_stage_get_default()
tests/micro-bench/test-cogl-perf.c | 14 ++++++--------
tests/micro-bench/test-picking.c | 10 ++++++----
tests/micro-bench/test-random-text.c | 5 ++++-
tests/micro-bench/test-text-perf.c | 6 +++---
tests/micro-bench/test-text.c | 11 ++++++-----
5 files changed, 25 insertions(+), 21 deletions(-)
commit a5522b707ecb719d05e57702b65be1a2cec250ac
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 8 17:11:34 2011 +0000
accessibility/*: Do not use clutter_stage_get_default()
tests/accessibility/cally-atkcomponent-example.c | 3 ++-
tests/accessibility/cally-atkeditabletext-example.c | 6 +++---
tests/accessibility/cally-atkevents-example.c | 16 +++++++++++-----
tests/accessibility/cally-atktext-example.c | 7 +++++--
tests/accessibility/cally-clone-example.c | 8 ++++++--
5 files changed, 27 insertions(+), 13 deletions(-)
commit deba576dd1ad5ca55c713dcc808e91adf9d2f1df
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 8 17:04:44 2011 +0000
conform/*: Do not use clutter_stage_get_default()
Use the correct stage creation/destruction API.
tests/conform/test-actor-invariants.c | 44 +++++++++++-------
tests/conform/test-anchors.c | 4 +-
tests/conform/test-cally-text.c | 8 ++--
tests/conform/test-clutter-cairo-texture.c | 4 +-
tests/conform/test-clutter-texture.c | 4 +-
tests/conform/test-cogl-backface-culling.c | 5 ++-
tests/conform/test-cogl-blend-strings.c | 5 ++-
tests/conform/test-cogl-depth-test.c | 5 ++-
tests/conform/test-cogl-just-vertex-shader.c | 7 +--
tests/conform/test-cogl-materials.c | 5 ++-
tests/conform/test-cogl-multitexture.c | 4 +-
tests/conform/test-cogl-npot-texture.c | 20 +++++----
tests/conform/test-cogl-offscreen.c | 8 +---
tests/conform/test-cogl-path.c | 5 ++-
tests/conform/test-cogl-pipeline-user-matrix.c | 4 +-
tests/conform/test-cogl-pixel-buffer.c | 8 +---
tests/conform/test-cogl-premult.c | 5 ++-
tests/conform/test-cogl-primitive.c | 5 ++-
tests/conform/test-cogl-readpixels.c | 8 +---
tests/conform/test-cogl-sub-texture.c | 8 +---
tests/conform/test-cogl-texture-3d.c | 6 +--
tests/conform/test-cogl-texture-get-set-data.c | 4 +-
tests/conform/test-cogl-texture-mipmaps.c | 5 ++-
tests/conform/test-cogl-texture-pixmap-x11.c | 52 +++++++++++-----------
tests/conform/test-cogl-texture-rectangle.c | 4 +-
tests/conform/test-cogl-vertex-buffer-contiguous.c | 5 ++-
tests/conform/test-cogl-vertex-buffer-interleved.c | 5 ++-
tests/conform/test-cogl-vertex-buffer-mutability.c | 5 ++-
tests/conform/test-cogl-viewport.c | 8 +---
tests/conform/test-cogl-wrap-modes.c | 4 +-
tests/conform/test-conform-main.c | 1 +
tests/conform/test-offscreen-redirect.c | 4 +-
tests/conform/test-paint-opacity.c | 14 +++---
tests/conform/test-pick.c | 5 ++-
tests/conform/test-score.c | 2 +-
tests/conform/test-shader-effect.c | 4 +-
tests/conform/test-text-cache.c | 4 +-
tests/conform/test-texture-fbo.c | 20 ++-------
38 files changed, 167 insertions(+), 151 deletions(-)
commit 89644ae0488951015e44e864a3cc6840c207357c
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Nov 7 19:06:22 2011 +0000
docs: Update the release notes in the README
README.in | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 69 insertions(+), 10 deletions(-)
commit 6d68ac2e8bf6f1210c7692748e27c989213e6ba7
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Nov 7 14:48:48 2011 +0000
osx: Clean up the backend implementation
Instead of implementing create_stage() and a constructor for
ClutterStageOSX, we can use the default implementations in
ClutterBackend, and spare us some code duplication.
clutter/osx/clutter-backend-osx.c | 27 ++++-----------------------
clutter/osx/clutter-stage-osx.c | 33 +++++++++------------------------
clutter/osx/clutter-stage-osx.h | 3 ---
3 files changed, 13 insertions(+), 50 deletions(-)
commit 88b27beea465a6e790ad78ce7ca3a07e8521f7db
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Nov 7 14:44:37 2011 +0000
wayland/backend: Remove create_stage()
The create_stage() implementation in ClutterBackendWayland isn't doing
anything special, so we can fall back to the default one.
clutter/wayland/clutter-backend-wayland.c | 19 -------------------
1 file changed, 19 deletions(-)
commit 7472c07c41db28591da46b3e437fc97b799787a2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 19:49:45 2011 +0000
build: Clean up the configuration summary
List the input backends, and remove the EGL backend options.
configure.ac | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
commit 17c89bd0a0aba8fa400c591b8cc8934f5b8ec901
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 19:25:54 2011 +0000
backend: Clean up the device manager creation
Create the device manager during the event initialization, where it
makes sense.
This allows us to get rid of the per-backend get_device_manager()
virtual function, and just store the DeviceManager pointer into the
ClutterBackend structure.
clutter/cex100/clutter-backend-cex100.c | 25 -------------------------
clutter/clutter-backend-private.h | 10 ++++++----
clutter/clutter-backend.c | 13 +++++++++++++
clutter/clutter-device-manager.c | 7 ++-----
clutter/egl/clutter-backend-eglnative.c | 26 --------------------------
clutter/evdev/clutter-device-manager-evdev.c | 12 +++---------
clutter/gdk/clutter-backend-gdk.c | 25 ++++++++-----------------
clutter/osx/clutter-backend-osx.c | 27 ++++-----------------------
clutter/win32/clutter-backend-win32.c | 19 +------------------
clutter/x11/clutter-backend-x11.c | 13 ++-----------
10 files changed, 39 insertions(+), 138 deletions(-)
commit cd1e8da07fd437a0368c198a3ee2a16569ce7699
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 19:01:32 2011 +0000
*/backend: Clean up the stage creation
Use the default implementation of create_stage() wherever possible.
clutter/cex100/clutter-backend-cex100.c | 27 ---------------------------
clutter/cex100/clutter-backend-cex100.h | 3 ---
clutter/egl/clutter-backend-eglnative.c | 27 ---------------------------
clutter/egl/clutter-backend-eglnative.h | 3 ---
clutter/gdk/clutter-backend-gdk.c | 12 ------------
clutter/win32/clutter-backend-win32.c | 20 --------------------
6 files changed, 92 deletions(-)
commit 828ca2982f0f7b6974283921d59c65929385da8f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 19:00:49 2011 +0000
backend: Provide a default create_stage()
We can now safely create a ClutterStageWindow in the shared code path,
instead of deferring to the backend.
clutter/clutter-backend.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
commit 9c038ebefb88cd052c1dc9448c58d2d5a9a9bfc7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 18:50:46 2011 +0000
stage-window: Add :backend and :wrapper properties
All StageWindow implementation already have back pointers, but we need a
unified API to actually set them from the generic code path; we can use
properties on the StageWindow interface — though this requires fixing
all backends at the same time, to avoid GObject complaining.
clutter/clutter-stage-window.c | 19 ++++++++++++++
clutter/cogl/clutter-stage-cogl.c | 15 ++---------
clutter/osx/clutter-stage-osx.c | 46 ++++++++++++++++++++++++++++++---
clutter/wayland/clutter-stage-wayland.c | 37 ++++++++++++++++++++++++++
clutter/win32/clutter-stage-win32.c | 35 +++++++++++++++++++++++++
5 files changed, 135 insertions(+), 17 deletions(-)
commit f3c89e82b3ab47b29cf5bf59418ca0f473624c2f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 18:50:02 2011 +0000
gdk/backend: Fix an invalid chain up
clutter/gdk/clutter-backend-gdk.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit b980d2dc17f84b4c5e99f9f850feb3ac47de2439
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 18:27:08 2011 +0000
*/backend: Store the StageWindow implementation type
clutter/cex100/clutter-backend-cex100.c | 2 ++
clutter/egl/clutter-backend-eglnative.c | 2 ++
clutter/gdk/clutter-backend-gdk.c | 3 +++
clutter/osx/clutter-backend-osx.c | 2 ++
clutter/wayland/clutter-backend-wayland.c | 2 ++
clutter/win32/clutter-backend-win32.c | 10 ++++++----
clutter/x11/clutter-backend-x11.c | 4 ++++
7 files changed, 21 insertions(+), 4 deletions(-)
commit 6082be409ee3f64770170e73323a2df5b50084c2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 18:26:33 2011 +0000
backend: Store the type of the StageWindow implementation
We can use it later on to create it and provide a default create_stage()
implementation.
clutter/clutter-backend-private.h | 2 ++
clutter/clutter-backend.c | 2 ++
2 files changed, 4 insertions(+)
commit 04a2b5f42b0bee41dbb6968b98551bb0fa079548
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 17:49:25 2011 +0000
egl/backend: Clean up
The "EGL native" backend is just a short-hand for a pure Cogl backend,
using whatever input mechanism was enabled at run-time.
clutter/egl/clutter-backend-eglnative.c | 136 +-------------------------------
clutter/egl/clutter-egl.h | 5 --
2 files changed, 2 insertions(+), 139 deletions(-)
commit 89e26497de8f3f05fbaf409436c4ee92f5d3669c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 17:44:55 2011 +0000
Add a CEx100-specific backend
Instead of piggybacking on the EGL backend, let's create a small
ClutterBackend for the CEx100 platforms. This allows us to handle the
CEx100-specific details in a much cleaner way.
.gitignore | 2 +-
clutter/Makefile.am | 11 +-
clutter/cex100/clutter-backend-cex100.c | 264 ++++++++++++++++++++++++++++
clutter/cex100/clutter-backend-cex100.h | 74 ++++++++
clutter/{egl => cex100}/clutter-cex100.h.in | 35 +---
configure.ac | 134 +++++++-------
6 files changed, 422 insertions(+), 98 deletions(-)
commit 5c9cafb411961fbd9117e86c6e8ca636f91fb158
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 16:52:44 2011 +0000
cogl/backend: Remove the ClutterBackendCogl class
All the functionality that ClutterBackendCogl provided has been moved
into ClutterBackend itself, so there is no need to have this class
around in the source.
Cogl-based backends can derive directly from ClutterBackend.
clutter/Makefile.am | 2 -
clutter/cogl/clutter-backend-cogl.c | 111 --------------------------------
clutter/cogl/clutter-backend-cogl.h | 68 -------------------
clutter/cogl/clutter-stage-cogl.c | 10 +--
clutter/cogl/clutter-stage-cogl.h | 8 +--
clutter/egl/clutter-backend-eglnative.c | 2 +-
clutter/egl/clutter-backend-eglnative.h | 5 +-
clutter/gdk/clutter-backend-gdk.c | 2 +-
clutter/gdk/clutter-backend-gdk.h | 5 +-
clutter/x11/clutter-backend-x11.c | 2 +-
clutter/x11/clutter-backend-x11.h | 5 +-
clutter/x11/clutter-stage-x11.c | 5 +-
12 files changed, 19 insertions(+), 206 deletions(-)
commit 5ac0cf1c2852b0ad1cb58edc254bb787c6354e3c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 16:41:52 2011 +0000
cogl/backend: Remove pre/post_parse
The CLUTTER_VBLANK environment variable is now handled in the common
code path.
clutter/cogl/clutter-backend-cogl.c | 38 -------------------------------------
1 file changed, 38 deletions(-)
commit db211a2131eed46bcecf8abc14822f2bd9a50812
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 16:39:52 2011 +0000
Remove per-backend CLUTTER_VBLANK envvar
We have a global flag we can use.
clutter/cogl/clutter-backend-cogl.h | 2 --
clutter/cogl/clutter-stage-cogl.c | 6 ++----
clutter/win32/clutter-backend-win32.c | 24 ------------------------
clutter/win32/clutter-backend-win32.h | 2 --
clutter/win32/clutter-stage-win32.c | 6 ++----
clutter/x11/clutter-backend-x11.c | 6 ++----
6 files changed, 6 insertions(+), 40 deletions(-)
commit e8562089f692f5fa8bbf8c646d3c508244fd3d14
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 16:35:38 2011 +0000
main: Add a sync-to-vblank global flag
It replaces the per-backend CLUTTER_VBLANK environment variable.
clutter/clutter-main.c | 21 +++++++++++++++++++++
clutter/clutter-private.h | 2 ++
2 files changed, 23 insertions(+)
commit 80fdbeb9543e0de18ac28f8cae28c42f2e18942e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 16:13:04 2011 +0000
backend: Provide a default get_features() implementation
Continue gutting ClutterBackendCogl; get_features() is the last bit that
still does something, but now we can use the Cogl API.
clutter/clutter-backend.c | 34 +++++++++++++++++++++++++++++
clutter/cogl/clutter-backend-cogl.c | 41 -----------------------------------
clutter/cogl/clutter-stage-cogl.c | 15 ++++++-------
clutter/gdk/clutter-backend-gdk.c | 8 ++++---
clutter/win32/clutter-backend-win32.c | 28 +++---------------------
5 files changed, 49 insertions(+), 77 deletions(-)
commit b97324ee9f8684a0388cacc2e00ea1a2da16e5cc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 15:57:01 2011 +0000
win32/backend: Use the default context creation
The win32 backend doesn't do anything special on context creation, so we
can just use the default implementation provided by ClutterBackend.
clutter/win32/clutter-backend-win32.c | 59 -----------------------------------
1 file changed, 59 deletions(-)
commit 6ec7a28802999b24f1d07dfb73a8a4e670596a42
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 15:54:58 2011 +0000
gdk/backend: Use the context creation hooks
Same as it has happened to the X11 backend.
clutter/gdk/clutter-backend-gdk.c | 128 ++++++++++++++++++++------------------
1 file changed, 69 insertions(+), 59 deletions(-)
commit 68e8ef0103af438749660a0346267688b27b05c2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 15:53:47 2011 +0000
x11/backend: Use the context creation hooks
Don't replace create_context(): given that the X11 backend already uses
Cogl for the context creation, we can just provide the right data
structures ourselves.
clutter/x11/clutter-backend-x11.c | 113 +++++++++++++++-----------------------
1 file changed, 43 insertions(+), 70 deletions(-)
commit a918ac92cb2278a8ebbc118f55443e4974dd696f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Nov 4 15:50:47 2011 +0000
backend: Provide a default create_context()
Since we use Cogl for the context creation we can now provide a default
context creation that should just work, plus a couple of hooks to allow
plugging into the creation sequence for platforms supported by Cogl that
require special handling — like foreign displays or alpha-enabled swap
chains.
The various backends have now two choices: either replace the
create_context() in its entirety, or plug themselves into the default
context creation.
clutter/clutter-backend-private.h | 6 ++
clutter/clutter-backend.c | 114 +++++++++++++++++++++++++++++++++++++-
2 files changed, 117 insertions(+), 3 deletions(-)
commit 5b1b936491c89b75c211584e77946d3dea0c5f81
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 4 12:21:11 2011 +0000
backend: Fix up the input backend detection ordering
And add a missing 'else' in the OSX check, to avoid a g_error().
clutter/clutter-backend.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
commit 1f8915d2c89cced191fbd94bdb5dd6833d942584
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 18:27:09 2011 +0000
Add a 'null' input backend symbol
We should have an input backend symbol that thoroughly disables all
input event handling.
clutter/clutter-backend.c | 8 +++++++-
configure.ac | 4 ++++
2 files changed, 11 insertions(+), 1 deletion(-)
commit adb6ffbd0e67f1f43a7fbcd8df53a94fb7b241e8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 17:53:54 2011 +0000
backend: Unify the event initialization
Input backends are, in some cases, independent from the windowing system
backends; we can initialize input handling using a model similar to what
we use for windowing backends, including an environment variable and
compile-/run-time checks.
This model allows us to remove the backend-specific init_events(), and
use a generic implementation directly inside the base ClutterBackend
class, thus further reducing the backend-specific code that every
platform has to implement.
This requires some minor surgery to every single backend, to make sure
that the function exposed to initialize the event loop is similar and
performs roughly the same operations.
clutter/clutter-backend.c | 85 ++++++++++++++-
clutter/egl/clutter-backend-eglnative.c | 26 -----
clutter/gdk/clutter-backend-gdk.c | 24 ++---
clutter/gdk/clutter-backend-gdk.h | 4 +-
clutter/gdk/clutter-event-gdk.c | 21 ----
clutter/osx/clutter-backend-osx.c | 11 +-
clutter/osx/clutter-backend-osx.h | 6 +-
clutter/osx/clutter-event-osx.c | 14 ---
clutter/wayland/clutter-backend-wayland.c | 6 --
clutter/x11/clutter-backend-x11-private.h | 32 ------
clutter/x11/clutter-backend-x11.c | 58 ++++++----
clutter/x11/clutter-backend-x11.h | 35 +++---
clutter/x11/clutter-event-x11.c | 173 ++++++++----------------------
configure.ac | 12 ++-
14 files changed, 205 insertions(+), 302 deletions(-)
commit 84d208b2c6c774a27d7d00ef5136bf31ebe82310
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 16:48:20 2011 +0000
win32/backend: Remove ensure_context()
We have a fallback, now.
clutter/win32/clutter-backend-win32.c | 11 -----------
1 file changed, 11 deletions(-)
commit 672ab70144b9270535f6371ae79921d72cbada58
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 16:47:57 2011 +0000
win32/stage: Implement get_active_framebuffer()
clutter/win32/clutter-stage-win32.c | 9 +++++++++
1 file changed, 9 insertions(+)
commit 42af690255f2b32af6a778df312211001a2c1fc2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 16:47:18 2011 +0000
wayland/backend: Remove empty ensure_context()
There is a default fallback, now.
clutter/wayland/clutter-backend-wayland.c | 7 -------
1 file changed, 7 deletions(-)
commit 0c02e8adb31413e4d19c101a94da91834558b9b3
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 16:46:48 2011 +0000
cogl/backend: Remove ensure_context()
We have a default implementation for it, now.
clutter/cogl/clutter-backend-cogl.c | 17 -----------------
1 file changed, 17 deletions(-)
commit 790c0d1f9128ea64b84db944ef2ac853bfd8e057
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 16:45:56 2011 +0000
backend: Provide an implementation of ensure_backend()
We can do it for all Cogl-based backends.
clutter/clutter-backend.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
commit e374c2bd8922049ab9c0e285baf21e56641ec974
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 10 14:15:32 2011 +0000
conform/color: Check invalid strings
We need to make sure to fail consistently for invalid strings.
tests/conform/test-color.c | 20 ++++++++++++++++++--
tests/conform/test-conform-main.c | 3 ++-
2 files changed, 20 insertions(+), 3 deletions(-)
commit 0550a8b99d0589ef9a196c6787577a0975014f3f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 10 14:13:45 2011 +0000
color: Validate hex formats
Right now, we pass through to Pango unrecognized hexadecimal formats
when parsing colors from strings. Since we parse all possible formats
ourselves, we can do validation ourselves as well, and avoid the Pango
path.
clutter/clutter-color.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
commit 889a1f44f422224c4d652256197b6358d2b74fc4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 10 12:56:47 2011 +0000
conform/color: Test hsla() format
tests/conform/test-color.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
commit b96773f9c9b3c397ade8e88b3b3523e63732843f
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed Nov 9 16:37:32 2011 -0500
clutter-stage-x11: Make sure to set geometry x and y
Otherwise, we could be dealing with uninitialized values, causing
havoc all over the place.
https://bugzilla.gnome.org/show_bug.cgi?id=663733
clutter/x11/clutter-stage-x11.c | 2 ++
1 file changed, 2 insertions(+)
commit 33303f92f3c3d164ab8c477d99af25e10e9520c2
Author: Craig R. Hughes <craig.git@rungie.com>
Date: Mon Nov 7 17:00:45 2011 -0800
Minor whitespace fix for clutter color parsing of hsla(h,s,l,a)
Previously, if there was whitespace between "l" and the comma before the
alpha value, parsing would fail. This patch allows that whitespace
making it consistent with whitespace being allowed everywhere else.
https://bugzilla.gnome.org/show_bug.cgi?id=663594
clutter/clutter-color.c | 1 +
1 file changed, 1 insertion(+)
commit d596401a3c1f88d396c06702ed488328ff4d1bd8
Author: Matthias Clasen <mclasen@redhat.com>
Date: Fri Nov 4 07:14:47 2011 -0400
cally: Use the proper role for password entries
https://bugzilla.gnome.org/show_bug.cgi?id=663332
clutter/cally/cally-text.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
commit 7b5e5b772740a4067925f39be85cd9e9e8438479
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Nov 9 09:09:37 2011 +0000
main: Add a debug note when reading the settings file
So that's easier to track in the debug log.
clutter/clutter-main.c | 2 ++
1 file changed, 2 insertions(+)
commit 63dbcc245c0edc92c235374d7918b4a26c4d1158
Merge: bf8f1afb4 ba8d682c0
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Nov 9 00:30:32 2011 +0800
Merge branch 'master' into msvc-support-master
commit ba8d682c0900afd0ef14acc8fe7083d4137f4b63
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 8 14:46:55 2011 +0000
actor: Deprecate [sg]et_geometry()
These methods are short-hands for accessing the position and size,
which are already shorthands for accessing the various dimensional
and positional attributes. Plus, they use ClutterGeometry, which is a
fairly bad data type for a rectangle.
clutter/clutter-actor.c | 9 ++++++++-
clutter/clutter-actor.h | 4 ----
clutter/deprecated/clutter-actor.h | 11 +++++++++--
3 files changed, 17 insertions(+), 7 deletions(-)
commit 101f39ea922687427c5cf2a69a18d171f289fe6e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 8 14:46:16 2011 +0000
Replace usage of [sg]et_geometry()
The set_geometry() and get_geometry() methods are going to be
deprecated.
clutter/win32/clutter-stage-win32.c | 2 +-
clutter/x11/clutter-stage-x11.c | 2 +-
tests/accessibility/cally-atkcomponent-example.c | 44 +++++++++---------------
tests/accessibility/cally-atkevents-example.c | 22 ++++++------
tests/accessibility/cally-clone-example.c | 4 +--
tests/conform/test-pick.c | 9 +++--
6 files changed, 38 insertions(+), 45 deletions(-)
commit 4fe7a77302ed0de7a977916e83e4b62244b99275
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 8 14:20:32 2011 +0000
Replace ClutterGeometry with cairo_rectangle_int_t
We still use ClutterGeometry internally in a couple of places, but we
should really move away from that flawed rectangle data type, and use
the Cairo one.
Sadly, we still have some public API that we cannot remove yet.
clutter/win32/clutter-stage-win32.c | 2 +-
clutter/x11/clutter-stage-x11.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 76e85f68eaec4307ba27cd45e99072d78ee5b8e6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Nov 8 11:19:22 2011 +0000
build: Remove mention of missing file
There is no clutter-event-gdk.h in the build.
clutter/Makefile.am | 1 -
1 file changed, 1 deletion(-)
commit 67d5a4993c6459461ab486ed394f110ede4a5cc8
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon Nov 7 20:24:13 2011 +0000
main: Deprecate clutter_set_default_frame_rate()
Setting the default frame rate does not do anything even remotely
useful, unless synchronization to the vertical refresh rate is also
disabled - which can only be done through environment variable or
through configuration file. Having a programmatic way to change the
default frame rate is, thus, completely pointless.
Changing the default frame rate through environment variable and
configuration file is still allowed.
clutter/clutter-main.c | 9 ++-------
clutter/clutter-main.h | 5 ++---
clutter/deprecated/clutter-main.h | 7 +++++--
3 files changed, 9 insertions(+), 12 deletions(-)
commit bf8f1afb404c522dc54f31b8171b51453d591465
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 7 12:46:56 2011 +0800
Update VS property sheets
In response to the following moved to deprecated in the following commits:
a39be454
main: Move deprecated symbols to a separate header
40d703a0
backend: Move deprecated symbols to a separate header
b19c9196
actor: Move deprecated symbols into separate headers
142cd0bf
Move clutter-keysyms-compat.h to the deprecated section
530b07f1
Don't use a -deprecated suffix for headers
11420a70
group: Move deprecated macro into its own header
98b467f9
stage: Move the deprecated macros to a separate header
build/win32/vs10/clutter.props | 18 ++++++++++++++----
build/win32/vs9/clutter.vsprops | 11 ++++++++---
2 files changed, 22 insertions(+), 7 deletions(-)
commit bd9dbe870a9835d6bfc0b8832846936a5fa16e6a
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 7 12:44:44 2011 +0800
Add GDK-specific symbols to clutter.symbols
A GDK backend for clutter was added in commits 610a9c17
(Add A new GDK backend) and f14cbf5b (gdk: Allow disabling event retrieval)
These are not included in the Win32 builds for the moment as GDK3 is
quite unstable on Windows at this time
clutter/clutter.symbols | 9 +++++++++
1 file changed, 9 insertions(+)
commit 73fa9eec5f1ca248f16d15fd19e5e548655321d9
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 7 12:12:53 2011 +0800
Update clutter-version.h.win32.in
-Update clutter-version.h.win32.in to reflect the state of
clutter-version.h.in commit 21a24c86 (updated in commit 8249e488)
-Also add clutter_check_windowing_backend to clutter.symbols as a result.
clutter/clutter-version.h.win32.in | 2 ++
clutter/clutter.symbols | 1 +
2 files changed, 3 insertions(+)
commit bb9e452a36d7a4fe3ed2090c050d096c26aae988
Merge: 61c3b9395 e0bfdbfeb
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Nov 7 11:42:16 2011 +0800
Merge branch 'master' into msvc-support-master
commit e0bfdbfeba82a77d0960f62957b3515792cefc90
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Nov 4 12:03:13 2011 +0000
osx/stage: Fix compilation
We need to include clutter-stage-window.h.
clutter/osx/clutter-stage-osx.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 61c3b9395ff167f2f1716e7c8fd59082c6e5ba49
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Nov 4 12:01:51 2011 +0800
Fix cally-atkevents-example VS projects
Refer to $(srcroot)\clutter so that the correct Cally headers can be
referenced
build/win32/vs10/cally-atkevents-example.vcxproj | 4 ++++
build/win32/vs9/cally-atkevents-example.vcproj | 4 ++++
2 files changed, 8 insertions(+)
commit 6f8f8295c053bb8b61e83422d7e105b12ed0401c
Author: Colin Walters <walters@verbum.org>
Date: Thu Nov 3 14:42:07 2011 -0400
build: Ensure libdir exists before installing to it
clutter/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 683642ba545acaf78b13de3d5ffe07705dec348a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 16:05:36 2011 +0000
docs: Fixes for the API reference build
clutter/clutter-layout-manager.c | 1 -
doc/reference/clutter/Makefile.am | 25 ++++++++++++++++---------
doc/reference/clutter/running-clutter.xml | 1 +
3 files changed, 17 insertions(+), 10 deletions(-)
commit 53513f858633ae578b87e0c12f43cc77721c84e5
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 15:35:03 2011 +0000
tests: Remove #undef CLUTTER_DISABLE_DEPRECATED
We need to test deprecated API as well, and we don't use a guard any
more in the build.
tests/conform/test-behaviours.c | 2 --
tests/conform/test-score.c | 2 --
tests/conform/test-script-parser.c | 2 --
tests/interactive/test-actor-clone.c | 1 -
tests/interactive/test-actors.c | 1 -
tests/interactive/test-behave.c | 1 -
tests/interactive/test-depth.c | 2 --
tests/interactive/test-multistage.c | 2 --
tests/interactive/test-paint-wrapper.c | 1 -
tests/interactive/test-pixmap.c | 1 -
tests/interactive/test-scale.c | 2 --
tests/interactive/test-script.c | 2 --
tests/interactive/test-texture-quality.c | 2 --
tests/interactive/test-threads.c | 2 --
14 files changed, 23 deletions(-)
commit 7ab84f981c39952926ea408a817a1d8a88c615ea
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 15:32:53 2011 +0000
Remove CLUTTER_DISABLE_DEPRECATED from the build flags
We don't use it any more.
clutter/Makefile.am | 8 ++++----
configure.ac | 2 +-
doc/cookbook/examples/Makefile.am | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
commit 2403d4875b03c14169cf90e55d449ff46a75e23a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 15:32:04 2011 +0000
Remove CLUTTER_DISABLE_DEPRECATED guard
Except for macros, we now entirely depend on the deprecation warnings
instead of a guard.
clutter/clutter-types.h | 9 +++------
clutter/clutter.h | 2 --
clutter/deprecated/clutter-actor.h | 1 -
clutter/deprecated/clutter-keysyms.h | 4 ++++
4 files changed, 7 insertions(+), 9 deletions(-)
commit 9ea2bb694ee4a72e1156194fa4bfc01b7c61a280
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 15:16:02 2011 +0000
docs: Fix a wrongly named argument
clutter/clutter-group.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 98b467f9b86555bb30e1d3855dce81f06bb42d89
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 15:13:54 2011 +0000
stage: Move the deprecated macros to a separate header
The clutter-stage.h header still has a bunch of macros that have, for
reasons unknown[*], survived the 1.0 API cut and have long since been
deprecated. Let's hide them under the deprecated/ carpet and let us
never speak of them ever again.
[*] pretty sure alcohol or other psychotropic substances were involved
but I take the 5th on that.
clutter/Makefile.am | 1 +
clutter/clutter-deprecated.h | 1 +
clutter/clutter-stage.h | 39 ---------------------------------
clutter/deprecated/clutter-stage.h | 45 ++++++++++++++++++++++++++++++++++++++
4 files changed, 47 insertions(+), 39 deletions(-)
commit 0157615faeda3725bf4c8d63fb86c8850790ee90
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 15:03:16 2011 +0000
build: Fix compilation
clutter/deprecated/clutter-main.h | 1 +
1 file changed, 1 insertion(+)
commit 11420a705734ab3626754c550c942b0d66fd4200
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 15:02:35 2011 +0000
group: Move deprecated macro into its own header
clutter/Makefile.am | 1 +
clutter/clutter-deprecated.h | 1 +
clutter/clutter-group.c | 15 ++++++----
clutter/clutter-group.h | 57 ++++++++++----------------------------
clutter/deprecated/clutter-group.h | 23 +++++++++++++++
5 files changed, 49 insertions(+), 48 deletions(-)
commit 530b07f12beb392426427a3f2910656da2438f99
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 14:49:56 2011 +0000
Don't use a -deprecated suffix for headers
They are already in the deprecated/ directory, the suffix is redundant,
and there is no chance of collision.
clutter/Makefile.am | 6 +++---
clutter/clutter-deprecated.h | 6 +++---
clutter/deprecated/{clutter-actor-deprecated.h => clutter-actor.h} | 0
.../deprecated/{clutter-backend-deprecated.h => clutter-backend.h} | 0
clutter/deprecated/{clutter-main-deprecated.h => clutter-main.h} | 0
5 files changed, 6 insertions(+), 6 deletions(-)
commit 142cd0bf82b3e10acc19d237db8da440509e7715
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 14:42:39 2011 +0000
Move clutter-keysyms-compat.h to the deprecated section
No reason to have it lingering in the main section.
clutter/Makefile.am | 2 +-
clutter/clutter-deprecated.h | 3 ++-
clutter/clutter-keysyms-update.pl | 17 ++++++-----------
clutter/clutter-keysyms.h | 13 ++++++++-----
.../clutter-keysyms.h} | 14 +++++++++++---
5 files changed, 28 insertions(+), 21 deletions(-)
commit 983510fad4b7ca71cf57efb19c39116d6bfb79e3
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Nov 3 14:02:43 2011 +0000
x11/backend: Use an internal GError
Don't just return the error from Cogl, but proxy it so that it has the
correct error domain and code.
clutter/x11/clutter-backend-x11.c | 37 ++++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
commit 7a2001436b759018a0e7178baa0e32bcd994a561
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 17:31:29 2011 +0000
build: Clean up the per-backend summary
configure.ac | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
commit dc672b5c89c2b4300b16f117aff26a1fe1f7bbfa
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 17:30:30 2011 +0000
build: Use AC_CACHE_SAVE
Delimit the points in the configure script that should save the state,
so that running the script multiple times doesn't require starting from
scratch even if it didn't terminate successfully.
configure.ac | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit 9110fa1ee7821523b7e3b47743846b1e20dbc33c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 13:17:27 2011 +0000
build: Disable tslib by default
The event handling through tslib hasn't been tested in a while, and it
hasn't been ported to the device manager machinery either. We are still
considering whether or not it should be entirely removed, since evdev is
supposed to be a better way to handle events not coming from an existing
windowing system.
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit c4e6f74f2944e20dbf04794f167a3da1b817235a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 17 16:07:05 2011 +0100
interactive/pixmap: Make sure to work only on the X11 backend
Even if the test has been successfully compiled against the X11 backend,
we need to ensure that it is actually running against it, otherwise bad
things will happen.
tests/interactive/test-pixmap.c | 48 ++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 25 deletions(-)
commit 3b38cee66bfda2fae376b74c8e5cd500243d3be6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 17 16:06:15 2011 +0100
interactive/devices: Build unconditionally
The test-devices interactive test does not rely on the X11 API being
present any more, after the introduction of the device manager API.
tests/interactive/Makefile.am | 5 +++--
tests/interactive/test-devices.c | 5 +++++
2 files changed, 8 insertions(+), 2 deletions(-)
commit 8249e48802193865114d7ff7e0b1023ffaee9456
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 17 16:03:19 2011 +0100
Clean up the windowing system defines
Instead of defining new symbols for the windowing systems enabled at
configure time, we can reuse the same symbols for both the compile time
and run time checks, e.g.:
#ifdef CLUTTER_WINDOWING_X11
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
/* use the clutter_x11_* API */
else
#endif
#ifdef CLUTTER_WINDOWING_WIN32
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32))
/* use the clutter_win32_* API */
#endif
This scheme allows us to ensure that the input system namespace is free
for us to use and select at run time in later versions of Clutter.
clutter/clutter-backend-private.h | 3 ++
clutter/clutter-backend.h | 77 ++----------------------------------
clutter/clutter-main.c | 83 +++++++++++++++++++++++++--------------
clutter/clutter-version.h.in | 2 +-
configure.ac | 20 +++++-----
5 files changed, 71 insertions(+), 114 deletions(-)
commit 98c177def5c861e03a1386b02bb0b3acb7c09e65
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 17 13:25:15 2011 +0100
Clean up the backend creation
Move it to its own function.
clutter/clutter-main.c | 83 ++++++++++++++++++++++++++++----------------------
1 file changed, 46 insertions(+), 37 deletions(-)
commit 3987db16595cb52c1b309ad8251066fa63c71651
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Oct 14 12:00:44 2011 +0100
build: Make sure to remove colliding shared libraries
The compatibility links should take over any existing installed
shared library with the same soname, to avoid ldd creating stale
links.
clutter/Makefile.am | 3 +++
1 file changed, 3 insertions(+)
commit 50c72367a8b6946b0d047c4ea10e6e08d3a47442
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Oct 12 17:56:07 2011 +0100
docs: Update the README section on configure switches
README.in | 51 +++++++++++++++++++++++----------------------------
1 file changed, 23 insertions(+), 28 deletions(-)
commit b07756e0b3248134aad075f690eaf8560424d8c0
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Oct 12 08:48:56 2011 +0100
build: Implement proper platform checking
Perform the check for enabling platform-specific backends conditionally
on the 'check' value, instead of unconditionally.
Also, rename the configure switches for the backends to have a '-backend'
suffix, to avoid collisions and provide a more descriptive name.
configure.ac | 77 +++++++++++++++++++++++++++++++++++-------------------------
1 file changed, 45 insertions(+), 32 deletions(-)
commit 4b0d7f2929c39528227bae6e2d39ab7f3edf1ac9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 3 17:11:49 2011 +0100
build: Improve the compat libs rule
Use the same commands libtool uses when installing symbolic links for
the shared libraries.
clutter/Makefile.am | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
commit 8eb71af23d55bbc07dadd552369e10d405f7c670
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 3 15:25:40 2011 +0100
gdk/events: Clean up the event handling code
We need debugging notes, to see what's happening when handling events.
We need to queue a (clipped) redraw when receiving a GDK_EXPOSE event.
We need to check the device (both master and source) of the event using
the GdkEvent API, and pass them to the ClutterEvent using the
corresponding Clutter API.
clutter/gdk/clutter-event-gdk.c | 93 +++++++++++++++++++++++++++-------
clutter/gdk/clutter-input-device-gdk.c | 2 +-
2 files changed, 75 insertions(+), 20 deletions(-)
commit 405e72f2e4ce94e3fad5c668cf0e7622fdc3af35
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 3 12:25:53 2011 +0100
egl: First attempt at cleaning up the EGL native backend
At least, let's make it compile when built along with the other
backends. In reality, it still needs to be verified as working.
clutter/Makefile.am | 16 ++-
clutter/clutter-main.c | 4 +-
clutter/cogl/clutter-backend-cogl.c | 40 +------
clutter/cogl/clutter-stage-cogl.h | 4 -
clutter/egl/clutter-backend-eglnative.c | 159 +++++++++++++++++++++------
clutter/egl/clutter-backend-eglnative.h | 5 -
clutter/egl/clutter-egl.h | 3 +
clutter/evdev/clutter-device-manager-evdev.c | 11 +-
clutter/tslib/clutter-event-tslib.c | 26 +----
clutter/tslib/clutter-event-tslib.h | 35 ++++++
configure.ac | 48 ++++----
11 files changed, 220 insertions(+), 131 deletions(-)
commit 19508132df6227f5b865de458bdf959106073373
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 3 10:23:46 2011 +0100
build: Move EGL-related files under egl/
Including the clutter-cex100.h.in header.
.gitignore | 2 +-
clutter/Makefile.am | 6 +-
clutter/egl/clutter-cex100.h | 91 -----------------------------
clutter/{cogl => egl}/clutter-cex100.h.in | 0
clutter/{cogl => egl}/clutter-egl-headers.h | 0
clutter/{cogl => egl}/clutter-egl.h | 0
configure.ac | 2 +-
7 files changed, 5 insertions(+), 96 deletions(-)
commit 4ee00b67b55d56c5c36bdf2978593532d540190a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 3 10:17:56 2011 +0100
build: Move clutter-event-tslib.c out of egl/
Prepare for a full tslib device manager.
clutter/Makefile.am | 2 +-
clutter/{egl => tslib}/clutter-event-tslib.c | 0
2 files changed, 1 insertion(+), 1 deletion(-)
commit 6e9f474d90687df0e21cc374b6a7fafa5694a846
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Sep 30 17:29:40 2011 +0100
Coding style and cosmetic fixes
clutter/gdk/clutter-event-gdk.c | 297 ++++++++++++++++++++++------------------
1 file changed, 162 insertions(+), 135 deletions(-)
commit 0c919adf508351aa95d201d36277ff677f4348b1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Sep 30 14:50:31 2011 +0100
Minimal cosmetic fix to the configure output
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fedfac3b7cb3899619dfe6c197cf22a5b1b8c0aa
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Sep 30 13:58:40 2011 +0100
Remove the X11-specific bit in ClutterStageCogl
Let's use a new virtual function in ClutterStageWindow to check whether
a platform-specific implementation does support clipped redraws.
clutter/clutter-stage-window.c | 14 ++++++++++++++
clutter/clutter-stage-window.h | 4 ++++
clutter/cogl/clutter-stage-cogl.c | 21 +++------------------
clutter/gdk/clutter-stage-gdk.c | 24 ++++++++++--------------
clutter/x11/clutter-stage-x11.c | 13 +++++++++++++
5 files changed, 44 insertions(+), 32 deletions(-)
commit f58d393187af1258d6f23cbe172d7c20ee7d0d2d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Sep 29 18:16:48 2011 +0100
gdk: Fix Stage foreign window support
The code is generally wrong, and does not work. We need to skip the
GdkWindow creation when we have a foreing window, but we still need to
create the Cogl onscreen buffer and connect it to the GdkWindow's native
resource.
clutter/gdk/clutter-stage-gdk.c | 141 +++++++++++++++++++++-------------------
1 file changed, 74 insertions(+), 67 deletions(-)
commit f14cbf5bdb4f763925f53451dd94d56f756c93ea
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Sep 29 18:10:48 2011 +0100
gdk: Allow disabling event retrieval
Just like the other backends can disable the internal event handling,
and use clutter_<backend>_handle_event() to do the native → Clutter
event translation.
clutter/gdk/clutter-backend-gdk.c | 18 +++++++++++++++++-
clutter/gdk/clutter-gdk.h | 2 ++
2 files changed, 19 insertions(+), 1 deletion(-)
commit a73f1e67685b30702757b03b39ad585acfc90f89
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Sep 27 13:24:52 2011 +0100
Cosmetic fixes
clutter/x11/clutter-backend-x11.c | 143 +++++++++++++++++++-------------------
1 file changed, 72 insertions(+), 71 deletions(-)
commit 21a24c862ef652552ada4d9d4a0eb95edd5790bb
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Sep 26 13:14:26 2011 +0100
Allow checking the backend type at run-time
Portable code should be allowed to check type backend currently being
used, so that it can use platform-specific API (not just Clutter's).
We don't want to go down the GDK route, with public types for
ClutterBackend and ClutterStageWindow implementations, and use the type
system, e.g.:
#ifdef GDK_WINDOWING_X11
if (GDK_IS_WINDOW_X11 (window))
use_x11_api (window);
else
#endif
#ifdef GDK_WINDOWING_WIN32
if (GDK_IS_WINDOW_WIN32 (window))
use_win32_api (window);
else
#endif
g_critical ("Unsupported backend");
This system would make us expose the backend system, and we want to
still reserve us the option to change the backend system to increase its
granularity — e.g. choosing different input event systems regardless of
the windowing system.
This commit adds a simple function that checks the backend type against
a symbolic constant — the same constant string that can be used to
select the backend at run-time through the CLUTTER_BACKEND environment
variable.
clutter/clutter-backend.h | 67 ++++++++++++++++++++++++++++++++++++++++++
clutter/clutter-main.c | 70 ++++++++++++++++++++++++++++++++++++++++----
clutter/clutter-version.h.in | 2 ++
3 files changed, 133 insertions(+), 6 deletions(-)
commit a09bbffd922123d0b4ae9405be4651119e5fa7a1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Sep 21 18:05:03 2011 +0100
Implement multi-backend support
The Clutter backend split is opaque enough that should allow us to just
build all possible backends inside the same shared object, and select
the wanted backend at initialization time.
This requires some work in the build system, as well as the
initialization code, to remove duplicate functions that might cause
conflicts at build and link time. We also need to defer all the checks
of the internal state of the platform-specific API to run-time type
checks.
clutter/Makefile.am | 139 ++++++---
clutter/clutter-backend-private.h | 3 -
clutter/clutter-main.c | 63 +++-
clutter/clutter-version.h.in | 14 +
clutter/clutter.pc.in | 11 +-
clutter/cogl/clutter-stage-cogl.c | 19 +-
clutter/egl/clutter-backend-eglnative.c | 55 ++--
clutter/gdk/clutter-backend-gdk.c | 16 +-
clutter/gdk/clutter-gdk.h | 13 +-
clutter/gdk/clutter-stage-gdk.c | 14 +-
clutter/osx/clutter-backend-osx.c | 6 -
clutter/wayland/clutter-backend-wayland.c | 6 -
clutter/win32/clutter-backend-win32.c | 6 -
clutter/win32/clutter-stage-win32.c | 10 +-
clutter/x11/clutter-backend-x11.c | 78 +++--
clutter/x11/clutter-x11-texture-pixmap.c | 25 +-
configure.ac | 482 +++++++++++++++---------------
doc/cookbook/examples/Makefile.am | 2 +-
doc/reference/cally/Makefile.am | 2 +-
doc/reference/clutter/Makefile.am | 2 +-
tests/accessibility/Makefile.am | 2 +-
tests/conform/Makefile.am | 2 +-
tests/interactive/Makefile.am | 2 +-
tests/micro-bench/Makefile.am | 2 +-
tests/performance/Makefile.am | 2 +-
25 files changed, 578 insertions(+), 398 deletions(-)
commit 9c102b7c516078d13703981ca1b8cd7affb17602
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sat Aug 27 00:16:12 2011 +0200
Rework the interaction between the Cogl and GDK / X11 backends.
Previously, the Cogl backend was at times a subclass of the X11
backend, and at times a standalone one. Now it is the other way
round, with GDK and X11 backends providing the concrete classes,
layered on top of the generic Cogl backend. A new EglNative backend
was introduced for direct to framebuffer rendering. This greatly
simplifies the API design (at the expense of some casts needed)
and reduces the amount of #ifdefs, without duplicating code.
https://bugzilla.gnome.org/show_bug.cgi?id=657434
clutter/Makefile.am | 21 +-
clutter/cogl/clutter-backend-cogl.c | 349 +--------------------
clutter/cogl/clutter-backend-cogl.h | 41 ---
clutter/cogl/clutter-stage-cogl.c | 167 +++-------
clutter/cogl/clutter-stage-cogl.h | 20 --
clutter/egl/clutter-backend-eglnative.c | 262 ++++++++++++++++
clutter/egl/clutter-backend-eglnative.h | 80 +++++
clutter/egl/clutter-cex100.h | 91 ++++++
clutter/{cogl => egl}/clutter-event-tslib.c | 4 +-
clutter/gdk/clutter-backend-gdk.c | 180 ++++++++---
clutter/gdk/clutter-backend-gdk.h | 5 +-
clutter/gdk/clutter-stage-gdk.c | 161 +++++-----
clutter/gdk/clutter-stage-gdk.h | 9 +-
clutter/x11/clutter-backend-x11.c | 230 ++++++++++----
clutter/x11/clutter-backend-x11.h | 12 +-
clutter/{cogl => x11}/clutter-glx-texture-pixmap.c | 0
clutter/{cogl => x11}/clutter-glx-texture-pixmap.h | 0
clutter/{cogl => x11}/clutter-glx.h | 0
clutter/x11/clutter-stage-x11.c | 139 +++++---
clutter/x11/clutter-stage-x11.h | 9 +-
configure.ac | 29 +-
21 files changed, 996 insertions(+), 813 deletions(-)
commit 610a9c17bacfe3106d59d3c450be6a07cd26490a
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Fri Aug 26 03:09:18 2011 +0200
Add a new GDK backend
This commit introduces a new flavour for Clutter, that uses GDK
for handling all window system specific interactions (except for
creating the cogl context, as cogl does not know about GDK), including
in particular events. This is not compatible with the X11 (glx)
flavour, and this is reflected by the different soname (libclutter-gdk-1.0.so),
as all X11 specific functions and classes are not available. If you
wish to be compatible, you should check for CLUTTER_WINDOWING_X11.
Other than that, this backend should be on feature parity with X11,
including XInput 2, XSettings and EMWH (with much, much less code)
https://bugzilla.gnome.org/show_bug.cgi?id=657434
clutter/Makefile.am | 28 ++
clutter/cogl/clutter-backend-cogl.c | 86 ++--
clutter/cogl/clutter-backend-cogl.h | 18 +-
clutter/cogl/clutter-stage-cogl.c | 70 +++-
clutter/cogl/clutter-stage-cogl.h | 17 +-
clutter/gdk/clutter-backend-gdk-private.h | 32 ++
clutter/gdk/clutter-backend-gdk.c | 368 ++++++++++++++++
clutter/gdk/clutter-backend-gdk.h | 72 ++++
clutter/gdk/clutter-device-manager-gdk.c | 249 +++++++++++
clutter/gdk/clutter-device-manager-gdk.h | 63 +++
clutter/gdk/clutter-event-gdk.c | 264 ++++++++++++
clutter/gdk/clutter-gdk.h | 55 +++
clutter/gdk/clutter-input-device-gdk.c | 160 +++++++
clutter/gdk/clutter-input-device-gdk.h | 55 +++
clutter/gdk/clutter-settings-gdk.h | 28 ++
clutter/gdk/clutter-stage-gdk.c | 601 +++++++++++++++++++++++++++
clutter/gdk/clutter-stage-gdk.h | 84 ++++
configure.ac | 21 +
tests/conform/test-cogl-texture-pixmap-x11.c | 10 +-
tests/conform/test-conform-common.c | 4 +-
20 files changed, 2232 insertions(+), 53 deletions(-)
commit db53ca382c5db10fa19f93761b8f898b20a4534f
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Nov 1 13:42:40 2011 +0000
cogl: fallback to non-transparent stages if unsupported
If our check of the CoglOnscreenTemplate during initialization fails
then we disable the request for an alpha component in the swap chain and
try the check again.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/cogl/clutter-backend-cogl.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
commit b751b90bc014666ddf0e0f1d220c949403f72185
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 13:03:26 2011 +0000
build: Bump up Cogl dependency
The newly added cogl-xlib.h header is available since Cogl 1.9, so we
need to bump up the dependency.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4ce95306a357b85537de709033848f61bafca04a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:53:55 2011 +0000
tslib: Remove mention of clutter-stage-egl.h
That header has long since disappeared from the build.
clutter/cogl/clutter-event-tslib.c | 1 -
1 file changed, 1 deletion(-)
commit 0b4b19700f371e0f49ca727e66017f8862a5c4eb
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:53:26 2011 +0000
utils: Remove CLUTTER_DISABLE_DEPRECATED
We use deprecation warnings now.
clutter/clutter-util.h | 4 ----
1 file changed, 4 deletions(-)
commit 377a292b4e1255a421b9f7687ef2db2e4c7b68d1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:53:03 2011 +0000
texture: Remove CLUTTER_DISABLE_DEPRECATED
We use deprecation warnings now.
clutter/clutter-texture.h | 2 --
1 file changed, 2 deletions(-)
commit 4a4289cfa53968c1886d1a691f9e82bb54ba5005
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:52:42 2011 +0000
stage-manager: Remove CLUTTER_DISABLE_DEPRECATED
We use deprecation warnings now.
clutter/clutter-stage-manager.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 1ba9a123ede0fdf4d670a860305c75e0858fb693
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:52:18 2011 +0000
cairo-texture: Remove CLUTTER_DISABLE_DEPRECATED
We use deprecation warnings now.
clutter/clutter-cairo-texture.h | 2 --
1 file changed, 2 deletions(-)
commit f4d8ba7db4bcdcf615feb9423435ebc4b60a1973
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:51:58 2011 +0000
animatable: Remove CLUTTER_DISABLE_DEPRECATED
We use deprecation warnings, now.
clutter/clutter-animatable.h | 2 --
1 file changed, 2 deletions(-)
commit f4e971a7e583d9474cec57dd47d9e267a6fd24f1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:48:31 2011 +0000
cairo-texture: Use an internal function for create_region()
Avoid double argument checking, and a deprecation warning when
implementing create() as a wrapper around create_region(), by using
a simple internal function.
clutter/clutter-cairo-texture.c | 88 +++++++++++++++++++++++------------------
1 file changed, 49 insertions(+), 39 deletions(-)
commit b19c919645dfb90461698d38d128f47543336dad
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:47:46 2011 +0000
actor: Move deprecated symbols into separate headers
The clutter-actor.h header is already pretty big, so let's try to keep
the deprecated symbols out of it.
clutter/Makefile.am | 1 +
clutter/clutter-actor.h | 34 ---------------------------
clutter/clutter-deprecated.h | 1 +
clutter/deprecated/clutter-actor-deprecated.h | 17 ++++++++++++++
clutter/deprecated/clutter-shader.h | 24 +++++++++++++++++++
5 files changed, 43 insertions(+), 34 deletions(-)
commit 40d703a00514898a68d7772ca89f1242b0832458
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:41:42 2011 +0000
backend: Move deprecated symbols to a separate header
clutter/Makefile.am | 1 +
clutter/clutter-backend.h | 27 -------------------
clutter/clutter-deprecated.h | 2 ++
clutter/deprecated/clutter-backend-deprecated.h | 36 +++++++++++++++++++++++++
4 files changed, 39 insertions(+), 27 deletions(-)
commit a39be454cf6befb1a26fe368f4924b4ddb89a178
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Nov 2 12:32:09 2011 +0000
main: Move deprecated symbols to a separate header
The number of deprecations in clutter-main.h makes the header harder to
parse, and more confusing. We can use a separate header under the
deprecated subdirectory to hold all the deprecated symbols.
clutter/Makefile.am | 1 +
clutter/clutter-main.h | 169 +++++++++------------------
clutter/deprecated/clutter-main-deprecated.h | 52 +++++++++
3 files changed, 109 insertions(+), 113 deletions(-)
commit 6e28121ff3944ccded33a7a9900e1bb04f4a4516
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Nov 1 15:47:43 2011 +0000
cogl: include <cogl/cogl-xlib.h> for xlib specific symbols
Since Xlib.h is such a terrible citizen when it comes to symbol
namespacing it's not desirable to include Xlib.h if it is not absolutely
required. Cogl now has a standalone cogl-xlib.h that should be included
whenever any xlib specific symbols are required.
This patch updates clutter to include <cogl/cogl-xlib.h> wherever
clutter needs to use xlib specific cogl apis.
Acked-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/cogl/clutter-backend-cogl.c | 2 ++
clutter/x11/clutter-backend-x11.c | 1 +
2 files changed, 3 insertions(+)
commit 0bfda786153947e0acc232b7b83b97db399f4591
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 31 10:39:46 2011 +0000
profile: Disable deprecation warnings
We use an atexit() handler to print out the profile report coming from
Uprof. The g_atexit() call has been deprecated by GLib, but since this
use case is pretty specific and it's not meant to be turned on by
default (or distributed) then we can safely disable the deprecation
warnings inside clutter-profile.c.
clutter/clutter-profile.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 09de87b0e540bfb6c0fc12e34625388bcc12fdc9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 24 12:07:30 2011 +0100
backend: Remove atexit handlers
The g_atexit() function has been deprecated in GLib as it is a fairly
bad idea in basically all cases.
We could probably use a GCC destructor if we didn't care about
portability, but for the time being we just remove the atexit() handler
that disposed the backend.
clutter/cogl/clutter-backend-cogl.c | 9 ---------
clutter/wayland/clutter-backend-wayland.c | 9 ---------
2 files changed, 18 deletions(-)
commit d97a8c431b0a937e42490bc7f29a9282514686a4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 24 11:58:23 2011 +0100
cairo-texture: Drop the half pixel rounding
Calling ceilf() should be enough.
https://bugzilla.gnome.org/show_bug.cgi?id=661887
clutter/clutter-cairo-texture.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 41d04f3611d4e94f839def532e358ed9a70978f6
Author: Alexander Shopov <ash@kambanaria.org>
Date: Sun Oct 30 17:04:55 2011 +0200
Updated Bulgarian translation
po/bg.po | 2227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2227 insertions(+)
commit 0406e235bf2f1d26b0f0cca19905a1ecc7e3828b
Merge: 7c6038d77 81a82867e
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 26 12:55:05 2011 +0800
Merge branch 'master' into msvc-support-master
commit 81a82867e1cbd0b7a4da0ae518b9b1719974ad60
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Oct 25 11:30:46 2011 +0100
docs: Clarify CLUTTER_ACTOR_IS_MAPPED
There are a couple of gotchas in the 'mapped' flag that are not properly
documented, or are documented only in the actor_invariants.txt file; we
should have a proper description in the API reference as well, to avoid
confusion.
clutter/clutter-actor.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
commit 8c196c94035e0a311512cf7aa448b1df2d75afff
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Oct 25 00:13:53 2011 +0800
Bug 662071-[Win32]-Don't init the Big Clutter Lock
Since the Windows GUI system is assuming multithreadedness, initializing
locks after entering the GUI portion on Windows is likely to cause
problems[1][2], which results many Clutter programs to crash due to
releasing resources that they did not own.
[1]: Multi-threaded use of GTK+ on Win32 in README.win32 of GTK+
source package
[2]: Explanation of Windows GUI system regarding its multithreadness
assumptions-
http://mail.gnome.org/archives/gtk-list/2011-June/msg00005.html
clutter/clutter-main.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 7c6038d77b0d0b3323867f8a881d72ca37bb8b7c
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Oct 25 00:13:53 2011 +0800
Bug 662071-[Win32]-Don't init the Big Clutter Lock
Since the Windows GUI system is assuming multithreadedness, initializing
locks after entering the GUI portion on Windows is likely to cause
problems[1][2], which results many Clutter programs to crash due to
releasing resources that they did not own.
[1]: Multi-threaded use of GTK+ on Win32 in README.win32 of GTK+
source package
[2]: Explanation of Windows GUI system regarding its multithreadness
assumptions-
http://mail.gnome.org/archives/gtk-list/2011-June/msg00005.html
clutter/clutter-main.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 0f9eded1c33c5c41157989f092bb6a47b535ea97
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Oct 25 00:01:24 2011 +0800
Revert "Don't init the Big Clutter Lock on Win32"
This reverts commit f6acae9f3d92a324c80ec07a94515e13692a2843.
clutter/clutter-main.c | 2 --
1 file changed, 2 deletions(-)
commit f6acae9f3d92a324c80ec07a94515e13692a2843
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Oct 24 17:17:39 2011 +0800
Don't init the Big Clutter Lock on Win32
Since the Windows GUI system is assuming multithreadedness, initializing
locks after entering the GUI portion on Windows is likely to cause
problems[1][2], which results many Clutter programs to crash due to
releasing resources that they did not own.
[1]: Multi-threaded use of GTK+ on Win32 in README.win32 of GTK+ source package
[2]: Explanation of Windows GUI system regarding its multithreadness
assumtopns-http://lists-archives.org/gtk/12724-compiling-a-gtk-application-on-windows.html
clutter/clutter-main.c | 2 ++
1 file changed, 2 insertions(+)
commit 1c648dc7dad72b7943bc62fd00743bd6f5218cbb
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Sat Oct 22 17:53:30 2011 +0200
Updated Spanish translation
po/es.po | 526 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 264 insertions(+), 262 deletions(-)
commit 8af0054f24aba9636bfee871df1228968dd533b3
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat Oct 22 15:50:50 2011 +0200
Updated Hebrew translation (Initialized PO file).
po/he.po | 2213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2213 insertions(+)
commit 5540e6bd9c50b7b14d5757f1af0ae024b136667a
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri Oct 21 21:19:27 2011 +0100
docs: Document the behaviour in case of init failure
Or, better, the fact that the behaviour of any Clutter function will be
undefined in case the initialization fails.
The value returned by clutter_init() and friends has to be handled
properly.
clutter/clutter-main.c | 9 +++++++++
1 file changed, 9 insertions(+)
commit 5f84c197b4e370ce80aef6ddda5c67d9031f4f6d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Fri Oct 21 21:20:00 2011 +0200
Updated Slovenian translation
po/sl.po | 716 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 367 insertions(+), 349 deletions(-)
commit 0bc1ac2312c54e2a7fa38847500e5243b302a33d
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Oct 21 17:53:54 2011 +0800
Update VS property sheets
Stop the use of CLUTTER_DISABLE_DEPRECATED and COGL_DISABLE_DEPRECATED, as
now compiler warnings are used instead when deprecated items are used.
build/win32/vs10/clutter.props | 2 +-
build/win32/vs9/clutter.vsprops | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit fedca055e98901c88320c72813a4d15a4c91681e
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Oct 21 17:44:27 2011 +0800
Revert "Revert "Deprecate clutter_threads_init()""
This reverts commit 5419c11c99f721f2f9bf520c0444c053a88b3725.
This is another part to attempt to investigate on error 0xC0000264
on Windows
clutter/clutter-main.c | 31 +++++++------------------------
clutter/clutter-main.h | 4 ++++
tests/interactive/test-texture-async.c | 4 ++--
tests/interactive/test-texture-material.c | 2 --
tests/interactive/test-threads.c | 2 --
5 files changed, 13 insertions(+), 30 deletions(-)
commit e0ad11a1935ec68464c41036e6902081627452f3
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Oct 21 17:43:21 2011 +0800
Revert "clutter-main.c: Fix multiple declarations"
This reverts commit 3d74552684a6eb49bc67845bfb3839896395e66a.
This is a part to attempt to further investigate about the 0xC0000264 error
on Windows
clutter/clutter-main.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit 098a83af9ed8adef2b4aa048a756b8c9ce0b8ed3
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Oct 20 17:26:55 2011 +0800
test-[interactive/conformance].bat: Update .exe name
tests/conform/Makefile.am | 4 ++--
tests/interactive/Makefile.am | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit a36ab5787b4f2afa3935b3a2ab9e8308b19ad141
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Oct 20 16:35:38 2011 +0800
Rename conform/interactive tests VS projects
Add a -clutter suffix for their project names to avoid clashes with the
COGL test executables
build/win32/vs10/Makefile.am | 16 ++++++++--------
build/win32/vs10/clutter.sln | 4 ++--
build/win32/vs10/install.vcxproj | 4 ++--
...in => test-conformance-clutter.vcxproj.filtersin} | 0
....vcxprojin => test-conformance-clutter.vcxprojin} | 2 +-
...in => test-interactive-clutter.vcxproj.filtersin} | 0
....vcxprojin => test-interactive-clutter.vcxprojin} | 2 +-
build/win32/vs9/Makefile.am | 8 ++++----
build/win32/vs9/clutter.sln | 4 ++--
...ce.vcprojin => test-conformance-clutter.vcprojin} | 4 ++--
...ve.vcprojin => test-interactive-clutter.vcprojin} | 4 ++--
tests/conform/Makefile.am | 20 ++++++++++----------
tests/interactive/Makefile.am | 20 ++++++++++----------
13 files changed, 44 insertions(+), 44 deletions(-)
commit 3d74552684a6eb49bc67845bfb3839896395e66a
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Oct 20 15:42:55 2011 +0800
clutter-main.c: Fix multiple declarations
clutter_threads_impl_lock/clutter_threads_impl_unlock was accidently
defined 2 times during the revert-fix that.
clutter/clutter-main.c | 12 ------------
1 file changed, 12 deletions(-)
commit d6af2e54c805e88d2d6c65fca63d179ff208891b
Merge: 5419c11c9 53a1d0317
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Oct 20 15:41:46 2011 +0800
Merge branch 'master' into msvc-support-master
commit 5419c11c99f721f2f9bf520c0444c053a88b3725
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Oct 20 15:17:25 2011 +0800
Revert "Deprecate clutter_threads_init()"
This reverts commit 7e3a75c66bbca1e278b15c797cfc6acbcbd6c7c7.
Conflicts:
clutter/clutter-main.c
clutter/clutter-main.h
clutter/clutter-main.c | 31 ++++++++++++++++++++++++-------
clutter/clutter-main.h | 4 ----
tests/interactive/test-texture-async.c | 4 ++--
tests/interactive/test-texture-material.c | 2 ++
tests/interactive/test-threads.c | 2 ++
5 files changed, 30 insertions(+), 13 deletions(-)
commit 53a1d03179e471486a2a1d4c68fb1afbcd0a68e0
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Wed Oct 19 23:18:16 2011 +0200
Updated Norwegian bokmål translation
po/nb.po | 1200 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 616 insertions(+), 584 deletions(-)
commit f1d86071c3310b430b85ee4bab4a8bc8a9460da3
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Oct 19 15:32:41 2011 +0100
build: Remove the GLES configuration option
The selector for GLES 1.1 or 2.0 is all in Cogl, now.
configure.ac | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
commit 14b3ec84852899ff9c351113a293d92e889016d9
Author: Robert Bragg <robert@linux.intel.com>
Date: Thu Aug 4 16:09:00 2011 +0100
build: remove the experimental_image var from configure
Since the image backend is something now dealt with by Cogl there is no
need to check the experimental status of the backend in the Clutter
configure script.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
configure.ac | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
commit 63cc5ab698e8d1a31015a73a2d0e69c8cb59b2ed
Author: Robert Bragg <robert@linux.intel.com>
Date: Tue Oct 18 10:06:06 2011 +0100
blur: don't accumulate texture padding twice
This removes the create_texture implementation for ClutterBlurEffect
because we already account for padding in the get_paint_volume
implementation so we were creating textures larger than necessary.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-blur-effect.c | 12 ------------
1 file changed, 12 deletions(-)
commit 2ba1a198709b0030c465ecfb726483254d54509f
Author: Robert Bragg <robert@linux.intel.com>
Date: Thu Aug 4 16:04:52 2011 +0100
build: Don't actually check for glx for glx flavour
GLX is now totally abstracted by Cogl so the "glx" flavour is actually
only used to determine the soname of clutter now so we don't actually
have to check for the glx header or that libGL provides any GLX symbols.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
configure.ac | 8 --------
1 file changed, 8 deletions(-)
commit a18a8a3ae21a18555cd56654b70c2ab83fac0d35
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Oct 19 15:23:55 2011 +0100
Avoid the shadowing of 'clone'
The clone() call can creep into the build environment, so it's a good
thing to avoid using 'clone' as a variable name.
clutter/clutter-clone.c | 113 +++++++++++++++++++++++++-----------------------
clutter/clutter-clone.h | 4 +-
2 files changed, 60 insertions(+), 57 deletions(-)
commit b240b95a97a220f760c06fe09cde3eeb91fed581
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Oct 19 13:42:18 2011 +0100
tests: Use the portable cogl wrappers for GLSL builtins
Instead of directly using the GLSL names for the builtins in the
shaders for test-shader and test-pick, this makes it use the Cogl
wrapper names instead. That way it will be portable to GLES2 as well.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
tests/conform/test-pick.c | 4 ++--
tests/interactive/test-shader.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
commit e33a6219d8e4bf22725c9cf7ca5abee1936bd7fa
Merge: 8b5d255a2 8083dd517
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Oct 18 15:48:17 2011 +0800
Merge branch 'master' into msvc-support-master
commit 8083dd51786492237355003278208824cf99edcb
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 17 11:48:47 2011 +0100
docs: Improve documentation of LayoutManager
Especially with regards to layout properties and their usage inside a
ClutterScript UI definition.
clutter/clutter-layout-manager.c | 103 ++++++++++++++++++++++++++++-----------
1 file changed, 74 insertions(+), 29 deletions(-)
commit 8b5d255a2b75b4a9da3166419489f2eb71c309fa
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Oct 17 18:37:32 2011 +0800
Update clutter.symbols
_clutter_shader_release_all is removed...
clutter/clutter.symbols | 1 -
1 file changed, 1 deletion(-)
commit 3cc62523e6121a8e8316a578246da4db737f4a41
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 17 10:25:20 2011 +0100
docs: Clean up the 'running Clutter apps' chapter
doc/reference/clutter/running-clutter.xml | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
commit be4007ef53acce84dbb7b90be7f06eab1b845bc6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 17 10:25:07 2011 +0100
Remove mentions of clutter_redraw()
clutter/clutter-actor.c | 14 ++++++++------
clutter/clutter-main.c | 2 +-
clutter/clutter-master-clock.c | 4 ++--
3 files changed, 11 insertions(+), 9 deletions(-)
commit 146e15297fab2a087effdd3df1bc0d320f674a5d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 17 10:24:25 2011 +0100
debug: Clean up debugging notes
clutter/clutter-backend.c | 6 +++---
clutter/clutter-bezier.c | 2 +-
clutter/clutter-debug.h | 27 ++++++++++++--------------
clutter/clutter-main.c | 4 ----
clutter/deprecated/clutter-behaviour-depth.c | 2 +-
clutter/deprecated/clutter-behaviour-ellipse.c | 2 +-
clutter/deprecated/clutter-behaviour-opacity.c | 2 +-
clutter/deprecated/clutter-behaviour-path.c | 2 +-
clutter/deprecated/clutter-behaviour.c | 12 ++++++------
clutter/wayland/clutter-backend-wayland.c | 2 +-
clutter/win32/clutter-event-win32.c | 4 ++--
11 files changed, 29 insertions(+), 36 deletions(-)
commit 3a95d81471ccce2717bf03f9cf2851d7737b4dc6
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Oct 17 15:57:19 2011 +0800
Update VS property sheets
Get rid of G_DISABLE_DEPRECATED-warnings are now used to tell people that
GLib-deprecated items is to be avoided
build/win32/vs10/clutter.props | 2 +-
build/win32/vs9/clutter.vsprops | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit b1780711f75fe9a36e95cc1d8599508d2d7d3352
Merge: 0ee89f178 f75dfcfd8
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Oct 17 15:52:57 2011 +0800
Merge branch 'master' into msvc-support-master
commit f75dfcfd8b2e17862614eb6e0722a61c34e0dcde
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat Oct 15 18:35:45 2011 +0100
interactive: Use the newly added CLUTTER_ALIGN_BOTH value
We center a lot of stuff using ClutterAlignConstraints.
tests/interactive/test-actors.c | 3 +--
tests/interactive/test-constraints.c | 7 ++-----
tests/interactive/test-scrolling.c | 3 +--
tests/interactive/test-snap-constraint.c | 3 +--
tests/interactive/test-state-script.c | 3 +--
5 files changed, 6 insertions(+), 13 deletions(-)
commit 1e51961f7a19c4c2ddca1ad75e6bbae12d51bbbb
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat Oct 15 18:33:49 2011 +0100
align-constraint: Add CLUTTER_ALIGN_BOTH
Just like ClutterBindConstraint has two shorthand enumerations for binding
position and size and avoid using multiple instances, ClutterAlignConstraint
should have a way to align an actor with the same alignment factor on both
axis at the same time; this is especially useful for centering actors.
clutter/clutter-align-constraint.c | 15 +++++++++++++--
clutter/clutter-enums.h | 6 ++++--
2 files changed, 17 insertions(+), 4 deletions(-)
commit 30d309c6e3c7fbe41d3038ff03a2460867036364
Author: Fran Dieguez <fran@openhost.es>
Date: Sat Oct 15 15:24:41 2011 +0200
Updaged Galician translations
po/gl.po | 1132 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 584 insertions(+), 548 deletions(-)
commit 7f3363e1db2ecf11861e386b89b352b512f77983
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Oct 14 11:34:38 2011 +0100
Tag all deprecated symbols using CLUTTER_DEPRECATED
This requires some minor surgery in the build to disable the deprecation
warnings in the deprecated classes.
clutter/clutter-actor.c | 2 +
clutter/clutter-path.c | 62 +++++++++++++++++
clutter/deprecated/clutter-behaviour-depth.c | 2 +
clutter/deprecated/clutter-behaviour-depth.h | 8 +--
clutter/deprecated/clutter-behaviour-ellipse.c | 2 +
clutter/deprecated/clutter-behaviour-ellipse.h | 22 ++++--
clutter/deprecated/clutter-behaviour-opacity.c | 2 +
clutter/deprecated/clutter-behaviour-opacity.h | 7 +-
clutter/deprecated/clutter-behaviour-path.c | 2 +
clutter/deprecated/clutter-behaviour-path.h | 10 +--
clutter/deprecated/clutter-behaviour-rotate.c | 2 +
clutter/deprecated/clutter-behaviour-rotate.h | 13 ++--
clutter/deprecated/clutter-behaviour-scale.c | 2 +
clutter/deprecated/clutter-behaviour-scale.h | 8 +--
clutter/deprecated/clutter-behaviour.c | 96 ++++++++------------------
clutter/deprecated/clutter-behaviour.h | 14 ++--
clutter/deprecated/clutter-fixed.c | 2 +
clutter/deprecated/clutter-fixed.h | 10 ++-
clutter/deprecated/clutter-frame-source.c | 2 +
clutter/deprecated/clutter-frame-source.h | 8 +--
clutter/deprecated/clutter-score.c | 2 +
clutter/deprecated/clutter-score.h | 18 +++--
clutter/deprecated/clutter-shader.c | 2 +
clutter/deprecated/clutter-shader.h | 19 +++--
clutter/deprecated/clutter-timeout-interval.c | 2 +
clutter/deprecated/clutter-timeout-pool.c | 2 +
clutter/deprecated/clutter-timeout-pool.h | 10 +--
27 files changed, 209 insertions(+), 122 deletions(-)
commit d93e6ef6b9b259f4561dc1517246d0da89e134e1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Oct 14 11:34:26 2011 +0100
Bump up the dependency on gtk-doc
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a05eb9177dc85efba81b0f370c0d4a8a212fa96c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Oct 12 18:04:23 2011 +0100
build: Strip out G_DISABLE_DEPRECATED
We have compiler warnings, now.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 96cb1d7128ef5d92ac89ecde84cbdedda94ba261
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Oct 13 17:50:25 2011 +0100
Disable deprecation warnings for the test suite
We test deprecated functionality as well as current one, so we need to
enable all symbols and disable the deprecation warnings.
tests/conform/Makefile.am | 4 ++--
tests/conform/test-clutter-cairo-texture.c | 2 --
tests/conform/test-texture-fbo.c | 2 --
tests/interactive/Makefile.am | 4 ++--
tests/interactive/test-cairo-flowers.c | 3 ---
tests/interactive/test-fbo.c | 2 --
tests/interactive/test-shader.c | 4 ----
7 files changed, 4 insertions(+), 17 deletions(-)
commit a063f0961129d9e40b3e73ecf30b9976240a09fc
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Oct 13 11:38:27 2011 +0100
debug: Move paint-deform-tiles to CLUTTER_PAINT
The CLUTTER_DEBUG class of debugging flags is meant for debugging notes,
while the CLUTTER_PAINT debugging flags are for changing the output of
the paint cycle. Painting the DeformEffect tiles should go in the latter.
clutter/clutter-debug.h | 6 +++---
clutter/clutter-deform-effect.c | 2 +-
clutter/clutter-main.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
commit ef1a3a5477706126334aa9bd51b5db2f2d9f7abe
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Oct 13 10:42:30 2011 +0100
docs: Include test-threads.c in the API reference
We can use the test-threads.c interactive test as part of the documentation
on how to use threads with Clutter.
clutter/clutter-main.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit c58baf42ca38ca1aa059640b2b5348ea816a5d9a
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu Oct 13 10:38:36 2011 +0100
interactive/threads: Clean up
Add some comments explaining why we use idle handlers to update the UI,
and update to the newest API in GLib master.
tests/interactive/test-threads.c | 44 +++++++++++++++++++++++++++++-----------
1 file changed, 32 insertions(+), 12 deletions(-)
commit e389240b2300d213ae6f7c2a3d9e1cab7706f705
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Wed Oct 12 20:33:16 2011 +0200
Updated POTFILES.in
po/POTFILES.in | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit e0283993f4eed80518398dea952bde542615ba56
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Oct 12 16:17:39 2011 +0100
Avoid using deprecated API internally
Use the proper API to implement deprecated functions.
clutter/clutter-actor.c | 38 +++++++++++++++++++++++---------------
clutter/clutter-main.c | 48 +++++++++++++++++++++++++++++++++++++-----------
2 files changed, 60 insertions(+), 26 deletions(-)
commit 72da6f808e8a5c0339a3d8e6dd6c93ad01f7c90f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Oct 12 12:36:41 2011 +0100
texture: Disable deprecation warnings
Sadly, ClutterTexture is still using internally deprecated API, like
clutter_actor_get_shader().
clutter/clutter-texture.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 0ee89f1788efaef7d948aa03e0004780a310bd90
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 17:50:32 2011 +0800
clutter-backend-win32.c: Include clutter-shader.h
This is needed for _clutter_shader_release_all to avoid C4013
errors/warnings (a.k.a implicit declaration of ...)
clutter/win32/clutter-backend-win32.c | 2 ++
1 file changed, 2 insertions(+)
commit 53d9e88135746350f3e329bbc9f5d478893f99c2
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Oct 12 10:36:17 2011 +0100
Remove _clutter_shader_release_all()
This function is called when the backend is being disposed - as a way
of releasing all ClutterShader. This doesn't take into account three
things:
- ClutterShader is deprecated
- the Backend is *never* disposed
- once the process terminates, all its resources are automatically
released by the OS
So the _clutter_shader_release_all() function is a pointless exercise
in futility.
clutter/deprecated/clutter-shader.c | 14 --------------
clutter/deprecated/clutter-shader.h | 3 ---
clutter/osx/clutter-backend-osx.c | 2 --
clutter/win32/clutter-backend-win32.c | 3 ---
4 files changed, 22 deletions(-)
commit a2bd2afb9366be0ba5fa206fc600a3ba53921379
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 17:33:33 2011 +0800
clutter/Makefile.am
The previous update on clutter-timeout-interval.[ch] is wrong, so correct
that and add $(deprecated_c_priv) to the VS sources list. Sorry.
clutter/Makefile.am | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
commit 15cafc4c77ac471e10b81e7724073fecc1be3a10
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 17:30:08 2011 +0800
clutter/Makefile.am: Update formatting from last commit
clutter/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 830d6887cd04de676f2af31024be78965978836f
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 17:26:31 2011 +0800
clutter/Makefile.am: Made up for missed sources
The clutter/deprecated/clutter-timeout-interval.c is missed from the
deprecated_c sources list...
clutter/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit e0de326b2a415edb165e020d8313c98dff3235f3
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 17:25:37 2011 +0800
clutter/clutter-keysyms-table.c: Fix function name
The function name is clutter_unicode_to_keysym, not
clutter_unicode_to_keyval
clutter/clutter-keysyms-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cb98da4a9d0d89b4f4c6569c7e3e481902701efb
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 17:24:36 2011 +0800
Update clutter.symbols
clutter/clutter.symbols | 1 -
1 file changed, 1 deletion(-)
commit 762a4350d1c5f8e0b3ef14429f1228d6e7b105ed
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 17:02:08 2011 +0800
Update VS support
-clutter/Makefile.am: Include the deprecated sources as well
-clutter.vc(x)projin: Add clutter/deprecated into the "Additional Include
Directories"
build/win32/vs10/clutter.vcxprojin | 8 ++++----
build/win32/vs9/clutter.vcprojin | 8 ++++----
clutter/Makefile.am | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
commit 9901a06a1fb0499feb4a4e6efb3868f2a155f753
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Oct 12 09:57:53 2011 +0100
tests: Fix some compiler warnings
tests/interactive/test-main.c | 2 +-
tests/interactive/test-threads.c | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
commit 9e61cfcf38be9580341af1edf6269000205209e8
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Oct 12 09:57:33 2011 +0100
tests: Disable deprecation warnings
tests/conform/test-clutter-cairo-texture.c | 1 +
tests/conform/test-texture-fbo.c | 2 +-
tests/interactive/test-cairo-flowers.c | 1 +
tests/interactive/test-fbo.c | 2 +-
tests/interactive/test-shader.c | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
commit f2dc315b3b2b3ecbde99e69698dada5b95ae3a01
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 16:55:39 2011 +0800
Fix VS 2008 property sheet
There was a quote escape problem... fix that. DOH!
build/win32/vs9/clutter.vsprops | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 97d51f201b61fdeacbf59c585f14e0128e37c6bc
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 16:51:58 2011 +0800
po/POTFILE.in: Reflect on the shift of sources
Several source files have been moved to clutter/deprecated, so reflect them
in the po/POTFILE.in file.
po/POTFILES.in | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit cbcd79d3946d6aab11e408aab55f6fd4253ae6bb
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 16:25:28 2011 +0800
Update VS property sheets
For the following:
-Move of headers to $(srcroot)/clutter/deprecated, commits:
50cda9fe
4b748f43
4b33a9c5
e57f8c26
bcd7845d
62d72b86
a21f1d15
-Addition of clutter/clutter-enums.h, in commit d28e04be.
-Addition of config file usage, in commit f5eee5ae
build/win32/vs10/clutter.props | 59 ++++++++++++++++++++++-------------------
build/win32/vs9/clutter.vsprops | 33 ++++++++++++-----------
2 files changed, 50 insertions(+), 42 deletions(-)
commit 72bedbc4e98423b3d986c1559e52a8a914702c27
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 16:17:27 2011 +0800
Update clutter.symbols
For deprecation of APIs, in commits
522b8be3 (clutter_get_input_device_for_id())
6ef09dd1 (clutter_clear_glyph_cache())
01080dc5 (clutter_[sg]et_font_flags())
clutter/clutter.symbols | 10 ----------
1 file changed, 10 deletions(-)
commit bd991e625b09bc8c238432511fa4d957be7ded1e
Merge: 9aabf1bca 29a16980f
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 14:37:19 2011 +0800
Merge branch 'master' into msvc-support-master
commit 9aabf1bca1a19e003a9d9bceb6869c4671900334
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Oct 12 14:34:49 2011 +0800
Update VS property sheets
Update to use COGL-1.0, not COGL-2.0.
build/win32/vs10/clutter.props | 4 ++--
build/win32/vs9/clutter.vsprops | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 29a16980fe69212149673725edf23b45947235bf
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed Oct 12 00:20:43 2011 +0100
interactive/threads: Use G_PRIVATE_INIT
Though strictly not necessary, we should be using the proper init macro
for GPrivate.
tests/interactive/test-threads.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 193b345786f2ae3c2a518f3ca9dac719386992a4
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Oct 11 23:42:23 2011 +0100
Remove some compiler warnings
Some issues found using clang as the compiler.
clutter/clutter-main.c | 2 +-
clutter/clutter-model.c | 12 ++++++------
clutter/clutter-script-parser.c | 2 +-
clutter/osx/clutter-event-loop-osx.c | 4 ++--
clutter/osx/clutter-stage-osx.c | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
commit 2ede853ea3bf2b2576a7ddfffc29af37c695d611
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Oct 11 23:11:56 2011 +0100
Fix included header
clutter/clutter-util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ef0e52f0e184f42eaf66116b371eb2013f39328c
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Oct 11 23:06:06 2011 +0100
build: Disable deprecation warnings with --enable-deprecated
Just like we turn everything on with --disable-deprecated, we have to
turn everything off with --enable-deprecated. This means disabling the
deprecation warnings from the compiler as well.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit af7afc29a716a813197d024a973a2d6db80d6758
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Oct 11 23:03:09 2011 +0100
Add a Clutter-specific deprecation macro for symbols
Just like GLIB_DEPRECATED and GLIB_DEPRECATED_FOR, Clutter should have
its own wrappers for G_DEPRECATED and G_DEPRECATED_FOR, to allow opting
out of deprecation warnings.
Deprecation warnings are enabled by default, now, even when building
Clutter.
clutter/clutter-actor.h | 11 +++++++++++
clutter/clutter-animatable.h | 1 +
clutter/clutter-backend.h | 13 +++++++++++++
clutter/clutter-cairo-texture.h | 3 +++
clutter/clutter-main.h | 21 ++++++++++++++++++---
clutter/clutter-texture.h | 1 +
clutter/clutter-types.h | 14 ++++++++++++++
clutter/clutter-util.h | 3 ++-
clutter/cogl/clutter-egl.h | 2 ++
clutter/x11/clutter-x11.h | 6 ++++--
10 files changed, 69 insertions(+), 6 deletions(-)
commit b34e89e0c5b192adf1b12841d80cfec89c836c01
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Oct 11 23:02:17 2011 +0100
Fix duplicate typedef of ClutterAlpha
Caught on OS X but not on my Fedora machine. Weird.
clutter/clutter-alpha.h | 1 -
1 file changed, 1 deletion(-)
commit 7bd5659962c34b54631074212f4746394a076564
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Oct 11 22:43:54 2011 +0100
Do not leak strings from GKeyFile
The string getters always copy, so we need to free the returned
values.
clutter/clutter-main.c | 12 ++++++++++--
clutter/clutter-settings.c | 4 ++--
2 files changed, 12 insertions(+), 4 deletions(-)
commit 31bee53eb769b4d72b39c0994adf1ddf345de209
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 11 18:25:14 2011 +0100
docs: Fixes to build the API reference
doc/reference/clutter/clutter-sections.txt | 9 +++++++++
doc/reference/clutter/running-clutter.xml | 20 ++++++++++----------
2 files changed, 19 insertions(+), 10 deletions(-)
commit 809298b5a2ab77ac2e24e91759eec2af6f43bffd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 14:21:32 2011 +0100
Move more typedefs into clutter-types.h
clutter/clutter-animatable.h | 1 -
clutter/clutter-script.h | 1 -
clutter/clutter-state.h | 2 --
clutter/clutter-timeline.h | 1 -
clutter/clutter-types.h | 12 +++++++-----
5 files changed, 7 insertions(+), 10 deletions(-)
commit d28e04be72d0a8c4408e07f468698d61ef312091
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 13:28:04 2011 +0100
Move all enumerations to a separate file
This should allow sharing types, and we can avoid glib-mkenums thrawling
the whole repository for enumerations.
clutter/Makefile.am | 1 +
clutter/clutter-actor.h | 60 --
clutter/clutter-align-constraint.h | 15 -
clutter/clutter-animator.h | 14 -
clutter/clutter-bin-layout.h | 25 -
clutter/clutter-bind-constraint.h | 24 -
clutter/clutter-box-layout.h | 18 -
clutter/clutter-click-action.h | 17 -
clutter/clutter-color.h | 105 ----
clutter/clutter-drag-action.h | 18 -
clutter/clutter-effect.h | 13 -
clutter/clutter-enums.h | 1059 ++++++++++++++++++++++++++++++++++++
clutter/clutter-event.h | 87 +--
clutter/clutter-feature.h | 36 +-
clutter/clutter-flow-layout.h | 17 -
clutter/clutter-input-device.h | 78 ---
clutter/clutter-path.h | 33 --
clutter/clutter-snap-constraint.h | 18 -
clutter/clutter-stage.h | 16 -
clutter/clutter-swipe-action.h | 18 -
clutter/clutter-table-layout.h | 19 -
clutter/clutter-texture.h | 40 --
clutter/clutter-timeline.h | 16 +-
clutter/clutter-types.h | 330 +----------
clutter/clutter-units.h | 46 +-
clutter/clutter.h | 3 +-
26 files changed, 1078 insertions(+), 1048 deletions(-)
commit a21f1d158063edd7dc1d37b418b690adef07aa8f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 12:18:26 2011 +0100
Move clutter-fixed.[ch] to the deprecated section
clutter/Makefile.am | 4 ++--
clutter/clutter-deprecated.h | 1 +
clutter/clutter-timeline.h | 1 -
clutter/{ => deprecated}/clutter-fixed.c | 0
clutter/{ => deprecated}/clutter-fixed.h | 0
5 files changed, 3 insertions(+), 3 deletions(-)
commit 62d72b8690f76cba6fba9f816f163f9f12f5aa08
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 11:58:44 2011 +0100
Move ClutterBehaviour to the deprecated section
clutter/Makefile.am | 4 ++--
clutter/clutter-deprecated.h | 1 +
clutter/clutter.h | 1 -
clutter/{ => deprecated}/clutter-behaviour.c | 0
clutter/{ => deprecated}/clutter-behaviour.h | 0
5 files changed, 3 insertions(+), 3 deletions(-)
commit e2682012219c5af174489baa4759ac2b6e021dee
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 11:52:47 2011 +0100
Minor header surgery to ClutterBehaviour
This moves a couple of definitions to the common types header, and makes
sure that ClutterBehaviour subclasses include clutter-behaviour.h first,
so that their types can be fully expanded without necessarily have the
ClutterBehaviour header header included by their public headers. This is
the necessary prelude to have clutter-behaviour.[ch] moved to the
deprecated section.
clutter/clutter-behaviour.h | 3 ---
clutter/clutter-path.h | 4 +---
clutter/clutter-types.h | 12 ++++++++----
clutter/deprecated/clutter-behaviour-depth.c | 2 +-
clutter/deprecated/clutter-behaviour-depth.h | 3 +--
clutter/deprecated/clutter-behaviour-ellipse.c | 2 +-
clutter/deprecated/clutter-behaviour-ellipse.h | 3 ---
clutter/deprecated/clutter-behaviour-opacity.c | 2 +-
clutter/deprecated/clutter-behaviour-opacity.h | 3 +--
clutter/deprecated/clutter-behaviour-path.c | 2 +-
clutter/deprecated/clutter-behaviour-path.h | 3 +--
clutter/deprecated/clutter-behaviour-rotate.c | 4 ++--
clutter/deprecated/clutter-behaviour-rotate.h | 2 --
clutter/deprecated/clutter-behaviour-scale.c | 2 +-
clutter/deprecated/clutter-behaviour-scale.h | 2 +-
15 files changed, 20 insertions(+), 29 deletions(-)
commit bcd7845d91338861d5fd79eb80532027a8d21b24
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 11:32:36 2011 +0100
Move ClutterBehaviour subclasses to the deprecated section
Moving ClutterBehaviour itself will require some minor header surgery,
so we'll do that next.
clutter/Makefile.am | 40 +++++++++++-----------
clutter/clutter-deprecated.h | 6 ++++
clutter/clutter.h | 6 ----
clutter/{ => deprecated}/clutter-behaviour-depth.c | 0
clutter/{ => deprecated}/clutter-behaviour-depth.h | 0
.../{ => deprecated}/clutter-behaviour-ellipse.c | 0
.../{ => deprecated}/clutter-behaviour-ellipse.h | 0
.../{ => deprecated}/clutter-behaviour-opacity.c | 0
.../{ => deprecated}/clutter-behaviour-opacity.h | 0
clutter/{ => deprecated}/clutter-behaviour-path.c | 0
clutter/{ => deprecated}/clutter-behaviour-path.h | 0
.../{ => deprecated}/clutter-behaviour-rotate.c | 0
.../{ => deprecated}/clutter-behaviour-rotate.h | 0
clutter/{ => deprecated}/clutter-behaviour-scale.c | 0
clutter/{ => deprecated}/clutter-behaviour-scale.h | 0
15 files changed, 26 insertions(+), 26 deletions(-)
commit 6c100e151376fdbbffbb332edd98bf9768c3a168
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 11:16:38 2011 +0100
docs: Move deprecated classes out of the way
The deprecated sections should be much more prominently separated from
the current API; we can use a new part inside the main reference index
for this.
doc/reference/clutter/clutter-docs.xml.in | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
commit e57f8c26f62c50f3b47aae88a2b6a50972a25edc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 11:12:55 2011 +0100
Move ClutterShader to the deprecated section
clutter/Makefile.am | 4 ++--
clutter/clutter-deprecated.h | 1 +
clutter/clutter.h | 1 -
clutter/{ => deprecated}/clutter-shader.c | 0
clutter/{ => deprecated}/clutter-shader.h | 0
5 files changed, 3 insertions(+), 3 deletions(-)
commit 4b33a9c5f4cdf26492d24b7e989ba8bba022edef
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 11:07:03 2011 +0100
Move ClutterScore to the deprecated section
clutter/Makefile.am | 4 ++--
clutter/clutter-deprecated.h | 1 +
clutter/clutter.h | 7 ++++---
clutter/{ => deprecated}/clutter-score.c | 0
clutter/{ => deprecated}/clutter-score.h | 0
5 files changed, 7 insertions(+), 5 deletions(-)
commit 4b748f433419462bd3daba18191f2fc173224a76
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 10:57:28 2011 +0100
Move timeout pool to the deprecated section
clutter/Makefile.am | 8 ++++----
clutter/clutter-deprecated.h | 1 +
clutter/clutter.h | 1 -
clutter/{ => deprecated}/clutter-timeout-interval.c | 0
clutter/{ => deprecated}/clutter-timeout-interval.h | 0
clutter/{ => deprecated}/clutter-timeout-pool.c | 0
clutter/{ => deprecated}/clutter-timeout-pool.h | 0
7 files changed, 5 insertions(+), 5 deletions(-)
commit 50cda9fed1acddef53d29222b22d276b9fa80a48
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 10:51:09 2011 +0100
build: Move deprecated code into its own prefix
The code that has been deprecated should live into its own directory,
both in the repository and when installed. This should make it clear
which functionality is actually maintained and which is not.
We start with an oldie: the frame source API.
clutter/Makefile.am | 41 ++++-
clutter/clutter-deprecated.h | 207 +-----------------------
clutter/clutter.h | 1 -
clutter/{ => deprecated}/clutter-frame-source.c | 0
clutter/{ => deprecated}/clutter-frame-source.h | 0
5 files changed, 41 insertions(+), 208 deletions(-)
commit 57f54173ecb4b618fb1b48a9c70aa482ce3efe49
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 11 17:51:14 2011 +0100
interactive/threads: Fix up after deprecations
The GThread API has undergone a massive restructuring, and the fallout
is still being processed.
tests/interactive/test-threads.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
commit 2d2046f9620a9e6cd0a3a5eb1170073562879ba2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 11 17:08:20 2011 +0100
docs: Document the settings.ini file
Describe the location, groups, and keys of the settings.ini file used by
Clutter.
doc/reference/clutter/running-clutter.xml | 97 +++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
commit 53e201f86531195ee7391e54f50b39dce45bcca1
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 11 16:05:24 2011 +0100
Show lib and sysconfdir in the configure summary
configure.ac | 2 ++
1 file changed, 2 insertions(+)
commit 372b39fd63880955d88fe205b7a23c202938e639
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 11 15:28:47 2011 +0100
Add more sections to the Clutter configuration file
On top of the existing "Settings" group in the settings.ini file we
should have two more groups:
Environment - contains all the configuration possible through
environment variables
Debug - contains all the possible debug variables
clutter/clutter-main.c | 165 +++++++++++++++++++++++++++++++++++--
clutter/clutter-settings-private.h | 4 +-
clutter/clutter-settings.c | 28 +------
3 files changed, 165 insertions(+), 32 deletions(-)
commit f5eee5aec7a87a3c8a1f2e658231eca4b04561dd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 11 14:42:31 2011 +0100
Add a configuration file for ClutterSettings
ClutterSettings should be able to load its initial state by using
configuration files in SYSCONFDIR and XDG_CONFIG_HOME. This allows
Clutter to have a system (and user) configuration on platforms that
do not have XSETTINGS bridges.
clutter/Makefile.am | 2 +
clutter/clutter-main.c | 42 ++++++++++
clutter/clutter-settings-private.h | 16 ++++
clutter/clutter-settings.c | 164 ++++++++++++++++++++++++++++++++++---
4 files changed, 213 insertions(+), 11 deletions(-)
commit 01080dc5f313fb3d191e78c555c1f04d78aaa83a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 3 14:12:48 2011 +0100
Deprecate clutter_[sg]et_font_flags()
We already have two mechanisms for controlling the font rendering
quality on a per-application basis:
• ClutterSettings properties
• clutter_backend_set_font_options()
The font flags were always a stop-gap solution, and one that tried to
simplify a fairly complex issue beyond the point of actually being
useful.
https://bugzilla.gnome.org/show_bug.cgi?id=660786
clutter/clutter-main.c | 6 ++++++
clutter/clutter-main.h | 3 +--
clutter/clutter-types.h | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
commit 6ef09dd15bbe7e4305c683231d6431771bd3cffc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 10 17:00:28 2011 +0100
Deprecate clutter_clear_glyph_cache()
This is a wrapper function for API that has long since been public.
clutter/clutter-main.c | 3 +++
clutter/clutter-main.h | 3 +++
2 files changed, 6 insertions(+)
commit 522b8be306be2008d4990fcfc6aeee4759e7d00a
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 10 16:57:18 2011 +0100
Deprecate clutter_get_input_device_for_id()
We have the ClutterDeviceManager methods for that.
clutter/clutter-main.c | 2 ++
clutter/clutter-main.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
commit b6dd306998e626cbc86051dc1237894d515aa3dd
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 10 16:45:20 2011 +0100
Clean up grab implementation
The grab API is a relic of Clutter 0.6, and hasn't been through proper
vetting in a *long* time — mostly due to the fact that we don't really
like grabs, and point to the ::captured-event as a way to implement
"soft grabs" in toolkits and applications.
The implementation of full and device grabs uses weak references on
actors instead of using the ::destroy signal, which is meant exactly for
the case of releasing pointers to actors when they are disposed.
The API naming scheme is also fairly broken, especially for
device-related grabs.
Finally, keyboard device grabs are just not implemented.
We can, in one go, clean up this mess and deprecate a bunch of badly
named API by introducing generic device grab/ungrab methods on
ClutterInputDevice, and re-implement the current API on top of them.
clutter/clutter-device-manager-private.h | 1 +
clutter/clutter-input-device.h | 5 +
clutter/clutter-main.c | 268 +++++++++++++++++++++++--------
clutter/clutter-main.h | 10 +-
4 files changed, 215 insertions(+), 69 deletions(-)
commit 93f2b3d60dd83f421d4b3c0c11971377cc93b662
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Oct 11 17:24:58 2011 +0800
Update clutter.symbols
Due to an added API in commits 25b7b30c (clutter_unicode_to_keysym)
clutter/clutter.symbols | 1 +
1 file changed, 1 insertion(+)
commit 1cf712854007d5b376877de31c8a474b10a3bc8a
Merge: a9771b596 58fec63b9
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Oct 11 17:19:45 2011 +0800
Merge branch 'master' into msvc-support-master
commit 33846dcf4df7443964150d6afe64a165adecc5e6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 10 15:48:43 2011 +0100
Deprecate clutter_redraw()
It's just a badly named proxy to clutter_stage_ensure_redraw().
clutter/clutter-main.c | 4 +++-
clutter/clutter-main.h | 5 ++++-
tests/interactive/test-stage-read-pixels.c | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
commit 51ca20e81e372d7621019c457888fae054e03184
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Oct 10 15:42:36 2011 +0100
Cosmetic fixes
clutter/clutter-main.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit 58fec63b9273d6daabfd66905f0481adedbe431e
Author: Algimantas Margevičius <gymka@mail.ru>
Date: Sun Oct 9 00:57:38 2011 +0300
Updated Lithuanian translation
po/lt.po | 1251 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 645 insertions(+), 606 deletions(-)
commit b5109e852aed1ce96383d25892908c8ec4880561
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Oct 7 16:56:21 2011 +0100
animation: Use the timeline's new-frame signal
Instead of using the ClutterAlpha's notify::alpha. This makes the code
less dependent on GObject's property notification.
clutter/clutter-animation.c | 60 +++++++++++++++++++++++++--------------------
1 file changed, 34 insertions(+), 26 deletions(-)
commit 7e3a75c66bbca1e278b15c797cfc6acbcbd6c7c7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Oct 7 15:53:50 2011 +0100
Deprecate clutter_threads_init()
GLib deprecated g_thread_init(), and threading support is initialized
by GObject, so Clutter already runs with threading support enabled. We
can drop the clutter_threads_init() call requirement, and initialize the
Big Clutter Lock™ on clutter_init(). This reduces the things that have
to be done when dealing with threads with Clutter, and the things that
can possibly go wrong.
clutter/clutter-main.c | 55 +++++++++++++++++--------------
clutter/clutter-main.h | 3 ++
tests/interactive/test-texture-async.c | 4 +--
tests/interactive/test-texture-material.c | 2 --
tests/interactive/test-threads.c | 2 --
5 files changed, 36 insertions(+), 30 deletions(-)
commit 32b8217027a1bafa2b9ff1780253b2f849d708ea
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Oct 7 15:08:27 2011 +0100
Use a static mutex for the default Clutter lock
The Big Clutter Lock™ can now be a static GMutex, since GLib supports
them. We can also drop a bunch of checks given the recent changes in
GLib threading API.
clutter/clutter-main.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
commit 3690ddc4a0a328ca8efd89980c619762548c92aa
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Oct 7 15:07:26 2011 +0100
Drop g_thread_init()
It's not necessary any more, and it has been deprecated.
tests/interactive/test-texture-async.c | 1 -
1 file changed, 1 deletion(-)
commit 389d24727839b1a3ba0696c63277d0e867dfb73f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Oct 7 15:06:37 2011 +0100
texture: Drop G_MUTEX_INIT
The static initializer for GMutex has been removed from GLib.
The g_thread_supported() call can also be removed: threading is always
enabled in GLib ≥ 2.31.
clutter/clutter-texture.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 6d974f278e937cce0872567bce672ed515662678
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Wed Oct 5 22:03:25 2011 +0200
Mark clutter_state_set_key() source_state_name as nullable
https://bugzilla.gnome.org/show_bug.cgi?id=661022
clutter/clutter-state.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 25b7b30ccce6b99cba6a7a8e1cad1a4bcb3676d3
Author: Zan Dobersek <zandobersek@gmail.com>
Date: Fri Oct 7 12:05:39 2011 +0100
Add clutter_unicode_to_keyval function
This commit introduces a unicode-to-keyval conversion function that
performs identical action as the gdk version of that function. Also
added is the necessary table holding all the conversion values.
https://bugzilla.gnome.org/show_bug.cgi?id=661015
clutter/clutter-event.h | 1 +
clutter/clutter-keysyms-table.c | 804 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 805 insertions(+)
commit 5dbc00e625c515a6732eaec06ddd6185ad8b5916
Author: Sunjin Yang <fan4326@gmail.com>
Date: Fri Oct 7 15:21:34 2011 +0900
box-layout: Plug memory leaks
https://bugzilla.gnome.org/show_bug.cgi?id=660985
clutter/clutter-box-layout.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
commit c607382de6a278fe2b2d5d5d4d3def0cb2771015
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Fri Oct 7 10:13:08 2011 +0200
Updated Spanish translation
po/es.po | 1144 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 588 insertions(+), 556 deletions(-)
commit a9771b596fba7f02fec52dc94d98f40cda4ca9ae
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Oct 6 13:00:26 2011 +0800
Update Visual C++ support
-tests/interactive/Makefile.am, build/win32/Makefile.am: copy the
generated test-unit-names.h to build/win32 so that it can be
distributed in "make dist" (maybe we could dist the generated header
in tests/interactive directly?)
-Update test-interactive Visual C++ projects to include build/win32 in
the list of folders to look for headers
build/win32/Makefile.am | 2 +-
build/win32/vs10/test-interactive.vcxprojin | 4 ++++
build/win32/vs9/test-interactive.vcprojin | 4 ++++
tests/interactive/Makefile.am | 3 +++
4 files changed, 12 insertions(+), 1 deletion(-)
commit d86a6d8df4d1f74405285649615f38923c828e99
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Oct 6 12:53:41 2011 +0800
Update clutter.symbols
...Due to the addtion of clutter_actor_has_actions,
clutter_actor_has_contraints and clutter_actor_has_effects APIs
clutter/clutter.symbols | 3 +++
1 file changed, 3 insertions(+)
commit b55656b6984a6a5f2dd9d12d6adac09efc9b8595
Merge: f0dfd8ab0 938fcc60f
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Oct 6 12:04:30 2011 +0800
Merge branch 'master' into msvc-support-master
commit 938fcc60f0365db5dbcc4677ba5e7cefbccf22c8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Oct 4 10:32:27 2011 +0100
Deprecate the GParamSpec for CoglFixed
The fixed-point API is not used anywhere, and it's pretty much useless
to have a fixed-point type for properties.
clutter/clutter-fixed.c | 8 +++++++-
clutter/clutter-fixed.h | 8 ++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
commit 839b939d36ab5b2c5aec71b325c1ca7b5363b8f1
Author: Håkon Løvdal <haakon@bitfrost.no>
Date: Mon Oct 3 15:56:26 2011 +0100
spelling fix: timeour -> timeout
clutter/clutter-main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2d76f295df30c3583f43079216c941087cd5fb61
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date: Mon Oct 3 15:57:21 2011 +0200
Update French translation
po/fr.po | 184 +++++++++++++++++++++++++++++++++------------------------------
1 file changed, 97 insertions(+), 87 deletions(-)
commit 99f2dbbf5ae33855c37df4372a7402fc048fe394
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date: Sat Oct 1 17:24:51 2011 +0200
Updated Esperanto translation
po/eo.po | 1551 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 790 insertions(+), 761 deletions(-)
commit d331e92742d0af445b9a38fd06bc1bc90646bca4
Author: Adel Gadllah <adel.gadllah@gmail.com>
Date: Sat Oct 1 12:36:36 2011 +0200
clutter-actor-meta: Fix _clutter_meta_group_has_metas_no_internal
This function is backwards i.e it is supposed to check for metas that
are *not* internal, hence the name.
https://bugzilla.gnome.org/show_bug.cgi?id=660623
clutter/clutter-actor-meta.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 6377d3646b4c034be57c2627dd3c2e432ab80aa0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Sep 30 17:02:57 2011 +0100
paint-volume: Don't try to complete a completed volume
If we do project() → get_bounding_box(), we'll try to complete the
volume twice, which whacks out all the lazily computed vertices.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
clutter/clutter-paint-volume.c | 3 +++
1 file changed, 3 insertions(+)
commit 3372a0233e574b6d67e9f9d83010c1891c427ad8
Author: Neil Roberts <neil@linux.intel.com>
Date: Thu Sep 29 20:14:26 2011 +0100
Add a conformance test for ClutterShaderEffect
This adds a simple conformance test which sets up a few shader effects
using both the old style with clutter_shader_effect_set_source and the
new style by overriding get_static_shader_source. The effects are then
verified to confirm that they drew the right pixel colour.
https://bugzilla.gnome.org/show_bug.cgi?id=660512
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
tests/conform/Makefile.am | 1 +
tests/conform/test-conform-main.c | 1 +
tests/conform/test-shader-effect.c | 267 +++++++++++++++++++++++++++++++++++++
3 files changed, 269 insertions(+)
commit 8b995a9457bba3397c54f227b6ed0cef39cf9c73
Author: Neil Roberts <neil@linux.intel.com>
Date: Thu Sep 29 20:05:39 2011 +0100
clutter-shader-effect: Add a get_static_shader_source virtual
This is used as an alternative to calling
clutter_shader_effect_set_shader_source. A ClutterShaderEffect
subclass is now expected to implement this method to return the source
for the effect that will be used for all instances of this
subclass. It is only called once regardless of the number of instances
created. That way Clutter can avoid recompiling the shader source for
every new instance of the effect.
https://bugzilla.gnome.org/show_bug.cgi?id=660512
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-shader-effect.c | 236 +++++++++++++++++++++++++---------------
clutter/clutter-shader-effect.h | 10 +-
2 files changed, 156 insertions(+), 90 deletions(-)
commit e8ec7ebed013895e63c9579d8b7dbd6c63ccec80
Author: Adel Gadllah <adel.gadllah@gmail.com>
Date: Thu Sep 29 18:34:12 2011 +0200
ClutterActor: Add clutter_actor_has_actions
Adds an efficent way to query whether an actor has any
applied actions.
https://bugzilla.gnome.org/show_bug.cgi?id=660471
clutter/clutter-action.h | 2 ++
clutter/clutter-actor.c | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
commit e81800607cdde8522fde33e0df14686e9b972541
Author: Adel Gadllah <adel.gadllah@gmail.com>
Date: Thu Sep 29 18:29:40 2011 +0200
ClutterActor: Add clutter_actor_has_contraints
Adds an efficent way to query whether an actor has any
applied constraints.
https://bugzilla.gnome.org/show_bug.cgi?id=660471
clutter/clutter-actor.c | 19 +++++++++++++++++++
clutter/clutter-constraint.h | 2 ++
2 files changed, 21 insertions(+)
commit bed2d9e7876064c70b87fe2f2cd4f5fa65b1082e
Author: Adel Gadllah <adel.gadllah@gmail.com>
Date: Thu Sep 29 15:31:30 2011 +0200
ClutterActor: Add clutter_actor_has_effects
Adds an efficent way to query whether an actor has any
applied effects.
https://bugzilla.gnome.org/show_bug.cgi?id=660471
clutter/clutter-actor-meta-private.h | 2 ++
clutter/clutter-actor-meta.c | 21 +++++++++++++++++++++
clutter/clutter-actor.c | 22 ++++++++++++++++++++++
clutter/clutter-effect.h | 2 ++
4 files changed, 47 insertions(+)
commit e058cd4c5fcb0a37f24749221d5b854f82ef4703
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Sep 29 14:01:03 2011 +0100
Pass the remaining args to the executed interactive unit
We only support running one interactive test at a time; everything after
the unit name is to be considered an argument to the actual unit.
tests/interactive/test-main.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit f0dfd8ab07809ae54667e5dcea581f429d476d2f
Merge: 9e822d9ae 7d515553e
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu Sep 29 16:33:02 2011 +0800
Merge branch 'master' into msvc-support-master
Conflicts:
tests/interactive/Makefile.am
commit 7d515553e662210e8a17c3f6067f681bdbed1bbe
Author: krishnababu k <kkrothap@redhat.ocm>
Date: Thu Sep 29 12:09:11 2011 +0530
Updated Telugu Translations
po/te.po | 83 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 42 insertions(+), 41 deletions(-)
commit b1fbbe23b43f56da9cbd515e92ef44a8f7b31aa2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Sep 28 15:54:32 2011 +0100
Revert "Add lightness, brightness, and contrast effects"
Discussed a bit with Neil, and I might have jumped the gun a little.
We might want a different API for 1.10. See comment 12 on:
https://bugzilla.gnome.org/show_bug.cgi?id=656156
This reverts commit 4829ae1c79f1ae60d562621b81a7be800e0697bb.
clutter/Makefile.am | 6 -
clutter/clutter-brightness-effect.c | 380 ---------------------------
clutter/clutter-brightness-effect.h | 63 -----
clutter/clutter-contrast-effect.c | 395 -----------------------------
clutter/clutter-contrast-effect.h | 63 -----
clutter/clutter-invert-lightness-effect.c | 243 ------------------
clutter/clutter-invert-lightness-effect.h | 57 -----
doc/reference/clutter/clutter-docs.xml.in | 3 -
doc/reference/clutter/clutter-sections.txt | 47 ----
doc/reference/clutter/clutter.types | 3 -
10 files changed, 1260 deletions(-)
commit 4829ae1c79f1ae60d562621b81a7be800e0697bb
Author: Joseph Scheuhammer <clown@alum.mit.edu>
Date: Tue Sep 27 13:01:36 2011 -0400
Add lightness, brightness, and contrast effects
Added three classes for new clutter effects: inverse lightness,
modify brightness, and modify contrast.
https://bugzilla.gnome.org/show_bug.cgi?id=656156
clutter/Makefile.am | 6 +
clutter/clutter-brightness-effect.c | 380 +++++++++++++++++++++++++++
clutter/clutter-brightness-effect.h | 63 +++++
clutter/clutter-contrast-effect.c | 395 +++++++++++++++++++++++++++++
clutter/clutter-contrast-effect.h | 63 +++++
clutter/clutter-invert-lightness-effect.c | 243 ++++++++++++++++++
clutter/clutter-invert-lightness-effect.h | 57 +++++
doc/reference/clutter/clutter-docs.xml.in | 3 +
doc/reference/clutter/clutter-sections.txt | 47 ++++
doc/reference/clutter/clutter.types | 3 +
10 files changed, 1260 insertions(+)
commit ac8e174eca31a28dae4a7aa5b3336b8cf27d6767
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Sep 28 13:32:57 2011 +0100
tests/interactive: Add some descriptions
tests/interactive/test-animation.c | 6 ++++++
tests/interactive/test-cairo-clock.c | 6 ++++++
tests/interactive/test-constraints.c | 6 ++++++
tests/interactive/test-drop.c | 6 ++++++
tests/interactive/test-easing.c | 6 ++++++
tests/interactive/test-table-layout.c | 6 ++++++
tests/interactive/test-text-field.c | 11 +++++++++++
tests/interactive/test-texture-async.c | 6 ++++++
tests/interactive/test-texture-slicing.c | 6 ++++++
9 files changed, 59 insertions(+)
commit 5fc953cb5eec7960138037f248440778239aef11
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Sep 27 17:50:51 2011 +0100
test-textures -> test-texture-slicing
The unit is supposed to be testing the slicing support in CoglTexture.
tests/interactive/Makefile.am | 2 +-
tests/interactive/{test-textures.c => test-texture-slicing.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
commit d640c56cef4738b2c9b75b034b81438390538561
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Sep 27 17:40:51 2011 +0100
test-interactive: Allow querying the interactive test for a description
It would be nice if the interactive tests had a way to be queried for a
description, instead of "Just Knowing" what they are meant to be doing.
tests/interactive/Makefile.am | 25 ++++-
tests/interactive/test-main.c | 210 ++++++++++++++++++++++++++++++++++++++----
2 files changed, 211 insertions(+), 24 deletions(-)
commit 4ebdeede9feed7995335616ae5e9c2cf3af0ec6b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Sep 27 16:40:34 2011 +0100
test-texture-async: Clean up the test code
Force threading on, and stop using the default stage and behaviours:
let's try to use modern API.
tests/interactive/test-texture-async.c | 63 ++++++++++++++++------------------
1 file changed, 29 insertions(+), 34 deletions(-)
commit 56c7d9b0b3211af53952e97b059f8cc0f87d1de8
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Sep 27 16:06:43 2011 +0100
texture: Simplify asynchronous loading code
The asynchronous loading code could do with some modernization.
First of all, we should drop the internal GMutex held when manipulating
the boolean flags: it's far too expensive for its role, and modern GLib
provides us with bitlocks that are quite a lot faster.
Then we should consolidate most of the implementation into something
smaller and more manageable.
clutter/clutter-texture.c | 270 ++++++++++++++++++++--------------------------
1 file changed, 115 insertions(+), 155 deletions(-)
commit 11c585c420da633964beb93e80c0dc12d2901a61
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Sep 27 14:22:22 2011 +0100
texture: Remove GStaticMutex
It's now possible to statically initialize a GMutex.
clutter/clutter-texture.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit 1465aa04aa4a8da7ced0eeadb183083a8972a6bf
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Sep 27 14:21:41 2011 +0100
Depend on GLib 2.31
We need to switch away from GStaticMutex and use GMutex instead, as the
former has been deprecated.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 39db46123ed6bbbc3e6ad359a64d4d344ca9e11b
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Wed Sep 28 14:24:57 2011 +0200
Add paint-deform-tiles option to CLUTTER_DEBUG
To make easier to visualize the triangles in a ClutterDeformEffect
https://bugzilla.gnome.org/show_bug.cgi?id=660354
clutter/clutter-debug.h | 3 ++-
clutter/clutter-deform-effect.c | 20 ++++++++++++++++++++
clutter/clutter-main.c | 3 ++-
3 files changed, 24 insertions(+), 2 deletions(-)
commit 9e822d9ae4d65b0fae2843bc57119b3d879502d7
Merge: ad7bb392c 4f5ce6c16
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Sep 27 14:35:26 2011 +0800
Merge branch 'master' into msvc-support-master
commit 4f5ce6c165e9e9e599993e77b987f2f229264731
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date: Tue Sep 27 01:55:26 2011 +0200
Added Serbian translation
po/sr.po | 2194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/sr@latin.po | 2194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 4388 insertions(+)
commit 8a76949588f278301d3cd7dc5b1752005d624248
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date: Mon Sep 26 14:41:42 2011 +0200
[l10n]Updated Catalan (Valencian) translation
po/ca@valencia.po | 1138 +++++++++++++++++++++++++++--------------------------
1 file changed, 584 insertions(+), 554 deletions(-)
commit 1776ac8ed50d2cdae34a53d6fa41a1761d6b907f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Aug 16 16:01:22 2011 +0100
Remove internal usage of ClutterGeometry in StageWindow
The ClutterGeometry type is a poor substitute of cairo_rectangle_int_t,
with unsigned integers for width and height to complicate matters.
Let's remove the internal usage of ClutterGeometry and switch to the
rectangle type from Cairo.
https://bugzilla.gnome.org/show_bug.cgi?id=656663
clutter/clutter-private.h | 4 ++
clutter/clutter-stage-private.h | 6 ++-
clutter/clutter-stage-window.c | 16 +++----
clutter/clutter-stage-window.h | 26 ++++++------
clutter/clutter-stage.c | 74 +++++++++++++++++++--------------
clutter/clutter-util.c | 30 +++++++++++++
clutter/cogl/clutter-stage-cogl.c | 29 ++++++-------
clutter/cogl/clutter-stage-cogl.h | 3 +-
clutter/osx/clutter-stage-osx.c | 4 +-
clutter/wayland/clutter-stage-wayland.c | 64 +++++++++++-----------------
clutter/wayland/clutter-stage-wayland.h | 6 +--
clutter/win32/clutter-stage-win32.c | 12 +++---
clutter/x11/clutter-stage-x11.c | 4 +-
13 files changed, 154 insertions(+), 124 deletions(-)
commit c59f9ef79f630b14e30623c0629551264e208d35
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date: Sun Sep 25 16:16:10 2011 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 1192 ++++++++++++++++++++++++++++++-----------------------------
po/zh_TW.po | 1192 ++++++++++++++++++++++++++++++-----------------------------
2 files changed, 1230 insertions(+), 1154 deletions(-)
commit 85c4c9c6ccdcd5272e4c21de768d788089075b93
Author: Ask H. Larsen <asklarsen@gmail.com>
Date: Sat Sep 24 17:28:11 2011 +0200
Updated Danish translation
po/da.po | 1749 +++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 920 insertions(+), 829 deletions(-)
commit afc09b817d043a62bec84ec1f923518f02cc8d22
Author: Mario Blättermann <mariobl@gnome.org>
Date: Sat Sep 24 10:44:08 2011 +0200
[l10n] Updated German translation
po/de.po | 1172 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 591 insertions(+), 581 deletions(-)
commit d3bafc4b09a50e9ee35c5439c604e56428670513
Author: Colin Walters <walters@verbum.org>
Date: Thu Sep 22 21:22:53 2011 -0400
clutter-main: Reword translator comment for default:LTR
This makes it much clearer, and fixes some typos in the original.
https://bugzilla.gnome.org/show_bug.cgi?id=659893
clutter/clutter-main.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
commit a23e59bd66c70349a456fa8f82b7ed61128450cf
Author: Alexandre Franke <alexandre.franke@gmail.com>
Date: Fri Sep 23 11:23:26 2011 +0200
Mark forgotten string as translatable
https://bugzilla.gnome.org/show_bug.cgi?id=659928
clutter/clutter-actor.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 220e5c967792b0dc3a0afb3501ad7f2c3e01e287
Author: Bruno Brouard <annoa.b@gmail.com>
Date: Fri Sep 23 18:26:19 2011 +0200
Updated French translation
po/fr.po | 1849 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 934 insertions(+), 915 deletions(-)
commit f8d808f140a4fe84e3002ee5935d4b8317779c9d
Author: Neil Roberts <neil@linux.intel.com>
Date: Fri Sep 23 15:12:44 2011 +0100
Add a CLUTTER_PAINT debug option to enable continous redrawing
When testing the performance of an application, it's often useful to
force it to continuously redraw instead of going idle to help measure
the frame rate. This just adds a CLUTTER_PAINT=continuous-redraw which
causes the master clock to queue a redraw on all of the stages
just before it prepares its source.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
clutter/clutter-debug.h | 3 ++-
clutter/clutter-main.c | 3 ++-
clutter/clutter-master-clock.c | 14 ++++++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
commit e08df14d42a999a1ed2fcfb0f241de986829a7be
Author: krishnababu k <kkrothap@redhat.ocm>
Date: Fri Sep 23 18:01:37 2011 +0530
Updated Telugu Translations
po/te.po | 1126 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 573 insertions(+), 553 deletions(-)
commit 2004f98bc457392ccf4d9114309511323fa37a3f
Author: Manoj Kumar Giri <mgiri@dhcp193-76.pnq.redhat.com>
Date: Fri Sep 23 12:46:22 2011 +0530
Updated Oriya Translation
po/or.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3dfdf58e3f0d2ad80322d5b0eda23cd91a135b82
Author: I Felix <ifelix25@gmail.com>
Date: Fri Sep 23 12:42:15 2011 +0530
Updated Tamil Translations
po/ta.po | 449 ++++++++++++++++++++++++++++++---------------------------------
1 file changed, 213 insertions(+), 236 deletions(-)
commit 2966ce2e59784ad85c2d40971e9a489e66da9772
Author: A S Alam <aalam@users.sf.net>
Date: Fri Sep 23 07:24:56 2011 +0530
update Punjabi Translation
po/pa.po | 1199 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 610 insertions(+), 589 deletions(-)
commit c67d3e5b52955fc87b5c1581a82b745d9b2b047c
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Sep 21 16:36:30 2011 +0100
clutter-offscreen-effect: Apply matrix expansion to proj not mv
When the viewport gets expanded because the actor extends off the edge
of the screen, instead of applying the transformation to the root of
the modelview transformation it is now applied to the end of the
projection transformation. This should end up with the same
transformation. This fixes a problem when the offscreen effects are
nested and the inner effect would try to pick up the current modelview
transformation to rescale it to fit the new viewport size. In this
case the modelview would have already been scaled for the size of the
outer viewport so it would end up wrong.
https://bugzilla.gnome.org/show_bug.cgi?id=659601
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
Reviewed-by: Robert Bragg <robert@linux.intel.com>
clutter/clutter-offscreen-effect.c | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
commit 9d8ad861653193a2a2428caeb2d7553f99c7083a
Author: Nilamdyuti Goswami <ngoswami@redhat.com>
Date: Thu Sep 22 12:41:20 2011 +0200
Add Assamese translation
po/as.po | 2191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2191 insertions(+)
commit 7fb8fc65a33aea59d7a970acefd0eab19d94da69
Author: Neil Roberts <neil@linux.intel.com>
Date: Wed Sep 21 13:37:44 2011 +0100
mingw-fetch-dependencies: Mirror the changes made to the Cogl version
Cogl has a similar script which has had the following additional
changes:
* Don't pass -c to wget
* Explicitly download and run config.guess
This patch just syncs up with those.
https://bugzilla.gnome.org/show_bug.cgi?id=659625
build/mingw/mingw-fetch-dependencies.sh | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
commit 7d8c48268efc87cbf5f8a38d30186e6ba18842cc
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Tue Sep 20 17:34:46 2011 +0100
mingw32: Update the build script to compile 1.8.0
* Updated dependencies, glib 2.28 and cogl 1.8.0
* Mesa has removed mesa_wgl.h from its headers
* added -I$ROOT_DIR/include to the CFLAGS to include the headers from
our prefix (say <GL/gl.h>) before the system ones
https://bugzilla.gnome.org/show_bug.cgi?id=659625
build/mingw/mingw-fetch-dependencies.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit dc5b047ed5e2a7f19d40689de14024c65c9bf786
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date: Wed Sep 21 00:34:48 2011 +0100
Updated Portuguese translation
po/pt.po | 2216 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 2216 insertions(+)
commit 8051c47664c4e049587c30c1135d247e72f08b3b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Sep 19 23:14:04 2011 +0100
Fix typo in ClutterSettings:password-hint-time blurb
clutter/clutter-settings.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 93ece6dd7bd0b711652d9b64c9a946873419756d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Sep 19 16:44:22 2011 +0100
text: Implement password hint
A ClutterText in password mode should have the ability to show the last
input character. This feature allows easier password entry on platforms
with unreliable keyboards, such as touchscreens or small devices.
https://bugzilla.gnome.org/show_bug.cgi?id=652588
clutter/clutter-text.c | 94 ++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 79 insertions(+), 15 deletions(-)
commit 07912a147dffca9cfdeb84a77e6edf567743cb20
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Sep 19 16:43:05 2011 +0100
settings: Add password-hint-time property
Add a setting that controls whether ClutterText actors in password mode
should display the last input character for a defined time. This helps
on touch-based interfaces.
https://bugzilla.gnome.org/show_bug.cgi?id=652588
clutter/clutter-settings.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
commit 0b07a5ef04843aa22bbc1f3a0f9d0f93bf98dfb7
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Sep 19 20:04:11 2011 +0100
Post branch version bump to 1.9.1
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ad7bb392c599c801106bf2d15ccdd4a07fe6efda
Merge: 65e498e3f f315e760d
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon Sep 19 14:24:04 2011 +0800
Merge branch 'master' into msvc-support-master
commit 65e498e3f903517104a6008f739b26f91e3d0610
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Sep 16 17:34:29 2011 +0800
Conform-tests: Remove C99ism
tests/conform/test-cogl-materials.c | 20 ++++++++++++++------
tests/conform/test-cogl-pixel-buffer.c | 2 +-
2 files changed, 15 insertions(+), 7 deletions(-)
commit 9f12ec534ebd8ad584b3655558ffdfbd43aefce9
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Sep 16 17:25:47 2011 +0800
msvc-support: Recover wrecked branch
Recover the branch! :|
Makefile.am | 5 +-
build/Makefile.am | 2 +-
build/win32/Makefile.am | 3 +
build/win32/vs10/Makefile.am | 37 +
build/win32/vs10/README.txt | 91 ++
.../win32/vs10/cally-atkcomponent-example.vcxproj | 172 +++
.../cally-atkcomponent-example.vcxproj.filters | 26 +
.../vs10/cally-atkeditabletext-example.vcxproj | 172 +++
.../cally-atkeditabletext-example.vcxproj.filters | 26 +
build/win32/vs10/cally-atkevents-example.vcxproj | 172 +++
.../vs10/cally-atkevents-example.vcxproj.filters | 26 +
build/win32/vs10/cally-atktext-example.vcxproj | 172 +++
.../vs10/cally-atktext-example.vcxproj.filters | 25 +
build/win32/vs10/cally-clone-example.vcxproj | 172 +++
.../win32/vs10/cally-clone-example.vcxproj.filters | 26 +
build/win32/vs10/clutter.props | 416 ++++++
build/win32/vs10/clutter.sln | 156 +++
build/win32/vs10/clutter.vcxproj.filtersin | 25 +
build/win32/vs10/clutter.vcxprojin | 196 +++
build/win32/vs10/install.vcxproj | 149 +++
build/win32/vs10/test-cogl-perf.vcxproj | 166 +++
build/win32/vs10/test-cogl-perf.vcxproj.filters | 14 +
.../win32/vs10/test-conformance.vcxproj.filtersin | 12 +
build/win32/vs10/test-conformance.vcxprojin | 168 +++
.../win32/vs10/test-interactive.vcxproj.filtersin | 12 +
build/win32/vs10/test-interactive.vcxprojin | 168 +++
build/win32/vs10/test-picking.vcxproj | 167 +++
build/win32/vs10/test-picking.vcxproj.filters | 14 +
build/win32/vs10/test-random-text.vcxproj | 166 +++
build/win32/vs10/test-random-text.vcxproj.filters | 14 +
build/win32/vs10/test-text-perf.vcxproj | 166 +++
build/win32/vs10/test-text-perf.vcxproj.filters | 14 +
build/win32/vs10/test-text.vcxproj | 166 +++
build/win32/vs10/test-text.vcxproj.filters | 14 +
build/win32/vs9/Makefile.am | 21 +
build/win32/vs9/README.txt | 90 ++
build/win32/vs9/cally-atkcomponent-example.vcproj | 169 +++
.../win32/vs9/cally-atkeditabletext-example.vcproj | 167 +++
build/win32/vs9/cally-atkevents-example.vcproj | 167 +++
build/win32/vs9/cally-atktext-example.vcproj | 164 +++
build/win32/vs9/cally-clone-example.vcproj | 169 +++
build/win32/vs9/clutter.sln | 207 +++
build/win32/vs9/clutter.vcprojin | 199 +++
build/win32/vs9/clutter.vsprops | 265 ++++
build/win32/vs9/install.vcproj | 80 ++
build/win32/vs9/test-cogl-perf.vcproj | 159 +++
build/win32/vs9/test-conformance.vcprojin | 165 +++
build/win32/vs9/test-interactive.vcprojin | 165 +++
build/win32/vs9/test-picking.vcproj | 160 +++
build/win32/vs9/test-random-text.vcproj | 159 +++
build/win32/vs9/test-text-perf.vcproj | 159 +++
build/win32/vs9/test-text.vcproj | 159 +++
clutter/Makefile.am | 42 +
clutter/clutter-config.h.win32 | 16 +
clutter/clutter-version.h.win32.in | 196 +++
clutter/clutter.symbols | 1386 ++++++++++++++++++++
tests/conform/Makefile.am | 42 +
tests/interactive/Makefile.am | 58 +-
tests/micro-bench/test-picking.c | 8 +-
59 files changed, 7895 insertions(+), 7 deletions(-)
commit 208fbe756ec40d56bba657c8a07fcd61c894e433
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Sep 16 17:15:33 2011 +0800
Recover msvc-support
messed up my own git repo...
config.h.win32.in | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 6 ++-
2 files changed, 163 insertions(+), 1 deletion(-)
|