Commit 69c5d21d7df107636c99f9ceda524406bef7fb4f
2013-10-27T21:26:46
WinRT: merged with SDL 2.0.1 codebase
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 14247 14248 14249 14250 14251 14252 14253 14254 14255 14256 14257 14258 14259 14260 14261 14262 14263 14264 14265 14266 14267 14268 14269 14270 14271 14272 14273 14274 14275 14276 14277 14278 14279 14280 14281 14282 14283 14284 14285 14286 14287 14288 14289 14290 14291 14292 14293 14294 14295 14296 14297 14298 14299 14300 14301 14302 14303 14304 14305 14306 14307 14308 14309 14310 14311 14312 14313 14314 14315 14316 14317 14318 14319 14320 14321 14322 14323 14324 14325 14326 14327 14328 14329 14330 14331 14332 14333 14334 14335 14336 14337 14338 14339 14340 14341 14342 14343 14344 14345 14346 14347 14348 14349 14350 14351 14352 14353 14354 14355 14356 14357 14358 14359 14360 14361 14362 14363 14364 14365 14366 14367 14368 14369 14370 14371 14372 14373 14374 14375 14376 14377 14378 14379 14380 14381 14382 14383 14384 14385 14386 14387 14388 14389 14390 14391 14392 14393 14394 14395 14396 14397 14398 14399 14400 14401 14402 14403 14404 14405 14406 14407 14408 14409 14410 14411 14412 14413 14414 14415 14416 14417 14418 14419 14420 14421 14422 14423 14424 14425 14426 14427 14428 14429 14430 14431 14432 14433 14434 14435 14436 14437 14438 14439 14440 14441 14442 14443 14444 14445 14446 14447 14448 14449 14450 14451 14452 14453 14454 14455 14456 14457 14458 14459 14460 14461 14462 14463 14464 14465 14466 14467 14468 14469 14470 14471 14472 14473 14474 14475 14476 14477 14478 14479 14480 14481 14482 14483 14484 14485 14486 14487 14488 14489 14490 14491 14492 14493 14494 14495 14496 14497 14498 14499 14500 14501 14502 14503 14504 14505 14506 14507 14508 14509 14510 14511 14512 14513 14514 14515 14516 14517 14518 14519 14520 14521 14522 14523 14524 14525 14526 14527 14528 14529 14530 14531 14532 14533 14534 14535 14536 14537 14538 14539 14540 14541 14542 14543 14544 14545 14546 14547 14548 14549 14550 14551 14552 14553 14554 14555 14556 14557 14558 14559 14560 14561 14562 14563 14564 14565 14566 14567 14568 14569 14570 14571 14572 14573 14574 14575 14576 14577 14578 14579 14580 14581 14582 14583 14584 14585 14586 14587 14588 14589 14590 14591 14592 14593 14594 14595 14596 14597 14598 14599 14600 14601 14602 14603 14604 14605 14606 14607 14608 14609 14610 14611 14612 14613 14614 14615 14616 14617 14618 14619 14620 14621 14622 14623 14624 14625 14626 14627 14628 14629 14630 14631 14632 14633 14634 14635 14636 14637 14638 14639 14640 14641 14642 14643 14644 14645 14646 14647 14648 14649 14650 14651 14652 14653 14654 14655 14656 14657 14658 14659 14660 14661 14662 14663 14664 14665 14666 14667 14668 14669 14670 14671 14672 14673 14674 14675 14676 14677 14678 14679 14680 14681 14682 14683 14684 14685 14686 14687 14688 14689 14690 14691 14692 14693 14694 14695 14696 14697 14698 14699 14700 14701 14702 14703 14704 14705 14706 14707 14708 14709 14710 14711 14712 14713 14714 14715 14716 14717 14718 14719 14720 14721 14722 14723 14724 14725 14726 14727 14728 14729 14730 14731 14732 14733 14734 14735 14736 14737 14738 14739 14740 14741 14742 14743 14744 14745 14746 14747 14748 14749 14750 14751 14752 14753 14754 14755 14756 14757 14758 14759 14760 14761 14762 14763 14764 14765 14766 14767 14768 14769 14770 14771 14772 14773 14774 14775 14776 14777 14778 14779 14780 14781 14782 14783 14784 14785 14786 14787 14788 14789 14790 14791 14792 14793 14794 14795 14796 14797 14798 14799 14800 14801 14802 14803 14804 14805 14806 14807 14808 14809 14810 14811 14812 14813 14814 14815 14816 14817 14818 14819 14820 14821 14822 14823 14824 14825 14826 14827 14828 14829 14830 14831 14832 14833 14834 14835 14836 14837 14838 14839 14840 14841 14842 14843 14844 14845 14846 14847 14848 14849 14850 14851 14852 14853 14854 14855 14856 14857 14858 14859 14860 14861 14862 14863 14864 14865 14866 14867 14868 14869 14870 14871 14872 14873 14874 14875 14876 14877 14878 14879 14880 14881 14882 14883 14884 14885 14886 14887 14888 14889 14890 14891 14892 14893 14894 14895 14896 14897 14898 14899 14900 14901 14902 14903 14904 14905 14906 14907 14908 14909 14910 14911 14912 14913 14914 14915 14916 14917 14918 14919 14920 14921 14922 14923 14924 14925 14926 14927 14928 14929 14930 14931 14932 14933 14934 14935 14936 14937 14938 14939 14940 14941 14942 14943 14944 14945 14946 14947 14948 14949 14950 14951 14952 14953 14954 14955 14956 14957 14958 14959 14960 14961 14962 14963 14964 14965 14966 14967 14968 14969 14970 14971 14972 14973 14974 14975 14976 14977 14978 14979 14980 14981 14982 14983 14984 14985 14986 14987 14988 14989 14990 14991 14992 14993 14994 14995 14996 14997 14998 14999 15000 15001 15002 15003 15004 15005 15006 15007 15008 15009 15010 15011 15012 15013 15014 15015 15016 15017 15018 15019 15020 15021 15022 15023 15024 15025 15026 15027 15028 15029 15030 15031 15032 15033 15034 15035 15036 15037 15038 15039 15040 15041 15042 15043 15044 15045 15046 15047 15048 15049 15050 15051 15052 15053 15054 15055 15056 15057 15058 15059 15060 15061 15062 15063 15064 15065 15066 15067 15068 15069 15070 15071 15072 15073 15074 15075 15076 15077 15078 15079 15080 15081 15082 15083 15084 15085 15086 15087 15088 15089 15090 15091 15092 15093 15094 15095 15096 15097 15098 15099 15100 15101 15102 15103 15104 15105 15106 15107 15108 15109 15110 15111 15112 15113 15114 15115 15116 15117 15118 15119 15120 15121 15122 15123 15124 15125 15126 15127 15128 15129 15130 15131 15132 15133 15134 15135 15136 15137 15138 15139 15140 15141 15142 15143 15144 15145 15146 15147 15148 15149 15150 15151 15152 15153 15154 15155 15156 15157 15158 15159 15160 15161 15162 15163 15164 15165 15166 15167 15168 15169 15170 15171 15172 15173 15174 15175 15176 15177 15178 15179 15180 15181 15182 15183 15184 15185 15186 15187 15188 15189 15190 15191 15192 15193 15194 15195 15196 15197 15198 15199 15200 15201 15202 15203 15204 15205 15206 15207 15208 15209 15210 15211 15212 15213 15214 15215 15216 15217 15218 15219 15220 15221 15222 15223 15224 15225 15226 15227 15228 15229 15230 15231 15232 15233 15234 15235 15236 15237 15238 15239 15240 15241 15242 15243 15244 15245 15246 15247 15248 15249 15250 15251 15252 15253 15254 15255 15256 15257 15258 15259 15260 15261 15262 15263 15264 15265 15266 15267 15268 15269 15270 15271 15272 15273 15274 15275 15276 15277 15278 15279 15280 15281 15282 15283 15284 15285 15286 15287 15288 15289 15290 15291 15292 15293 15294 15295 15296 15297 15298 15299 15300 15301 15302 15303 15304 15305 15306 15307 15308 15309 15310 15311 15312 15313 15314 15315 15316 15317 15318 15319 15320 15321 15322 15323 15324 15325 15326 15327 15328 15329 15330 15331 15332 15333 15334 15335 15336 15337 15338 15339 15340 15341 15342 15343 15344 15345 15346 15347 15348 15349 15350 15351 15352 15353 15354 15355 15356 15357 15358 15359 15360 15361 15362 15363 15364 15365 15366 15367 15368 15369 15370 15371 15372 15373 15374 15375 15376 15377 15378 15379 15380 15381 15382 15383 15384 15385 15386 15387 15388 15389 15390 15391 15392 15393 15394 15395 15396 15397 15398 15399 15400 15401 15402 15403 15404 15405 15406 15407 15408 15409 15410 15411 15412 15413 15414 15415 15416 15417 15418 15419 15420 15421 15422 15423 15424 15425 15426 15427 15428 15429 15430 15431 15432 15433 15434 15435 15436 15437 15438 15439 15440 15441 15442 15443 15444 15445 15446 15447 15448 15449 15450 15451 15452 15453 15454 15455 15456 15457 15458 15459 15460 15461 15462 15463 15464 15465 15466 15467 15468 15469 15470 15471 15472 15473 15474 15475 15476 15477 15478 15479 15480 15481 15482 15483 15484 15485 15486 15487 15488 15489 15490 15491 15492 15493 15494 15495 15496 15497 15498 15499 15500 15501 15502 15503 15504 15505 15506 15507 15508 15509 15510 15511 15512 15513 15514 15515 15516 15517 15518 15519 15520 15521 15522 15523 15524 15525 15526 15527 15528 15529 15530 15531 15532 15533 15534 15535 15536 15537 15538 15539 15540 15541 15542 15543 15544 15545 15546 15547 15548 15549 15550 15551 15552 15553 15554 15555 15556 15557 15558 15559 15560 15561 15562 15563 15564 15565 15566 15567 15568 15569 15570 15571 15572 15573 15574 15575 15576 15577 15578 15579 15580 15581 15582 15583 15584 15585 15586 15587 15588 15589 15590 15591 15592 15593 15594 15595 15596 15597 15598 15599 15600 15601 15602 15603 15604 15605 15606 15607 15608 15609 15610 15611 15612 15613 15614 15615 15616 15617 15618 15619 15620 15621 15622 15623 15624 15625 15626 15627 15628 15629 15630 15631 15632 15633 15634 15635 15636 15637 15638 15639 15640 15641 15642 15643 15644 15645 15646 15647 15648 15649 15650 15651 15652 15653 15654 15655 15656 15657 15658 15659 15660 15661 15662 15663 15664 15665 15666 15667 15668 15669 15670 15671 15672 15673 15674 15675 15676 15677 15678 15679 15680 15681 15682 15683 15684 15685 15686 15687 15688 15689 15690 15691 15692 15693 15694 15695 15696 15697 15698 15699 15700 15701 15702 15703 15704 15705 15706 15707 15708 15709 15710 15711 15712 15713 15714 15715 15716 15717 15718 15719 15720 15721 15722 15723 15724 15725 15726 15727 15728 15729 15730 15731 15732 15733 15734 15735 15736 15737 15738 15739 15740 15741 15742 15743 15744 15745 15746 15747 15748 15749 15750 15751 15752 15753 15754 15755 15756 15757 15758 15759 15760 15761 15762 15763 15764 15765 15766 15767 15768 15769 15770 15771 15772 15773 15774 15775 15776 15777 15778 15779 15780 15781 15782 15783 15784 15785 15786 15787 15788 15789 15790 15791 15792 15793 15794 15795 15796 15797 15798 15799 15800 15801 15802 15803 15804 15805 15806 15807 15808 15809 15810 15811 15812 15813 15814 15815 15816 15817 15818 15819 15820 15821 15822 15823 15824 15825 15826 15827 15828 15829 15830 15831 15832 15833 15834 15835 15836 15837 15838 15839 15840 15841 15842 15843 15844 15845 15846 15847 15848 15849 15850 15851 15852 15853 15854 15855 15856 15857 15858 15859 15860 15861 15862 15863 15864 15865 15866 15867 15868 15869 15870 15871 15872 15873 15874 15875 15876 15877 15878 15879 15880 15881 15882 15883 15884 15885 15886 15887 15888 15889 15890 15891 15892 15893 15894 15895 15896 15897 15898 15899 15900 15901 15902 15903 15904 15905 15906 15907 15908 15909 15910 15911 15912 15913 15914 15915 15916 15917 15918 15919 15920 15921 15922 15923 15924 15925 15926 15927 15928 15929 15930 15931 15932 15933 15934 15935 15936 15937 15938 15939 15940 15941 15942 15943 15944 15945 15946 15947 15948 15949 15950 15951 15952 15953 15954 15955 15956 15957 15958 15959 15960 15961 15962 15963 15964 15965 15966 15967 15968 15969 15970 15971 15972 15973 15974 15975 15976 15977 15978 15979 15980 15981 15982 15983 15984 15985 15986 15987 15988 15989 15990 15991 15992 15993 15994 15995 15996 15997 15998 15999 16000 16001 16002 16003 16004 16005 16006 16007 16008 16009 16010 16011 16012 16013 16014 16015 16016 16017 16018 16019 16020 16021 16022 16023 16024 16025 16026 16027 16028 16029 16030 16031 16032 16033 16034 16035 16036 16037 16038 16039 16040 16041 16042 16043 16044 16045 16046 16047 16048 16049 16050 16051 16052 16053 16054 16055 16056 16057 16058 16059 16060 16061 16062 16063 16064 16065 16066 16067 16068 16069 16070 16071 16072 16073 16074 16075 16076 16077 16078 16079 16080 16081 16082 16083 16084 16085 16086 16087 16088 16089 16090 16091 16092 16093 16094 16095 16096 16097 16098 16099 16100 16101 16102 16103 16104 16105 16106 16107 16108 16109 16110 16111 16112 16113 16114 16115 16116 16117 16118 16119 16120 16121 16122 16123 16124 16125 16126 16127 16128 16129 16130 16131 16132 16133 16134 16135 16136 16137 16138 16139 16140 16141 16142 16143 16144 16145 16146 16147 16148 16149 16150 16151 16152 16153 16154 16155 16156 16157 16158 16159 16160 16161 16162 16163 16164 16165 16166 16167 16168 16169 16170 16171 16172 16173 16174 16175 16176 16177 16178 16179 16180 16181 16182 16183 16184 16185 16186 16187 16188 16189 16190 16191 16192 16193 16194 16195 16196 16197 16198 16199 16200 16201 16202 16203 16204 16205 16206 16207 16208 16209 16210 16211 16212 16213 16214 16215 16216 16217 16218 16219 16220 16221 16222 16223 16224 16225 16226 16227 16228 16229 16230 16231 16232 16233 16234 16235 16236 16237 16238 16239 16240 16241 16242 16243 16244 16245 16246 16247 16248 16249 16250 16251 16252 16253 16254 16255 16256 16257 16258 16259 16260 16261 16262 16263 16264 16265 16266 16267 16268 16269 16270 16271 16272 16273 16274 16275 16276 16277 16278 16279 16280 16281 16282 16283 16284 16285 16286 16287 16288 16289 16290 16291 16292 16293 16294 16295 16296 16297 16298 16299 16300 16301 16302 16303 16304 16305 16306 16307 16308 16309 16310 16311 16312 16313 16314 16315 16316 16317 16318 16319 16320 16321 16322 16323 16324 16325 16326 16327 16328 16329 16330 16331 16332 16333 16334 16335 16336 16337 16338 16339 16340 16341 16342 16343 16344 16345 16346 16347 16348 16349 16350 16351 16352 16353 16354 16355 16356 16357 16358 16359 16360 16361 16362 16363 16364 16365 16366 16367 16368 16369 16370 16371 16372 16373 16374 16375 16376 16377 16378 16379 16380 16381 16382 16383 16384 16385 16386 16387 16388 16389 16390 16391 16392 16393 16394 16395 16396 16397 16398 16399 16400 16401 16402 16403 16404 16405 16406 16407 16408 16409 16410 16411 16412 16413 16414 16415 16416 16417 16418 16419 16420 16421 16422 16423 16424 16425 16426 16427 16428 16429 16430 16431 16432 16433 16434 16435 16436 16437 16438 16439 16440 16441 16442 16443 16444 16445 16446 16447 16448 16449 16450 16451 16452 16453 16454 16455 16456 16457 16458 16459 16460 16461 16462 16463 16464 16465 16466 16467 16468 16469 16470 16471 16472 16473 16474 16475 16476 16477 16478 16479 16480 16481 16482 16483 16484 16485 16486 16487 16488 16489 16490 16491 16492 16493 16494 16495 16496 16497 16498 16499 16500 16501 16502 16503 16504 16505 16506 16507 16508 16509 16510 16511 16512 16513 16514 16515 16516 16517 16518 16519 16520 16521 16522 16523 16524 16525 16526 16527 16528 16529 16530 16531 16532 16533 16534 16535 16536 16537 16538 16539 16540 16541 16542 16543 16544 16545 16546 16547 16548 16549 16550 16551 16552 16553 16554 16555 16556 16557 16558 16559 16560 16561 16562 16563 16564 16565 16566 16567 16568 16569 16570 16571 16572 16573 16574 16575 16576 16577 16578 16579 16580 16581 16582 16583 16584 16585 16586 16587 16588 16589 16590 16591 16592 16593 16594 16595 16596 16597 16598 16599 16600 16601 16602 16603 16604 16605 16606 16607 16608 16609 16610 16611 16612 16613 16614 16615 16616 16617 16618 16619 16620 16621 16622 16623 16624 16625 16626 16627 16628 16629 16630 16631 16632 16633 16634 16635 16636 16637 16638 16639 16640 16641 16642 16643 16644 16645 16646 16647 16648 16649 16650 16651 16652 16653 16654 16655 16656 16657 16658 16659 16660 16661 16662 16663 16664 16665 16666 16667 16668 16669 16670 16671 16672 16673 16674 16675 16676 16677 16678 16679 16680 16681 16682 16683 16684 16685 16686 16687 16688 16689 16690 16691 16692 16693 16694 16695 16696 16697 16698 16699 16700 16701 16702 16703 16704 16705 16706 16707 16708 16709 16710 16711 16712 16713 16714 16715 16716 16717 16718 16719 16720 16721 16722 16723 16724 16725 16726 16727 16728 16729 16730 16731 16732 16733 16734 16735 16736 16737 16738 16739 16740 16741 16742 16743 16744 16745 16746 16747 16748 16749 16750 16751 16752 16753 16754 16755 16756 16757 16758 16759 16760 16761 16762 16763 16764 16765 16766 16767 16768 16769 16770 16771 16772 16773 16774 16775 16776 16777 16778 16779 16780 16781 16782 16783 16784 16785 16786 16787 16788 16789 16790 16791 16792 16793 16794 16795 16796 16797 16798 16799 16800 16801 16802 16803 16804 16805 16806 16807 16808 16809 16810 16811 16812 16813 16814 16815 16816 16817 16818 16819 16820 16821 16822 16823 16824 16825 16826 16827 16828 16829 16830 16831 16832 16833 16834 16835 16836 16837 16838 16839 16840 16841 16842 16843 16844 16845 16846 16847 16848 16849 16850 16851 16852 16853 16854 16855 16856 16857 16858 16859 16860 16861 16862 16863 16864 16865 16866 16867 16868 16869 16870 16871 16872 16873 16874 16875 16876 16877 16878 16879 16880 16881 16882 16883 16884 16885 16886 16887 16888 16889 16890 16891 16892 16893 16894 16895 16896 16897 16898 16899 16900 16901 16902 16903 16904 16905 16906 16907 16908 16909 16910 16911 16912 16913 16914 16915 16916 16917 16918 16919 16920 16921 16922 16923 16924 16925 16926 16927 16928 16929 16930 16931 16932 16933 16934 16935 16936 16937 16938 16939 16940 16941 16942 16943 16944 16945 16946 16947 16948 16949 16950 16951 16952 16953 16954 16955 16956 16957 16958 16959 16960 16961 16962 16963 16964 16965 16966 16967 16968 16969 16970 16971 16972 16973 16974 16975 16976 16977 16978 16979 16980 16981 16982 16983 16984 16985 16986 16987 16988 16989 16990 16991 16992 16993 16994 16995 16996 16997 16998 16999 17000 17001 17002 17003 17004 17005 17006 17007 17008 17009 17010 17011 17012 17013 17014 17015 17016 17017 17018 17019 17020 17021 17022 17023 17024 17025 17026 17027 17028 17029 17030 17031 17032 17033 17034 17035 17036 17037 17038 17039 17040 17041 17042 17043 17044 17045 17046 17047 17048 17049 17050 17051 17052 17053 17054 17055 17056 17057 17058 17059 17060 17061 17062 17063 17064 17065 17066 17067 17068 17069 17070 17071 17072 17073 17074 17075 17076 17077 17078 17079 17080 17081 17082 17083 17084 17085 17086 17087 17088 17089 17090 17091 17092 17093 17094 17095 17096 17097 17098 17099 17100 17101 17102 17103 17104 17105 17106 17107 17108 17109 17110 17111 17112 17113 17114 17115 17116 17117 17118 17119 17120 17121 17122 17123 17124 17125 17126 17127 17128 17129 17130 17131 17132 17133 17134 17135 17136 17137 17138 17139 17140 17141 17142 17143 17144 17145 17146 17147 17148 17149 17150 17151 17152 17153 17154 17155 17156 17157 17158 17159 17160 17161 17162 17163 17164 17165 17166 17167 17168 17169 17170 17171 17172 17173 17174 17175 17176 17177 17178 17179 17180 17181 17182 17183 17184 17185 17186 17187 17188 17189 17190 17191 17192 17193 17194 17195 17196 17197 17198 17199 17200 17201 17202 17203 17204 17205 17206 17207 17208 17209 17210 17211 17212 17213 17214 17215 17216 17217 17218 17219 17220 17221 17222 17223 17224 17225 17226 17227 17228 17229 17230 17231 17232 17233 17234 17235 17236 17237 17238 17239 17240 17241 17242 17243 17244 17245 17246 17247 17248 17249 17250 17251 17252 17253 17254 17255 17256 17257 17258 17259 17260 17261 17262 17263 17264 17265 17266 17267 17268 17269 17270 17271 17272 17273 17274 17275 17276 17277 17278 17279 17280 17281 17282 17283 17284 17285 17286 17287 17288 17289 17290 17291 17292 17293 17294 17295 17296 17297 17298 17299 17300 17301 17302 17303 17304 17305 17306 17307 17308 17309 17310 17311 17312 17313 17314 17315 17316 17317 17318 17319 17320 17321 17322 17323 17324 17325 17326 17327 17328 17329 17330 17331 17332 17333 17334 17335 17336 17337 17338 17339 17340 17341 17342 17343 17344 17345 17346 17347 17348 17349 17350 17351 17352 17353 17354 17355 17356 17357 17358 17359 17360 17361 17362 17363 17364 17365 17366 17367 17368 17369 17370 17371 17372 17373 17374 17375 17376 17377 17378 17379 17380 17381 17382 17383 17384 17385 17386 17387 17388 17389 17390 17391 17392 17393 17394 17395 17396 17397 17398 17399 17400 17401 17402 17403 17404 17405 17406 17407 17408 17409 17410 17411 17412 17413 17414 17415 17416 17417 17418 17419 17420 17421 17422 17423 17424 17425 17426 17427 17428 17429 17430 17431 17432 17433 17434 17435 17436 17437 17438 17439 17440 17441 17442 17443 17444 17445 17446 17447 17448 17449 17450 17451 17452 17453 17454 17455 17456 17457 17458 17459 17460 17461 17462 17463 17464 17465 17466 17467 17468 17469 17470 17471 17472 17473 17474 17475 17476 17477 17478 17479 17480 17481 17482 17483 17484 17485 17486 17487 17488 17489 17490 17491 17492 17493 17494 17495 17496 17497 17498 17499 17500 17501 17502 17503 17504 17505 17506 17507 17508 17509 17510 17511 17512 17513 17514 17515 17516 17517 17518 17519 17520 17521 17522 17523 17524 17525 17526 17527 17528 17529 17530 17531 17532 17533 17534 17535 17536 17537 17538 17539 17540 17541 17542 17543 17544 17545 17546 17547 17548 17549 17550 17551 17552 17553 17554 17555 17556 17557 17558 17559 17560 17561 17562 17563 17564 17565 17566 17567 17568 17569 17570 17571 17572 17573 17574 17575 17576 17577 17578 17579 17580 17581 17582 17583 17584 17585 17586 17587 17588 17589 17590 17591 17592 17593 17594 17595 17596 17597 17598 17599 17600 17601 17602 17603 17604 17605 17606 17607 17608 17609 17610 17611 17612 17613 17614 17615 17616 17617 17618 17619 17620 17621 17622 17623 17624 17625 17626 17627 17628 17629 17630 17631 17632 17633 17634 17635 17636 17637 17638 17639 17640 17641 17642 17643 17644 17645 17646 17647 17648 17649 17650 17651 17652 17653 17654 17655 17656 17657 17658 17659 17660 17661 17662 17663 17664 17665 17666 17667 17668 17669 17670 17671 17672 17673 17674 17675 17676 17677 17678 17679 17680 17681 17682 17683 17684 17685 17686 17687 17688 17689 17690 17691 17692 17693 17694 17695 17696 17697 17698 17699 17700 17701 17702 17703 17704 17705 17706 17707 17708 17709 17710 17711 17712 17713 17714 17715 17716 17717 17718 17719 17720 17721 17722 17723 17724 17725 17726 17727 17728 17729 17730 17731 17732 17733 17734 17735 17736 17737 17738 17739 17740 17741 17742 17743 17744 17745 17746 17747 17748 17749 17750 17751 17752 17753 17754 17755 17756 17757 17758 17759 17760 17761 17762 17763 17764 17765 17766 17767 17768 17769 17770 17771 17772 17773 17774 17775 17776 17777 17778 17779 17780 17781 17782 17783 17784 17785 17786 17787 17788 17789 17790 17791 17792 17793 17794 17795 17796 17797 17798 17799 17800 17801 17802 17803 17804 17805 17806 17807 17808 17809 17810 17811 17812 17813 17814 17815 17816 17817 17818 17819 17820 17821 17822 17823 17824 17825 17826 17827 17828 17829 17830 17831 17832 17833 17834 17835 17836 17837 17838 17839 17840 17841 17842 17843 17844 17845 17846 17847 17848 17849 17850 17851 17852 17853 17854 17855 17856 17857 17858 17859 17860 17861 17862 17863 17864 17865 17866 17867 17868 17869 17870 17871 17872 17873 17874 17875 17876 17877 17878 17879 17880 17881 17882 17883 17884 17885 17886 17887 17888 17889 17890 17891 17892 17893 17894 17895 17896 17897 17898 17899 17900 17901 17902 17903 17904 17905 17906 17907 17908 17909 17910 17911 17912 17913 17914 17915 17916 17917 17918 17919 17920 17921 17922 17923 17924 17925 17926 17927 17928 17929 17930 17931 17932 17933 17934 17935 17936 17937 17938 17939 17940 17941 17942 17943 17944 17945 17946 17947 17948 17949 17950 17951 17952 17953 17954 17955 17956 17957 17958 17959 17960 17961 17962 17963 17964 17965 17966 17967 17968 17969 17970 17971 17972 17973 17974 17975 17976 17977 17978 17979 17980 17981 17982 17983 17984 17985 17986 17987 17988 17989 17990 17991 17992 17993 17994 17995 17996 17997 17998 17999 18000 18001 18002 18003 18004 18005 18006 18007 18008 18009 18010 18011 18012 18013 18014 18015 18016 18017 18018 18019 18020 18021 18022 18023 18024 18025 18026 18027 18028 18029 18030 18031 18032 18033 18034 18035 18036 18037 18038 18039 18040 18041 18042 18043 18044 18045 18046 18047 18048 18049 18050 18051 18052 18053 18054 18055 18056 18057 18058 18059 18060 18061 18062 18063 18064 18065 18066 18067 18068 18069 18070 18071 18072 18073 18074 18075 18076 18077 18078 18079 18080 18081 18082 18083 18084 18085 18086 18087 18088 18089 18090 18091 18092 18093 18094 18095 18096 18097 18098 18099 18100 18101 18102 18103 18104 18105 18106 18107 18108 18109 18110 18111 18112 18113 18114 18115 18116 18117 18118 18119 18120 18121 18122 18123 18124 18125 18126 18127 18128 18129 18130 18131 18132 18133 18134 18135 18136 18137 18138 18139 18140 18141 18142 18143 18144 18145 18146 18147 18148 18149 18150 18151 18152 18153 18154 18155 18156 18157 18158 18159 18160 18161 18162 18163 18164 18165 18166 18167 18168 18169 18170 18171 18172 18173 18174 18175 18176 18177 18178 18179 18180 18181 18182 18183 18184 18185 18186 18187 18188 18189 18190 18191 18192 18193 18194 18195 18196 18197 18198 18199 18200 18201 18202 18203 18204 18205 18206 18207 18208 18209 18210 18211 18212 18213 18214 18215 18216 18217 18218 18219 18220 18221 18222 18223 18224 18225 18226 18227 18228 18229 18230 18231 18232 18233 18234 18235 18236 18237 18238 18239 18240 18241 18242 18243 18244 18245 18246 18247 18248 18249 18250 18251 18252 18253 18254 18255 18256 18257 18258 18259 18260 18261 18262 18263 18264 18265 18266 18267 18268 18269 18270 18271 18272 18273 18274 18275 18276 18277 18278 18279 18280 18281 18282 18283 18284 18285 18286 18287 18288 18289 18290 18291 18292 18293 18294 18295 18296 18297 18298 18299 18300 18301 18302 18303 18304 18305 18306 18307 18308 18309 18310 18311 18312 18313 18314 18315 18316 18317 18318 18319 18320 18321 18322 18323 18324 18325 18326 18327 18328 18329 18330 18331 18332 18333 18334 18335 18336 18337 18338 18339 18340 18341 18342 18343 18344 18345 18346 18347 18348 18349 18350 18351 18352 18353 18354 18355 18356 18357 18358 18359 18360 18361 18362 18363 18364 18365 18366 18367 18368 18369 18370 18371 18372 18373 18374 18375 18376 18377 18378 18379 18380 18381 18382 18383 18384 18385 18386 18387 18388 18389 18390 18391 18392 18393 18394 18395 18396 18397 18398 18399 18400 18401 18402 18403 18404 18405 18406 18407 18408 18409 18410 18411 18412 18413 18414 18415 18416 18417 18418 18419 18420 18421 18422 18423 18424 18425 18426 18427 18428 18429 18430 18431 18432 18433 18434 18435 18436 18437 18438 18439 18440 18441 18442 18443 18444 18445 18446 18447 18448 18449 18450 18451 18452 18453 18454 18455 18456 18457 18458 18459 18460 18461 18462 18463 18464 18465 18466 18467 18468 18469 18470 18471 18472 18473 18474 18475 18476 18477 18478 18479 18480 18481 18482 18483 18484 18485 18486 18487 18488 18489 18490 18491 18492 18493 18494 18495 18496 18497 18498 18499 18500 18501 18502 18503 18504 18505 18506 18507 18508 18509 18510 18511 18512 18513 18514 18515 18516 18517 18518 18519 18520 18521 18522 18523 18524 18525 18526 18527 18528 18529 18530 18531 18532 18533 18534 18535 18536 18537 18538 18539 18540 18541 18542 18543 18544 18545 18546 18547 18548 18549 18550 18551 18552 18553 18554 18555 18556 18557 18558 18559 18560 18561 18562 18563 18564 18565 18566 18567 18568 18569 18570 18571 18572 18573 18574 18575 18576 18577 18578 18579 18580 18581 18582 18583 18584 18585 18586 18587 18588 18589 18590 18591 18592 18593 18594 18595 18596 18597 18598 18599 18600 18601 18602 18603 18604 18605 18606 18607 18608 18609 18610 18611 18612 18613 18614 18615 18616 18617 18618 18619 18620 18621 18622 18623 18624 18625 18626 18627 18628 18629 18630 18631 18632 18633 18634 18635 18636 18637 18638 18639 18640 18641 18642 18643 18644 18645 18646 18647 18648 18649 18650 18651 18652 18653 18654 18655 18656 18657 18658 18659 18660 18661 18662 18663 18664 18665 18666 18667 18668 18669 18670 18671 18672 18673 18674 18675 18676 18677 18678 18679 18680 18681 18682 18683 18684 18685 18686 18687 18688 18689 18690 18691 18692 18693 18694 18695 18696 18697 18698 18699 18700 18701 18702 18703 18704 18705 18706 18707 18708 18709 18710 18711 18712 18713 18714 18715 18716 18717 18718 18719 18720 18721 18722 18723 18724 18725 18726 18727 18728 18729 18730 18731 18732 18733 18734 18735 18736 18737 18738 18739 18740 18741 18742 18743 18744 18745 18746 18747 18748 18749 18750 18751 18752 18753 18754 18755 18756 18757 18758 18759 18760 18761 18762 18763 18764 18765 18766 18767 18768 18769 18770 18771 18772 18773 18774 18775 18776 18777 18778 18779 18780 18781 18782 18783 18784 18785 18786 18787 18788 18789 18790 18791 18792 18793 18794 18795 18796 18797 18798 18799 18800 18801 18802 18803 18804 18805 18806 18807 18808 18809 18810 18811 18812 18813 18814 18815 18816 18817 18818 18819 18820 18821 18822 18823 18824 18825 18826 18827 18828 18829 18830 18831 18832 18833 18834 18835 18836 18837 18838 18839 18840 18841 18842 18843 18844 18845 18846 18847 18848 18849 18850 18851 18852 18853 18854 18855 18856 18857 18858 18859 18860 18861 18862 18863 18864 18865 18866 18867 18868 18869 18870 18871 18872 18873 18874 18875 18876 18877 18878 18879 18880 18881 18882 18883 18884 18885 18886 18887 18888 18889 18890 18891 18892 18893 18894 18895 18896 18897 18898 18899 18900 18901 18902 18903 18904 18905 18906 18907 18908 18909 18910 18911 18912 18913 18914 18915 18916 18917 18918 18919 18920 18921 18922 18923 18924 18925 18926 18927 18928 18929 18930 18931 18932 18933 18934 18935 18936 18937 18938 18939 18940 18941 18942 18943 18944 18945 18946 18947 18948 18949 18950 18951 18952 18953 18954 18955 18956 18957 18958 18959 18960 18961 18962 18963 18964 18965 18966 18967 18968 18969 18970 18971 18972 18973 18974 18975 18976 18977 18978 18979 18980 18981 18982 18983 18984 18985 18986 18987 18988 18989 18990 18991 18992 18993 18994 18995 18996 18997 18998 18999 19000 19001 19002 19003 19004 19005 19006 19007 19008 19009 19010 19011 19012 19013 19014 19015 19016 19017 19018 19019 19020 19021 19022 19023 19024 19025 19026 19027 19028 19029 19030 19031 19032 19033 19034 19035 19036 19037 19038 19039 19040 19041 19042 19043 19044 19045 19046 19047 19048 19049 19050 19051 19052 19053 19054 19055 19056 19057 19058 19059 19060 19061 19062 19063 19064 19065 19066 19067 19068 19069 19070 19071 19072 19073 19074 19075 19076 19077 19078 19079 19080 19081 19082 19083 19084 19085 19086 19087 19088 19089 19090 19091 19092 19093 19094 19095 19096 19097 19098 19099 19100 19101 19102 19103 19104 19105 19106 19107 19108 19109 19110 19111 19112 19113 19114 19115 19116 19117 19118 19119 19120 19121 19122 19123 19124 19125 19126 19127 19128 19129 19130 19131 19132 19133 19134 19135 19136 19137 19138 19139 19140 19141 19142 19143 19144 19145 19146 19147 19148 19149 19150 19151 19152 19153 19154 19155 19156 19157 19158 19159 19160 19161 19162 19163 19164 19165 19166 19167 19168 19169 19170 19171 19172 19173 19174 19175 19176 19177 19178 19179 19180 19181 19182 19183 19184 19185 19186 19187 19188 19189 19190 19191 19192 19193 19194 19195 19196 19197 19198 19199 19200 19201 19202 19203 19204 19205 19206 19207 19208 19209 19210 19211 19212 19213 19214 19215 19216 19217 19218 19219 19220 19221 19222 19223 19224 19225 19226 19227 19228 19229 19230 19231 19232 19233 19234 19235 19236 19237 19238 19239 19240 19241 19242 19243 19244 19245 19246 19247 19248 19249 19250 19251 19252 19253 19254 19255 19256 19257 19258 19259 19260 19261 19262 19263 19264 19265 19266 19267 19268 19269 19270 19271 19272 19273 19274 19275 19276 19277 19278 19279 19280 19281 19282 19283 19284 19285 19286 19287 19288 19289 19290 19291 19292 19293 19294 19295 19296 19297 19298 19299 19300 19301 19302 19303 19304 19305 19306 19307 19308 19309 19310 19311 19312 19313 19314 19315 19316 19317 19318 19319 19320 19321 19322 19323 19324 19325 19326 19327 19328 19329 19330 19331 19332 19333 19334 19335 19336 19337 19338 19339 19340 19341 19342 19343 19344 19345 19346 19347 19348 19349 19350 19351 19352 19353 19354 19355 19356 19357 19358 19359 19360 19361 19362 19363 19364 19365 19366 19367 19368 19369 19370 19371 19372 19373 19374 19375 19376 19377 19378 19379 19380 19381 19382 19383 19384 19385 19386 19387 19388 19389 19390 19391 19392 19393 19394 19395 19396 19397 19398 19399 19400 19401 19402 19403 19404 19405 19406 19407 19408 19409 19410 19411 19412 19413 19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 19429 19430 19431 19432 19433 19434 19435 19436 19437 19438 19439 19440 19441 19442 19443 19444 19445 19446 19447 19448 19449 19450 19451 19452 19453 19454 19455 19456 19457 19458 19459 19460 19461 19462 19463 19464 19465 19466 19467 19468 19469 19470 19471 19472 19473 19474 19475 19476 19477 19478 19479 19480 19481 19482 19483 19484 19485 19486 19487 19488 19489 19490 19491 19492 19493 19494 19495 19496 19497 19498 19499 19500 19501 19502 19503 19504 19505 19506 19507 19508 19509 19510 19511 19512 19513 19514 19515 19516 19517 19518 19519 19520 19521 19522 19523 19524 19525 19526 19527 19528 19529 19530 19531 19532 19533 19534 19535 19536 19537 19538 19539 19540 19541 19542 19543 19544 19545 19546 19547 19548 19549 19550 19551 19552 19553 19554 19555 19556 19557 19558 19559 19560 19561 19562 19563 19564 19565 19566 19567 19568 19569 19570 19571 19572 19573 19574 19575 19576 19577 19578 19579 19580 19581 19582 19583 19584 19585 19586 19587 19588 19589 19590 19591 19592 19593 19594 19595 19596 19597 19598 19599 19600 19601 19602 19603 19604 19605 19606 19607 19608 19609 19610 19611 19612 19613 19614 19615 19616 19617 19618 19619 19620 19621 19622 19623 19624 19625 19626 19627 19628 19629 19630 19631 19632 19633 19634 19635 19636 19637 19638 19639 19640 19641 19642 19643 19644 19645 19646 19647 19648 19649 19650 19651 19652 19653 19654 19655 19656 19657 19658 19659 19660 19661 19662 19663 19664 19665 19666 19667 19668 19669 19670 19671 19672 19673 19674 19675 19676 19677 19678 19679 19680 19681 19682 19683 19684 19685 19686 19687 19688 19689 19690 19691 19692 19693 19694 19695 19696 19697 19698 19699 19700 19701 19702 19703 19704 19705 19706 19707 19708 19709 19710 19711 19712 19713 19714 19715 19716 19717 19718 19719 19720 19721 19722 19723 19724 19725 19726 19727 19728 19729 19730 19731 19732 19733 19734 19735 19736 19737 19738 19739 19740 19741 19742 19743 19744 19745 19746 19747 19748 19749 19750 19751 19752 19753 19754 19755 19756 19757 19758 19759 19760 19761 19762 19763 19764 19765 19766 19767 19768 19769 19770 19771 19772 19773 19774 19775 19776 19777 19778 19779 19780 19781 19782 19783 19784 19785 19786 19787 19788 19789 19790 19791 19792 19793 19794 19795 19796 19797 19798 19799 19800 19801 19802 19803 19804 19805 19806 19807 19808 19809 19810 19811 19812 19813 19814 19815 19816 19817 19818 19819 19820 19821 19822 19823 19824 19825 19826 19827 19828 19829 19830 19831 19832 19833 19834 19835 19836 19837 19838 19839 19840 19841 19842 19843 19844 19845 19846 19847 19848 19849 19850 19851 19852 19853 19854 19855 19856 19857 19858 19859 19860 19861 19862 19863 19864 19865 19866 19867 19868 19869 19870 19871 19872 19873 19874 19875 19876 19877 19878 19879 19880 19881 19882 19883 19884 19885 19886 19887 19888 19889 19890 19891 19892 19893 19894 19895 19896 19897 19898 19899 19900 19901 19902 19903 19904 19905 19906 19907 19908 19909 19910 19911 19912 19913 19914 19915 19916 19917 19918 19919 19920 19921 19922 19923 19924 19925 19926 19927 19928 19929 19930 19931 19932 19933 19934 19935 19936 19937 19938 19939 19940 19941 19942 19943 19944 19945 19946 19947 19948 19949 19950 19951 19952 19953 19954 19955 19956 19957 19958 19959 19960 19961 19962 19963 19964 19965 19966 19967 19968 19969 19970 19971 19972 19973 19974 19975 19976 19977 19978 19979 19980 19981 19982 19983 19984 19985 19986 19987 19988 19989 19990 19991 19992 19993 19994 19995 19996 19997 19998 19999 20000 20001 20002 20003 20004 20005 20006 20007 20008 20009 20010 20011 20012 20013 20014 20015 20016 20017 20018 20019 20020 20021 20022 20023 20024 20025 20026 20027 20028 20029 20030 20031 20032 20033 20034 20035 20036 20037 20038 20039 20040 20041 20042 20043 20044 20045 20046 20047 20048 20049 20050 20051 20052 20053 20054 20055 20056 20057 20058 20059 20060 20061 20062 20063 20064 20065 20066 20067 20068 20069 20070 20071 20072 20073 20074 20075 20076 20077 20078 20079 20080 20081 20082 20083 20084 20085 20086 20087 20088 20089 20090 20091 20092 20093 20094 20095 20096 20097 20098 20099 20100 20101 20102 20103 20104 20105 20106 20107 20108 20109 20110 20111 20112 20113 20114 20115 20116 20117 20118 20119 20120 20121 20122 20123 20124 20125 20126 20127 20128 20129 20130 20131 20132 20133 20134 20135 20136 20137 20138 20139 20140 20141 20142 20143 20144 20145 20146 20147 20148 20149 20150 20151 20152 20153 20154 20155 20156 20157 20158 20159 20160 20161 20162 20163 20164 20165 20166 20167 20168 20169 20170 20171 20172 20173 20174 20175 20176 20177 20178 20179 20180 20181 20182 20183 20184 20185 20186 20187 20188 20189 20190 20191 20192 20193 20194 20195 20196 20197 20198 20199 20200 20201 20202 20203 20204 20205 20206 20207 20208 20209 20210 20211 20212 20213 20214 20215 20216 20217 20218 20219 20220 20221 20222 20223 20224 20225 20226 20227 20228 20229 20230 20231 20232 20233 20234 20235 20236 20237 20238 20239 20240 20241 20242 20243 20244 20245 20246 20247 20248 20249 20250 20251 20252 20253 20254 20255 20256 20257 20258 20259 20260 20261 20262 20263 20264 20265 20266 20267 20268 20269 20270 20271 20272 20273 20274 20275 20276 20277 20278 20279 20280 20281 20282 20283 20284 20285 20286 20287 20288 20289 20290 20291 20292 20293 20294 20295 20296 20297 20298 20299 20300 20301 20302 20303 20304 20305 20306 20307 20308 20309 20310 20311 20312 20313 20314 20315 20316 20317 20318 20319 20320 20321 20322 20323 20324 20325 20326 20327 20328 20329 20330 20331 20332 20333 20334 20335 20336 20337 20338 20339 20340 20341 20342 20343 20344 20345 20346 20347 20348 20349 20350 20351 20352 20353 20354 20355 20356 20357 20358 20359 20360 20361 20362 20363 20364 20365 20366 20367 20368 20369 20370 20371 20372 20373 20374 20375 20376 20377 20378 20379 20380 20381 20382 20383 20384 20385 20386 20387 20388 20389 20390 20391 20392 20393 20394 20395 20396 20397 20398 20399 20400 20401 20402 20403 20404 20405 20406 20407 20408 20409 20410 20411 20412 20413 20414 20415 20416 20417 20418 20419 20420 20421 20422 20423 20424 20425 20426 20427 20428 20429 20430 20431 20432 20433 20434 20435 20436 20437 20438 20439 20440 20441 20442 20443 20444 20445 20446 20447 20448 20449 20450 20451 20452 20453 20454 20455 20456 20457 20458 20459 20460 20461 20462 20463 20464 20465 20466 20467 20468 20469 20470 20471 20472 20473 20474 20475 20476 20477 20478 20479 20480 20481 20482 20483 20484 20485 20486 20487 20488 20489 20490 20491 20492 20493 20494 20495 20496 20497 20498 20499 20500 20501 20502 20503 20504 20505 20506 20507 20508 20509 20510 20511 20512 20513 20514 20515 20516 20517 20518 20519 20520 20521 20522 20523 20524 20525 20526 20527 20528 20529 20530 20531 20532 20533 20534 20535 20536 20537 20538 20539 20540 20541 20542 20543 20544 20545 20546 20547 20548 20549 20550 20551 20552 20553 20554 20555 20556 20557 20558 20559 20560 20561 20562 20563 20564 20565 20566 20567 20568 20569 20570 20571 20572 20573 20574 20575 20576 20577 20578 20579 20580 20581 20582 20583 20584 20585 20586 20587 20588 20589 20590 20591 20592 20593 20594 20595 20596 20597 20598 20599 20600 20601 20602 20603 20604 20605 20606 20607 20608 20609 20610 20611 20612 20613 20614 20615 20616 20617 20618 20619 20620 20621 20622 20623 20624 20625 20626 20627 20628 20629 20630 20631 20632 20633 20634 20635 20636 20637 20638 20639 20640 20641 20642 20643 20644 20645 20646 20647 20648 20649 20650 20651 20652 20653 20654 20655 20656 20657 20658 20659 20660 20661 20662 20663 20664 20665 20666 20667 20668 20669 20670 20671 20672 20673 20674 20675 20676 20677 20678 20679 20680 20681 20682 20683 20684 20685 20686 20687 20688 20689 20690 20691 20692 20693 20694 20695 20696 20697 20698 20699 20700 20701 20702 20703 20704 20705 20706 20707 20708 20709 20710 20711 20712 20713 20714 20715 20716 20717 20718 20719 20720 20721 20722 20723 20724 20725 20726 20727 20728 20729 20730 20731 20732 20733 20734 20735 20736 20737 20738 20739 20740 20741 20742 20743 20744 20745 20746 20747 20748 20749 20750 20751 20752 20753 20754 20755 20756 20757 20758 20759 20760 20761 20762 20763 20764 20765 20766 20767 20768 20769 20770 20771 20772 20773 20774 20775 20776 20777 20778 20779 20780 20781 20782 20783 20784 20785 20786 20787 20788 20789 20790 20791 20792 20793 20794 20795 20796 20797 20798 20799 20800 20801 20802 20803 20804 20805 20806 20807 20808 20809 20810 20811 20812 20813 20814 20815 20816 20817 20818 20819 20820 20821 20822 20823 20824 20825 20826 20827 20828 20829 20830 20831 20832 20833 20834 20835 20836 20837 20838 20839 20840 20841 20842 20843 20844 20845 20846 20847 20848 20849 20850 20851 20852 20853 20854 20855 20856 20857 20858 20859 20860 20861 20862 20863 20864 20865 20866 20867 20868 20869 20870 20871 20872 20873 20874 20875 20876 20877 20878 20879 20880 20881 20882 20883 20884 20885 20886 20887 20888 20889 20890 20891 20892 20893 20894 20895 20896 20897 20898 20899 20900 20901 20902 20903 20904 20905 20906 20907 20908 20909 20910 20911 20912 20913 20914 20915 20916 20917 20918 20919 20920 20921 20922 20923 20924 20925 20926 20927 20928 20929 20930 20931 20932 20933 20934 20935 20936 20937 20938 20939 20940 20941 20942 20943 20944 20945 20946 20947 20948 20949 20950 20951 20952 20953 20954 20955 20956 20957 20958 20959 20960 20961 20962 20963 20964 20965 20966 20967 20968 20969 20970 20971 20972 20973 20974 20975 20976 20977 20978 20979 20980 20981 20982 20983 20984 20985 20986 20987 20988 20989 20990 20991 20992 20993 20994 20995 20996 20997 20998 20999 21000 21001 21002 21003 21004 21005 21006 21007 21008 21009 21010 21011 21012 21013 21014 21015 21016 21017 21018 21019 21020 21021 21022 21023 21024 21025 21026 21027 21028 21029 21030 21031 21032 21033 21034 21035 21036 21037 21038 21039 21040 21041 21042 21043 21044 21045 21046 21047 21048 21049 21050 21051 21052 21053 21054 21055 21056 21057 21058 21059 21060 21061 21062 21063 21064 21065 21066 21067 21068 21069 21070 21071 21072 21073 21074 21075 21076 21077 21078 21079 21080 21081 21082 21083 21084 21085 21086 21087 21088 21089 21090 21091 21092 21093 21094 21095 21096 21097 21098 21099 21100 21101 21102 21103 21104 21105 21106 21107 21108 21109 21110 21111 21112 21113 21114 21115 21116 21117 21118 21119 21120 21121 21122 21123 21124 21125 21126 21127 21128 21129 21130 21131 21132 21133 21134 21135 21136 21137 21138 21139 21140 21141 21142 21143 21144 21145 21146 21147 21148 21149 21150 21151 21152 21153 21154 21155 21156 21157 21158 21159 21160 21161 21162 21163 21164 21165 21166 21167 21168 21169 21170 21171 21172 21173 21174 21175 21176 21177 21178 21179 21180 21181 21182 21183 21184 21185 21186 21187 21188 21189 21190 21191 21192 21193 21194 21195 21196 21197 21198 21199 21200 21201 21202 21203 21204 21205 21206 21207 21208 21209 21210 21211 21212 21213 21214 21215 21216 21217 21218 21219 21220 21221 21222 21223 21224 21225 21226 21227 21228 21229 21230 21231 21232 21233 21234 21235 21236 21237 21238 21239 21240 21241 21242 21243 21244 21245 21246 21247 21248 21249 21250 21251 21252 21253 21254 21255 21256 21257 21258 21259 21260 21261 21262 21263 21264 21265 21266 21267 21268 21269 21270 21271 21272 21273 21274 21275 21276 21277 21278 21279 21280 21281 21282 21283 21284 21285 21286 21287 21288 21289 21290 21291 21292 21293 21294 21295 21296 21297 21298 21299 21300 21301 21302 21303 21304 21305 21306 21307 21308 21309 21310 21311 21312 21313 21314 21315 21316 21317 21318 21319 21320 21321 21322 21323 21324 21325 21326 21327 21328 21329 21330 21331 21332 21333 21334 21335 21336 21337 21338 21339 21340 21341 21342 21343 21344 21345 21346 21347 21348 21349 21350 21351 21352 21353 21354 21355 21356 21357 21358 21359 21360 21361 21362 21363 21364 21365 21366 21367 21368 21369 21370 21371 21372 21373 21374 21375 21376 21377 21378 21379 21380 21381 21382 21383 21384 21385 21386 21387 21388 21389 21390 21391 21392 21393 21394 21395 21396 21397 21398 21399 21400 21401 21402 21403 21404 21405 21406 21407 21408 21409 21410 21411 21412 21413 21414 21415 21416 21417 21418 21419 21420 21421 21422 21423 21424 21425 21426 21427 21428 21429 21430 21431 21432 21433 21434 21435 21436 21437 21438 21439 21440 21441 21442 21443 21444 21445 21446 21447 21448 21449 21450 21451 21452 21453 21454 21455 21456 21457 21458 21459 21460 21461 21462 21463 21464 21465 21466 21467 21468 21469 21470 21471 21472 21473 21474 21475 21476 21477 21478 21479 21480 21481 21482 21483 21484 21485 21486 21487 21488 21489 21490 21491 21492 21493 21494 21495 21496 21497 21498 21499 21500 21501 21502 21503 21504 21505 21506 21507 21508 21509 21510 21511 21512 21513 21514 21515 21516 21517 21518 21519 21520 21521 21522 21523 21524 21525 21526 21527 21528 21529 21530 21531 21532 21533 21534 21535 21536 21537 21538 21539 21540 21541 21542 21543 21544 21545 21546 21547 21548 21549 21550 21551 21552 21553 21554 21555 21556 21557 21558 21559 21560 21561 21562 21563 21564 21565 21566 21567 21568 21569 21570 21571 21572 21573 21574 21575 21576 21577 21578 21579 21580 21581 21582 21583 21584 21585 21586 21587 21588 21589 21590 21591 21592 21593 21594 21595 21596 21597 21598 21599 21600 21601 21602 21603 21604 21605 21606 21607 21608 21609 21610 21611 21612 21613 21614 21615 21616 21617 21618 21619 21620 21621 21622 21623 21624 21625 21626 21627 21628 21629 21630 21631 21632 21633 21634 21635 21636 21637 21638 21639 21640 21641 21642 21643 21644 21645 21646 21647 21648 21649 21650 21651 21652 21653 21654 21655 21656 21657 21658 21659 21660 21661 21662 21663 21664 21665 21666 21667 21668 21669 21670 21671 21672 21673 21674 21675 21676 21677 21678 21679 21680 21681 21682 21683 21684 21685 21686 21687 21688 21689 21690 21691 21692 21693 21694 21695 21696 21697 21698 21699 21700 21701 21702 21703 21704 21705 21706 21707 21708 21709 21710 21711 21712 21713 21714 21715 21716 21717 21718 21719 21720 21721 21722 21723 21724 21725 21726 21727 21728 21729 21730 21731 21732 21733 21734 21735 21736 21737 21738 21739 21740 21741 21742 21743 21744 21745 21746 21747 21748 21749 21750 21751 21752 21753 21754 21755 21756 21757 21758 21759 21760 21761 21762 21763 21764 21765 21766 21767 21768 21769 21770 21771 21772 21773 21774 21775 21776 21777 21778 21779 21780 21781 21782 21783 21784 21785 21786 21787 21788 21789 21790 21791 21792 21793 21794 21795 21796 21797 21798 21799 21800 21801 21802 21803 21804 21805 21806 21807 21808 21809 21810 21811 21812 21813 21814 21815 21816 21817 21818 21819 21820 21821 21822 21823 21824 21825 21826 21827 21828 21829 21830 21831 21832 21833 21834 21835 21836 21837 21838 21839 21840 21841 21842 21843 21844 21845 21846 21847 21848 21849 21850 21851 21852 21853 21854 21855 21856 21857 21858 21859 21860 21861 21862 21863 21864 21865 21866 21867 21868 21869 21870 21871 21872 21873 21874 21875 21876 21877 21878 21879 21880 21881 21882 21883 21884 21885 21886 21887 21888 21889 21890 21891 21892 21893 21894 21895 21896 21897 21898 21899 21900 21901 21902 21903 21904 21905 21906 21907 21908 21909 21910 21911 21912 21913 21914 21915 21916 21917 21918 21919 21920 21921 21922 21923 21924 21925 21926 21927 21928 21929 21930 21931 21932 21933 21934 21935 21936 21937 21938 21939 21940 21941 21942 21943 21944 21945 21946 21947 21948 21949 21950 21951 21952 21953 21954 21955 21956 21957 21958 21959 21960 21961 21962 21963 21964 21965 21966 21967 21968 21969 21970 21971 21972 21973 21974 21975 21976 21977 21978 21979 21980 21981 21982 21983 21984 21985 21986 21987 21988 21989 21990 21991 21992 21993 21994 21995 21996 21997 21998 21999 22000 22001 22002 22003 22004 22005 22006 22007 22008 22009 22010 22011 22012 22013 22014 22015 22016 22017 22018 22019 22020 22021 22022 22023 22024 22025 22026 22027 22028 22029 22030 22031 22032 22033 22034 22035 22036 22037 22038 22039 22040 22041 22042 22043 22044 22045 22046 22047 22048 22049 22050 22051 22052 22053 22054 22055 22056 22057 22058 22059 22060 22061 22062 22063 22064 22065 22066 22067 22068 22069 22070 22071 22072 22073 22074 22075 22076 22077 22078 22079 22080 22081 22082 22083 22084 22085 22086 22087 22088 22089 22090 22091 22092 22093 22094 22095 22096 22097 22098 22099 22100 22101 22102 22103 22104 22105 22106 22107 22108 22109 22110 22111 22112 22113 22114 22115 22116 22117 22118 22119 22120 22121 22122 22123 22124 22125 22126 22127 22128 22129 22130 22131 22132 22133 22134 22135 22136 22137 22138 22139 22140 22141 22142 22143 22144 22145 22146 22147 22148 22149 22150 22151 22152 22153 22154 22155 22156 22157 22158 22159 22160 22161 22162 22163 22164 22165 22166 22167 22168 22169 22170 22171 22172 22173 22174 22175 22176 22177 22178 22179 22180 22181 22182 22183 22184 22185 22186 22187 22188 22189 22190 22191 22192 22193 22194 22195 22196 22197 22198 22199 22200 22201 22202 22203 22204 22205 22206 22207 22208 22209 22210 22211 22212 22213 22214 22215 22216 22217 22218 22219 22220 22221 22222 22223 22224 22225 22226 22227 22228 22229 22230 22231 22232 22233 22234 22235 22236 22237 22238 22239 22240 22241 22242 22243 22244 22245 22246 22247 22248 22249 22250 22251 22252 22253 22254 22255 22256 22257 22258 22259 22260 22261 22262 22263 22264 22265 22266 22267 22268 22269 22270 22271 22272 22273 22274 22275 22276 22277 22278 22279 22280 22281 22282 22283 22284 22285 22286 22287 22288 22289 22290 22291 22292 22293 22294 22295 22296 22297 22298 22299 22300 22301 22302 22303 22304 22305 22306 22307 22308 22309 22310 22311 22312 22313 22314 22315 22316 22317 22318 22319 22320 22321 22322 22323 22324 22325 22326 22327 22328 22329 22330 22331 22332 22333 22334 22335 22336 22337 22338 22339 22340 22341 22342 22343 22344 22345 22346 22347 22348 22349 22350 22351 22352 22353 22354 22355 22356 22357 22358 22359 22360 22361 22362 22363 22364 22365 22366 22367 22368 22369 22370 22371 22372 22373 22374 22375 22376 22377 22378 22379 22380 22381 22382 22383 22384 22385 22386 22387 22388 22389 22390 22391 22392 22393 22394 22395 22396 22397 22398 22399 22400 22401 22402 22403 22404 22405 22406 22407 22408 22409 22410 22411 22412 22413 22414 22415 22416 22417 22418 22419 22420 22421 22422 22423 22424 22425 22426 22427 22428 22429 22430 22431 22432 22433 22434 22435 22436 22437 22438 22439 22440 22441 22442 22443 22444 22445 22446 22447 22448 22449 22450 22451 22452 22453 22454 22455 22456 22457 22458 22459 22460 22461 22462 22463 22464 22465 22466 22467 22468 22469 22470 22471 22472 22473 22474 22475 22476 22477 22478 22479 22480 22481 22482 22483 22484 22485 22486 22487 22488 22489 22490 22491 22492 22493 22494 22495 22496 22497 22498 22499 22500 22501 22502 22503 22504 22505 22506 22507 22508 22509 22510 22511 22512 22513 22514 22515 22516 22517 22518 22519 22520 22521 22522 22523 22524 22525 22526 22527 22528 22529 22530 22531 22532 22533 22534 22535 22536 22537 22538 22539 22540 22541 22542 22543 22544 22545 22546 22547 22548 22549 22550 22551 22552 22553 22554 22555 22556 22557 22558 22559 22560 22561 22562 22563 22564 22565 22566 22567 22568 22569 22570 22571 22572 22573 22574 22575 22576 22577 22578 22579 22580 22581 22582 22583 22584 22585 22586 22587 22588 22589 22590 22591 22592 22593 22594 22595 22596 22597 22598 22599 22600 22601 22602 22603 22604 22605 22606 22607 22608 22609 22610 22611 22612 22613 22614 22615 22616 22617 22618 22619 22620 22621 22622 22623 22624 22625 22626 22627 22628 22629 22630 22631 22632 22633 22634 22635 22636 22637 22638 22639 22640 22641 22642 22643 22644 22645 22646 22647 22648 22649 22650 22651 22652 22653 22654 22655 22656 22657 22658 22659 22660 22661 22662 22663 22664 22665 22666 22667 22668 22669 22670 22671 22672 22673 22674 22675 22676 22677 22678 22679 22680 22681 22682 22683 22684 22685 22686 22687 22688 22689 22690 22691 22692 22693 22694 22695 22696 22697 22698 22699 22700 22701 22702 22703 22704 22705 22706 22707 22708 22709 22710 22711 22712 22713 22714 22715 22716 22717 22718 22719 22720 22721 22722 22723 22724 22725 22726 22727 22728 22729 22730 22731 22732 22733 22734 22735 22736 22737 22738 22739 22740 22741 22742 22743 22744 22745 22746 22747 22748 22749 22750 22751 22752 22753 22754 22755 22756 22757 22758 22759 22760 22761 22762 22763 22764 22765 22766 22767 22768 22769 22770 22771 22772 22773 22774 22775 22776 22777 22778 22779 22780 22781 22782 22783 22784 22785 22786 22787 22788 22789 22790 22791 22792 22793 22794 22795 22796 22797 22798 22799 22800 22801 22802 22803 22804 22805 22806 22807 22808 22809 22810 22811 22812 22813 22814 22815 22816 22817 22818 22819 22820 22821 22822 22823 22824 22825 22826 22827 22828 22829 22830 22831 22832 22833 22834 22835 22836 22837 22838 22839 22840 22841 22842 22843 22844 22845 22846 22847 22848 22849 22850 22851 22852 22853 22854 22855 22856 22857 22858 22859 22860 22861 22862 22863 22864 22865 22866 22867 22868 22869 22870 22871 22872 22873 22874 22875 22876 22877 22878 22879 22880 22881 22882 22883 22884 22885 22886 22887 22888 22889 22890 22891 22892 22893 22894 22895 22896 22897 22898 22899 22900 22901 22902 22903 22904 22905 22906 22907 22908 22909 22910 22911 22912 22913 22914 22915 22916 22917 22918 22919 22920 22921 22922 22923 22924 22925 22926 22927 22928 22929 22930 22931 22932 22933 22934 22935 22936 22937 22938 22939 22940 22941 22942 22943 22944 22945 22946 22947 22948 22949 22950 22951 22952 22953 22954 22955 22956 22957 22958 22959 22960 22961 22962 22963 22964 22965 22966 22967 22968 22969 22970 22971 22972 22973 22974 22975 22976 22977 22978 22979 22980 22981 22982 22983 22984 22985 22986 22987 22988 22989 22990 22991 22992 22993 22994 22995 22996 22997 22998 22999 23000 23001 23002 23003 23004 23005 23006 23007 23008 23009 23010 23011 23012 23013 23014 23015 23016 23017 23018 23019 23020 23021 23022 23023 23024 23025 23026 23027 23028 23029 23030 23031 23032 23033 23034 23035 23036 23037 23038 23039 23040 23041 23042 23043 23044 23045 23046 23047 23048 23049 23050 23051 23052 23053 23054 23055 23056 23057 23058 23059 23060 23061 23062 23063 23064 23065 23066 23067 23068 23069 23070 23071 23072 23073 23074 23075 23076 23077 23078 23079 23080 23081 23082 23083 23084 23085 23086 23087 23088 23089 23090 23091 23092 23093 23094 23095 23096 23097 23098 23099 23100 23101 23102 23103 23104 23105 23106 23107 23108 23109 23110 23111 23112 23113 23114 23115 23116 23117 23118 23119 23120 23121 23122 23123 23124 23125 23126 23127 23128 23129 23130 23131 23132 23133 23134 23135 23136 23137 23138 23139 23140 23141 23142 23143 23144 23145 23146 23147 23148 23149 23150 23151 23152 23153 23154 23155 23156 23157 23158 23159 23160 23161 23162 23163 23164 23165 23166 23167 23168 23169 23170 23171 23172 23173 23174 23175 23176 23177 23178 23179 23180 23181 23182 23183 23184 23185 23186 23187 23188 23189 23190 23191 23192 23193 23194 23195 23196 23197 23198 23199 23200 23201 23202 23203 23204 23205 23206 23207 23208 23209 23210 23211 23212 23213 23214 23215 23216 23217 23218 23219 23220 23221 23222 23223 23224 23225 23226 23227 23228 23229 23230 23231 23232 23233 23234 23235 23236 23237 23238 23239 23240 23241 23242 23243 23244 23245 23246 23247 23248 23249 23250 23251 23252 23253 23254 23255 23256 23257 23258 23259 23260 23261 23262 23263 23264 23265 23266 23267 23268 23269 23270 23271 23272 23273 23274 23275 23276 23277 23278 23279 23280 23281 23282 23283 23284 23285 23286 23287 23288 23289 23290 23291 23292 23293 23294 23295 23296 23297 23298 23299 23300 23301 23302 23303 23304 23305 23306 23307 23308 23309 23310 23311 23312 23313 23314 23315 23316 23317 23318 23319 23320 23321 23322 23323 23324 23325 23326 23327 23328 23329 23330 23331 23332 23333 23334 23335 23336 23337 23338 23339 23340 23341 23342 23343 23344 23345 23346 23347 23348 23349 23350 23351 23352 23353 23354 23355 23356 23357 23358 23359 23360 23361 23362 23363 23364 23365 23366 23367 23368 23369 23370 23371 23372 23373 23374 23375 23376 23377 23378 23379 23380 23381 23382 23383 23384 23385 23386 23387 23388 23389 23390 23391 23392 23393 23394 23395 23396 23397 23398 23399 23400 23401 23402 23403 23404 23405 23406 23407 23408 23409 23410 23411 23412 23413 23414 23415 23416 23417 23418 23419 23420 23421 23422 23423 23424 23425 23426 23427 23428 23429 23430 23431 23432 23433 23434 23435 23436 23437 23438 23439 23440 23441 23442 23443 23444 23445 23446 23447 23448 23449 23450 23451 23452 23453 23454 23455 23456 23457 23458 23459 23460 23461 23462 23463 23464 23465 23466 23467 23468 23469 23470 23471 23472 23473 23474 23475 23476 23477 23478 23479 23480 23481 23482 23483 23484 23485 23486 23487 23488 23489 23490 23491 23492 23493 23494 23495 23496 23497 23498 23499 23500 23501 23502 23503 23504 23505 23506 23507 23508 23509 23510 23511 23512 23513 23514 23515 23516 23517 23518 23519 23520 23521 23522 23523 23524 23525 23526 23527 23528 23529 23530 23531 23532 23533 23534 23535 23536 23537 23538 23539 23540 23541 23542 23543 23544 23545 23546 23547 23548 23549 23550 23551 23552 23553 23554 23555 23556 23557 23558 23559 23560 23561 23562 23563 23564 23565 23566 23567 23568 23569 23570 23571 23572 23573 23574 23575 23576 23577 23578 23579 23580 23581 23582 23583 23584 23585 23586 23587 23588 23589 23590 23591 23592 23593 23594 23595 23596 23597 23598 23599 23600 23601 23602 23603 23604 23605 23606 23607 23608 23609 23610 23611 23612 23613 23614 23615 23616 23617 23618 23619 23620 23621 23622 23623 23624 23625 23626 23627 23628 23629 23630 23631 23632 23633 23634 23635 23636 23637 23638 23639 23640 23641 23642 23643 23644 23645 23646 23647 23648 23649 23650 23651 23652 23653 23654 23655 23656 23657 23658 23659 23660 23661 23662 23663 23664 23665 23666 23667 23668 23669 23670 23671 23672 23673 23674 23675 23676 23677 23678 23679 23680 23681 23682 23683 23684 23685 23686 23687 23688 23689 23690 23691 23692 23693 23694 23695 23696 23697 23698 23699 23700 23701 23702 23703 23704 23705 23706 23707 23708 23709 23710 23711 23712 23713 23714 23715 23716 23717 23718 23719 23720 23721 23722 23723 23724 23725 23726 23727 23728 23729 23730 23731 23732 23733 23734 23735 23736 23737 23738 23739 23740 23741 23742 23743 23744 23745 23746 23747 23748 23749 23750 23751 23752 23753 23754 23755 23756 23757 23758 23759 23760 23761 23762 23763 23764 23765 23766 23767 23768 23769 23770 23771 23772 23773 23774 23775 23776 23777 23778 23779 23780 23781 23782 23783 23784 23785 23786 23787 23788 23789 23790 23791 23792 23793 23794 23795 23796 23797 23798 23799 23800 23801 23802 23803 23804 23805 23806 23807 23808 23809 23810 23811 23812 23813 23814 23815 23816 23817 23818 23819 23820 23821 23822 23823 23824 23825 23826 23827 23828 23829 23830 23831 23832 23833 23834 23835 23836 23837 23838 23839 23840 23841 23842 23843 23844 23845 23846 23847 23848 23849 23850 23851 23852 23853 23854 23855 23856 23857 23858 23859 23860 23861 23862 23863 23864 23865 23866 23867 23868 23869 23870 23871 23872 23873 23874 23875 23876 23877 23878 23879 23880 23881 23882 23883 23884 23885 23886 23887 23888 23889 23890 23891 23892 23893 23894 23895 23896 23897 23898 23899 23900 23901 23902 23903 23904 23905 23906 23907 23908 23909 23910 23911 23912 23913 23914 23915 23916 23917 23918 23919 23920 23921 23922 23923 23924 23925 23926 23927 23928 23929 23930 23931 23932 23933 23934 23935 23936 23937 23938 23939 23940 23941 23942 23943 23944 23945 23946 23947 23948 23949 23950 23951 23952 23953 23954 23955 23956 23957 23958 23959 23960 23961 23962 23963 23964 23965 23966 23967 23968 23969 23970 23971 23972 23973 23974 23975 23976 23977 23978 23979 23980 23981 23982 23983 23984 23985 23986 23987 23988 23989 23990 23991 23992 23993 23994 23995 23996 23997 23998 23999 24000 24001 24002 24003 24004 24005 24006 24007 24008 24009 24010 24011 24012 24013 24014 24015 24016 24017 24018 24019 24020 24021 24022 24023 24024 24025 24026 24027 24028 24029 24030 24031 24032 24033 24034 24035 24036 24037 24038 24039 24040 24041 24042 24043 24044 24045 24046 24047 24048 24049 24050 24051 24052 24053 24054 24055 24056 24057 24058 24059 24060 24061 24062 24063 24064 24065 24066 24067 24068 24069 24070 24071 24072 24073 24074 24075 24076 24077 24078 24079 24080 24081 24082 24083 24084 24085 24086 24087 24088 24089 24090 24091 24092 24093 24094 24095 24096 24097 24098 24099 24100 24101 24102 24103 24104 24105 24106 24107 24108 24109 24110 24111 24112 24113 24114 24115 24116 24117 24118 24119 24120 24121 24122 24123 24124 24125 24126 24127 24128 24129 24130 24131 24132 24133 24134 24135 24136 24137 24138 24139 24140 24141 24142 24143 24144 24145 24146 24147 24148 24149 24150 24151 24152 24153 24154 24155 24156 24157 24158 24159 24160 24161 24162 24163 24164 24165 24166 24167 24168 24169 24170 24171 24172 24173 24174 24175 24176 24177 24178 24179 24180 24181 24182 24183 24184 24185 24186 24187 24188 24189 24190 24191 24192 24193 24194 24195 24196 24197 24198 24199 24200 24201 24202 24203 24204 24205 24206 24207 24208 24209 24210 24211 24212 24213 24214 24215 24216 24217 24218 24219 24220 24221 24222 24223 24224 24225 24226 24227 24228 24229 24230 24231 24232 24233 24234 24235 24236 24237 24238 24239 24240 24241 24242 24243 24244 24245 24246 24247 24248 24249 24250 24251 24252 24253 24254 24255 24256 24257 24258 24259 24260 24261 24262 24263 24264 24265 24266 24267 24268 24269 24270 24271 24272 24273 24274 24275 24276 24277 24278 24279 24280 24281 24282 24283 24284 24285 24286 24287 24288 24289 24290 24291 24292 24293 24294 24295 24296 24297 24298 24299 24300 24301 24302 24303 24304 24305 24306 24307 24308 24309 24310 24311 24312 24313 24314 24315 24316 24317 24318 24319 24320 24321 24322 24323 24324 24325 24326 24327 24328 24329 24330 24331 24332 24333 24334 24335 24336 24337 24338 24339 24340 24341 24342 24343 24344 24345 24346 24347 24348 24349 24350 24351 24352 24353 24354 24355 24356 24357 24358 24359 24360 24361 24362 24363 24364 24365 24366 24367 24368 24369 24370 24371 24372 24373 24374 24375 24376 24377 24378 24379 24380 24381 24382 24383 24384 24385 24386 24387 24388 24389 24390 24391 24392 24393 24394 24395 24396 24397 24398 24399 24400 24401 24402 24403 24404 24405 24406 24407 24408 24409 24410 24411 24412 24413 24414 24415 24416 24417 24418 24419 24420 24421 24422 24423 24424 24425 24426 24427 24428 24429 24430 24431 24432 24433 24434 24435 24436 24437 24438 24439 24440 24441 24442 24443 24444 24445 24446 24447 24448 24449 24450 24451 24452 24453 24454 24455 24456 24457 24458 24459 24460 24461 24462 24463 24464 24465 24466 24467 24468 24469 24470 24471 24472 24473 24474 24475 24476 24477 24478 24479 24480 24481 24482 24483 24484 24485 24486 24487 24488 24489 24490 24491 24492 24493 24494 24495 24496 24497 24498 24499 24500 24501 24502 24503 24504 24505 24506 24507 24508 24509 24510 24511 24512 24513 24514 24515 24516 24517 24518 24519 24520 24521 24522 24523 24524 24525 24526 24527 24528 24529 24530 24531 24532 24533 24534 24535 24536 24537 24538 24539 24540 24541 24542 24543 24544 24545 24546 24547 24548 24549 24550 24551 24552 24553 24554 24555 24556 24557 24558 24559 24560 24561 24562 24563 24564 24565 24566 24567 24568 24569 24570 24571 24572 24573 24574 24575 24576 24577 24578 24579 24580 24581 24582 24583 24584 24585 24586 24587 24588 24589 24590 24591 24592 24593 24594 24595 24596 24597 24598 24599 24600 24601 24602 24603 24604 24605 24606 24607 24608 24609 24610 24611 24612 24613 24614 24615 24616 24617 24618 24619 24620 24621 24622 24623 24624 24625 24626 24627 24628 24629 24630 24631 24632 24633 24634 24635 24636 24637 24638 24639 24640 24641 24642 24643 24644 24645 24646 24647 24648 24649 24650 24651 24652 24653 24654 24655 24656 24657 24658 24659 24660 24661 24662 24663 24664 24665 24666 24667 24668 24669 24670 24671 24672 24673 24674 24675 24676 24677 24678 24679 24680 24681 24682 24683 24684 24685 24686 24687 24688 24689 24690 24691 24692 24693 24694 24695 24696 24697 24698 24699 24700 24701 24702 24703 24704 24705 24706 24707 24708 24709 24710 24711 24712 24713 24714 24715 24716 24717 24718 24719 24720 24721 24722 24723 24724 24725 24726 24727 24728 24729 24730 24731 24732 24733 24734 24735 24736 24737 24738 24739 24740 24741 24742 24743 24744 24745 24746 24747 24748 24749 24750 24751 24752 24753 24754 24755 24756 24757 24758 24759 24760 24761 24762 24763 24764 24765 24766 24767 24768 24769 24770 24771 24772 24773 24774 24775 24776 24777 24778 24779 24780 24781 24782 24783 24784 24785 24786 24787 24788 24789 24790 24791 24792 24793 24794 24795 24796 24797 24798 24799 24800 24801 24802 24803 24804 24805 24806 24807 24808 24809 24810 24811 24812 24813 24814 24815 24816 24817 24818 24819 24820 24821 24822 24823 24824 24825 24826 24827 24828 24829 24830 24831 24832 24833 24834 24835 24836 24837 24838 24839 24840 24841 24842 24843 24844 24845 24846 24847 24848 24849 24850 24851 24852 24853 24854 24855 24856 24857 24858 24859 24860 24861 24862 24863 24864 24865 24866 24867 24868 24869 24870 24871 24872 24873 24874 24875 24876 24877 24878 24879 24880 24881 24882 24883 24884 24885 24886 24887 24888 24889 24890 24891 24892 24893 24894 24895 24896 24897 24898 24899 24900 24901 24902 24903 24904 24905 24906 24907 24908 24909 24910 24911 24912 24913 24914 24915 24916 24917 24918 24919 24920 24921 24922 24923 24924 24925 24926 24927 24928 24929 24930 24931 24932 24933 24934 24935 24936 24937 24938 24939 24940 24941 24942 24943 24944 24945 24946 24947 24948 24949 24950 24951 24952 24953 24954 24955 24956 24957 24958 24959 24960 24961 24962 24963 24964 24965 24966 24967 24968 24969 24970 24971 24972 24973 24974 24975 24976 24977 24978 24979 24980 24981 24982 24983 24984 24985 24986 24987 24988 24989 24990 24991 24992 24993 24994 24995 24996 24997 24998 24999 25000 25001 25002 25003 25004 25005 25006 25007 25008 25009 25010 25011 25012 25013 25014 25015 25016 25017 25018 25019 25020 25021 25022 25023 25024 25025 25026 25027 25028 25029 25030 25031 25032 25033 25034 25035 25036 25037 25038 25039 25040 25041 25042 25043 25044 25045 25046 25047 25048 25049 25050 25051 25052 25053 25054 25055 25056 25057 25058 25059 25060 25061 25062 25063 25064 25065 25066 25067 25068 25069 25070 25071 25072 25073 25074 25075 25076 25077 25078 25079 25080 25081 25082 25083 25084 25085 25086 25087 25088 25089 25090 25091 25092 25093 25094 25095 25096 25097 25098 25099 25100 25101 25102 25103 25104 25105 25106 25107 25108 25109 25110 25111 25112 25113 25114 25115 25116 25117 25118 25119 25120 25121 25122 25123 25124 25125 25126 25127 25128 25129 25130 25131 25132 25133 25134 25135 25136 25137 25138 25139 25140 25141 25142 25143 25144 25145 25146 25147 25148 25149 25150 25151 25152 25153 25154 25155 25156 25157 25158 25159 25160 25161 25162 25163 25164 25165 25166 25167 25168 25169 25170 25171 25172 25173 25174 25175 25176 25177 25178 25179 25180 25181 25182 25183 25184 25185 25186 25187 25188 25189 25190 25191 25192 25193 25194 25195 25196 25197 25198 25199 25200 25201 25202 25203 25204 25205 25206 25207 25208 25209 25210 25211 25212 25213 25214 25215 25216 25217 25218 25219 25220 25221 25222 25223 25224 25225 25226 25227 25228 25229 25230 25231 25232 25233 25234 25235 25236 25237 25238 25239 25240 25241 25242 25243 25244 25245 25246 25247 25248 25249 25250 25251 25252 25253 25254 25255 25256 25257 25258 25259 25260 25261 25262 25263 25264 25265 25266 25267 25268 25269 25270 25271 25272 25273 25274 25275 25276 25277 25278 25279 25280 25281 25282 25283 25284 25285 25286 25287 25288 25289 25290 25291 25292 25293 25294 25295 25296 25297 25298 25299 25300 25301 25302 25303 25304 25305 25306 25307 25308 25309 25310 25311 25312 25313 25314 25315 25316 25317 25318 25319 25320 25321 25322 25323 25324 25325 25326 25327 25328 25329 25330 25331 25332 25333 25334 25335 25336 25337 25338 25339 25340 25341 25342 25343 25344 25345 25346 25347 25348 25349 25350 25351 25352 25353 25354 25355 25356 25357 25358 25359 25360 25361 25362 25363 25364 25365 25366 25367 25368 25369 25370 25371 25372 25373 25374 25375 25376 25377 25378 25379 25380 25381 25382 25383 25384 25385 25386 25387 25388 25389 25390 25391 25392 25393 25394 25395 25396 25397 25398 25399 25400 25401 25402 25403 25404 25405 25406 25407 25408 25409 25410 25411 25412 25413 25414 25415 25416 25417 25418 25419 25420 25421 25422 25423 25424 25425 25426 25427 25428 25429 25430 25431 25432 25433 25434 25435 25436 25437 25438 25439 25440 25441 25442 25443 25444 25445 25446 25447 25448 25449 25450 25451 25452 25453 25454 25455 25456 25457 25458 25459 25460 25461 25462 25463 25464 25465 25466 25467 25468 25469 25470 25471 25472 25473 25474 25475 25476 25477 25478 25479 25480 25481 25482 25483 25484 25485 25486 25487 25488 25489 25490 25491 25492 25493 25494 25495 25496 25497 25498 25499 25500 25501 25502 25503 25504 25505 25506 25507 25508 25509 25510 25511 25512 25513 25514 25515 25516 25517 25518 25519 25520 25521 25522 25523 25524 25525 25526 25527 25528 25529 25530 25531 25532 25533 25534 25535 25536 25537 25538 25539 25540 25541 25542 25543 25544 25545 25546 25547 25548 25549 25550 25551 25552 25553 25554 25555 25556 25557 25558 25559 25560 25561 25562 25563 25564 25565 25566 25567 25568 25569 25570 25571 25572 25573 25574 25575 25576 25577 25578 25579 25580 25581 25582 25583 25584 25585 25586 25587 25588 25589 25590 25591 25592 25593 25594 25595 25596 25597 25598 25599 25600 25601 25602 25603 25604 25605 25606 25607 25608 25609 25610 25611 25612 25613 25614 25615 25616 25617 25618 25619 25620 25621 25622 25623 25624 25625 25626 25627 25628 25629 25630 25631 25632 25633 25634 25635 25636 25637 25638 25639 25640 25641 25642 25643 25644 25645 25646 25647 25648 25649 25650 25651 25652 25653 25654 25655 25656 25657 25658 25659 25660 25661 25662 25663 25664 25665 25666 25667 25668 25669 25670 25671 25672 25673 25674 25675 25676 25677 25678 25679 25680 25681 25682 25683 25684 25685 25686 25687 25688 25689 25690 25691 25692 25693 25694 25695 25696 25697 25698 25699 25700 25701 25702 25703 25704 25705 25706 25707 25708 25709 25710 25711 25712 25713 25714 25715 25716 25717 25718 25719 25720 25721 25722 25723 25724 25725 25726 25727 25728 25729 25730 25731 25732 25733 25734 25735 25736 25737 25738 25739 25740 25741 25742 25743 25744 25745 25746 25747 25748 25749 25750 25751 25752 25753 25754 25755 25756 25757 25758 25759 25760 25761 25762 25763 25764 25765 25766 25767 25768 25769 25770 25771 25772 25773 25774 25775 25776 25777 25778 25779 25780 25781 25782 25783 25784 25785 25786 25787 25788 25789 25790 25791 25792 25793 25794 25795 25796 25797 25798 25799 25800 25801 25802 25803 25804 25805 25806 25807 25808 25809 25810 25811 25812 25813 25814 25815 25816 25817 25818 25819 25820 25821 25822 25823 25824 25825 25826 25827 25828 25829 25830 25831 25832 25833 25834 25835 25836 25837 25838 25839 25840 25841 25842 25843 25844 25845 25846 25847 25848 25849 25850 25851 25852 25853 25854 25855 25856 25857 25858 25859 25860 25861 25862 25863 25864 25865 25866 25867 25868 25869 25870 25871 25872 25873 25874 25875 25876 25877 25878 25879 25880 25881 25882 25883 25884 25885 25886 25887 25888 25889 25890 25891 25892 25893 25894 25895 25896 25897 25898 25899 25900 25901 25902 25903 25904 25905 25906 25907 25908 25909 25910 25911 25912 25913 25914 25915 25916 25917 25918 25919 25920 25921 25922 25923 25924 25925 25926 25927 25928 25929 25930 25931 25932 25933 25934 25935 25936 25937 25938 25939 25940 25941 25942 25943 25944 25945 25946 25947 25948 25949 25950 25951 25952 25953 25954 25955 25956 25957 25958 25959 25960 25961 25962 25963 25964 25965 25966 25967 25968 25969 25970 25971 25972 25973 25974 25975 25976 25977 25978 25979 25980 25981 25982 25983 25984 25985 25986 25987 25988 25989 25990 25991 25992 25993 25994 25995 25996 25997 25998 25999 26000 26001 26002 26003 26004 26005 26006 26007 26008 26009 26010 26011 26012 26013 26014 26015 26016 26017 26018 26019 26020 26021 26022 26023 26024 26025 26026 26027 26028 26029 26030 26031 26032 26033 26034 26035 26036 26037 26038 26039 26040 26041 26042 26043 26044 26045 26046 26047 26048 26049 26050 26051 26052 26053 26054 26055 26056 26057 26058 26059 26060 26061 26062 26063 26064 26065 26066 26067 26068 26069 26070 26071 26072 26073 26074 26075 26076 26077 26078 26079 26080 26081 26082 26083 26084 26085 26086 26087 26088 26089 26090 26091 26092 26093 26094 26095 26096 26097 26098 26099 26100 26101 26102 26103 26104 26105 26106 26107 26108 26109 26110 26111 26112 26113 26114 26115 26116 26117 26118 26119 26120 26121 26122 26123 26124 26125 26126 26127 26128 26129 26130 26131 26132 26133 26134 26135 26136 26137 26138 26139 26140 26141 26142 26143 26144 26145 26146 26147 26148 26149 26150 26151 26152 26153 26154 26155 26156 26157 26158 26159 26160 26161 26162 26163 26164 26165 26166 26167 26168 26169 26170 26171 26172 26173 26174 26175 26176 26177 26178 26179 26180 26181 26182 26183 26184 26185 26186 26187 26188 26189 26190 26191 26192 26193 26194 26195 26196 26197 26198 26199 26200 26201 26202 26203 26204 26205 26206 26207 26208 26209 26210 26211 26212 26213 26214 26215 26216 26217 26218 26219 26220 26221 26222 26223 26224 26225 26226 26227 26228 26229 26230 26231 26232 26233 26234 26235 26236 26237 26238 26239 26240 26241 26242 26243 26244 26245 26246 26247 26248 26249 26250 26251 26252 26253 26254 26255 26256 26257 26258 26259 26260 26261 26262 26263 26264 26265 26266 26267 26268 26269 26270 26271 26272 26273 26274 26275 26276 26277 26278 26279 26280 26281 26282 26283 26284 26285 26286 26287 26288 26289 26290 26291 26292 26293 26294 26295 26296 26297 26298 26299 26300 26301 26302 26303 26304 26305 26306 26307 26308 26309 26310 26311 26312 26313 26314 26315 26316 26317 26318 26319 26320 26321 26322 26323 26324 26325 26326 26327 26328 26329 26330 26331 26332 26333 26334 26335 26336 26337 26338 26339 26340 26341 26342 26343 26344 26345 26346 26347 26348 26349 26350 26351 26352 26353 26354 26355 26356 26357 26358 26359 26360 26361 26362 26363 26364 26365 26366 26367 26368 26369 26370 26371 26372 26373 26374 26375 26376 26377 26378 26379 26380 26381 26382 26383 26384 26385 26386 26387 26388 26389 26390 26391 26392 26393 26394 26395 26396 26397 26398 26399 26400 26401 26402 26403 26404 26405 26406 26407 26408 26409 26410 26411 26412 26413 26414 26415 26416 26417 26418 26419 26420 26421 26422 26423 26424 26425 26426 26427 26428 26429 26430 26431 26432 26433 26434 26435 26436 26437 26438 26439 26440 26441 26442 26443 26444 26445 26446 26447 26448 26449 26450 26451 26452 26453 26454 26455 26456 26457 26458 26459 26460 26461 26462 26463 26464 26465 26466 26467 26468 26469 26470 26471 26472 26473 26474 26475 26476 26477 26478 26479 26480 26481 26482 26483 26484 26485 26486 26487 26488 26489 26490 26491 26492 26493 26494 26495 26496 26497 26498 26499 26500 26501 26502 26503 26504 26505 26506 26507 26508 26509 26510 26511 26512 26513 26514 26515 26516 26517 26518 26519 26520 26521 26522 26523 26524 26525 26526 26527 26528 26529 26530 26531 26532 26533 26534 26535 26536 26537 26538 26539 26540 26541 26542 26543 26544 26545 26546 26547 26548 26549 26550 26551 26552 26553 26554 26555 26556 26557 26558 26559 26560 26561 26562 26563 26564 26565 26566 26567 26568 26569 26570 26571 26572 26573 26574 26575 26576 26577 26578 26579 26580 26581 26582 26583 26584 26585 26586 26587 26588 26589 26590 26591 26592 26593 26594 26595 26596 26597 26598 26599 26600 26601 26602 26603 26604 26605 26606 26607 26608 26609 26610 26611 26612 26613 26614 26615 26616 26617 26618 26619 26620 26621 26622 26623 26624 26625 26626 26627 26628 26629 26630 26631 26632 26633 26634 26635 26636 26637 26638 26639 26640 26641 26642 26643 26644 26645 26646 26647 26648 26649 26650 26651 26652 26653 26654 26655 26656 26657 26658 26659 26660 26661 26662 26663 26664 26665 26666 26667 26668 26669 26670 26671 26672 26673 26674 26675 26676 26677 26678 26679 26680 26681 26682 26683 26684 26685 26686 26687 26688 26689 26690 26691 26692 26693 26694 26695 26696 26697 26698 26699 26700 26701 26702 26703 26704 26705 26706 26707 26708 26709 26710 26711 26712 26713 26714 26715 26716 26717 26718 26719 26720 26721 26722 26723 26724 26725 26726 26727 26728 26729 26730 26731 26732 26733 26734 26735 26736 26737 26738 26739 26740 26741 26742 26743 26744 26745 26746 26747 26748 26749 26750 26751 26752 26753 26754 26755 26756 26757 26758 26759 26760 26761 26762 26763 26764 26765 26766 26767 26768 26769 26770 26771 26772 26773 26774 26775 26776 26777 26778 26779 26780 26781 26782 26783 26784 26785 26786 26787 26788 26789 26790 26791 26792 26793 26794 26795 26796 26797 26798 26799 26800 26801 26802 26803 26804 26805 26806 26807 26808 26809 26810 26811 26812 26813 26814 26815 26816 26817 26818 26819 26820 26821 26822 26823 26824 26825 26826 26827 26828 26829 26830 26831 26832 26833 26834 26835 26836 26837 26838 26839 26840 26841 26842 26843 26844 26845 26846 26847 26848 26849 26850 26851 26852 26853 26854 26855 26856 26857 26858 26859 26860 26861 26862 26863 26864 26865 26866 26867 26868 26869 26870 26871 26872 26873 26874 26875 26876 26877 26878 26879 26880 26881 26882 26883 26884 26885 26886 26887 26888 26889 26890 26891 26892 26893 26894 26895 26896 26897 26898 26899 26900 26901 26902 26903 26904 26905 26906 26907 26908 26909 26910 26911 26912 26913 26914 26915 26916 26917 26918 26919 26920 26921 26922 26923 26924 26925 26926 26927 26928 26929 26930 26931 26932 26933 26934 26935 26936 26937 26938 26939 26940 26941 26942 26943 26944 26945 26946 26947 26948 26949 26950 26951 26952 26953 26954 26955 26956 26957 26958 26959 26960 26961 26962 26963 26964 26965 26966 26967 26968 26969 26970 26971 26972 26973 26974 26975 26976 26977 26978 26979 26980 26981 26982 26983 26984 26985 26986 26987 26988 26989 26990 26991 26992 26993 26994 26995 26996 26997 26998 26999 27000 27001 27002 27003 27004 27005 27006 27007 27008 27009 27010 27011 27012 27013 27014 27015 27016 27017 27018 27019 27020 27021 27022 27023 27024 27025 27026 27027 27028 27029 27030 27031 27032 27033 27034 27035 27036 27037 27038 27039 27040 27041 27042 27043 27044 27045 27046 27047 27048 27049 27050 27051 27052 27053 27054 27055 27056 27057 27058 27059 27060 27061 27062 27063 27064 27065 27066 27067 27068 27069 27070 27071 27072 27073 27074 27075 27076 27077 27078 27079 27080 27081 27082 27083 27084 27085 27086 27087 27088 27089 27090 27091 27092 27093 27094 27095 27096 27097 27098 27099 27100 27101 27102 27103 27104 27105 27106 27107 27108 27109 27110 27111 27112 27113 27114 27115 27116 27117 27118 27119 27120 27121 27122 27123 27124 27125 27126 27127 27128 27129 27130 27131 27132 27133 27134 27135 27136 27137 27138 27139 27140 27141 27142 27143 27144 27145 27146 27147 27148 27149 27150 27151 27152 27153 27154 27155 27156 27157 27158 27159 27160 27161 27162 27163 27164 27165 27166 27167 27168 27169 27170 27171 27172 27173 27174 27175 27176 27177 27178 27179 27180 27181 27182 27183 27184 27185 27186 27187 27188 27189 27190 27191 27192 27193 27194 27195 27196 27197 27198 27199 27200 27201 27202 27203 27204 27205 27206 27207 27208 27209 27210 27211 27212 27213 27214 27215 27216 27217 27218 27219 27220 27221 27222 27223 27224 27225 27226 27227 27228 27229 27230 27231 27232 27233 27234 27235 27236 27237 27238 27239 27240 27241 27242 27243 27244 27245 27246 27247 27248 27249 27250 27251 27252 27253 27254 27255 27256 27257 27258 27259 27260 27261 27262 27263 27264 27265 27266 27267 27268 27269 27270 27271 27272 27273 27274 27275 27276 27277 27278 27279 27280 27281 27282 27283 27284 27285 27286 27287 27288 27289 27290 27291 27292 27293 27294 27295 27296 27297 27298 27299 27300 27301 27302 27303 27304 27305 27306 27307 27308 27309 27310 27311 27312 27313 27314 27315 27316 27317 27318 27319 27320 27321 27322 27323 27324 27325 27326 27327 27328 27329 27330 27331 27332 27333 27334 27335 27336 27337 27338 27339 27340 27341 27342 27343 27344 27345 27346 27347 27348 27349 27350 27351 27352 27353 27354 27355 27356 27357 27358 27359 27360 27361 27362 27363 27364 27365 27366 27367 27368 27369 27370 27371 27372 27373 27374 27375 27376 27377 27378 27379 27380 27381 27382 27383 27384 27385 27386 27387 27388 27389 27390 27391 27392 27393 27394 27395 27396 27397 27398 27399 27400 27401 27402 27403 27404 27405 27406 27407 27408 27409 27410 27411 27412 27413 27414 27415 27416 27417 27418 27419 27420 27421 27422 27423 27424 27425 27426 27427 27428 27429 27430 27431 27432 27433 27434 27435 27436 27437 27438 27439 27440 27441 27442 27443 27444 27445 27446 27447 27448 27449 27450 27451 27452 27453 27454 27455 27456 27457 27458 27459 27460 27461 27462 27463 27464 27465 27466 27467 27468 27469 27470 27471 27472 27473 27474 27475 27476 27477 27478 27479 27480 27481 27482 27483 27484 27485 27486 27487 27488 27489 27490 27491 27492 27493 27494 27495 27496 27497 27498 27499 27500 27501 27502 27503 27504 27505 27506 27507 27508 27509 27510 27511 27512 27513 27514 27515 27516 27517 27518 27519 27520 27521 27522 27523 27524 27525 27526 27527 27528 27529 27530 27531 27532 27533 27534 27535 27536 27537 27538 27539 27540 27541 27542 27543 27544 27545 27546 27547 27548 27549 27550 27551 27552 27553 27554 27555 27556 27557 27558 27559 27560 27561 27562 27563 27564 27565 27566 27567 27568 27569 27570 27571 27572 27573 27574 27575 27576 27577 27578 27579 27580 27581 27582 27583 27584 27585 27586 27587 27588 27589 27590 27591 27592 27593 27594 27595 27596 27597 27598 27599 27600 27601 27602 27603 27604 27605 27606 27607 27608 27609 27610 27611 27612 27613 27614 27615 27616 27617 27618 27619 27620 27621 27622 27623 27624 27625 27626 27627 27628 27629 27630 27631 27632 27633 27634 27635 27636 27637 27638 27639 27640 27641 27642 27643 27644 27645 27646 27647 27648 27649 27650 27651 27652 27653 27654 27655 27656 27657 27658 27659 27660 27661 27662 27663 27664 27665 27666 27667 27668 27669 27670 27671 27672 27673 27674 27675 27676 27677 27678 27679 27680 27681 27682 27683 27684 27685 27686 27687 27688 27689 27690 27691 27692 27693 27694 27695 27696 27697 27698 27699 27700 27701 27702 27703 27704 27705 27706 27707 27708 27709 27710 27711 27712 27713 27714 27715 27716 27717 27718 27719 27720 27721 27722 27723 27724 27725 27726 27727 27728 27729 27730 27731 27732 27733 27734 27735 27736 27737 27738 27739 27740 27741 27742 27743 27744 27745 27746 27747 27748 27749 27750 27751 27752 27753 27754 27755 27756 27757 27758 27759 27760 27761 27762 27763 27764 27765 27766 27767 27768 27769 27770 27771 27772 27773 27774 27775 27776 27777 27778 27779 27780 27781 27782 27783 27784 27785 27786 27787 27788 27789 27790 27791 27792 27793 27794 27795 27796 27797 27798 27799 27800 27801 27802 27803 27804 27805 27806 27807 27808 27809 27810 27811 27812 27813 27814 27815 27816 27817 27818 27819 27820 27821 27822 27823 27824 27825 27826 27827 27828 27829 27830 27831 27832 27833 27834 27835 27836 27837 27838 27839 27840 27841 27842 27843 27844 27845 27846 27847 27848 27849 27850 27851 27852 27853 27854 27855 27856 27857 27858 27859 27860 27861 27862 27863 27864 27865 27866 27867 27868 27869 27870 27871 27872 27873 27874 27875 27876 27877 27878 27879 27880 27881 27882 27883 27884 27885 27886 27887 27888 27889 27890 27891 27892 27893 27894 27895 27896 27897 27898 27899 27900 27901 27902 27903 27904 27905 27906 27907 27908 27909 27910 27911 27912 27913 27914 27915 27916 27917 27918 27919 27920 27921 27922 27923 27924 27925 27926 27927 27928 27929 27930 27931 27932 27933 27934 27935 27936 27937 27938 27939 27940 27941 27942 27943 27944 27945 27946 27947 27948 27949 27950 27951 27952 27953 27954 27955 27956 27957 27958 27959 27960 27961 27962 27963 27964 27965 27966 27967 27968 27969 27970 27971 27972 27973 27974 27975 27976 27977 27978 27979 27980 27981 27982 27983 27984 27985 27986 27987 27988 27989 27990 27991 27992 27993 27994 27995 27996 27997 27998 27999 28000 28001 28002 28003 28004 28005 28006 28007 28008 28009 28010 28011 28012 28013 28014 28015 28016 28017 28018 28019 28020 28021 28022 28023 28024 28025 28026 28027 28028 28029 28030 28031 28032 28033 28034 28035 28036 28037 28038 28039 28040 28041 28042 28043 28044 28045 28046 28047 28048 28049 28050 28051 28052 28053 28054 28055 28056 28057 28058 28059 28060 28061 28062 28063 28064 28065 28066 28067 28068 28069 28070 28071 28072 28073 28074 28075 28076 28077 28078 28079 28080 28081 28082 28083 28084 28085 28086 28087 28088 28089 28090 28091 28092 28093 28094 28095 28096 28097 28098 28099 28100 28101 28102 28103 28104 28105 28106 28107 28108 28109 28110 28111 28112 28113 28114 28115 28116 28117 28118 28119 28120 28121 28122 28123 28124 28125 28126 28127 28128 28129 28130 28131 28132 28133 28134 28135 28136 28137 28138 28139 28140 28141 28142 28143 28144 28145 28146 28147 28148 28149 28150 28151 28152 28153 28154 28155 28156 28157 28158 28159 28160 28161 28162 28163 28164 28165 28166 28167 28168 28169 28170 28171 28172 28173 28174 28175 28176 28177 28178 28179 28180 28181 28182 28183 28184 28185 28186 28187 28188 28189 28190 28191 28192 28193 28194 28195 28196 28197 28198 28199 28200 28201 28202 28203 28204 28205 28206 28207 28208 28209 28210 28211 28212 28213 28214 28215 28216 28217 28218 28219 28220 28221 28222 28223 28224 28225 28226 28227 28228 28229 28230 28231 28232 28233 28234 28235 28236 28237 28238 28239 28240 28241 28242 28243 28244 28245 28246 28247 28248 28249 28250 28251 28252 28253 28254 28255 28256 28257 28258 28259 28260 28261 28262 28263 28264 28265 28266 28267 28268 28269 28270 28271 28272 28273 28274 28275 28276 28277 28278 28279 28280 28281 28282 28283 28284 28285 28286 28287 28288 28289 28290 28291 28292 28293 28294 28295 28296 28297 28298 28299 28300 28301 28302 28303 28304 28305 28306 28307 28308 28309 28310 28311 28312 28313 28314 28315 28316 28317 28318 28319 28320 28321 28322 28323 28324 28325 28326 28327 28328 28329 28330 28331 28332 28333 28334 28335 28336 28337 28338 28339 28340 28341 28342 28343 28344 28345 28346 28347 28348 28349 28350 28351 28352 28353 28354 28355 28356 28357 28358 28359 28360 28361 28362 28363 28364 28365 28366 28367 28368 28369 28370 28371 28372 28373 28374 28375 28376 28377 28378 28379 28380 28381 28382 28383 28384 28385 28386 28387 28388 28389 28390 28391 28392 28393 28394 28395 28396 28397 28398 28399 28400 28401 28402 28403 28404 28405 28406 28407 28408 28409 28410 28411 28412 28413 28414 28415 28416 28417 28418 28419 28420 28421 28422 28423 28424 28425 28426 28427 28428 28429 28430 28431 28432 28433 28434 28435 28436 28437 28438 28439 28440 28441 28442 28443 28444 28445 28446 28447 28448 28449 28450 28451 28452 28453 28454 28455 28456 28457 28458 28459 28460 28461 28462 28463 28464 28465 28466 28467 28468 28469 28470 28471 28472 28473 28474 28475 28476 28477 28478 28479 28480 28481 28482 28483 28484 28485 28486 28487 28488 28489 28490 28491 28492 28493 28494 28495 28496 28497 28498 28499 28500 28501 28502 28503 28504 28505 28506 28507 28508 28509 28510 28511 28512 28513 28514 28515 28516 28517 28518 28519 28520 28521 28522 28523 28524 28525 28526 28527 28528 28529 28530 28531 28532 28533 28534 28535 28536 28537 28538 28539 28540 28541 28542 28543 28544 28545 28546 28547 28548 28549 28550 28551 28552 28553 28554 28555 28556 28557 28558 28559 28560 28561 28562 28563 28564 28565 28566 28567 28568 28569 28570 28571 28572 28573 28574 28575 28576 28577 28578 28579 28580 28581 28582 28583 28584 28585 28586 28587 28588 28589 28590 28591 28592 28593 28594 28595 28596 28597 28598 28599 28600 28601 28602 28603 28604 28605 28606 28607 28608 28609 28610 28611 28612 28613 28614 28615 28616 28617 28618 28619 28620 28621 28622 28623 28624 28625 28626 28627 28628 28629 28630 28631 28632 28633 28634 28635 28636 28637 28638 28639 28640 28641 28642 28643 28644 28645 28646 28647 28648 28649 28650 28651 28652 28653 28654 28655 28656 28657 28658 28659 28660 28661 28662 28663 28664 28665 28666 28667 28668 28669 28670 28671 28672 28673 28674 28675 28676 28677 28678 28679 28680 28681 28682 28683 28684 28685 28686 28687 28688 28689 28690 28691 28692 28693 28694 28695 28696 28697 28698 28699 28700 28701 28702 28703 28704 28705 28706 28707 28708 28709 28710 28711 28712 28713 28714 28715 28716 28717 28718 28719 28720 28721 28722 28723 28724 28725 28726 28727 28728 28729 28730 28731 28732 28733 28734 28735 28736 28737 28738 28739 28740 28741 28742 28743 28744 28745 28746 28747 28748 28749 28750 28751 28752 28753 28754 28755 28756 28757 28758 28759 28760 28761 28762 28763 28764 28765 28766 28767 28768 28769 28770 28771 28772 28773 28774 28775 28776 28777 28778 28779 28780 28781 28782 28783 28784 28785 28786 28787 28788 28789 28790 28791 28792 28793 28794 28795 28796 28797 28798 28799 28800 28801 28802 28803 28804 28805 28806 28807 28808 28809 28810 28811 28812 28813 28814 28815 28816 28817 28818 28819 28820 28821 28822 28823 28824 28825 28826 28827 28828 28829 28830 28831 28832 28833 28834 28835 28836 28837 28838 28839 28840 28841 28842 28843 28844 28845 28846 28847 28848 28849 28850 28851 28852 28853 28854 28855 28856 28857 28858 28859 28860 28861 28862 28863 28864 28865 28866 28867 28868 28869 28870 28871 28872 28873 28874 28875 28876 28877 28878 28879 28880 28881 28882 28883 28884 28885 28886 28887 28888 28889 28890 28891 28892 28893 28894 28895 28896 28897 28898 28899 28900 28901 28902 28903 28904 28905 28906 28907 28908 28909 28910 28911 28912 28913 28914 28915 28916 28917 28918 28919 28920 28921 28922 28923 28924 28925 28926 28927 28928 28929 28930 28931 28932 28933 28934 28935 28936 28937 28938 28939 28940 28941 28942 28943 28944 28945 28946 28947 28948 28949 28950 28951 28952 28953 28954 28955 28956 28957 28958 28959 28960 28961 28962 28963 28964 28965 28966 28967 28968 28969 28970 28971 28972 28973 28974 28975 28976 28977 28978 28979 28980 28981 28982 28983 28984 28985 28986 28987 28988 28989 28990 28991 28992 28993 28994 28995 28996 28997 28998 28999 29000 29001 29002 29003 29004 29005 29006 29007 29008 29009 29010 29011 29012 29013 29014 29015 29016 29017 29018 29019 29020 29021 29022 29023 29024 29025 29026 29027 29028 29029 29030 29031 29032 29033 29034 29035 29036 29037 29038 29039 29040 29041 29042 29043 29044 29045 29046 29047 29048 29049 29050 29051 29052 29053 29054 29055 29056 29057 29058 29059 29060 29061 29062 29063 29064 29065 29066 29067 29068 29069 29070 29071 29072 29073 29074 29075 29076 29077 29078 29079 29080 29081 29082 29083 29084 29085 29086 29087 29088 29089 29090 29091 29092 29093 29094 29095 29096 29097 29098 29099 29100 29101 29102 29103 29104 29105 29106 29107 29108 29109 29110 29111 29112 29113 29114 29115 29116 29117 29118 29119 29120 29121 29122 29123 29124 29125 29126 29127 29128 29129 29130 29131 29132 29133 29134 29135 29136 29137 29138 29139 29140 29141 29142 29143 29144 29145 29146 29147 29148 29149 29150 29151 29152 29153 29154 29155 29156 29157 29158 29159 29160 29161 29162 29163 29164 29165 29166 29167 29168 29169 29170 29171 29172 29173 29174 29175 29176 29177 29178 29179 29180 29181 29182 29183 29184 29185 29186 29187 29188 29189 29190 29191 29192 29193 29194 29195 29196 29197 29198 29199 29200 29201 29202 29203 29204 29205 29206 29207 29208 29209 29210 29211 29212 29213 29214 29215 29216 29217 29218 29219 29220 29221 29222 29223 29224 29225 29226 29227 29228 29229 29230 29231 29232 29233 29234 29235 29236 29237 29238 29239 29240 29241 29242 29243 29244 29245 29246 29247 29248 29249 29250 29251 29252 29253 29254 29255 29256 29257 29258 29259 29260 29261 29262 29263 29264 29265 29266 29267 29268 29269 29270 29271 29272 29273 29274 29275 29276 29277 29278 29279 29280 29281 29282 29283 29284 29285 29286 29287 29288 29289 29290 29291 29292 29293 29294 29295 29296 29297 29298 29299 29300 29301 29302 29303 29304 29305 29306 29307 29308 29309 29310 29311 29312 29313 29314 29315 29316 29317 29318 29319 29320 29321 29322 29323 29324 29325 29326 29327 29328 29329 29330 29331 29332 29333 29334 29335 29336 29337 29338 29339 29340 29341 29342 29343 29344 29345 29346 29347 29348 29349 29350 29351 29352 29353 29354 29355 29356 29357 29358 29359 29360 29361 29362 29363 29364 29365 29366 29367 29368 29369 29370 29371 29372 29373 29374 29375 29376 29377 29378 29379 29380 29381 29382 29383 29384 29385 29386 29387 29388 29389 29390 29391 29392 29393 29394 29395 29396 29397 29398 29399 29400 29401 29402 29403 29404 29405 29406 29407 29408 29409 29410 29411 29412 29413 29414 29415 29416 29417 29418 29419 29420 29421 29422 29423 29424 29425 29426 29427 29428 29429 29430 29431 29432 29433 29434 29435 29436 29437 29438 29439 29440 29441 29442 29443 29444 29445 29446 29447 29448 29449 29450 29451 29452 29453 29454 29455 29456 29457 29458 29459 29460 29461 29462 29463 29464 29465 29466 29467 29468 29469 29470 29471 29472 29473 29474 29475 29476 29477 29478 29479 29480 29481 29482 29483 29484 29485 29486 29487 29488 29489 29490 29491 29492 29493 29494 29495 29496 29497 29498 29499 29500 29501 29502 29503 29504 29505 29506 29507 29508 29509 29510 29511 29512 29513 29514 29515 29516 29517 29518 29519 29520 29521 29522 29523 29524 29525 29526 29527 29528 29529 29530 29531 29532 29533 29534 29535 29536 29537 29538 29539 29540 29541 29542 29543 29544 29545 29546 29547 29548 29549 29550 29551 29552 29553 29554 29555 29556 29557 29558 29559 29560 29561 29562 29563 29564 29565 29566 29567 29568 29569 29570 29571 29572 29573 29574 29575 29576 29577 29578 29579 29580 29581 29582 29583 29584 29585 29586 29587 29588 29589 29590 29591 29592 29593 29594 29595 29596 29597 29598 29599 29600 29601 29602 29603 29604 29605 29606 29607 29608 29609 29610 29611 29612 29613 29614 29615 29616 29617 29618 29619 29620 29621 29622 29623 29624 29625 29626 29627 29628 29629 29630 29631 29632 29633 29634 29635 29636 29637 29638 29639 29640 29641 29642 29643 29644 29645 29646 29647 29648 29649 29650 29651 29652 29653 29654 29655 29656 29657 29658 29659 29660 29661 29662 29663 29664 29665 29666 29667 29668 29669 29670 29671 29672 29673 29674 29675 29676 29677 29678 29679 29680 29681 29682 29683 29684 29685 29686 29687 29688 29689 29690 29691 29692 29693 29694 29695 29696 29697 29698 29699 29700 29701 29702 29703 29704 29705 29706 29707 29708 29709 29710 29711 29712 29713 29714 29715 29716 29717 29718 29719 29720 29721 29722 29723 29724 29725 29726 29727 29728 29729 29730 29731 29732 29733 29734 29735 29736 29737 29738 29739 29740 29741 29742 29743 29744 29745 29746 29747 29748 29749 29750 29751 29752 29753 29754 29755 29756 29757 29758 29759 29760 29761 29762 29763 29764 29765 29766 29767 29768 29769 29770 29771 29772 29773 29774 29775 29776 29777 29778 29779 29780 29781 29782 29783 29784 29785 29786 29787 29788 29789 29790 29791 29792 29793 29794 29795 29796 29797 29798 29799 29800 29801 29802 29803 29804 29805 29806 29807 29808 29809 29810 29811 29812 29813 29814 29815 29816 29817 29818 29819 29820 29821 29822 29823 29824 29825 29826 29827 29828 29829 29830 29831 29832 29833 29834 29835 29836 29837 29838 29839 29840 29841 29842 29843 29844 29845 29846 29847 29848 29849 29850 29851 29852 29853 29854 29855 29856 29857 29858 29859 29860 29861 29862 29863 29864 29865 29866 29867 29868 29869 29870 29871 29872 29873 29874 29875 29876 29877 29878 29879 29880 29881 29882 29883 29884 29885 29886 29887 29888 29889 29890 29891 29892 29893 29894 29895 29896 29897 29898 29899 29900 29901 29902 29903 29904 29905 29906 29907 29908 29909 29910 29911 29912 29913 29914 29915 29916 29917 29918 29919 29920 29921 29922 29923 29924 29925 29926 29927 29928 29929 29930 29931 29932 29933 29934 29935 29936 29937 29938 29939 29940 29941 29942 29943 29944 29945 29946 29947 29948 29949 29950 29951 29952 29953 29954 29955 29956 29957 29958 29959 29960 29961 29962 29963 29964 29965 29966 29967 29968 29969 29970 29971 29972 29973 29974 29975 29976 29977 29978 29979 29980 29981 29982 29983 29984 29985 29986 29987 29988 29989 29990 29991 29992 29993 29994 29995 29996 29997 29998 29999 30000 30001 30002 30003 30004 30005 30006 30007 30008 30009 30010 30011 30012 30013 30014 30015 30016 30017 30018 30019 30020 30021 30022 30023 30024 30025 30026 30027 30028 30029 30030 30031 30032 30033 30034 30035 30036 30037 30038 30039 30040 30041 30042 30043 30044 30045 30046 30047 30048 30049 30050 30051 30052 30053 30054 30055 30056 30057 30058 30059 30060 30061 30062 30063 30064 30065 30066 30067 30068 30069 30070 30071 30072 30073 30074 30075 30076 30077 30078 30079 30080 30081 30082 30083 30084 30085 30086 30087 30088 30089 30090 30091 30092 30093 30094 30095 30096 30097 30098 30099 30100 30101 30102 30103 30104 30105 30106 30107 30108 30109 30110 30111 30112 30113 30114 30115 30116 30117 30118 30119 30120 30121 30122 30123 30124 30125 30126 30127 30128 30129 30130 30131 30132 30133 30134 30135 30136 30137 30138 30139 30140 30141 30142 30143 30144 30145 30146 30147 30148 30149 30150 30151 30152 30153 30154 30155 30156 30157 30158 30159 30160 30161 30162 30163 30164 30165 30166 30167 30168 30169 30170 30171 30172 30173 30174 30175 30176 30177 30178 30179 30180 30181 30182 30183 30184 30185 30186 30187 30188 30189 30190 30191 30192 30193 30194 30195 30196 30197 30198 30199 30200 30201 30202 30203 30204 30205 30206 30207 30208 30209 30210 30211 30212 30213 30214 30215 30216 30217 30218 30219 30220 30221 30222 30223 30224 30225 30226 30227 30228 30229 30230 30231 30232 30233 30234 30235 30236 30237 30238 30239 30240 30241 30242 30243 30244 30245 30246 30247 30248 30249 30250 30251 30252 30253 30254 30255 30256 30257 30258 30259 30260 30261 30262 30263 30264 30265 30266 30267 30268 30269 30270 30271 30272 30273 30274 30275 30276 30277 30278 30279 30280 30281 30282 30283 30284 30285 30286 30287 30288 30289 30290 30291 30292 30293 30294 30295 30296 30297 30298 30299 30300 30301 30302 30303 30304 30305 30306 30307 30308 30309 30310 30311 30312 30313 30314 30315 30316 30317 30318 30319 30320 30321 30322 30323 30324 30325 30326 30327 30328 30329 30330 30331 30332 30333 30334 30335 30336 30337 30338 30339 30340 30341 30342 30343 30344 30345 30346 30347 30348 30349 30350 30351 30352 30353 30354 30355 30356 30357 30358 30359 30360 30361 30362 30363 30364 30365 30366 30367 30368 30369 30370 30371 30372 30373 30374 30375 30376 30377 30378 30379 30380 30381 30382 30383 30384 30385 30386 30387 30388 30389 30390 30391 30392 30393 30394 30395 30396 30397 30398 30399 30400 30401 30402 30403 30404 30405 30406 30407 30408 30409 30410 30411 30412 30413 30414 30415 30416 30417 30418 30419 30420 30421 30422 30423 30424 30425 30426 30427 30428 30429 30430 30431 30432 30433 30434 30435 30436 30437 30438 30439 30440 30441 30442 30443 30444 30445 30446 30447 30448 30449 30450 30451 30452 30453 30454 30455 30456 30457 30458 30459 30460 30461 30462 30463 30464 30465 30466 30467 30468 30469 30470 30471 30472 30473 30474 30475 30476 30477 30478 30479 30480 30481 30482 30483 30484 30485 30486 30487 30488 30489 30490 30491 30492 30493 30494 30495 30496 30497 30498 30499 30500 30501 30502 30503 30504 30505 30506 30507 30508 30509 30510 30511 30512 30513 30514 30515 30516 30517 30518 30519 30520 30521 30522 30523 30524 30525 30526 30527 30528 30529 30530 30531 30532 30533 30534 30535 30536 30537 30538 30539 30540 30541 30542 30543 30544 30545 30546 30547 30548 30549 30550 30551 30552 30553 30554 30555 30556 30557 30558 30559 30560 30561 30562 30563 30564 30565 30566 30567 30568 30569 30570 30571 30572 30573 30574 30575 30576 30577 30578 30579 30580 30581 30582 30583 30584 30585 30586 30587 30588 30589 30590 30591 30592 30593 30594 30595 30596 30597 30598 30599 30600 30601 30602 30603 30604 30605 30606 30607 30608 30609 30610 30611 30612 30613 30614 30615 30616 30617 30618 30619 30620 30621 30622 30623 30624 30625 30626 30627 30628 30629 30630 30631 30632 30633 30634 30635 30636 30637 30638 30639 30640 30641 30642 30643 30644 30645 30646 30647 30648 30649 30650 30651 30652 30653 30654 30655 30656 30657 30658 30659 30660 30661 30662 30663 30664 30665 30666 30667 30668 30669 30670 30671 30672 30673 30674 30675 30676 30677 30678 30679 30680 30681 30682 30683 30684 30685 30686 30687 30688 30689 30690 30691 30692 30693 30694 30695 30696 30697 30698 30699 30700 30701 30702 30703 30704 30705 30706 30707 30708 30709 30710 30711 30712 30713 30714 30715 30716 30717 30718 30719 30720 30721 30722 30723 30724 30725 30726 30727 30728 30729 30730 30731 30732 30733 30734 30735 30736 30737 30738 30739 30740 30741 30742 30743 30744 30745 30746 30747 30748 30749 30750 30751 30752 30753 30754 30755 30756 30757 30758 30759 30760 30761 30762 30763 30764 30765 30766 30767 30768 30769 30770 30771 30772 30773 30774 30775 30776 30777 30778 30779 30780 30781 30782 30783 30784 30785 30786 30787 30788 30789 30790 30791 30792 30793 30794 30795 30796 30797 30798 30799 30800 30801 30802 30803 30804 30805 30806 30807 30808 30809 30810 30811 30812 30813 30814 30815 30816 30817 30818 30819 30820 30821 30822 30823 30824 30825 30826 30827 30828 30829 30830 30831 30832 30833 30834 30835 30836 30837 30838 30839 30840 30841 30842 30843 30844 30845 30846 30847 30848 30849 30850 30851 30852 30853 30854 30855 30856 30857 30858 30859 30860 30861 30862 30863 30864 30865 30866 30867 30868 30869 30870 30871 30872 30873 30874 30875 30876 30877 30878 30879 30880 30881 30882 30883 30884 30885 30886 30887 30888 30889 30890 30891 30892 30893 30894 30895 30896 30897 30898 30899 30900 30901 30902 30903 30904 30905 30906 30907 30908 30909 30910 30911 30912 30913 30914 30915 30916 30917 30918 30919 30920 30921 30922 30923 30924 30925 30926 30927 30928 30929 30930 30931 30932 30933 30934 30935 30936 30937 30938 30939 30940 30941 30942 30943 30944 30945 30946 30947 30948 30949 30950 30951 30952 30953 30954 30955 30956 30957 30958 30959 30960 30961 30962 30963 30964 30965 30966 30967 30968 30969 30970 30971 30972 30973 30974 30975 30976 30977 30978 30979 30980 30981 30982 30983 30984 30985 30986 30987 30988 30989 30990 30991 30992 30993 30994 30995 30996 30997 30998 30999 31000 31001 31002 31003 31004 31005 31006 31007 31008 31009 31010 31011 31012 31013 31014 31015 31016 31017 31018 31019 31020 31021 31022 31023 31024 31025 31026 31027 31028 31029 31030 31031 31032 31033 31034 31035 31036 31037 31038 31039 31040 31041 31042 31043 31044 31045 31046 31047 31048 31049 31050 31051 31052 31053 31054 31055 31056 31057 31058 31059 31060 31061 31062 31063 31064 31065 31066 31067 31068 31069 31070 31071 31072 31073 31074 31075 31076 31077 31078 31079 31080 31081 31082 31083 31084 31085 31086 31087 31088 31089 31090 31091 31092 31093 31094 31095 31096 31097 31098 31099 31100 31101 31102 31103 31104 31105 31106 31107 31108 31109 31110 31111 31112 31113 31114 31115 31116 31117 31118 31119 31120 31121 31122 31123 31124 31125 31126 31127 31128 31129 31130 31131 31132 31133 31134 31135 31136 31137 31138 31139 31140 31141 31142 31143 31144 31145 31146 31147 31148 31149 31150 31151 31152 31153 31154 31155 31156 31157 31158 31159 31160 31161 31162 31163 31164 31165 31166 31167 31168 31169 31170 31171 31172 31173 31174 31175 31176 31177 31178 31179 31180 31181 31182 31183 31184 31185 31186 31187 31188 31189 31190 31191 31192 31193 31194 31195 31196 31197 31198 31199 31200 31201 31202 31203 31204 31205 31206 31207 31208 31209 31210 31211 31212 31213 31214 31215 31216 31217 31218 31219 31220 31221 31222 31223 31224 31225 31226 31227 31228 31229 31230 31231 31232 31233 31234 31235 31236 31237 31238 31239 31240 31241 31242 31243 31244 31245 31246 31247 31248 31249 31250 31251 31252 31253 31254 31255 31256 31257 31258 31259 31260 31261 31262 31263 31264 31265 31266 31267 31268 31269 31270 31271 31272 31273 31274 31275 31276 31277 31278 31279 31280 31281 31282 31283 31284 31285 31286 31287 31288 31289 31290 31291 31292 31293 31294 31295 31296 31297 31298 31299 31300 31301 31302 31303 31304 31305 31306 31307 31308 31309 31310 31311 31312 31313 31314 31315 31316 31317 31318 31319 31320 31321 31322 31323 31324 31325 31326 31327 31328 31329 31330 31331 31332 31333 31334 31335 31336 31337 31338 31339 31340 31341 31342 31343 31344 31345 31346 31347 31348 31349 31350 31351 31352 31353 31354 31355 31356 31357 31358 31359 31360 31361 31362 31363 31364 31365 31366 31367 31368 31369 31370 31371 31372 31373 31374 31375 31376 31377 31378 31379 31380 31381 31382 31383 31384 31385 31386 31387 31388 31389 31390 31391 31392 31393 31394 31395 31396 31397 31398 31399 31400 31401 31402 31403 31404 31405 31406 31407 31408 31409 31410 31411 31412 31413 31414 31415 31416 31417 31418 31419 31420 31421 31422 31423 31424 31425 31426 31427 31428 31429 31430 31431 31432 31433 31434 31435 31436 31437 31438 31439 31440 31441 31442 31443 31444 31445 31446 31447 31448 31449 31450 31451 31452 31453 31454 31455 31456 31457 31458 31459 31460 31461 31462 31463 31464 31465 31466 31467 31468 31469 31470 31471 31472 31473 31474 31475 31476 31477 31478 31479 31480 31481 31482 31483 31484 31485 31486 31487 31488 31489 31490 31491 31492 31493 31494 31495 31496 31497 31498 31499 31500 31501 31502 31503 31504 31505 31506 31507 31508 31509 31510 31511 31512 31513 31514 31515 31516 31517 31518 31519 31520 31521 31522 31523 31524 31525 31526 31527 31528 31529 31530 31531 31532 31533 31534 31535 31536 31537 31538 31539 31540 31541 31542 31543 31544 31545 31546 31547 31548 31549 31550 31551 31552 31553 31554 31555 31556 31557 31558 31559 31560 31561 31562 31563 31564 31565 31566 31567 31568 31569 31570 31571 31572 31573 31574 31575 31576 31577 31578 31579 31580 31581 31582 31583 31584 31585 31586 31587 31588 31589 31590 31591 31592 31593 31594 31595 31596 31597 31598 31599 31600 31601 31602 31603 31604 31605 31606 31607 31608 31609 31610 31611 31612 31613 31614 31615 31616 31617 31618 31619 31620 31621 31622 31623 31624 31625 31626 31627 31628 31629 31630 31631 31632 31633 31634 31635 31636 31637 31638 31639 31640 31641 31642 31643 31644 31645 31646 31647 31648 31649 31650 31651 31652 31653 31654 31655 31656 31657 31658 31659 31660 31661 31662 31663 31664 31665 31666 31667 31668 31669 31670 31671 31672 31673 31674 31675 31676 31677 31678 31679 31680 31681 31682 31683 31684 31685 31686 31687 31688 31689 31690 31691 31692 31693 31694 31695 31696 31697 31698 31699 31700 31701 31702 31703 31704 31705 31706 31707 31708 31709 31710 31711 31712 31713 31714 31715 31716 31717 31718 31719 31720 31721 31722 31723 31724 31725 31726 31727 31728 31729 31730 31731 31732 31733 31734 31735 31736 31737 31738 31739 31740 31741 31742 31743 31744 31745 31746 31747 31748 31749 31750 31751 31752 31753 31754 31755 31756 31757 31758 31759 31760 31761 31762 31763 31764 31765 31766 31767 31768 31769 31770 31771 31772 31773 31774 31775 31776 31777 31778 31779 31780 31781 31782 31783 31784 31785 31786 31787 31788 31789 31790 31791 31792 31793 31794 31795 31796 31797 31798 31799 31800 31801 31802 31803 31804 31805 31806 31807 31808 31809 31810 31811 31812 31813 31814 31815 31816 31817 31818 31819 31820 31821 31822 31823 31824 31825 31826 31827 31828 31829 31830 31831 31832 31833 31834 31835 31836 31837 31838 31839 31840 31841 31842 31843 31844 31845 31846 31847 31848 31849 31850 31851 31852 31853 31854 31855 31856 31857 31858 31859 31860 31861 31862 31863 31864 31865 31866 31867 31868 31869 31870 31871 31872 31873 31874 31875 31876 31877 31878 31879 31880 31881 31882 31883 31884 31885 31886 31887 31888 31889 31890 31891 31892 31893 31894 31895 31896 31897 31898 31899 31900 31901 31902 31903 31904 31905 31906 31907 31908 31909 31910 31911 31912 31913 31914 31915 31916 31917 31918 31919 31920 31921 31922 31923 31924 31925 31926 31927 31928 31929 31930 31931 31932 31933 31934 31935 31936 31937 31938 31939 31940 31941 31942 31943 31944 31945 31946 31947 31948 31949 31950 31951 31952 31953 31954 31955 31956 31957 31958 31959 31960 31961 31962 31963 31964 31965 31966 31967 31968 31969 31970 31971 31972 31973 31974 31975 31976 31977 31978 31979 31980 31981 31982 31983 31984 31985 31986 31987 31988 31989 31990 31991 31992 31993 31994 31995 31996 31997 31998 31999 32000 32001 32002 32003 32004 32005 32006 32007 32008 32009 32010 32011 32012 32013 32014 32015 32016 32017 32018 32019 32020 32021 32022 32023 32024 32025 32026 32027 32028 32029 32030 32031 32032 32033 32034 32035 32036 32037 32038 32039 32040 32041 32042 32043 32044 32045 32046 32047 32048 32049 32050 32051 32052 32053 32054 32055 32056 32057 32058 32059 32060 32061 32062 32063 32064 32065 32066 32067 32068 32069 32070 32071 32072 32073 32074 32075 32076 32077 32078 32079 32080 32081 32082 32083 32084 32085 32086 32087 32088 32089 32090 32091 32092 32093 32094 32095 32096 32097 32098 32099 32100 32101 32102 32103 32104 32105 32106 32107 32108 32109 32110 32111 32112 32113 32114 32115 32116 32117 32118 32119 32120 32121 32122 32123 32124 32125 32126 32127 32128 32129 32130 32131 32132 32133 32134 32135 32136 32137 32138 32139 32140 32141 32142 32143 32144 32145 32146 32147 32148 32149 32150 32151 32152 32153 32154 32155 32156 32157 32158 32159 32160 32161 32162 32163 32164 32165 32166 32167 32168 32169 32170 32171 32172 32173 32174 32175 32176 32177 32178 32179 32180 32181 32182 32183 32184 32185 32186 32187 32188 32189 32190 32191 32192 32193 32194 32195 32196 32197 32198 32199 32200 32201 32202 32203 32204 32205 32206 32207 32208 32209 32210 32211 32212 32213 32214 32215 32216 32217 32218 32219 32220 32221 32222 32223 32224 32225 32226 32227 32228 32229 32230 32231 32232 32233 32234 32235 32236 32237 32238 32239 32240 32241 32242 32243 32244 32245 32246 32247 32248 32249 32250 32251 32252 32253 32254 32255 32256 32257 32258 32259 32260 32261 32262 32263 32264 32265 32266 32267 32268 32269 32270 32271 32272 32273 32274 32275 32276 32277 32278 32279 32280 32281 32282 32283 32284 32285 32286 32287 32288 32289 32290 32291 32292 32293 32294 32295 32296 32297 32298 32299 32300 32301 32302 32303 32304 32305 32306 32307 32308 32309 32310 32311 32312 32313 32314 32315 32316 32317 32318 32319 32320 32321 32322 32323 32324 32325 32326 32327 32328 32329 32330 32331 32332 32333 32334 32335 32336 32337 32338 32339 32340 32341 32342 32343 32344 32345 32346 32347 32348 32349 32350 32351 32352 32353 32354 32355 32356 32357 32358 32359 32360 32361 32362 32363 32364 32365 32366 32367 32368 32369 32370 32371 32372 32373 32374 32375 32376 32377 32378 32379 32380 32381 32382 32383 32384 32385 32386 32387 32388 32389 32390 32391 32392 32393 32394 32395 32396 32397 32398 32399 32400 32401 32402 32403 32404 32405 32406 32407 32408 32409 32410 32411 32412 32413 32414 32415 32416 32417 32418 32419 32420 32421 32422 32423 32424 32425 32426 32427 32428 32429 32430 32431 32432 32433 32434 32435 32436 32437 32438 32439 32440 32441 32442 32443 32444 32445 32446 32447 32448 32449 32450 32451 32452 32453 32454 32455 32456 32457 32458 32459 32460 32461 32462 32463 32464 32465 32466 32467 32468 32469 32470 32471 32472 32473 32474 32475 32476 32477 32478 32479 32480 32481 32482 32483 32484 32485 32486 32487 32488 32489 32490 32491 32492 32493 32494 32495 32496 32497 32498 32499 32500 32501 32502 32503 32504 32505 32506 32507 32508 32509 32510 32511 32512 32513 32514 32515 32516 32517 32518 32519 32520 32521 32522 32523 32524 32525 32526 32527 32528 32529 32530 32531 32532 32533 32534 32535 32536 32537 32538 32539 32540 32541 32542 32543 32544 32545 32546 32547 32548 32549 32550 32551 32552 32553 32554 32555 32556 32557 32558 32559 32560 32561 32562 32563 32564 32565 32566 32567 32568 32569 32570 32571 32572 32573 32574 32575 32576 32577 32578 32579 32580 32581 32582 32583 32584 32585 32586 32587 32588 32589 32590 32591 32592 32593 32594 32595 32596 32597 32598 32599 32600 32601 32602 32603 32604 32605 32606 32607 32608 32609 32610 32611 32612 32613 32614 32615 32616 32617 32618 32619 32620 32621 32622 32623 32624 32625 32626 32627 32628 32629 32630 32631 32632 32633 32634 32635 32636 32637 32638 32639 32640 32641 32642 32643 32644 32645 32646 32647 32648 32649 32650 32651 32652 32653 32654 32655 32656 32657 32658 32659 32660 32661 32662 32663 32664 32665 32666 32667 32668 32669 32670 32671 32672 32673 32674 32675 32676 32677 32678 32679 32680 32681 32682 32683 32684 32685 32686 32687 32688 32689 32690 32691 32692 32693 32694 32695 32696 32697 32698 32699 32700 32701 32702 32703 32704 32705 32706 32707 32708 32709 32710 32711 32712 32713 32714 32715 32716 32717 32718 32719 32720 32721 32722 32723 32724 32725 32726 32727 32728 32729 32730 32731 32732 32733 32734 32735 32736 32737 32738 32739 32740 32741 32742 32743 32744 32745 32746 32747 32748 32749 32750 32751 32752 32753 32754 32755 32756 32757 32758 32759 32760 32761 32762 32763 32764 32765 32766 32767 32768 32769 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779 32780 32781 32782 32783 32784 32785 32786 32787 32788 32789 32790 32791 32792 32793 32794 32795 32796 32797 32798 32799 32800 32801 32802 32803 32804 32805 32806 32807 32808 32809 32810 32811 32812 32813 32814 32815 32816 32817 32818 32819 32820 32821 32822 32823 32824 32825 32826 32827 32828 32829 32830 32831 32832 32833 32834 32835 32836 32837 32838 32839 32840 32841 32842 32843 32844 32845 32846 32847 32848 32849 32850 32851 32852 32853 32854 32855 32856 32857 32858 32859 32860 32861 32862 32863 32864 32865 32866 32867 32868 32869 32870 32871 32872 32873 32874 32875 32876 32877 32878 32879 32880 32881 32882 32883 32884 32885 32886 32887 32888 32889 32890 32891 32892 32893 32894 32895 32896 32897 32898 32899 32900 32901 32902 32903 32904 32905 32906 32907 32908 32909 32910 32911 32912 32913 32914 32915 32916 32917 32918 32919 32920 32921 32922 32923 32924 32925 32926 32927 32928 32929 32930 32931 32932 32933 32934 32935 32936 32937 32938 32939 32940 32941 32942 32943 32944 32945 32946 32947 32948 32949 32950 32951 32952 32953 32954 32955 32956 32957 32958 32959 32960 32961 32962 32963 32964 32965 32966 32967 32968 32969 32970 32971 32972 32973 32974 32975 32976 32977 32978 32979 32980 32981 32982 32983 32984 32985 32986 32987 32988 32989 32990 32991 32992 32993 32994 32995 32996 32997 32998 32999 33000 33001 33002 33003 33004 33005 33006 33007 33008 33009 33010 33011 33012 33013 33014 33015 33016 33017 33018 33019 33020 33021 33022 33023 33024 33025 33026 33027 33028 33029 33030 33031 33032 33033 33034 33035 33036 33037 33038 33039 33040 33041 33042 33043 33044 33045 33046 33047 33048 33049 33050 33051 33052 33053 33054 33055 33056 33057 33058 33059 33060 33061 33062 33063 33064 33065 33066 33067 33068 33069 33070 33071 33072 33073 33074 33075 33076 33077 33078 33079 33080 33081 33082 33083 33084 33085 33086 33087 33088 33089 33090 33091 33092 33093 33094 33095 33096 33097 33098 33099 33100 33101 33102 33103 33104 33105 33106 33107 33108 33109 33110 33111 33112 33113 33114 33115 33116 33117 33118 33119 33120 33121 33122 33123 33124 33125 33126 33127 33128 33129 33130 33131 33132 33133 33134 33135 33136 33137 33138 33139 33140 33141 33142 33143 33144 33145 33146 33147 33148 33149 33150 33151 33152 33153 33154 33155 33156 33157 33158 33159 33160 33161 33162 33163 33164 33165 33166 33167 33168 33169 33170 33171 33172 33173 33174 33175 33176 33177 33178 33179 33180 33181 33182 33183 33184 33185 33186 33187 33188 33189 33190 33191 33192 33193 33194 33195 33196 33197 33198 33199 33200 33201 33202 33203 33204 33205 33206 33207 33208 33209 33210 33211 33212 33213 33214 33215 33216 33217 33218 33219 33220 33221 33222 33223 33224 33225 33226 33227 33228 33229 33230 33231 33232 33233 33234 33235 33236 33237 33238 33239 33240 33241 33242 33243 33244 33245 33246 33247 33248 33249 33250 33251 33252 33253 33254 33255 33256 33257 33258 33259 33260 33261 33262 33263 33264 33265 33266 33267 33268 33269 33270 33271 33272 33273 33274 33275 33276 33277 33278 33279 33280 33281 33282 33283 33284 33285 33286 33287 33288 33289 33290 33291 33292 33293 33294 33295 33296 33297 33298 33299 33300 33301 33302 33303 33304 33305 33306 33307 33308 33309 33310 33311 33312 33313 33314 33315 33316 33317 33318 33319 33320 33321 33322 33323 33324 33325 33326 33327 33328 33329 33330 33331 33332 33333 33334 33335 33336 33337 33338 33339 33340 33341 33342 33343 33344 33345 33346 33347 33348 33349 33350 33351 33352 33353 33354 33355 33356 33357 33358 33359 33360 33361 33362 33363 33364 33365 33366 33367 33368 33369 33370 33371 33372 33373 33374 33375 33376 33377 33378 33379 33380 33381 33382 33383 33384 33385 33386 33387 33388 33389 33390 33391 33392 33393 33394 33395 33396 33397 33398 33399 33400 33401 33402 33403 33404 33405 33406 33407 33408 33409 33410 33411 33412 33413 33414 33415 33416 33417 33418 33419 33420 33421 33422 33423 33424 33425 33426 33427 33428 33429 33430 33431 33432 33433 33434 33435 33436 33437 33438 33439 33440 33441 33442 33443 33444 33445 33446 33447 33448 33449 33450 33451 33452 33453 33454 33455 33456 33457 33458 33459 33460 33461 33462 33463 33464 33465 33466 33467 33468 33469 33470 33471 33472 33473 33474 33475 33476 33477 33478 33479 33480 33481 33482 33483 33484 33485 33486 33487 33488 33489 33490 33491 33492 33493 33494 33495 33496 33497 33498 33499 33500 33501 33502 33503 33504 33505 33506 33507 33508 33509 33510 33511 33512 33513 33514 33515 33516 33517 33518 33519 33520 33521 33522 33523 33524 33525 33526 33527 33528 33529 33530 33531 33532 33533 33534 33535 33536 33537 33538 33539 33540 33541 33542 33543 33544 33545 33546 33547 33548 33549 33550 33551 33552 33553 33554 33555 33556 33557 33558 33559 33560 33561 33562 33563 33564 33565 33566 33567 33568 33569 33570 33571 33572 33573 33574 33575 33576 33577 33578 33579 33580 33581 33582 33583 33584 33585 33586 33587 33588 33589 33590 33591 33592 33593 33594 33595 33596 33597 33598 33599 33600 33601 33602 33603 33604 33605 33606 33607 33608 33609 33610 33611 33612 33613 33614 33615 33616 33617 33618 33619 33620 33621 33622 33623 33624 33625 33626 33627 33628 33629 33630 33631 33632 33633 33634 33635 33636 33637 33638 33639 33640 33641 33642 33643 33644 33645 33646 33647 33648 33649 33650 33651 33652 33653 33654 33655 33656 33657 33658 33659 33660 33661 33662 33663 33664 33665 33666 33667 33668 33669 33670 33671 33672 33673 33674 33675 33676 33677 33678 33679 33680 33681 33682 33683 33684 33685 33686 33687 33688 33689 33690 33691 33692 33693 33694 33695 33696 33697 33698 33699 33700 33701 33702 33703 33704 33705 33706 33707 33708 33709 33710 33711 33712 33713 33714 33715 33716 33717 33718 33719 33720 33721 33722 33723 33724 33725 33726 33727 33728 33729 33730 33731 33732 33733 33734 33735 33736 33737 33738 33739 33740 33741 33742 33743 33744 33745 33746 33747 33748 33749 33750 33751 33752 33753 33754 33755 33756 33757 33758 33759 33760 33761 33762 33763 33764 33765 33766 33767 33768 33769 33770 33771 33772 33773 33774 33775 33776 33777 33778 33779 33780 33781 33782 33783 33784 33785 33786 33787 33788 33789 33790 33791 33792 33793 33794 33795 33796 33797 33798 33799 33800 33801 33802 33803 33804 33805 33806 33807 33808 33809 33810 33811 33812 33813 33814 33815 33816 33817 33818 33819 33820 33821 33822 33823 33824 33825 33826 33827 33828 33829 33830 33831 33832 33833 33834 33835 33836 33837 33838 33839 33840 33841 33842 33843 33844 33845 33846 33847 33848 33849 33850 33851 33852 33853 33854 33855 33856 33857 33858 33859 33860 33861 33862 33863 33864 33865 33866 33867 33868 33869 33870 33871 33872 33873 33874 33875 33876 33877 33878 33879 33880 33881 33882 33883 33884 33885 33886 33887 33888 33889 33890 33891 33892 33893 33894 33895 33896 33897 33898 33899 33900 33901 33902 33903 33904 33905 33906 33907 33908 33909 33910 33911 33912 33913 33914 33915 33916 33917 33918 33919 33920 33921 33922 33923 33924 33925 33926 33927 33928 33929 33930 33931 33932 33933 33934 33935 33936 33937 33938 33939 33940 33941 33942 33943 33944 33945 33946 33947 33948 33949 33950 33951 33952 33953 33954 33955 33956 33957 33958 33959 33960 33961 33962 33963 33964 33965 33966 33967 33968 33969 33970 33971 33972 33973 33974 33975 33976 33977 33978 33979 33980 33981 33982 33983 33984 33985 33986 33987 33988 33989 33990 33991 33992 33993 33994 33995 33996 33997 33998 33999 34000 34001 34002 34003 34004 34005 34006 34007 34008 34009 34010 34011 34012 34013 34014 34015 34016 34017 34018 34019 34020 34021 34022 34023 34024 34025 34026 34027 34028 34029 34030 34031 34032 34033 34034 34035 34036 34037 34038 34039 34040 34041 34042 34043 34044 34045 34046 34047 34048 34049 34050 34051 34052 34053 34054 34055 34056 34057 34058 34059 34060 34061 34062 34063 34064 34065 34066 34067 34068 34069 34070 34071 34072 34073 34074 34075 34076 34077 34078 34079 34080 34081 34082 34083 34084 34085 34086 34087 34088 34089 34090 34091 34092 34093 34094 34095 34096 34097 34098 34099 34100 34101 34102 34103 34104 34105 34106 34107 34108 34109 34110 34111 34112 34113 34114 34115 34116 34117 34118 34119 34120 34121 34122 34123 34124 34125 34126 34127 34128 34129 34130 34131 34132 34133 34134 34135 34136 34137 34138 34139 34140 34141 34142 34143 34144 34145 34146 34147 34148 34149 34150 34151 34152 34153 34154 34155 34156 34157 34158 34159 34160 34161 34162 34163 34164 34165 34166 34167 34168 34169 34170 34171 34172 34173 34174 34175 34176 34177 34178 34179 34180 34181 34182 34183 34184 34185 34186 34187 34188 34189 34190 34191 34192 34193 34194 34195 34196 34197 34198 34199 34200 34201 34202 34203 34204 34205 34206 34207 34208 34209 34210 34211 34212 34213 34214 34215 34216 34217 34218 34219 34220 34221 34222 34223 34224 34225 34226 34227 34228 34229 34230 34231 34232 34233 34234 34235 34236 34237 34238 34239 34240 34241 34242 34243 34244 34245 34246 34247 34248 34249 34250 34251 34252 34253 34254 34255 34256 34257 34258 34259 34260 34261 34262 34263 34264 34265 34266 34267 34268 34269 34270 34271 34272 34273 34274 34275 34276 34277 34278 34279 34280 34281 34282 34283 34284 34285 34286 34287 34288 34289 34290 34291 34292 34293 34294 34295 34296 34297 34298 34299 34300 34301 34302 34303 34304 34305 34306 34307 34308 34309 34310 34311 34312 34313 34314 34315 34316 34317 34318 34319 34320 34321 34322 34323 34324 34325 34326 34327 34328 34329 34330 34331 34332 34333 34334 34335 34336 34337 34338 34339 34340 34341 34342 34343 34344 34345 34346 34347 34348 34349 34350 34351 34352 34353 34354 34355 34356 34357 34358 34359 34360 34361 34362 34363 34364 34365 34366 34367 34368 34369 34370 34371 34372 34373 34374 34375 34376 34377 34378 34379 34380 34381 34382 34383 34384 34385 34386 34387 34388 34389 34390 34391 34392 34393 34394 34395 34396 34397 34398 34399 34400 34401 34402 34403 34404 34405 34406 34407 34408 34409 34410 34411 34412 34413 34414 34415 34416 34417 34418 34419 34420 34421 34422 34423 34424 34425 34426 34427 34428 34429 34430 34431 34432 34433 34434 34435 34436 34437 34438 34439 34440 34441 34442 34443 34444 34445 34446 34447 34448 34449 34450 34451 34452 34453 34454 34455 34456 34457 34458 34459 34460 34461 34462 34463 34464 34465 34466 34467 34468 34469 34470 34471 34472 34473 34474 34475 34476 34477 34478 34479 34480 34481 34482 34483 34484 34485 34486 34487 34488 34489 34490 34491 34492 34493 34494 34495 34496 34497 34498 34499 34500 34501 34502 34503 34504 34505 34506 34507 34508 34509 34510 34511 34512 34513 34514 34515 34516 34517 34518 34519 34520 34521 34522 34523 34524 34525 34526 34527 34528 34529 34530 34531 34532 34533 34534 34535 34536 34537 34538 34539 34540 34541 34542 34543 34544 34545 34546 34547 34548 34549 34550 34551 34552 34553 34554 34555 34556 34557 34558 34559 34560 34561 34562 34563 34564 34565 34566 34567 34568 34569 34570 34571 34572 34573 34574 34575 34576 34577 34578 34579 34580 34581 34582 34583 34584 34585 34586 34587 34588 34589 34590 34591 34592 34593 34594 34595 34596 34597 34598 34599 34600 34601 34602 34603 34604 34605 34606 34607 34608 34609 34610 34611 34612 34613 34614 34615 34616 34617 34618 34619 34620 34621 34622 34623 34624 34625 34626 34627 34628 34629 34630 34631 34632 34633 34634 34635 34636 34637 34638 34639 34640 34641 34642 34643 34644 34645 34646 34647 34648 34649 34650 34651 34652 34653 34654 34655 34656 34657 34658 34659 34660 34661 34662 34663 34664 34665 34666 34667 34668 34669 34670 34671 34672 34673 34674 34675 34676 34677 34678 34679 34680 34681 34682 34683 34684 34685 34686 34687 34688 34689 34690 34691 34692 34693 34694 34695 34696 34697 34698 34699 34700 34701 34702 34703 34704 34705 34706 34707 34708 34709 34710 34711 34712 34713 34714 34715 34716 34717 34718 34719 34720 34721 34722 34723 34724 34725 34726 34727 34728 34729 34730 34731 34732 34733 34734 34735 34736 34737 34738 34739 34740 34741 34742 34743 34744 34745 34746 34747 34748 34749 34750 34751 34752 34753 34754 34755 34756 34757 34758 34759 34760 34761 34762 34763 34764 34765 34766 34767 34768 34769 34770 34771 34772 34773 34774 34775 34776 34777 34778 34779 34780 34781 34782 34783 34784 34785 34786 34787 34788 34789 34790 34791 34792 34793 34794 34795 34796 34797 34798 34799 34800 34801 34802 34803 34804 34805 34806 34807 34808 34809 34810 34811 34812 34813 34814 34815 34816 34817 34818 34819 34820 34821 34822 34823 34824 34825 34826 34827 34828 34829 34830 34831 34832 34833 34834 34835 34836 34837 34838 34839 34840 34841 34842 34843 34844 34845 34846 34847 34848 34849 34850 34851 34852 34853 34854 34855 34856 34857 34858 34859 34860 34861 34862 34863 34864 34865 34866 34867 34868 34869 34870 34871 34872 34873 34874 34875 34876 34877 34878 34879 34880 34881 34882 34883 34884 34885 34886 34887 34888 34889 34890 34891 34892 34893 34894 34895 34896 34897 34898 34899 34900 34901 34902 34903 34904 34905 34906 34907 34908 34909 34910 34911 34912 34913 34914 34915 34916 34917 34918 34919 34920 34921 34922 34923 34924 34925 34926 34927 34928 34929 34930 34931 34932 34933 34934 34935 34936 34937 34938 34939 34940 34941 34942 34943 34944 34945 34946 34947 34948 34949 34950 34951 34952 34953 34954 34955 34956 34957 34958 34959 34960 34961 34962 34963 34964 34965 34966 34967 34968 34969 34970 34971 34972 34973 34974 34975 34976 34977 34978 34979 34980 34981 34982 34983 34984 34985 34986 34987 34988 34989 34990 34991 34992 34993 34994 34995 34996 34997 34998 34999 35000 35001 35002 35003 35004 35005 35006 35007 35008 35009 35010 35011 35012 35013 35014 35015 35016 35017 35018 35019 35020 35021 35022 35023 35024 35025 35026 35027 35028 35029 35030 35031 35032 35033 35034 35035 35036 35037 35038 35039 35040 35041 35042 35043 35044 35045 35046 35047 35048 35049 35050 35051 35052 35053 35054 35055 35056 35057 35058 35059 35060 35061 35062 35063 35064 35065 35066 35067 35068 35069 35070 35071 35072 35073 35074 35075 35076 35077 35078 35079 35080 35081 35082 35083 35084 35085 35086 35087 35088 35089 35090 35091 35092 35093 35094 35095 35096 35097 35098 35099 35100 35101 35102 35103 35104 35105 35106 35107 35108 35109 35110 35111 35112 35113 35114 35115 35116 35117 35118 35119 35120 35121 35122 35123 35124 35125 35126 35127 35128 35129 35130 35131 35132 35133 35134 35135 35136 35137 35138 35139 35140 35141 35142 35143 35144 35145 35146 35147 35148 35149 35150 35151 35152 35153 35154 35155 35156 35157 35158 35159 35160 35161 35162 35163 35164 35165 35166 35167 35168 35169 35170 35171 35172 35173 35174 35175 35176 35177 35178 35179 35180 35181 35182 35183 35184 35185 35186 35187 35188 35189 35190 35191 35192 35193 35194 35195 35196 35197 35198 35199 35200 35201 35202 35203 35204 35205 35206 35207 35208 35209 35210 35211 35212 35213 35214 35215 35216 35217 35218 35219 35220 35221 35222 35223 35224 35225 35226 35227 35228 35229 35230 35231 35232 35233 35234 35235 35236 35237 35238 35239 35240 35241 35242 35243 35244 35245 35246 35247 35248 35249 35250 35251 35252 35253 35254 35255 35256 35257 35258 35259 35260 35261 35262 35263 35264 35265 35266 35267 35268 35269 35270 35271 35272 35273 35274 35275 35276 35277 35278 35279 35280 35281 35282 35283 35284 35285 35286 35287 35288 35289 35290 35291 35292 35293 35294 35295 35296 35297 35298 35299 35300 35301 35302 35303 35304 35305 35306 35307 35308 35309 35310 35311 35312 35313 35314 35315 35316 35317 35318 35319 35320 35321 35322 35323 35324 35325 35326 35327 35328 35329 35330 35331 35332 35333 35334 35335 35336 35337 35338 35339 35340 35341 35342 35343 35344 35345 35346 35347 35348 35349 35350 35351 35352 35353 35354 35355 35356 35357 35358 35359 35360 35361 35362 35363 35364 35365 35366 35367 35368 35369 35370 35371 35372 35373 35374 35375 35376 35377 35378 35379 35380 35381 35382 35383 35384 35385 35386 35387 35388 35389 35390 35391 35392 35393 35394 35395 35396 35397 35398 35399 35400 35401 35402 35403 35404 35405 35406 35407 35408 35409 35410 35411 35412 35413 35414 35415 35416 35417 35418 35419 35420 35421 35422 35423 35424 35425 35426 35427 35428 35429 35430 35431 35432 35433 35434 35435 35436 35437 35438 35439 35440 35441 35442 35443 35444 35445 35446 35447 35448 35449 35450 35451 35452 35453 35454 35455 35456 35457 35458 35459 35460 35461 35462 35463 35464 35465 35466 35467 35468 35469 35470 35471 35472 35473 35474 35475 35476 35477 35478 35479 35480 35481 35482 35483 35484 35485 35486 35487 35488 35489 35490 35491 35492 35493 35494 35495 35496 35497 35498 35499 35500 35501 35502 35503 35504 35505 35506 35507 35508 35509 35510 35511 35512 35513 35514 35515 35516 35517 35518 35519 35520 35521 35522 35523 35524 35525 35526 35527 35528 35529 35530 35531 35532 35533 35534 35535 35536 35537 35538 35539 35540 35541 35542 35543 35544 35545 35546 35547 35548 35549 35550 35551 35552 35553 35554 35555 35556 35557 35558 35559 35560 35561 35562 35563 35564 35565 35566 35567 35568 35569 35570 35571 35572 35573 35574 35575 35576 35577 35578 35579 35580 35581 35582 35583 35584 35585 35586 35587 35588 35589 35590 35591 35592 35593 35594 35595 35596 35597 35598 35599 35600 35601 35602 35603 35604 35605 35606 35607 35608 35609 35610 35611 35612 35613 35614 35615 35616 35617 35618 35619 35620 35621 35622 35623 35624 35625 35626 35627 35628 35629 35630 35631 35632 35633 35634 35635 35636 35637 35638 35639 35640 35641 35642 35643 35644 35645 35646 35647 35648 35649 35650 35651 35652 35653 35654 35655 35656 35657 35658 35659 35660 35661 35662 35663 35664 35665 35666 35667 35668 35669 35670 35671 35672 35673 35674 35675 35676 35677 35678 35679 35680 35681 35682 35683 35684 35685 35686 35687 35688 35689 35690 35691 35692 35693 35694 35695 35696 35697 35698 35699 35700 35701 35702 35703 35704 35705 35706 35707 35708 35709 35710 35711 35712 35713 35714 35715 35716 35717 35718 35719 35720 35721 35722 35723 35724 35725 35726 35727 35728 35729
diff --git a/.hgignore b/.hgignore
index b6c427f..c4b1187 100644
--- a/.hgignore
+++ b/.hgignore
@@ -76,6 +76,7 @@ test/testnative
test/testoverlay2
test/testplatform
test/testpower
+test/testfilesystem
test/testrelative
test/testrendercopyex
test/testrendertarget
diff --git a/Android.mk b/Android.mk
index 3230f9f..c8e67da 100755
--- a/Android.mk
+++ b/Android.mk
@@ -33,6 +33,7 @@ LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
+ $(wildcard $(LOCAL_PATH)/src/filesystem/dummy/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
@@ -41,9 +42,27 @@ LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/*.c) \
- $(wildcard $(LOCAL_PATH)/src/video/android/*.c))
+ $(wildcard $(LOCAL_PATH)/src/video/android/*.c) \
+ $(wildcard $(LOCAL_PATH)/src/test/*.c))
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
-LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog
+LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
include $(BUILD_SHARED_LIBRARY)
+
+###########################
+#
+# SDL static library
+#
+###########################
+
+LOCAL_MODULE := SDL2_static
+
+LOCAL_MODULE_FILENAME := libSDL2
+
+LOCAL_SRC_FILES += $(LOCAL_PATH)/src/main/android/SDL_android_main.c
+
+LOCAL_LDLIBS :=
+LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 925392e..1a1607f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,9 +29,9 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake)
# set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
set(SDL_MAJOR_VERSION 2)
set(SDL_MINOR_VERSION 0)
-set(SDL_MICRO_VERSION 0)
+set(SDL_MICRO_VERSION 1)
set(SDL_INTERFACE_AGE 0)
-set(SDL_BINARY_AGE 0)
+set(SDL_BINARY_AGE 1)
set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")
# Calculate a libtool-like version number
@@ -172,7 +172,7 @@ include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include)
set(SDL_SUBSYSTEMS
Atomic Audio Video Render Events Joystick Haptic Power Threads Timers
- File Loadso CPUinfo)
+ File Loadso CPUinfo Filesystem)
foreach(_SUB ${SDL_SUBSYSTEMS})
string(TOUPPER ${_SUB} _OPT)
option(SDL_${_OPT} "Enable the ${_SUB} subsystem" ON)
@@ -714,6 +714,13 @@ if(UNIX AND NOT APPLE)
endif(LINUX)
endif(SDL_POWER)
+ if(SDL_FILESYSTEM)
+ set(SDL_FILESYSTEM_UNIX 1)
+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/unix/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
+ set(HAVE_SDL_FILESYSTEM TRUE)
+ endif(SDL_FILESYSTEM)
+
if(SDL_TIMERS)
set(SDL_TIMER_UNIX 1)
file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/unix/*.c)
@@ -814,6 +821,13 @@ elseif(WINDOWS)
set(HAVE_SDL_POWER TRUE)
endif(SDL_POWER)
+ if(SDL_FILESYSTEM)
+ set(SDL_FILESYSTEM_WINDOWS 1)
+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesytem/windows/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
+ set(HAVE_SDL_FILESYSTEM TRUE)
+ endif(SDL_FILESYSTEM)
+
# Libraries for Win32 native and MinGW
list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid)
@@ -924,6 +938,13 @@ elseif(APPLE)
set(SDL_FRAMEWORK_IOKIT 1)
endif()
+ if(SDL_FILESYSTEM)
+ set(SDL_FILESYSTEM_COCOA 1)
+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/cocoa/*.m)
+ set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
+ set(HAVE_SDL_FILESYSTEM TRUE)
+ endif()
+
# Actually load the frameworks at the end so we don't duplicate include.
if(SDL_FRAMEWORK_COCOA)
find_library(COCOA_LIBRARY Cocoa)
@@ -973,6 +994,11 @@ elseif(BEOS)
set(SOURCE_FILES ${SOURCE_FILES} ${BWINDOW_SOURCES})
set(HAVE_SDL_VIDEO TRUE)
+ set(SDL_FILESYSTEM_BEOS 1)
+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/beos/*.cc)
+ set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
+ set(HAVE_SDL_FILESYSTEM TRUE)
+
if(VIDEO_OPENGL)
# TODO: Use FIND_PACKAGE(OpenGL) instead
set(SDL_VIDEO_OPENGL 1)
@@ -1008,8 +1034,13 @@ endif(NOT HAVE_SDL_HAPTIC)
if(NOT HAVE_SDL_LOADSO)
set(SDL_LOADSO_DISABLED 1)
file(GLOB LOADSO_SOURCES ${SDL2_SOURCE_DIR}/src/loadso/dummy/*.c)
- set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES})
+ set(SOURCE_FILES ${SOURCE_FILES} ${LOADSO_SOURCES})
endif(NOT HAVE_SDL_LOADSO)
+if(NOT HAVE_SDL_FILESYSTEM)
+ set(SDL_FILESYSTEM_DISABLED 1)
+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/dummy/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
+endif(NOT HAVE_SDL_FILESYSTEM)
# We always need to have threads and timers around
if(NOT HAVE_SDL_THREADS)
diff --git a/CREDITS.txt b/CREDITS.txt
index a1c2cdc..74163e8 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -21,6 +21,8 @@ Thanks to everyone who made this possible, including:
* Pierre-Loup Griffais for his deep knowledge of OpenGL drivers.
+* Julian Winter for the SDL 2.0 website.
+
* Sheena Smith for many months of great work on the SDL wiki creating the API documentation and style guides.
* Paul Hunkin for his port of SDL to Android during the Google Summer of Code 2010.
diff --git a/Makefile.in b/Makefile.in
index ae6293e..da42661 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,6 +54,7 @@ HDRS = \
SDL_endian.h \
SDL_error.h \
SDL_events.h \
+ SDL_filesystem.h \
SDL_gamecontroller.h \
SDL_gesture.h \
SDL_haptic.h \
diff --git a/Makefile.minimal b/Makefile.minimal
index a060832..6ec1ce8 100644
--- a/Makefile.minimal
+++ b/Makefile.minimal
@@ -19,6 +19,7 @@ SOURCES = \
src/joystick/dummy/*.c \
src/loadso/dummy/*.c \
src/power/*.c \
+ src/filesystem/dummy/*.c \
src/render/*.c \
src/render/software/*.c \
src/stdlib/*.c \
diff --git a/Makefile.pandora b/Makefile.pandora
index de15c84..bb89d52 100644
--- a/Makefile.pandora
+++ b/Makefile.pandora
@@ -19,7 +19,7 @@ SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \
./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \
./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \
./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c \
- ./src/atomic/linux/*.c \
+ ./src/atomic/linux/*.c ./src/filesystem/unix/*.c \
./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c
diff --git a/Makefile.psp b/Makefile.psp
index 8bcdcb9..5e7dcd2 100644
--- a/Makefile.psp
+++ b/Makefile.psp
@@ -31,6 +31,7 @@ OBJS= src/SDL.o \
src/joystick/psp/SDL_sysjoystick.o \
src/power/SDL_power.o \
src/power/psp/SDL_syspower.o \
+ src/filesystem/dummy/SDL_sysfilesystem.o \
src/render/SDL_render.o \
src/render/SDL_yuv_sw.o \
src/render/psp/SDL_render_psp.o \
diff --git a/README-android.txt b/README-android.txt
index ecd31ae..a161c84 100644
--- a/README-android.txt
+++ b/README-android.txt
@@ -38,7 +38,33 @@ src/main/android/SDL_android_main.c
Building an app
================================================================================
-Instructions:
+For simple projects you can use the script located at build-scripts/androidbuild.sh
+
+There's two ways of using it:
+
+androidbuild.sh com.yourcompany.yourapp < sources.list
+androidbuild.sh com.yourcompany.yourapp source1.c source2.c ...sourceN.c
+
+sources.list should be a text file with a source file name in each line
+Filenames should be specified relative to the current directory, for example if
+you are in the build-scripts directory and want to create the testgles.c test, you'll
+run:
+
+./androidbuild.sh org.libsdl.testgles ../test/testgles.c
+
+One limitation of this script is that all sources provided will be aggregated into
+a single directory, thus all your source files should have a unique name.
+
+Once the project is complete the script will tell you where the debug APK is located.
+If you want to create a signed release APK, you can use the project created by this
+utility to generate it.
+
+Finally, a word of caution: re running androidbuild.sh wipes any changes you may have
+done in the build directory for the app!
+
+
+For more complex projects, follow these instructions:
+
1. Copy the android-project directory wherever you want to keep your projects
and rename it to the name of your project.
2. Move or symlink this SDL directory into the <project>/jni directory
@@ -85,6 +111,28 @@ android-project/
================================================================================
+ Build an app with static linking of libSDL
+================================================================================
+
+This build uses the Android NDK module system.
+
+Instructions:
+1. Copy the android-project directory wherever you want to keep your projects
+ and rename it to the name of your project.
+2. Rename <project>/jni/src/Android_static.mk to <project>/jni/src/Android.mk
+ (overwrite the existing one)
+3. Edit <project>/jni/src/Android.mk to include your source files
+4. create and export an environment variable named NDK_MODULE_PATH that points
+ to the parent directory of this SDL directory. e.g.:
+
+ export NDK_MODULE_PATH="$PWD"/..
+
+5. Edit <project>/src/org/libsdl/app/SDLActivity.java and remove the call to
+ System.loadLibrary("SDL2") line 42.
+6. Run 'ndk-build' (a script provided by the NDK). This compiles the C source
+
+
+================================================================================
Customizing your application name
================================================================================
diff --git a/README-macosx.txt b/README-macosx.txt
index c5cc89b..021b140 100644
--- a/README-macosx.txt
+++ b/README-macosx.txt
@@ -30,6 +30,42 @@ To use the library once it's built, you essential have two possibilities:
use the traditional autoconf/automake/make method, or use Xcode.
==============================================================================
+Caveats for using SDL with Mac OS X
+==============================================================================
+
+Some things you have to be aware of when using SDL on Mac OS X:
+
+- If you register your own NSApplicationDelegate (using [NSApp setDelegate:]),
+ SDL will not register its own. This means that SDL will not terminate using
+ SDL_Quit if it receives a termination request, it will terminate like a
+ normal app, and it will not send a SDL_DROPFILE when you request to open a
+ file with the app. To solve these issues, put the following code in your
+ NSApplicationDelegate implementation:
+
+ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+ {
+ if (SDL_GetEventState(SDL_QUIT) == SDL_ENABLE) {
+ SDL_Event event;
+ event.type = SDL_QUIT;
+ SDL_PushEvent(&event);
+ }
+
+ return NSTerminateCancel;
+ }
+
+ - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
+ {
+ if (SDL_GetEventState(SDL_DROPFILE) == SDL_ENABLE) {
+ SDL_Event event;
+ event.type = SDL_DROPFILE;
+ event.drop.file = SDL_strdup([filename UTF8String]);
+ return (SDL_PushEvent(&event) > 0);
+ }
+
+ return NO;
+ }
+
+==============================================================================
Using the Simple DirectMedia Layer with a traditional Makefile
==============================================================================
diff --git a/README-raspberrypi.txt b/README-raspberrypi.txt
new file mode 100644
index 0000000..0724a8c
--- /dev/null
+++ b/README-raspberrypi.txt
@@ -0,0 +1,155 @@
+================================================================================
+SDL2 for Raspberry Pi
+================================================================================
+
+Requirements:
+
+Raspbian (other Linux distros may work as well).
+
+================================================================================
+ Features
+================================================================================
+
+* Works without X11
+* Hardware accelerated OpenGL ES 2.x
+* Sound via ALSA
+* Input (mouse/keyboard/joystick) via EVDEV
+* Hotplugging of input devices via UDEV
+
+================================================================================
+ Raspbian Build Dependencies
+================================================================================
+
+sudo apt-get install libudev-dev libasound2-dev libdbus-1-dev
+
+You also need the VideoCore binary stuff that ships in /opt/vc for EGL and
+OpenGL ES 2.x, it usually comes pre installed, but in any case:
+
+sudo apt-get install libraspberrypi0 libraspberrypi-bin libraspberrypi-dev
+
+================================================================================
+ Cross compiling from x86 Linux
+================================================================================
+
+To cross compile SDL for Raspbian from your desktop machine, you'll need a
+Raspbian system root and the cross compilation tools. We'll assume these tools
+will be placed in /opt/rpi-tools
+
+ sudo git clone --depth 1 https://github.com/raspberrypi/tools /opt/rpi-tools
+
+You'll also need a Rasbian binary image.
+Get it from: http://downloads.raspberrypi.org/raspbian_latest
+After unzipping, you'll get file with a name like: <date>-wheezy-raspbian.img
+Let's assume the sysroot will be built in /opt/rpi-sysroot.
+
+ export SYSROOT=/opt/rpi-sysroot
+ sudo kpartx -a -v <path_to_raspbian_image>.img
+ sudo mount -o loop /dev/mapper/loop0p2 /mnt
+ sudo cp -r /mnt $SYSROOT
+ sudo apt-get install qemu binfmt-support qemu-user-static
+ sudo cp /usr/bin/qemu-arm-static $SYSROOT/usr/bin
+ sudo mount --bind /dev $SYSROOT/dev
+ sudo mount --bind /proc $SYSROOT/proc
+ sudo mount --bind /sys $SYSROOT/sys
+
+Now, before chrooting into the ARM sysroot, you'll need to apply a workaround,
+edit $SYSROOT/etc/ld.so.preload and comment out all lines in it.
+
+ sudo chroot $SYSROOT
+ apt-get install libudev-dev libasound2-dev libdbus-1-dev libraspberrypi0 libraspberrypi-bin libraspberrypi-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev libxss-dev
+ exit
+ sudo umount $SYSROOT/dev
+ sudo umount $SYSROOT/proc
+ sudo umount $SYSROOT/sys
+ sudo umount /mnt
+
+The final step is compiling SDL itself.
+
+ export CC="/opt/rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc --sysroot=$SYSROOT -I$SYSROOT/opt/vc/include -I$SYSROOT/usr/include -I$SYSROOT/opt/vc/include/interface/vcos/pthreads -I$SYSROOT/opt/vc/include/interface/vmcs_host/linux"
+ cd <SDL SOURCE>
+ mkdir -p build;cd build
+ ../configure --with-sysroot=$SYSROOT --host=arm-raspberry-linux-gnueabihf --prefix=$PWD/rpi-sdl2-installed --disable-pulseaudio --disable-esd
+ make
+ make install
+
+To be able to deploy this to /usr/local in the Raspbian system you need to fix up a few paths:
+
+ perl -w -pi -e "s#$PWD/rpi-sdl2-installed#/usr/local#g;" ./rpi-sdl2-installed/lib/libSDL2.la ./rpi-sdl2-installed/lib/pkgconfig/sdl2.pc ./rpi-sdl2-installed/bin/sdl2-config
+
+================================================================================
+ Apps don't work or poor video/audio performance
+================================================================================
+
+If you get sound problems, buffer underruns, etc, run "sudo rpi-update" to
+update the RPi's firmware. Note that doing so will fix these problems, but it
+will also render the CMA - Dynamic Memory Split functionality useless.
+
+Also, by default the Raspbian distro configures the GPU RAM at 64MB, this is too
+low in general, specially if a 1080p TV is hooked up.
+
+See here how to configure this setting: http://elinux.org/RPiconfig
+
+Using a fixed gpu_mem=128 is the best option (specially if you updated the
+firmware, using CMA probably won't work, at least it's the current case).
+
+================================================================================
+ No input
+================================================================================
+
+Make sure you belong to the "input" group.
+
+ sudo usermod -aG input `whoami`
+
+================================================================================
+ No HDMI Audio
+================================================================================
+
+If you notice that ALSA works but there's no audio over HDMI, try adding:
+
+ hdmi_drive=2
+
+to your config.txt file and reboot.
+
+Reference: http://www.raspberrypi.org/phpBB3/viewtopic.php?t=5062
+
+================================================================================
+ Text Input API support
+================================================================================
+
+The Text Input API is supported, with translation of scan codes done via the
+kernel symbol tables. For this to work, SDL needs access to a valid console.
+If you notice there's no SDL_TEXTINPUT message being emmited, double check that
+your app has read access to one of the following:
+
+* /proc/self/fd/0
+* /dev/tty
+* /dev/tty[0...6]
+* /dev/vc/0
+* /dev/console
+
+This is usually not a problem if you run from the physical terminal (as opposed
+to running from a pseudo terminal, such as via SSH). If running from a PTS, a
+quick workaround is to run your app as root or add yourself to the tty group,
+then re login to the system.
+
+ sudo usermod -aG tty `whoami`
+
+The keyboard layout used by SDL is the same as the one the kernel uses.
+To configure the layout on Raspbian:
+
+ sudo dpkg-reconfigure keyboard-configuration
+
+To configure the locale, which controls which keys are interpreted as letters,
+this determining the CAPS LOCK behavior:
+
+ sudo dpkg-reconfigure locales
+
+================================================================================
+ Notes
+================================================================================
+
+* When launching apps remotely (via SSH), SDL can prevent local keystrokes from
+ leaking into the console only if it has root privileges. Launching apps locally
+ does not suffer from this issue.
+
+
diff --git a/TODO.txt b/TODO.txt
index 14c47d0..89637eb 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,15 +1,10 @@
Future work roadmap:
* http://wiki.libsdl.org/moin.cgi/Roadmap
- * See why windows are being rearranged. Is the shield window not up?
- * Add __WINDOWS__ in addition to __WIN32__
- * Write test for fullscreen gamma to check X11 colormap handling
-
* Check 1.2 revisions:
3554 - Need to resolve semantics for locking keys on different platforms
4874 - Do we want screen rotation? At what level?
4974 - Windows file code needs to convert UTF-8 to Unicode, but we don't need to tap dance for Windows 95/98
- 4484, 4485 - Verify that SDL's Windows keyboard handling works correctly
4865 - See if this is still needed (mouse coordinate clamping)
4866 - See if this is still needed (blocking window repositioning)
diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj
index 72eb2d4..1e7db21 100644
--- a/VisualC/SDL/SDL_VS2008.vcproj
+++ b/VisualC/SDL/SDL_VS2008.vcproj
@@ -428,6 +428,10 @@
>
</File>
<File
+ RelativePath="..\..\include\SDL_filesystem.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\SDL_gamecontroller.h"
>
</File>
@@ -1089,6 +1093,10 @@
>
</File>
<File
+ RelativePath="..\..\src\filesystem\windows\SDL_sysfilesystem.c"
+ >
+ </File>
+ <File
RelativePath="..\..\src\haptic\windows\SDL_syshaptic.c"
>
</File>
diff --git a/VisualC/SDL/SDL_VS2010.vcxproj b/VisualC/SDL/SDL_VS2010.vcxproj
index 4fa9111..d9ca5af 100644
--- a/VisualC/SDL/SDL_VS2010.vcxproj
+++ b/VisualC/SDL/SDL_VS2010.vcxproj
@@ -1,464 +1,679 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>SDL2</ProjectName>
- <ProjectGuid>{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}</ProjectGuid>
- <RootNamespace>SDL</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent />
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x64</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent />
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- </Midl>
- <ClCompile>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <IntrinsicFunctions>false</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- <ExceptionHandling>false</ExceptionHandling>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <IntrinsicFunctions>false</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <ExceptionHandling>false</ExceptionHandling>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x64</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="..\..\include\SDL.h" />
- <ClInclude Include="..\..\include\SDL_assert.h" />
- <ClInclude Include="..\..\include\SDL_atomic.h" />
- <ClInclude Include="..\..\include\SDL_audio.h" />
- <ClInclude Include="..\..\include\SDL_bits.h" />
- <ClInclude Include="..\..\include\SDL_blendmode.h" />
- <ClInclude Include="..\..\include\SDL_clipboard.h" />
- <ClInclude Include="..\..\include\SDL_config.h" />
- <ClInclude Include="..\..\include\SDL_config_windows.h" />
- <ClInclude Include="..\..\include\SDL_copying.h" />
- <ClInclude Include="..\..\include\SDL_cpuinfo.h" />
- <ClInclude Include="..\..\include\SDL_endian.h" />
- <ClInclude Include="..\..\include\SDL_error.h" />
- <ClInclude Include="..\..\include\SDL_events.h" />
- <ClInclude Include="..\..\include\SDL_gesture.h" />
- <ClInclude Include="..\..\include\SDL_haptic.h" />
- <ClInclude Include="..\..\include\SDL_hints.h" />
- <ClInclude Include="..\..\include\SDL_joystick.h" />
- <ClInclude Include="..\..\include\SDL_gamecontroller.h" />
- <ClInclude Include="..\..\include\SDL_keyboard.h" />
- <ClInclude Include="..\..\include\SDL_keycode.h" />
- <ClInclude Include="..\..\include\SDL_loadso.h" />
- <ClInclude Include="..\..\include\SDL_log.h" />
- <ClInclude Include="..\..\include\SDL_main.h" />
- <ClInclude Include="..\..\include\SDL_mouse.h" />
- <ClInclude Include="..\..\include\SDL_mutex.h" />
- <ClInclude Include="..\..\include\SDL_name.h" />
- <ClInclude Include="..\..\include\SDL_opengl.h" />
- <ClInclude Include="..\..\include\SDL_opengles.h" />
- <ClInclude Include="..\..\include\SDL_pixels.h" />
- <ClInclude Include="..\..\include\SDL_platform.h" />
- <ClInclude Include="..\..\include\SDL_power.h" />
- <ClInclude Include="..\..\include\SDL_quit.h" />
- <ClInclude Include="..\..\include\SDL_rect.h" />
- <ClInclude Include="..\..\include\SDL_render.h" />
- <ClInclude Include="..\..\include\SDL_revision.h" />
- <ClInclude Include="..\..\include\SDL_rwops.h" />
- <ClInclude Include="..\..\include\SDL_scancode.h" />
- <ClInclude Include="..\..\include\SDL_shape.h" />
- <ClInclude Include="..\..\include\SDL_stdinc.h" />
- <ClInclude Include="..\..\include\SDL_surface.h" />
- <ClInclude Include="..\..\include\SDL_system.h" />
- <ClInclude Include="..\..\include\SDL_syswm.h" />
- <ClInclude Include="..\..\include\SDL_thread.h" />
- <ClInclude Include="..\..\include\SDL_timer.h" />
- <ClInclude Include="..\..\include\SDL_touch.h" />
- <ClInclude Include="..\..\include\SDL_types.h" />
- <ClInclude Include="..\..\include\SDL_version.h" />
- <ClInclude Include="..\..\include\SDL_video.h" />
- <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />
- <ClInclude Include="..\..\src\events\blank_cursor.h" />
- <ClInclude Include="..\..\src\events\default_cursor.h" />
- <ClInclude Include="..\..\src\audio\directsound\directx.h" />
- <ClInclude Include="..\..\src\events\SDL_clipboardevents_c.h" />
- <ClInclude Include="..\..\src\events\SDL_gesture_c.h" />
- <ClInclude Include="..\..\src\events\SDL_touch_c.h" />
- <ClInclude Include="..\..\src\libm\math.h" />
- <ClInclude Include="..\..\src\libm\math_private.h" />
- <ClInclude Include="..\..\src\render\mmx.h" />
- <ClInclude Include="..\..\src\render\opengl\SDL_shaders_gl.h" />
- <ClInclude Include="..\..\src\render\SDL_sysrender.h" />
- <ClInclude Include="..\..\src\render\SDL_yuv_sw_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
- <ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
- <ClInclude Include="..\..\src\render\software\SDL_blendline.h" />
- <ClInclude Include="..\..\src\render\software\SDL_blendpoint.h" />
- <ClInclude Include="..\..\src\render\software\SDL_draw.h" />
- <ClInclude Include="..\..\src\render\software\SDL_drawline.h" />
- <ClInclude Include="..\..\src\render\software\SDL_drawpoint.h" />
- <ClInclude Include="..\..\src\events\SDL_dropevents_c.h" />
- <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
- <ClInclude Include="..\..\src\render\software\SDL_rotate.h" />
- <ClInclude Include="..\..\src\video\dummy\SDL_nullframebuffer_c.h" />
- <ClInclude Include="..\..\src\video\SDL_blit.h" />
- <ClInclude Include="..\..\src\video\SDL_blit_auto.h" />
- <ClInclude Include="..\..\src\video\SDL_blit_copy.h" />
- <ClInclude Include="..\..\src\video\SDL_blit_slow.h" />
- <ClInclude Include="..\..\src\video\SDL_shape_internals.h" />
- <ClInclude Include="..\..\src\audio\winmm\SDL_winmm.h" />
- <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
- <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
- <ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" />
- <ClInclude Include="..\..\src\SDL_error_c.h" />
- <ClInclude Include="..\..\src\SDL_hints_c.h" />
- <ClInclude Include="..\..\src\events\SDL_events_c.h" />
- <ClInclude Include="..\..\src\video\SDL_glesfuncs.h" />
- <ClInclude Include="..\..\src\video\SDL_glfuncs.h" />
- <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
- <ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
- <ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
- <ClInclude Include="..\..\src\video\dummy\SDL_nullevents_c.h" />
- <ClInclude Include="..\..\src\video\dummy\SDL_nullvideo.h" />
- <ClInclude Include="..\..\src\video\SDL_pixels_c.h" />
- <ClInclude Include="..\..\src\video\SDL_rect_c.h" />
- <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
- <ClInclude Include="..\..\src\video\SDL_stretch_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
- <ClInclude Include="..\..\src\events\SDL_sysevents.h" />
- <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
- <ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" />
- <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
- <ClInclude Include="..\..\src\thread\windows\SDL_systhread_c.h" />
- <ClInclude Include="..\..\src\timer\SDL_systimer.h" />
- <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
- <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
- <ClInclude Include="..\..\src\timer\SDL_timer_c.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_vkeys.h" />
- <ClInclude Include="..\..\src\audio\SDL_wave.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsclipboard.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsevents.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsframebuffer.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowskeyboard.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsmessagebox.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsmodes.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsmouse.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsopengl.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsshape.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowsvideo.h" />
- <ClInclude Include="..\..\src\video\windows\SDL_windowswindow.h" />
- <ClInclude Include="..\..\src\events\SDL_windowevents_c.h" />
- <ClInclude Include="..\..\src\video\windows\wmmsg.h" />
- <ClInclude Include="resource.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\core\windows\SDL_windows.c" />
- <ClCompile Include="..\..\src\events\SDL_clipboardevents.c" />
- <ClCompile Include="..\..\src\events\SDL_gesture.c" />
- <ClCompile Include="..\..\src\events\SDL_touch.c" />
- <ClCompile Include="..\..\src\libm\e_atan2.c" />
- <ClCompile Include="..\..\src\libm\e_log.c" />
- <ClCompile Include="..\..\src\libm\e_pow.c" />
- <ClCompile Include="..\..\src\libm\e_rem_pio2.c" />
- <ClCompile Include="..\..\src\libm\e_sqrt.c" />
- <ClCompile Include="..\..\src\libm\k_cos.c" />
- <ClCompile Include="..\..\src\libm\k_rem_pio2.c" />
- <ClCompile Include="..\..\src\libm\k_sin.c" />
- <ClCompile Include="..\..\src\libm\s_atan.c" />
- <ClCompile Include="..\..\src\libm\s_copysign.c" />
- <ClCompile Include="..\..\src\libm\s_cos.c" />
- <ClCompile Include="..\..\src\libm\s_fabs.c" />
- <ClCompile Include="..\..\src\libm\s_floor.c" />
- <ClCompile Include="..\..\src\libm\s_scalbn.c" />
- <ClCompile Include="..\..\src\libm\s_sin.c" />
- <ClCompile Include="..\..\src\render\direct3d\SDL_render_d3d.c" />
- <ClCompile Include="..\..\src\render\opengl\SDL_render_gl.c" />
- <ClCompile Include="..\..\src\render\opengl\SDL_shaders_gl.c" />
- <ClCompile Include="..\..\src\render\SDL_render.c" />
- <ClCompile Include="..\..\src\render\SDL_yuv_mmx.c" />
- <ClCompile Include="..\..\src\render\SDL_yuv_sw.c" />
- <ClCompile Include="..\..\src\render\software\SDL_blendfillrect.c" />
- <ClCompile Include="..\..\src\render\software\SDL_blendline.c" />
- <ClCompile Include="..\..\src\render\software\SDL_blendpoint.c" />
- <ClCompile Include="..\..\src\render\software\SDL_drawline.c" />
- <ClCompile Include="..\..\src\render\software\SDL_drawpoint.c" />
- <ClCompile Include="..\..\src\render\software\SDL_render_sw.c" />
- <ClCompile Include="..\..\src\render\software\SDL_rotate.c" />
- <ClCompile Include="..\..\src\SDL.c" />
- <ClCompile Include="..\..\src\SDL_assert.c" />
- <ClCompile Include="..\..\src\atomic\SDL_atomic.c" />
- <ClCompile Include="..\..\src\atomic\SDL_spinlock.c" />
- <ClCompile Include="..\..\src\audio\SDL_audio.c" />
- <ClCompile Include="..\..\src\audio\SDL_audiocvt.c" />
- <ClCompile Include="..\..\src\audio\SDL_audiodev.c" />
- <ClCompile Include="..\..\src\audio\SDL_audiotypecvt.c" />
- <ClCompile Include="..\..\src\SDL_hints.c" />
- <ClCompile Include="..\..\src\SDL_log.c" />
- <ClCompile Include="..\..\src\video\dummy\SDL_nullframebuffer.c" />
- <ClCompile Include="..\..\src\video\SDL_blit.c" />
- <ClCompile Include="..\..\src\video\SDL_blit_0.c" />
- <ClCompile Include="..\..\src\video\SDL_blit_1.c" />
- <ClCompile Include="..\..\src\video\SDL_blit_A.c" />
- <ClCompile Include="..\..\src\video\SDL_blit_auto.c" />
- <ClCompile Include="..\..\src\video\SDL_blit_copy.c" />
- <ClCompile Include="..\..\src\video\SDL_blit_N.c" />
- <ClCompile Include="..\..\src\video\SDL_blit_slow.c" />
- <ClCompile Include="..\..\src\video\SDL_bmp.c" />
- <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c" />
- <ClCompile Include="..\..\src\video\SDL_clipboard.c" />
- <ClCompile Include="..\..\src\video\SDL_shape.c" />
- <ClCompile Include="..\..\src\audio\winmm\SDL_winmm.c" />
- <ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" />
- <ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" />
- <ClCompile Include="..\..\src\audio\directsound\SDL_directsound.c" />
- <ClCompile Include="..\..\src\events\SDL_dropevents.c" />
- <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />
- <ClCompile Include="..\..\src\joystick\windows\SDL_dxjoystick.c" />
- <ClCompile Include="..\..\src\SDL_error.c" />
- <ClCompile Include="..\..\src\events\SDL_events.c" />
- <ClCompile Include="..\..\src\video\SDL_fillrect.c" />
- <ClCompile Include="..\..\src\stdlib\SDL_getenv.c" />
- <ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
- <ClCompile Include="..\..\src\stdlib\SDL_iconv.c" />
- <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
- <ClCompile Include="..\..\src\joystick\SDL_gamecontroller.c" />
- <ClCompile Include="..\..\src\events\SDL_keyboard.c" />
- <ClCompile Include="..\..\src\stdlib\SDL_malloc.c" />
- <ClCompile Include="..\..\src\audio\SDL_mixer.c" />
- <ClCompile Include="..\..\src\joystick\windows\SDL_mmjoystick.c" />
- <ClCompile Include="..\..\src\events\SDL_mouse.c" />
- <ClCompile Include="..\..\src\video\dummy\SDL_nullevents.c" />
- <ClCompile Include="..\..\src\video\dummy\SDL_nullvideo.c" />
- <ClCompile Include="..\..\src\video\SDL_pixels.c" />
- <ClCompile Include="..\..\src\power\SDL_power.c" />
- <ClCompile Include="..\..\src\stdlib\SDL_qsort.c" />
- <ClCompile Include="..\..\src\events\SDL_quit.c" />
- <ClCompile Include="..\..\src\video\SDL_rect.c" />
- <ClCompile Include="..\..\src\video\SDL_RLEaccel.c" />
- <ClCompile Include="..\..\src\file\SDL_rwops.c" />
- <ClCompile Include="..\..\src\stdlib\SDL_stdlib.c" />
- <ClCompile Include="..\..\src\video\SDL_stretch.c" />
- <ClCompile Include="..\..\src\stdlib\SDL_string.c" />
- <ClCompile Include="..\..\src\video\SDL_surface.c" />
- <ClCompile Include="..\..\src\thread\generic\SDL_syscond.c" />
- <ClCompile Include="..\..\src\haptic\windows\SDL_syshaptic.c" />
- <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
- <ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c" />
- <ClCompile Include="..\..\src\power\windows\SDL_syspower.c" />
- <ClCompile Include="..\..\src\thread\windows\SDL_syssem.c" />
- <ClCompile Include="..\..\src\thread\windows\SDL_systhread.c" />
- <ClCompile Include="..\..\src\thread\windows\SDL_systls.c" />
- <ClCompile Include="..\..\src\timer\windows\SDL_systimer.c" />
- <ClCompile Include="..\..\src\thread\SDL_thread.c" />
- <ClCompile Include="..\..\src\timer\SDL_timer.c" />
- <ClCompile Include="..\..\src\video\SDL_video.c" />
- <ClCompile Include="..\..\src\audio\SDL_wave.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsclipboard.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsevents.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsframebuffer.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsmessagebox.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsmodes.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsmouse.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsopengl.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsshape.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowsvideo.c" />
- <ClCompile Include="..\..\src\video\windows\SDL_windowswindow.c" />
- <ClCompile Include="..\..\src\events\SDL_windowevents.c" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\src\main\windows\version.rc" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug_static|Win32">
+ <Configuration>Debug_static</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug_static|x64">
+ <Configuration>Debug_static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_static|Win32">
+ <Configuration>Release_static</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_static|x64">
+ <Configuration>Release_static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>SDL2</ProjectName>
+ <ProjectGuid>{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}</ProjectGuid>
+ <RootNamespace>SDL</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_static|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_static|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_static|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_static|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_static|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_static|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_static|Win32'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_static|Win32'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_static|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_static|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_static|Win32'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_static|Win32'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_static|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_static|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_static|Win32'">$(ProjectName)_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_static|x64'">$(ProjectName)_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_static|Win32'">$(ProjectName)_static</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_static|x64'">$(ProjectName)_static</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <PreBuildEvent />
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ <ExceptionHandling>false</ExceptionHandling>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_static|Win32'">
+ <PreBuildEvent />
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>HAVE_LIBC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ <ExceptionHandling>false</ExceptionHandling>
+ <OmitDefaultLibName>true</OmitDefaultLibName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <ExceptionHandling>false</ExceptionHandling>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x64</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_static|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>HAVE_LIBC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <ExceptionHandling>false</ExceptionHandling>
+ <OmitDefaultLibName>true</OmitDefaultLibName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x64</AdditionalLibraryDirectories>
+ </Link>
+ <Lib>
+ <AdditionalOptions>/MACHINE:X64 %(AdditionalOptions)</AdditionalOptions>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <PreBuildEvent />
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <IntrinsicFunctions>false</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ <ExceptionHandling>false</ExceptionHandling>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_static|Win32'">
+ <PreBuildEvent />
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <IntrinsicFunctions>false</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>HAVE_LIBC;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ <ExceptionHandling>false</ExceptionHandling>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <OmitDefaultLibName>true</OmitDefaultLibName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <IntrinsicFunctions>false</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <ExceptionHandling>false</ExceptionHandling>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x64</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_static|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <IntrinsicFunctions>false</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories);"$(DXSDK_DIR)\Include";</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>HAVE_LIBC;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <ExceptionHandling>false</ExceptionHandling>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <OmitDefaultLibName>true</OmitDefaultLibName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;imm32.lib;oleaut32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ <SubSystem>Windows</SubSystem>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x64</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <Lib>
+ <AdditionalOptions>/MACHINE:X64 %(AdditionalOptions)</AdditionalOptions>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\SDL.h" />
+ <ClInclude Include="..\..\include\SDL_assert.h" />
+ <ClInclude Include="..\..\include\SDL_atomic.h" />
+ <ClInclude Include="..\..\include\SDL_audio.h" />
+ <ClInclude Include="..\..\include\SDL_bits.h" />
+ <ClInclude Include="..\..\include\SDL_blendmode.h" />
+ <ClInclude Include="..\..\include\SDL_clipboard.h" />
+ <ClInclude Include="..\..\include\SDL_config.h" />
+ <ClInclude Include="..\..\include\SDL_config_windows.h" />
+ <ClInclude Include="..\..\include\SDL_copying.h" />
+ <ClInclude Include="..\..\include\SDL_cpuinfo.h" />
+ <ClInclude Include="..\..\include\SDL_endian.h" />
+ <ClInclude Include="..\..\include\SDL_error.h" />
+ <ClInclude Include="..\..\include\SDL_events.h" />
+ <ClInclude Include="..\..\include\SDL_filesystem.h" />
+ <ClInclude Include="..\..\include\SDL_gesture.h" />
+ <ClInclude Include="..\..\include\SDL_haptic.h" />
+ <ClInclude Include="..\..\include\SDL_hints.h" />
+ <ClInclude Include="..\..\include\SDL_joystick.h" />
+ <ClInclude Include="..\..\include\SDL_gamecontroller.h" />
+ <ClInclude Include="..\..\include\SDL_keyboard.h" />
+ <ClInclude Include="..\..\include\SDL_keycode.h" />
+ <ClInclude Include="..\..\include\SDL_loadso.h" />
+ <ClInclude Include="..\..\include\SDL_log.h" />
+ <ClInclude Include="..\..\include\SDL_main.h" />
+ <ClInclude Include="..\..\include\SDL_mouse.h" />
+ <ClInclude Include="..\..\include\SDL_mutex.h" />
+ <ClInclude Include="..\..\include\SDL_name.h" />
+ <ClInclude Include="..\..\include\SDL_opengl.h" />
+ <ClInclude Include="..\..\include\SDL_opengles.h" />
+ <ClInclude Include="..\..\include\SDL_pixels.h" />
+ <ClInclude Include="..\..\include\SDL_platform.h" />
+ <ClInclude Include="..\..\include\SDL_power.h" />
+ <ClInclude Include="..\..\include\SDL_quit.h" />
+ <ClInclude Include="..\..\include\SDL_rect.h" />
+ <ClInclude Include="..\..\include\SDL_render.h" />
+ <ClInclude Include="..\..\include\SDL_revision.h" />
+ <ClInclude Include="..\..\include\SDL_rwops.h" />
+ <ClInclude Include="..\..\include\SDL_scancode.h" />
+ <ClInclude Include="..\..\include\SDL_shape.h" />
+ <ClInclude Include="..\..\include\SDL_stdinc.h" />
+ <ClInclude Include="..\..\include\SDL_surface.h" />
+ <ClInclude Include="..\..\include\SDL_system.h" />
+ <ClInclude Include="..\..\include\SDL_syswm.h" />
+ <ClInclude Include="..\..\include\SDL_thread.h" />
+ <ClInclude Include="..\..\include\SDL_timer.h" />
+ <ClInclude Include="..\..\include\SDL_touch.h" />
+ <ClInclude Include="..\..\include\SDL_types.h" />
+ <ClInclude Include="..\..\include\SDL_version.h" />
+ <ClInclude Include="..\..\include\SDL_video.h" />
+ <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />
+ <ClInclude Include="..\..\src\events\blank_cursor.h" />
+ <ClInclude Include="..\..\src\events\default_cursor.h" />
+ <ClInclude Include="..\..\src\audio\directsound\directx.h" />
+ <ClInclude Include="..\..\src\events\SDL_clipboardevents_c.h" />
+ <ClInclude Include="..\..\src\events\SDL_gesture_c.h" />
+ <ClInclude Include="..\..\src\events\SDL_touch_c.h" />
+ <ClInclude Include="..\..\src\libm\math.h" />
+ <ClInclude Include="..\..\src\libm\math_private.h" />
+ <ClInclude Include="..\..\src\render\mmx.h" />
+ <ClInclude Include="..\..\src\render\opengl\SDL_shaders_gl.h" />
+ <ClInclude Include="..\..\src\render\SDL_sysrender.h" />
+ <ClInclude Include="..\..\src\render\SDL_yuv_sw_c.h" />
+ <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
+ <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
+ <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
+ <ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
+ <ClInclude Include="..\..\src\render\software\SDL_blendline.h" />
+ <ClInclude Include="..\..\src\render\software\SDL_blendpoint.h" />
+ <ClInclude Include="..\..\src\render\software\SDL_draw.h" />
+ <ClInclude Include="..\..\src\render\software\SDL_drawline.h" />
+ <ClInclude Include="..\..\src\render\software\SDL_drawpoint.h" />
+ <ClInclude Include="..\..\src\events\SDL_dropevents_c.h" />
+ <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
+ <ClInclude Include="..\..\src\render\software\SDL_rotate.h" />
+ <ClInclude Include="..\..\src\video\dummy\SDL_nullframebuffer_c.h" />
+ <ClInclude Include="..\..\src\video\SDL_blit.h" />
+ <ClInclude Include="..\..\src\video\SDL_blit_auto.h" />
+ <ClInclude Include="..\..\src\video\SDL_blit_copy.h" />
+ <ClInclude Include="..\..\src\video\SDL_blit_slow.h" />
+ <ClInclude Include="..\..\src\video\SDL_shape_internals.h" />
+ <ClInclude Include="..\..\src\audio\winmm\SDL_winmm.h" />
+ <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
+ <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
+ <ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" />
+ <ClInclude Include="..\..\src\SDL_error_c.h" />
+ <ClInclude Include="..\..\src\SDL_hints_c.h" />
+ <ClInclude Include="..\..\src\events\SDL_events_c.h" />
+ <ClInclude Include="..\..\src\video\SDL_glesfuncs.h" />
+ <ClInclude Include="..\..\src\video\SDL_glfuncs.h" />
+ <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
+ <ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
+ <ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
+ <ClInclude Include="..\..\src\video\dummy\SDL_nullevents_c.h" />
+ <ClInclude Include="..\..\src\video\dummy\SDL_nullvideo.h" />
+ <ClInclude Include="..\..\src\video\SDL_pixels_c.h" />
+ <ClInclude Include="..\..\src\video\SDL_rect_c.h" />
+ <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
+ <ClInclude Include="..\..\src\video\SDL_stretch_c.h" />
+ <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
+ <ClInclude Include="..\..\src\events\SDL_sysevents.h" />
+ <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
+ <ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" />
+ <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
+ <ClInclude Include="..\..\src\thread\windows\SDL_systhread_c.h" />
+ <ClInclude Include="..\..\src\timer\SDL_systimer.h" />
+ <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
+ <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
+ <ClInclude Include="..\..\src\timer\SDL_timer_c.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_vkeys.h" />
+ <ClInclude Include="..\..\src\audio\SDL_wave.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsclipboard.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsevents.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsframebuffer.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowskeyboard.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsmessagebox.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsmodes.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsmouse.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsopengl.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsshape.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowsvideo.h" />
+ <ClInclude Include="..\..\src\video\windows\SDL_windowswindow.h" />
+ <ClInclude Include="..\..\src\events\SDL_windowevents_c.h" />
+ <ClInclude Include="..\..\src\video\windows\wmmsg.h" />
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\src\core\windows\SDL_windows.c" />
+ <ClCompile Include="..\..\src\events\SDL_clipboardevents.c" />
+ <ClCompile Include="..\..\src\events\SDL_gesture.c" />
+ <ClCompile Include="..\..\src\events\SDL_touch.c" />
+ <ClCompile Include="..\..\src\libm\e_atan2.c" />
+ <ClCompile Include="..\..\src\libm\e_log.c" />
+ <ClCompile Include="..\..\src\libm\e_pow.c" />
+ <ClCompile Include="..\..\src\libm\e_rem_pio2.c" />
+ <ClCompile Include="..\..\src\libm\e_sqrt.c" />
+ <ClCompile Include="..\..\src\libm\k_cos.c" />
+ <ClCompile Include="..\..\src\libm\k_rem_pio2.c" />
+ <ClCompile Include="..\..\src\libm\k_sin.c" />
+ <ClCompile Include="..\..\src\libm\s_atan.c" />
+ <ClCompile Include="..\..\src\libm\s_copysign.c" />
+ <ClCompile Include="..\..\src\libm\s_cos.c" />
+ <ClCompile Include="..\..\src\libm\s_fabs.c" />
+ <ClCompile Include="..\..\src\libm\s_floor.c" />
+ <ClCompile Include="..\..\src\libm\s_scalbn.c" />
+ <ClCompile Include="..\..\src\libm\s_sin.c" />
+ <ClCompile Include="..\..\src\render\direct3d\SDL_render_d3d.c" />
+ <ClCompile Include="..\..\src\render\opengl\SDL_render_gl.c" />
+ <ClCompile Include="..\..\src\render\opengl\SDL_shaders_gl.c" />
+ <ClCompile Include="..\..\src\render\SDL_render.c" />
+ <ClCompile Include="..\..\src\render\SDL_yuv_mmx.c" />
+ <ClCompile Include="..\..\src\render\SDL_yuv_sw.c" />
+ <ClCompile Include="..\..\src\render\software\SDL_blendfillrect.c" />
+ <ClCompile Include="..\..\src\render\software\SDL_blendline.c" />
+ <ClCompile Include="..\..\src\render\software\SDL_blendpoint.c" />
+ <ClCompile Include="..\..\src\render\software\SDL_drawline.c" />
+ <ClCompile Include="..\..\src\render\software\SDL_drawpoint.c" />
+ <ClCompile Include="..\..\src\render\software\SDL_render_sw.c" />
+ <ClCompile Include="..\..\src\render\software\SDL_rotate.c" />
+ <ClCompile Include="..\..\src\SDL.c" />
+ <ClCompile Include="..\..\src\SDL_assert.c" />
+ <ClCompile Include="..\..\src\atomic\SDL_atomic.c" />
+ <ClCompile Include="..\..\src\atomic\SDL_spinlock.c" />
+ <ClCompile Include="..\..\src\audio\SDL_audio.c" />
+ <ClCompile Include="..\..\src\audio\SDL_audiocvt.c" />
+ <ClCompile Include="..\..\src\audio\SDL_audiodev.c" />
+ <ClCompile Include="..\..\src\audio\SDL_audiotypecvt.c" />
+ <ClCompile Include="..\..\src\SDL_hints.c" />
+ <ClCompile Include="..\..\src\SDL_log.c" />
+ <ClCompile Include="..\..\src\video\dummy\SDL_nullframebuffer.c" />
+ <ClCompile Include="..\..\src\video\SDL_blit.c" />
+ <ClCompile Include="..\..\src\video\SDL_blit_0.c" />
+ <ClCompile Include="..\..\src\video\SDL_blit_1.c" />
+ <ClCompile Include="..\..\src\video\SDL_blit_A.c" />
+ <ClCompile Include="..\..\src\video\SDL_blit_auto.c" />
+ <ClCompile Include="..\..\src\video\SDL_blit_copy.c" />
+ <ClCompile Include="..\..\src\video\SDL_blit_N.c" />
+ <ClCompile Include="..\..\src\video\SDL_blit_slow.c" />
+ <ClCompile Include="..\..\src\video\SDL_bmp.c" />
+ <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c" />
+ <ClCompile Include="..\..\src\video\SDL_clipboard.c" />
+ <ClCompile Include="..\..\src\video\SDL_shape.c" />
+ <ClCompile Include="..\..\src\audio\winmm\SDL_winmm.c" />
+ <ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" />
+ <ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" />
+ <ClCompile Include="..\..\src\audio\directsound\SDL_directsound.c" />
+ <ClCompile Include="..\..\src\events\SDL_dropevents.c" />
+ <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />
+ <ClCompile Include="..\..\src\joystick\windows\SDL_dxjoystick.c" />
+ <ClCompile Include="..\..\src\SDL_error.c" />
+ <ClCompile Include="..\..\src\events\SDL_events.c" />
+ <ClCompile Include="..\..\src\video\SDL_fillrect.c" />
+ <ClCompile Include="..\..\src\stdlib\SDL_getenv.c" />
+ <ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
+ <ClCompile Include="..\..\src\stdlib\SDL_iconv.c" />
+ <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
+ <ClCompile Include="..\..\src\joystick\SDL_gamecontroller.c" />
+ <ClCompile Include="..\..\src\events\SDL_keyboard.c" />
+ <ClCompile Include="..\..\src\stdlib\SDL_malloc.c" />
+ <ClCompile Include="..\..\src\audio\SDL_mixer.c" />
+ <ClCompile Include="..\..\src\joystick\windows\SDL_mmjoystick.c" />
+ <ClCompile Include="..\..\src\events\SDL_mouse.c" />
+ <ClCompile Include="..\..\src\video\dummy\SDL_nullevents.c" />
+ <ClCompile Include="..\..\src\video\dummy\SDL_nullvideo.c" />
+ <ClCompile Include="..\..\src\video\SDL_pixels.c" />
+ <ClCompile Include="..\..\src\power\SDL_power.c" />
+ <ClCompile Include="..\..\src\stdlib\SDL_qsort.c" />
+ <ClCompile Include="..\..\src\events\SDL_quit.c" />
+ <ClCompile Include="..\..\src\video\SDL_rect.c" />
+ <ClCompile Include="..\..\src\video\SDL_RLEaccel.c" />
+ <ClCompile Include="..\..\src\file\SDL_rwops.c" />
+ <ClCompile Include="..\..\src\stdlib\SDL_stdlib.c" />
+ <ClCompile Include="..\..\src\video\SDL_stretch.c" />
+ <ClCompile Include="..\..\src\stdlib\SDL_string.c" />
+ <ClCompile Include="..\..\src\video\SDL_surface.c" />
+ <ClCompile Include="..\..\src\thread\generic\SDL_syscond.c" />
+ <ClCompile Include="..\..\src\filesystem\windows\SDL_sysfilesystem.c" />
+ <ClCompile Include="..\..\src\haptic\windows\SDL_syshaptic.c" />
+ <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
+ <ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c" />
+ <ClCompile Include="..\..\src\power\windows\SDL_syspower.c" />
+ <ClCompile Include="..\..\src\thread\windows\SDL_syssem.c" />
+ <ClCompile Include="..\..\src\thread\windows\SDL_systhread.c" />
+ <ClCompile Include="..\..\src\thread\windows\SDL_systls.c" />
+ <ClCompile Include="..\..\src\timer\windows\SDL_systimer.c" />
+ <ClCompile Include="..\..\src\thread\SDL_thread.c" />
+ <ClCompile Include="..\..\src\timer\SDL_timer.c" />
+ <ClCompile Include="..\..\src\video\SDL_video.c" />
+ <ClCompile Include="..\..\src\audio\SDL_wave.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsclipboard.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsevents.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsframebuffer.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsmessagebox.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsmodes.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsmouse.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsopengl.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsshape.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowsvideo.c" />
+ <ClCompile Include="..\..\src\video\windows\SDL_windowswindow.c" />
+ <ClCompile Include="..\..\src\events\SDL_windowevents.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\src\main\windows\version.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
</Project>
\ No newline at end of file
diff --git a/VisualC/SDL/SDL_VS2012.vcxproj b/VisualC/SDL/SDL_VS2012.vcxproj
index 213c10c..141bc64 100644
--- a/VisualC/SDL/SDL_VS2012.vcxproj
+++ b/VisualC/SDL/SDL_VS2012.vcxproj
@@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>SDL2</ProjectName>
+ <ProjectName>SDL2</ProjectName>
<ProjectGuid>{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}</ProjectGuid>
<RootNamespace>SDL</RootNamespace>
</PropertyGroup>
@@ -233,6 +233,7 @@
<ClInclude Include="..\..\include\SDL_endian.h" />
<ClInclude Include="..\..\include\SDL_error.h" />
<ClInclude Include="..\..\include\SDL_events.h" />
+ <ClInclude Include="..\..\include\SDL_filesystem.h" />
<ClInclude Include="..\..\include\SDL_gesture.h" />
<ClInclude Include="..\..\include\SDL_haptic.h" />
<ClInclude Include="..\..\include\SDL_hints.h" />
@@ -433,6 +434,7 @@
<ClCompile Include="..\..\src\stdlib\SDL_string.c" />
<ClCompile Include="..\..\src\video\SDL_surface.c" />
<ClCompile Include="..\..\src\thread\generic\SDL_syscond.c" />
+ <ClCompile Include="..\..\src\filesystem\windows\SDL_sysfilesystem.c" />
<ClCompile Include="..\..\src\haptic\windows\SDL_syshaptic.c" />
<ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
<ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c" />
diff --git a/VisualC/SDL_VS2010.sln b/VisualC/SDL_VS2010.sln
index fb5d873..3a493ac 100644
--- a/VisualC/SDL_VS2010.sln
+++ b/VisualC/SDL_VS2010.sln
@@ -1,255 +1,417 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CE748C1F-3C21-4825-AA6A-F895A023F7E7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loopwave", "tests\loopwave\loopwave_VS2010.vcxproj", "{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testplatform", "tests\testplatform\testplatform_VS2010.vcxproj", "{26932B24-EFC6-4E3A-B277-ED653DA37968}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "tests\testfile\testfile_VS2010.vcxproj", "{CAE4F1D0-314F-4B10-805B-0EFD670133A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl2", "tests\testgl2\testgl2_VS2010.vcxproj", "{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkkeys", "tests\checkkeys\checkkeys_VS2010.vcxproj", "{26828762-C95D-4637-9CB1-7F0979523813}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite2", "tests\testsprite2\testsprite2_VS2010.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testshape", "tests\testshape\testshape_VS2010.vcxproj", "{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdraw2", "tests\testdraw2\testdraw2_VS2010.vcxproj", "{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpower", "tests\testpower\testpower_VS2010.vcxproj", "{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2test", "SDLtest\SDLtest_VS2010.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_vs2010.vcxproj", "{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testatomic\testatomic_VS2010.vcxproj", "{2271060E-98B4-4596-8172-A041E4B2EC7A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscale\testscale_VS2010.vcxproj", "{E7A6C41C-E059-4C9C-8CCC-73586A540B62}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\testrendertarget\testrendertarget_VS2010.vcxproj", "{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamecontroller", "tests\testgamecontroller\testgamecontroller_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08336}"
- ProjectSection(ProjectDependencies) = postProject
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgesture", "tests\testgesture\testgesture_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08996}"
- ProjectSection(ProjectDependencies) = postProject
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testjoystick", "tests\testjoystick\testjoystick_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08BCC}"
- ProjectSection(ProjectDependencies) = postProject
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testoverlay2", "tests\testoverlay2\testoverlay2_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08AAD}"
- ProjectSection(ProjectDependencies) = postProject
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.ActiveCfg = Debug|Win32
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.Build.0 = Debug|Win32
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.ActiveCfg = Debug|x64
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.Build.0 = Debug|x64
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.ActiveCfg = Release|Win32
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.Build.0 = Release|Win32
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.ActiveCfg = Release|x64
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.Build.0 = Release|x64
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.ActiveCfg = Debug|Win32
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.Build.0 = Debug|Win32
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.ActiveCfg = Debug|x64
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.Build.0 = Debug|x64
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.ActiveCfg = Release|Win32
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.Build.0 = Release|Win32
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.ActiveCfg = Release|x64
- {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.Build.0 = Release|x64
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.ActiveCfg = Debug|Win32
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.Build.0 = Debug|Win32
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.ActiveCfg = Debug|x64
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.Build.0 = Debug|x64
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.ActiveCfg = Release|Win32
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.Build.0 = Release|Win32
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.ActiveCfg = Release|x64
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.Build.0 = Release|x64
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.ActiveCfg = Debug|Win32
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.Build.0 = Debug|Win32
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.ActiveCfg = Debug|x64
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.Build.0 = Debug|x64
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.ActiveCfg = Release|Win32
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.Build.0 = Release|Win32
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.ActiveCfg = Release|x64
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.Build.0 = Release|x64
- {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.ActiveCfg = Debug|Win32
- {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.Build.0 = Debug|Win32
- {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.ActiveCfg = Debug|x64
- {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.Build.0 = Debug|x64
- {26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.ActiveCfg = Release|Win32
- {26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.Build.0 = Release|Win32
- {26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.ActiveCfg = Release|x64
- {26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.Build.0 = Release|x64
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.ActiveCfg = Debug|Win32
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.Build.0 = Debug|Win32
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.ActiveCfg = Debug|x64
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.Build.0 = Debug|x64
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.ActiveCfg = Release|Win32
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.Build.0 = Release|Win32
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.ActiveCfg = Release|x64
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.Build.0 = Release|x64
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.ActiveCfg = Debug|Win32
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.Build.0 = Debug|Win32
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.ActiveCfg = Debug|x64
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.Build.0 = Debug|x64
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|Win32.ActiveCfg = Release|Win32
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|Win32.Build.0 = Release|Win32
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|x64.ActiveCfg = Release|x64
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|x64.Build.0 = Release|x64
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.Build.0 = Debug|Win32
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.ActiveCfg = Debug|x64
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.Build.0 = Debug|x64
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.ActiveCfg = Release|Win32
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.Build.0 = Release|Win32
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.ActiveCfg = Release|x64
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.Build.0 = Release|x64
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.ActiveCfg = Debug|Win32
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.Build.0 = Debug|Win32
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.ActiveCfg = Debug|x64
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.Build.0 = Debug|x64
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.ActiveCfg = Release|Win32
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.Build.0 = Release|Win32
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.ActiveCfg = Release|x64
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.Build.0 = Release|x64
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.ActiveCfg = Debug|Win32
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.Build.0 = Debug|Win32
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.ActiveCfg = Debug|x64
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.Build.0 = Debug|x64
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.ActiveCfg = Release|Win32
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.Build.0 = Release|Win32
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.ActiveCfg = Release|x64
- {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.Build.0 = Release|x64
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.ActiveCfg = Debug|Win32
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.Build.0 = Debug|Win32
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.ActiveCfg = Debug|x64
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.Build.0 = Debug|x64
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.ActiveCfg = Release|Win32
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|x64
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.Build.0 = Release|x64
- {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.ActiveCfg = Debug|Win32
- {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.Build.0 = Debug|Win32
- {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.ActiveCfg = Debug|Win32
- {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.ActiveCfg = Release|Win32
- {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.Build.0 = Release|Win32
- {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.ActiveCfg = Release|Win32
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.ActiveCfg = Debug|Win32
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.Build.0 = Debug|Win32
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.ActiveCfg = Debug|x64
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.Build.0 = Debug|x64
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.ActiveCfg = Release|Win32
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.Build.0 = Release|Win32
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.ActiveCfg = Release|x64
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.Build.0 = Release|x64
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.ActiveCfg = Debug|Win32
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.Build.0 = Debug|Win32
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.ActiveCfg = Debug|x64
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.Build.0 = Debug|x64
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.ActiveCfg = Release|Win32
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.Build.0 = Release|Win32
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.ActiveCfg = Release|x64
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.Build.0 = Release|x64
- {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.ActiveCfg = Debug|Win32
- {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.Build.0 = Debug|Win32
- {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.ActiveCfg = Debug|x64
- {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.Build.0 = Debug|x64
- {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.ActiveCfg = Release|Win32
- {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.Build.0 = Release|Win32
- {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.ActiveCfg = Release|x64
- {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.Build.0 = Release|x64
- {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.ActiveCfg = Debug|Win32
- {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.Build.0 = Debug|Win32
- {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.ActiveCfg = Debug|x64
- {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.Build.0 = Debug|x64
- {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.ActiveCfg = Release|Win32
- {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.Build.0 = Release|Win32
- {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.ActiveCfg = Release|x64
- {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.Build.0 = Release|x64
- {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.ActiveCfg = Debug|Win32
- {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.Build.0 = Debug|Win32
- {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.ActiveCfg = Debug|x64
- {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.Build.0 = Debug|x64
- {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.ActiveCfg = Release|Win32
- {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.Build.0 = Release|Win32
- {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.ActiveCfg = Release|x64
- {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.Build.0 = Release|x64
- {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|Win32.ActiveCfg = Debug|Win32
- {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|Win32.Build.0 = Debug|Win32
- {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|x64.ActiveCfg = Debug|x64
- {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|x64.Build.0 = Debug|x64
- {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|Win32.ActiveCfg = Release|Win32
- {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|Win32.Build.0 = Release|Win32
- {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|x64.ActiveCfg = Release|x64
- {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {26932B24-EFC6-4E3A-B277-ED653DA37968} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {CAE4F1D0-314F-4B10-805B-0EFD670133A0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {8B5CFB38-CCBA-40A8-AD7A-89C57B070884} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {26828762-C95D-4637-9CB1-7F0979523813} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {40FB7794-D3C3-4CFE-BCF4-A80C96635682} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {EDEA9D00-AF64-45DE-8F60-5957048F2F0F} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {2271060E-98B4-4596-8172-A041E4B2EC7A} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {E7A6C41C-E059-4C9C-8CCC-73586A540B62} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {43A06713-A52D-4008-AD7E-A69DF3FCFFA8} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {55812185-D13C-4022-9C81-32E0F4A08336} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {55812185-D13C-4022-9C81-32E0F4A08996} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {55812185-D13C-4022-9C81-32E0F4A08BCC} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- {55812185-D13C-4022-9C81-32E0F4A08AAD} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CE748C1F-3C21-4825-AA6A-F895A023F7E7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loopwave", "tests\loopwave\loopwave_VS2010.vcxproj", "{AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testplatform", "tests\testplatform\testplatform_VS2010.vcxproj", "{26932B24-EFC6-4E3A-B277-ED653DA37968}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "tests\testfile\testfile_VS2010.vcxproj", "{CAE4F1D0-314F-4B10-805B-0EFD670133A0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl2", "tests\testgl2\testgl2_VS2010.vcxproj", "{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkkeys", "tests\checkkeys\checkkeys_VS2010.vcxproj", "{26828762-C95D-4637-9CB1-7F0979523813}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite2", "tests\testsprite2\testsprite2_VS2010.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testshape", "tests\testshape\testshape_VS2010.vcxproj", "{EDEA9D00-AF64-45DE-8F60-5957048F2F0F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdraw2", "tests\testdraw2\testdraw2_VS2010.vcxproj", "{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpower", "tests\testpower\testpower_VS2010.vcxproj", "{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2test", "SDLtest\SDLtest_VS2010.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation_vs2010.vcxproj", "{FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testatomic\testatomic_VS2010.vcxproj", "{2271060E-98B4-4596-8172-A041E4B2EC7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscale\testscale_VS2010.vcxproj", "{E7A6C41C-E059-4C9C-8CCC-73586A540B62}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrendertarget", "tests\testrendertarget\testrendertarget_VS2010.vcxproj", "{43A06713-A52D-4008-AD7E-A69DF3FCFFA8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamecontroller", "tests\testgamecontroller\testgamecontroller_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08336}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgesture", "tests\testgesture\testgesture_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08996}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testjoystick", "tests\testjoystick\testjoystick_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08BCC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testoverlay2", "tests\testoverlay2\testoverlay2_VS2010.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08AAD}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A} = {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug_static|Win32 = Debug_static|Win32
+ Debug_static|x64 = Debug_static|x64
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release_static|Win32 = Release_static|Win32
+ Release_static|x64 = Release_static|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug_static|Win32.ActiveCfg = Debug_static|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug_static|Win32.Build.0 = Debug_static|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug_static|x64.ActiveCfg = Debug_static|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug_static|x64.Build.0 = Debug_static|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_static|Win32.ActiveCfg = Release_static|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_static|Win32.Build.0 = Release_static|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_static|x64.ActiveCfg = Release|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_static|x64.Build.0 = Release|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug_static|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug_static|x64.ActiveCfg = Debug|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug_static|x64.Build.0 = Debug|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_static|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_static|Win32.Build.0 = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_static|x64.ActiveCfg = Release|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_static|x64.Build.0 = Release|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug_static|Win32.Build.0 = Debug|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug_static|x64.ActiveCfg = Debug|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug_static|x64.Build.0 = Debug|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|Win32.Build.0 = Debug|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.ActiveCfg = Debug|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Debug|x64.Build.0 = Debug|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release_static|Win32.ActiveCfg = Release|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release_static|Win32.Build.0 = Release|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release_static|x64.ActiveCfg = Release|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release_static|x64.Build.0 = Release|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.ActiveCfg = Release|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|Win32.Build.0 = Release|Win32
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.ActiveCfg = Release|x64
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB}.Release|x64.Build.0 = Release|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug_static|Win32.Build.0 = Debug|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug_static|x64.ActiveCfg = Debug|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug_static|x64.Build.0 = Debug|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|Win32.Build.0 = Debug|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.ActiveCfg = Debug|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Debug|x64.Build.0 = Debug|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release_static|Win32.ActiveCfg = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release_static|Win32.Build.0 = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release_static|x64.ActiveCfg = Release|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release_static|x64.Build.0 = Release|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.ActiveCfg = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|Win32.Build.0 = Release|Win32
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.ActiveCfg = Release|x64
+ {26932B24-EFC6-4E3A-B277-ED653DA37968}.Release|x64.Build.0 = Release|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug_static|Win32.Build.0 = Debug|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug_static|x64.ActiveCfg = Debug|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug_static|x64.Build.0 = Debug|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|Win32.Build.0 = Debug|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.ActiveCfg = Debug|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Debug|x64.Build.0 = Debug|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release_static|Win32.ActiveCfg = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release_static|Win32.Build.0 = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release_static|x64.ActiveCfg = Release|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release_static|x64.Build.0 = Release|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.ActiveCfg = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|Win32.Build.0 = Release|Win32
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.ActiveCfg = Release|x64
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0}.Release|x64.Build.0 = Release|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug_static|Win32.Build.0 = Debug|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug_static|x64.ActiveCfg = Debug|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug_static|x64.Build.0 = Debug|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.Build.0 = Debug|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.ActiveCfg = Debug|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|x64.Build.0 = Debug|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release_static|Win32.ActiveCfg = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release_static|Win32.Build.0 = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release_static|x64.ActiveCfg = Release|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release_static|x64.Build.0 = Release|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.ActiveCfg = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.Build.0 = Release|Win32
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.ActiveCfg = Release|x64
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|x64.Build.0 = Release|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug_static|Win32.Build.0 = Debug|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug_static|x64.ActiveCfg = Debug|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug_static|x64.Build.0 = Debug|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.Build.0 = Debug|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.ActiveCfg = Debug|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Debug|x64.Build.0 = Debug|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release_static|Win32.ActiveCfg = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release_static|Win32.Build.0 = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release_static|x64.ActiveCfg = Release|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release_static|x64.Build.0 = Release|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.ActiveCfg = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.Build.0 = Release|Win32
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.ActiveCfg = Release|x64
+ {26828762-C95D-4637-9CB1-7F0979523813}.Release|x64.Build.0 = Release|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug_static|Win32.Build.0 = Debug|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug_static|x64.ActiveCfg = Debug|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug_static|x64.Build.0 = Debug|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.ActiveCfg = Debug|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|Win32.Build.0 = Debug|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.ActiveCfg = Debug|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Debug|x64.Build.0 = Debug|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release_static|Win32.ActiveCfg = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release_static|Win32.Build.0 = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release_static|x64.ActiveCfg = Release|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release_static|x64.Build.0 = Release|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.ActiveCfg = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|Win32.Build.0 = Release|Win32
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.ActiveCfg = Release|x64
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682}.Release|x64.Build.0 = Release|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug_static|Win32.Build.0 = Debug|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug_static|x64.ActiveCfg = Debug|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug_static|x64.Build.0 = Debug|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|Win32.Build.0 = Debug|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.ActiveCfg = Debug|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Debug|x64.Build.0 = Debug|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release_static|Win32.ActiveCfg = Release|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release_static|Win32.Build.0 = Release|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release_static|x64.ActiveCfg = Release|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release_static|x64.Build.0 = Release|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|Win32.ActiveCfg = Release|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|Win32.Build.0 = Release|Win32
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|x64.ActiveCfg = Release|x64
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F}.Release|x64.Build.0 = Release|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug_static|Win32.Build.0 = Debug|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug_static|x64.ActiveCfg = Debug|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug_static|x64.Build.0 = Debug|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|Win32.Build.0 = Debug|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.ActiveCfg = Debug|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Debug|x64.Build.0 = Debug|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release_static|Win32.ActiveCfg = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release_static|Win32.Build.0 = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release_static|x64.ActiveCfg = Release|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release_static|x64.Build.0 = Release|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.ActiveCfg = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|Win32.Build.0 = Release|Win32
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.ActiveCfg = Release|x64
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}.Release|x64.Build.0 = Release|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug_static|Win32.Build.0 = Debug|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug_static|x64.ActiveCfg = Debug|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug_static|x64.Build.0 = Debug|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|Win32.Build.0 = Debug|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.ActiveCfg = Debug|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Debug|x64.Build.0 = Debug|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release_static|Win32.ActiveCfg = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release_static|Win32.Build.0 = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release_static|x64.ActiveCfg = Release|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release_static|x64.Build.0 = Release|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.ActiveCfg = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|Win32.Build.0 = Release|Win32
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.ActiveCfg = Release|x64
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3}.Release|x64.Build.0 = Release|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug_static|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug_static|x64.ActiveCfg = Debug|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug_static|x64.Build.0 = Debug|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.ActiveCfg = Debug|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Debug|x64.Build.0 = Debug|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release_static|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release_static|Win32.Build.0 = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release_static|x64.ActiveCfg = Release|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release_static|x64.Build.0 = Release|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|Win32.Build.0 = Release|Win32
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.ActiveCfg = Release|x64
+ {DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}.Release|x64.Build.0 = Release|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug_static|Win32.Build.0 = Debug|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug_static|x64.ActiveCfg = Debug|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug_static|x64.Build.0 = Debug|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|Win32.Build.0 = Debug|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.ActiveCfg = Debug|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Debug|x64.Build.0 = Debug|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release_static|Win32.ActiveCfg = Release|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release_static|Win32.Build.0 = Release|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release_static|x64.ActiveCfg = Release|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release_static|x64.Build.0 = Release|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.ActiveCfg = Release|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|Win32.Build.0 = Release|Win32
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.ActiveCfg = Release|x64
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0}.Release|x64.Build.0 = Release|x64
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug_static|Win32.Build.0 = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug_static|x64.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|Win32.Build.0 = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Debug|x64.ActiveCfg = Debug|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release_static|Win32.ActiveCfg = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release_static|Win32.Build.0 = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release_static|x64.ActiveCfg = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.ActiveCfg = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|Win32.Build.0 = Release|Win32
+ {2271060E-98B4-4596-8172-A041E4B2EC7A}.Release|x64.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug_static|Win32.Build.0 = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug_static|x64.ActiveCfg = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug_static|x64.Build.0 = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|Win32.Build.0 = Debug|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.ActiveCfg = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Debug|x64.Build.0 = Debug|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release_static|Win32.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release_static|Win32.Build.0 = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release_static|x64.ActiveCfg = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release_static|x64.Build.0 = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.ActiveCfg = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|Win32.Build.0 = Release|Win32
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.ActiveCfg = Release|x64
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62}.Release|x64.Build.0 = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug_static|Win32.Build.0 = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug_static|x64.ActiveCfg = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug_static|x64.Build.0 = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|Win32.Build.0 = Debug|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.ActiveCfg = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Debug|x64.Build.0 = Debug|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release_static|Win32.ActiveCfg = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release_static|Win32.Build.0 = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release_static|x64.ActiveCfg = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release_static|x64.Build.0 = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.ActiveCfg = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|Win32.Build.0 = Release|Win32
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.ActiveCfg = Release|x64
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug_static|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug_static|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug_static|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release_static|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release_static|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release_static|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release_static|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08336}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug_static|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug_static|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug_static|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release_static|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release_static|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release_static|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release_static|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08996}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug_static|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug_static|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug_static|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release_static|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release_static|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release_static|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release_static|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08BCC}.Release|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug_static|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug_static|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug_static|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug_static|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|Win32.ActiveCfg = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|Win32.Build.0 = Debug|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|x64.ActiveCfg = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Debug|x64.Build.0 = Debug|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release_static|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release_static|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release_static|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release_static|x64.Build.0 = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|Win32.ActiveCfg = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|Win32.Build.0 = Release|Win32
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|x64.ActiveCfg = Release|x64
+ {55812185-D13C-4022-9C81-32E0F4A08AAD}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {AAAD1CB5-7ADA-47AE-85A0-08A6EC48FAFB} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {26932B24-EFC6-4E3A-B277-ED653DA37968} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {CAE4F1D0-314F-4B10-805B-0EFD670133A0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {8B5CFB38-CCBA-40A8-AD7A-89C57B070884} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {26828762-C95D-4637-9CB1-7F0979523813} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {40FB7794-D3C3-4CFE-BCF4-A80C96635682} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {EDEA9D00-AF64-45DE-8F60-5957048F2F0F} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {C4E04D18-EF76-4B42-B4C2-16A1BACDC0A3} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {FEE710DB-EC7B-4CCB-BD75-535D401A2FE0} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {2271060E-98B4-4596-8172-A041E4B2EC7A} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {E7A6C41C-E059-4C9C-8CCC-73586A540B62} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {43A06713-A52D-4008-AD7E-A69DF3FCFFA8} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08336} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08996} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08BCC} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ {55812185-D13C-4022-9C81-32E0F4A08AAD} = {CE748C1F-3C21-4825-AA6A-F895A023F7E7}
+ EndGlobalSection
+EndGlobal
diff --git a/VisualC/tests/loopwave/loopwave_VS2010.vcxproj b/VisualC/tests/loopwave/loopwave_VS2010.vcxproj
index 4ef300a..1fd5189 100644
--- a/VisualC/tests/loopwave/loopwave_VS2010.vcxproj
+++ b/VisualC/tests/loopwave/loopwave_VS2010.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -105,7 +105,8 @@
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
- <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
+ <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\sample.wav" "$(TargetDir)\sample.wav"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy SDL</Message>
@@ -139,7 +140,8 @@
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
- <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
+ <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\sample.wav" "$(TargetDir)\sample.wav"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy SDL</Message>
@@ -174,7 +176,8 @@
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
- <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
+ <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\sample.wav" "$(TargetDir)\sample.wav"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy SDL</Message>
@@ -208,7 +211,8 @@
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
- <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
+ <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\sample.wav" "$(TargetDir)\sample.wav"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy SDL</Message>
diff --git a/VisualC/tests/loopwave/loopwave_VS2012.vcxproj b/VisualC/tests/loopwave/loopwave_VS2012.vcxproj
index 0a64859..ea983c5 100644
--- a/VisualC/tests/loopwave/loopwave_VS2012.vcxproj
+++ b/VisualC/tests/loopwave/loopwave_VS2012.vcxproj
@@ -109,7 +109,8 @@
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
- <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
+ <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\sample.wav" "$(TargetDir)\sample.wav"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy SDL</Message>
@@ -143,7 +144,8 @@
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
- <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
+ <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\sample.wav" "$(TargetDir)\sample.wav"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy SDL</Message>
@@ -178,7 +180,8 @@
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
- <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
+ <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\sample.wav" "$(TargetDir)\sample.wav"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy SDL</Message>
@@ -212,7 +215,8 @@
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
- <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"</Command>
+ <Command>copy "$(SolutionDir)\SDL\$(Platform)\$(Configuration)\SDL2.dll" "$(TargetDir)\SDL2.dll"
+copy "$(SolutionDir)\..\test\sample.wav" "$(TargetDir)\sample.wav"</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Copy SDL</Message>
diff --git a/WhatsNew.txt b/WhatsNew.txt
index c3784de..5ac78c5 100644
--- a/WhatsNew.txt
+++ b/WhatsNew.txt
@@ -1,3 +1,57 @@
-This is a list of API changes in SDL's version history.
+This is a list of major changes in SDL's version history.
+---------------------------------------------------------------------------
+2.0.1:
+---------------------------------------------------------------------------
+
+General:
+* Added an API to get common filesystem paths in SDL_filesystem.h:
+ SDL_GetBasePath(), SDL_GetPrefPath()
+* Added an API to do optimized YV12 and IYUV texture updates:
+ SDL_UpdateYUVTexture()
+* Added an API to get the amount of RAM on the system:
+ SDL_GetSystemRAM()
+* Added a macro to perform timestamp comparisons with SDL_GetTicks():
+ SDL_TICKS_PASSED()
+* Dramatically improved OpenGL ES 2.0 rendering performance
+* Added OpenGL attribute SDL_GL_FRAMEBUFFER_SRGB_CAPABLE
+
+Windows:
+* Created a static library configuration for the Visual Studio 2010 project
+* Added a hint to create the Direct3D device with support for multi-threading:
+ SDL_HINT_RENDER_DIRECT3D_THREADSAFE
+* Added a function to get the D3D9 adapter index for a display:
+ SDL_Direct3D9GetAdapterIndex()
+* Added a function to get the D3D9 device for a D3D9 renderer:
+ SDL_RenderGetD3D9Device()
+* Fixed building SDL with the mingw32 toolchain (mingw-w64 is preferred)
+* Fixed crash when using two XInput controllers at the same time
+* Fixed detecting a mixture of XInput and DirectInput controllers
+* Fixed clearing a D3D render target larger than the window
+* Improved support for format specifiers in SDL_snprintf()
+
+Mac OS X:
+* Added support for retina displays:
+ Create your window with the SDL_WINDOW_ALLOW_HIGHDPI flag, and then use SDL_GL_GetDrawableSize() to find the actual drawable size. You are responsible for scaling mouse and drawing coordinates appropriately.
+* Fixed mouse warping in fullscreen mode
+* Right mouse click is emulated by holding the Ctrl key while left clicking
+
+Linux:
+* Fixed float audio support with the PulseAudio driver
+* Fixed missing line endpoints in the OpenGL renderer on some drivers
+* X11 symbols are no longer defined to avoid collisions when linking statically
+
+iOS:
+* Fixed status bar visibility on iOS 7
+* Flipped the accelerometer Y axis to match expected values
+
+Android:
+IMPORTANT: You MUST get the updated SDLActivity.java to match C code
+* Moved EGL initialization to native code
+* Fixed the accelerometer axis rotation relative to the device rotation
+* Fixed race conditions when handling the EGL context on pause/resume
+* Touch devices are available for enumeration immediately after init
+
+Raspberry Pi:
+* Added support for the Raspberry Pi, see README-raspberrypi.txt for details
diff --git a/Xcode-iOS/Demos/src/accelerometer.c b/Xcode-iOS/Demos/src/accelerometer.c
index 115de62..3b7985f 100644
--- a/Xcode-iOS/Demos/src/accelerometer.c
+++ b/Xcode-iOS/Demos/src/accelerometer.c
@@ -31,19 +31,19 @@ static SDL_Texture *ship = 0; /* texture for spaceship */
static SDL_Texture *space = 0; /* texture for space (background */
void
-render(SDL_Renderer *renderer)
+render(SDL_Renderer *renderer, int w, int h)
{
/* get joystick (accelerometer) axis values and normalize them */
float ax = SDL_JoystickGetAxis(accelerometer, 0);
- float ay = -SDL_JoystickGetAxis(accelerometer, 1);
+ float ay = SDL_JoystickGetAxis(accelerometer, 1);
/* ship screen constraints */
Uint32 minx = 0.0f;
- Uint32 maxx = SCREEN_WIDTH - shipData.rect.w;
+ Uint32 maxx = w - shipData.rect.w;
Uint32 miny = 0.0f;
- Uint32 maxy = SCREEN_HEIGHT - shipData.rect.h;
+ Uint32 maxy = h - shipData.rect.h;
#define SINT16_MAX ((float)(0x7FFF))
@@ -162,8 +162,9 @@ main(int argc, char *argv[])
SDL_Renderer *renderer;
Uint32 startFrame; /* time frame began to process */
Uint32 endFrame; /* time frame ended processing */
- Uint32 delay; /* time to pause waiting to draw next frame */
+ Sint32 delay; /* time to pause waiting to draw next frame */
int done; /* should we clean up and exit? */
+ int w, h;
/* initialize SDL */
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
@@ -173,8 +174,10 @@ main(int argc, char *argv[])
/* create main window and renderer */
window = SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
SDL_WINDOW_OPENGL |
- SDL_WINDOW_BORDERLESS);
+ SDL_WINDOW_FULLSCREEN);
renderer = SDL_CreateRenderer(window, 0, 0);
+
+ SDL_GetWindowSize(window, &w, &h);
/* print out some info about joysticks and try to open accelerometer for use */
printf("There are %d joysticks available\n", SDL_NumJoysticks());
@@ -196,8 +199,8 @@ main(int argc, char *argv[])
initializeTextures(renderer);
/* setup ship */
- shipData.x = (SCREEN_WIDTH - shipData.rect.w) / 2;
- shipData.y = (SCREEN_HEIGHT - shipData.rect.h) / 2;
+ shipData.x = (w - shipData.rect.w) / 2;
+ shipData.y = (h - shipData.rect.h) / 2;
shipData.vx = 0.0f;
shipData.vy = 0.0f;
@@ -211,7 +214,7 @@ main(int argc, char *argv[])
done = 1;
}
}
- render(renderer);
+ render(renderer, w, h);
endFrame = SDL_GetTicks();
/* figure out how much time we have left, and then sleep */
diff --git a/Xcode-iOS/Demos/src/fireworks.c b/Xcode-iOS/Demos/src/fireworks.c
index b2a4d09..6c60dd1 100644
--- a/Xcode-iOS/Demos/src/fireworks.c
+++ b/Xcode-iOS/Demos/src/fireworks.c
@@ -196,7 +196,7 @@ explodeEmitter(struct particle *emitter)
float speed = randomFloat(0.00, powf(0.17, exponent));
speed = powf(speed, 1.0f / exponent);
- /*select the particle at the end of our array */
+ /* select the particle at the end of our array */
struct particle *p = &particles[num_active_particles];
/* set the particles properties */
diff --git a/Xcode-iOS/Demos/src/keyboard.c b/Xcode-iOS/Demos/src/keyboard.c
index fd903ff..4fb45b9 100644
--- a/Xcode-iOS/Demos/src/keyboard.c
+++ b/Xcode-iOS/Demos/src/keyboard.c
@@ -80,7 +80,7 @@ fontMapping map[TABLE_SIZE] = {
{SDL_SCANCODE_7, 1, 0, 23}, /* 7 */
{SDL_SCANCODE_8, 1, 0, 24}, /* 8 */
{SDL_SCANCODE_9, 1, 0, 25}, /* 9 */
- {SDL_SCANCODE_SPACE, 1, 0, 0}, /*' ' */
+ {SDL_SCANCODE_SPACE, 1, 0, 0}, /* ' ' */
{SDL_SCANCODE_1, 0, KMOD_SHIFT, 1}, /* ! */
{SDL_SCANCODE_SLASH, 0, KMOD_SHIFT, 31}, /* ? */
{SDL_SCANCODE_SLASH, 1, 0, 15}, /* / */
diff --git a/Xcode-iOS/Demos/src/rectangles.c b/Xcode-iOS/Demos/src/rectangles.c
index 035e4f9..86fce49 100644
--- a/Xcode-iOS/Demos/src/rectangles.c
+++ b/Xcode-iOS/Demos/src/rectangles.c
@@ -37,7 +37,7 @@ render(SDL_Renderer *renderer)
int
main(int argc, char *argv[])
{
- if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO*/) < 0)
+ if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO */) < 0)
{
printf("Unable to initialize SDL");
}
diff --git a/Xcode-iOS/Demos/src/touch.c b/Xcode-iOS/Demos/src/touch.c
index e811967..c81dcbc 100644
--- a/Xcode-iOS/Demos/src/touch.c
+++ b/Xcode-iOS/Demos/src/touch.c
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
SDL_WINDOW_BORDERLESS);
renderer = SDL_CreateRenderer(window, 0, 0);
- /*load brush texture */
+ /* load brush texture */
initializeTexture(renderer);
/* fill canvass initially with all black */
diff --git a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
index 4d349d2..350426c 100755
--- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
@@ -67,6 +67,8 @@
04F7808512FB753F00FC43C0 /* SDL_nullframebuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7808312FB753F00FC43C0 /* SDL_nullframebuffer.c */; };
04FFAB8B12E23B8D00BA343D /* SDL_atomic.c in Sources */ = {isa = PBXBuildFile; fileRef = 04FFAB8912E23B8D00BA343D /* SDL_atomic.c */; };
04FFAB8C12E23B8D00BA343D /* SDL_spinlock.c in Sources */ = {isa = PBXBuildFile; fileRef = 04FFAB8A12E23B8D00BA343D /* SDL_spinlock.c */; };
+ 56C181DF17C44D5E00406AE3 /* SDL_filesystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 56C181DE17C44D5E00406AE3 /* SDL_filesystem.h */; };
+ 56C181E217C44D7A00406AE3 /* SDL_sysfilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 56C181E117C44D7A00406AE3 /* SDL_sysfilesystem.m */; };
56EA86FB13E9EC2B002E47EB /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 56EA86F913E9EC2B002E47EB /* SDL_coreaudio.c */; };
56EA86FC13E9EC2B002E47EB /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 56EA86FA13E9EC2B002E47EB /* SDL_coreaudio.h */; };
56ED04E1118A8EE200A56AA6 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E0118A8EE200A56AA6 /* SDL_power.c */; };
@@ -258,6 +260,8 @@
04F7808312FB753F00FC43C0 /* SDL_nullframebuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_nullframebuffer.c; sourceTree = "<group>"; };
04FFAB8912E23B8D00BA343D /* SDL_atomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_atomic.c; sourceTree = "<group>"; };
04FFAB8A12E23B8D00BA343D /* SDL_spinlock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_spinlock.c; sourceTree = "<group>"; };
+ 56C181DE17C44D5E00406AE3 /* SDL_filesystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_filesystem.h; sourceTree = "<group>"; };
+ 56C181E117C44D7A00406AE3 /* SDL_sysfilesystem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_sysfilesystem.m; path = ../../src/filesystem/cocoa/SDL_sysfilesystem.m; sourceTree = "<group>"; };
56EA86F913E9EC2B002E47EB /* SDL_coreaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_coreaudio.c; path = coreaudio/SDL_coreaudio.c; sourceTree = "<group>"; };
56EA86FA13E9EC2B002E47EB /* SDL_coreaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_coreaudio.h; path = coreaudio/SDL_coreaudio.h; sourceTree = "<group>"; };
56ED04E0118A8EE200A56AA6 /* SDL_power.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_power.c; path = ../../src/power/SDL_power.c; sourceTree = SOURCE_ROOT; };
@@ -549,6 +553,14 @@
sourceTree = "<group>";
usesTabs = 0;
};
+ 56C181E017C44D6900406AE3 /* filesystem */ = {
+ isa = PBXGroup;
+ children = (
+ 56C181E117C44D7A00406AE3 /* SDL_sysfilesystem.m */,
+ );
+ name = filesystem;
+ sourceTree = "<group>";
+ };
56EA86F813E9EBF9002E47EB /* coreaudio */ = {
isa = PBXGroup;
children = (
@@ -677,6 +689,7 @@
AA7558701595D55500BBD41B /* SDL_endian.h */,
AA7558711595D55500BBD41B /* SDL_error.h */,
AA7558721595D55500BBD41B /* SDL_events.h */,
+ 56C181DE17C44D5E00406AE3 /* SDL_filesystem.h */,
AA0AD06416647BD400CE5896 /* SDL_gamecontroller.h */,
AA7558731595D55500BBD41B /* SDL_gesture.h */,
AA7558741595D55500BBD41B /* SDL_haptic.h */,
@@ -727,6 +740,7 @@
FD99B98A0DD52EDC00FB1D6B /* cpuinfo */,
FD99B98C0DD52EDC00FB1D6B /* events */,
FD99B99D0DD52EDC00FB1D6B /* file */,
+ 56C181E017C44D6900406AE3 /* filesystem */,
047677B60EA769DF008ABAF1 /* haptic */,
FD5F9D080E0E08B3008E885B /* joystick */,
FD8BD8150E27E25900B52CD5 /* loadso */,
@@ -1019,6 +1033,7 @@
AABCC3941640643D00AB8930 /* SDL_uikitmessagebox.h in Headers */,
AA0AD06516647BD400CE5896 /* SDL_gamecontroller.h in Headers */,
AADA5B8F16CCAB7C00107CF7 /* SDL_bits.h in Headers */,
+ 56C181DF17C44D5E00406AE3 /* SDL_filesystem.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1184,6 +1199,7 @@
AABCC3951640643D00AB8930 /* SDL_uikitmessagebox.m in Sources */,
AA0AD06216647BBB00CE5896 /* SDL_gamecontroller.c in Sources */,
AA0F8495178D5F1A00823F9D /* SDL_systls.c in Sources */,
+ 56C181E217C44D7A00406AE3 /* SDL_sysfilesystem.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist
index 0ab4b25..696ef99 100644
--- a/Xcode/SDL/Info-Framework.plist
+++ b/Xcode/SDL/Info-Framework.plist
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>http://www.libsdl.org</string>
<key>CFBundleIconFile</key>
@@ -17,12 +19,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>2.0.0</string>
+ <string>2.0.1</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
- <string>2.0.0</string>
- <key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
+ <string>2.0.1</string>
</dict>
</plist>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index 3757efd..9002cc6 100755
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -391,8 +391,10 @@
04F7805F12FB74A200FC43C0 /* SDL_drawpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7804712FB74A200FC43C0 /* SDL_drawpoint.h */; };
566CDE8F148F0AC200C5A9BB /* SDL_dropevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 566CDE8D148F0AC200C5A9BB /* SDL_dropevents_c.h */; };
566CDE90148F0AC200C5A9BB /* SDL_dropevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 566CDE8E148F0AC200C5A9BB /* SDL_dropevents.c */; };
+ 567E2F1C17C44BB2005F1892 /* SDL_sysfilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 567E2F1B17C44BB2005F1892 /* SDL_sysfilesystem.m */; };
+ 567E2F2117C44C35005F1892 /* SDL_filesystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 567E2F2017C44C35005F1892 /* SDL_filesystem.h */; settings = {ATTRIBUTES = (Public, ); }; };
A77E6EB4167AB0A90010E40B /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; settings = {ATTRIBUTES = (Public, ); }; };
- A77E6EB5167AB0A90010E40B /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; };
+ A77E6EB5167AB0A90010E40B /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA0AD09D16648D1700CE5896 /* SDL_gamecontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = BBFC088A164C6514003E6A99 /* SDL_gamecontroller.c */; };
AA0F8491178D5ECC00823F9D /* SDL_systls.c in Sources */ = {isa = PBXBuildFile; fileRef = AA0F8490178D5ECC00823F9D /* SDL_systls.c */; };
AA0F8492178D5ECC00823F9D /* SDL_systls.c in Sources */ = {isa = PBXBuildFile; fileRef = AA0F8490178D5ECC00823F9D /* SDL_systls.c */; };
@@ -407,105 +409,105 @@
AA628AD3159367F2005138DD /* SDL_x11xinput2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AD0159367F2005138DD /* SDL_x11xinput2.h */; };
AA628AD4159367F2005138DD /* SDL_x11xinput2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AD0159367F2005138DD /* SDL_x11xinput2.h */; };
AA7557FA1595D4D800BBD41B /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7557FB1595D4D800BBD41B /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; };
+ AA7557FB1595D4D800BBD41B /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7557FC1595D4D800BBD41B /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7557FD1595D4D800BBD41B /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; };
+ AA7557FD1595D4D800BBD41B /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7557FE1595D4D800BBD41B /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7557FF1595D4D800BBD41B /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; };
+ AA7557FF1595D4D800BBD41B /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558001595D4D800BBD41B /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558011595D4D800BBD41B /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; };
+ AA7558011595D4D800BBD41B /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558021595D4D800BBD41B /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558031595D4D800BBD41B /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; };
+ AA7558031595D4D800BBD41B /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558041595D4D800BBD41B /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558051595D4D800BBD41B /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; };
+ AA7558051595D4D800BBD41B /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558061595D4D800BBD41B /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558071595D4D800BBD41B /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; };
+ AA7558071595D4D800BBD41B /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558081595D4D800BBD41B /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558091595D4D800BBD41B /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; };
+ AA7558091595D4D800BBD41B /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75580A1595D4D800BBD41B /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75580B1595D4D800BBD41B /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; };
+ AA75580B1595D4D800BBD41B /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75580C1595D4D800BBD41B /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75580D1595D4D800BBD41B /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; };
+ AA75580D1595D4D800BBD41B /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75580E1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75580F1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; };
+ AA75580F1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558101595D4D800BBD41B /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558111595D4D800BBD41B /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; };
+ AA7558111595D4D800BBD41B /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558121595D4D800BBD41B /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558131595D4D800BBD41B /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; };
+ AA7558131595D4D800BBD41B /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558141595D4D800BBD41B /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558151595D4D800BBD41B /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; };
+ AA7558151595D4D800BBD41B /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558161595D4D800BBD41B /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558171595D4D800BBD41B /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; };
+ AA7558171595D4D800BBD41B /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558181595D4D800BBD41B /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558191595D4D800BBD41B /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; };
+ AA7558191595D4D800BBD41B /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75581A1595D4D800BBD41B /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75581B1595D4D800BBD41B /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; };
+ AA75581B1595D4D800BBD41B /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75581E1595D4D800BBD41B /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75581F1595D4D800BBD41B /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; };
+ AA75581F1595D4D800BBD41B /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558201595D4D800BBD41B /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558211595D4D800BBD41B /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; };
+ AA7558211595D4D800BBD41B /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558221595D4D800BBD41B /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558231595D4D800BBD41B /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; };
+ AA7558231595D4D800BBD41B /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558241595D4D800BBD41B /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558251595D4D800BBD41B /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; };
+ AA7558251595D4D800BBD41B /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558261595D4D800BBD41B /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558271595D4D800BBD41B /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; };
+ AA7558271595D4D800BBD41B /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558281595D4D800BBD41B /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558291595D4D800BBD41B /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; };
+ AA7558291595D4D800BBD41B /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75582A1595D4D800BBD41B /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75582B1595D4D800BBD41B /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; };
+ AA75582B1595D4D800BBD41B /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75582C1595D4D800BBD41B /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75582D1595D4D800BBD41B /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; };
+ AA75582D1595D4D800BBD41B /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75582E1595D4D800BBD41B /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75582F1595D4D800BBD41B /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; };
+ AA75582F1595D4D800BBD41B /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558301595D4D800BBD41B /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558311595D4D800BBD41B /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; };
+ AA7558311595D4D800BBD41B /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558321595D4D800BBD41B /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558331595D4D800BBD41B /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; };
+ AA7558331595D4D800BBD41B /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558341595D4D800BBD41B /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558351595D4D800BBD41B /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; };
+ AA7558351595D4D800BBD41B /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558361595D4D800BBD41B /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558371595D4D800BBD41B /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; };
+ AA7558371595D4D800BBD41B /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558381595D4D800BBD41B /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558391595D4D800BBD41B /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; };
+ AA7558391595D4D800BBD41B /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75583A1595D4D800BBD41B /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75583B1595D4D800BBD41B /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; };
+ AA75583B1595D4D800BBD41B /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75583C1595D4D800BBD41B /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75583D1595D4D800BBD41B /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; };
+ AA75583D1595D4D800BBD41B /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75583E1595D4D800BBD41B /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75583F1595D4D800BBD41B /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; };
+ AA75583F1595D4D800BBD41B /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558401595D4D800BBD41B /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558411595D4D800BBD41B /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; };
+ AA7558411595D4D800BBD41B /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558421595D4D800BBD41B /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558431595D4D800BBD41B /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; };
+ AA7558431595D4D800BBD41B /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558441595D4D800BBD41B /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558451595D4D800BBD41B /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; };
+ AA7558451595D4D800BBD41B /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558461595D4D800BBD41B /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558471595D4D800BBD41B /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; };
+ AA7558471595D4D800BBD41B /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558481595D4D800BBD41B /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558491595D4D800BBD41B /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; };
+ AA7558491595D4D800BBD41B /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75584A1595D4D800BBD41B /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75584B1595D4D800BBD41B /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; };
+ AA75584B1595D4D800BBD41B /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75584C1595D4D800BBD41B /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75584D1595D4D800BBD41B /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; };
+ AA75584D1595D4D800BBD41B /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75584E1595D4D800BBD41B /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75584F1595D4D800BBD41B /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; };
+ AA75584F1595D4D800BBD41B /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558501595D4D800BBD41B /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558511595D4D800BBD41B /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; };
+ AA7558511595D4D800BBD41B /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558521595D4D800BBD41B /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558531595D4D800BBD41B /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; };
+ AA7558531595D4D800BBD41B /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558541595D4D800BBD41B /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558551595D4D800BBD41B /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; };
+ AA7558551595D4D800BBD41B /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558561595D4D800BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558571595D4D800BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; };
+ AA7558571595D4D800BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA7558581595D4D800BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA7558591595D4D800BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; };
+ AA7558591595D4D800BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75585A1595D4D800BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75585B1595D4D800BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; };
+ AA75585B1595D4D800BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75585C1595D4D800BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75585D1595D4D800BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; };
+ AA75585D1595D4D800BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA75585E1595D4D800BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; settings = {ATTRIBUTES = (Public, ); }; };
- AA75585F1595D4D800BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; };
+ AA75585F1595D4D800BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; settings = {ATTRIBUTES = (Public, ); }; };
AA9E4093163BE51E007A2AD0 /* SDL_x11messagebox.c in Sources */ = {isa = PBXBuildFile; fileRef = AA9E4092163BE51E007A2AD0 /* SDL_x11messagebox.c */; };
AA9E4094163BE51E007A2AD0 /* SDL_x11messagebox.c in Sources */ = {isa = PBXBuildFile; fileRef = AA9E4092163BE51E007A2AD0 /* SDL_x11messagebox.c */; };
AA9FF95A1637CBF9000DF050 /* SDL_messagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9FF9591637CBF9000DF050 /* SDL_messagebox.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -513,8 +515,8 @@
AABCC38E164063D200AB8930 /* SDL_cocoamessagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AABCC38B164063D200AB8930 /* SDL_cocoamessagebox.h */; };
AABCC38F164063D200AB8930 /* SDL_cocoamessagebox.m in Sources */ = {isa = PBXBuildFile; fileRef = AABCC38C164063D200AB8930 /* SDL_cocoamessagebox.m */; };
AABCC390164063D200AB8930 /* SDL_cocoamessagebox.m in Sources */ = {isa = PBXBuildFile; fileRef = AABCC38C164063D200AB8930 /* SDL_cocoamessagebox.m */; };
- AADA5B8716CCAB3000107CF7 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; };
- AADA5B8816CCAB3000107CF7 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; };
+ AADA5B8716CCAB3000107CF7 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ AADA5B8816CCAB3000107CF7 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; settings = {ATTRIBUTES = (Public, ); }; };
BBFC088D164C6647003E6A99 /* SDL_gamecontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = BBFC088A164C6514003E6A99 /* SDL_gamecontroller.c */; };
D55A1B81179F262300625D7C /* SDL_cocoamousetap.h in Headers */ = {isa = PBXBuildFile; fileRef = D55A1B7F179F262300625D7C /* SDL_cocoamousetap.h */; };
D55A1B82179F262300625D7C /* SDL_cocoamousetap.m in Sources */ = {isa = PBXBuildFile; fileRef = D55A1B80179F262300625D7C /* SDL_cocoamousetap.m */; };
@@ -522,6 +524,12 @@
D55A1B84179F263600625D7C /* SDL_cocoamousetap.m in Sources */ = {isa = PBXBuildFile; fileRef = D55A1B80179F262300625D7C /* SDL_cocoamousetap.m */; };
D55A1B85179F278E00625D7C /* SDL_cocoamousetap.h in Headers */ = {isa = PBXBuildFile; fileRef = D55A1B7F179F262300625D7C /* SDL_cocoamousetap.h */; };
D55A1B86179F278F00625D7C /* SDL_cocoamousetap.h in Headers */ = {isa = PBXBuildFile; fileRef = D55A1B7F179F262300625D7C /* SDL_cocoamousetap.h */; };
+ DB0F489317C400E6008798C5 /* SDL_messagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9FF9591637CBF9000DF050 /* SDL_messagebox.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB0F489417C400ED008798C5 /* SDL_messagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9FF9591637CBF9000DF050 /* SDL_messagebox.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB0F490817CA5292008798C5 /* SDL_sysfilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 567E2F1B17C44BB2005F1892 /* SDL_sysfilesystem.m */; };
+ DB0F490A17CA5293008798C5 /* SDL_sysfilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 567E2F1B17C44BB2005F1892 /* SDL_sysfilesystem.m */; };
+ DB0F490B17CA57ED008798C5 /* SDL_filesystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 567E2F2017C44C35005F1892 /* SDL_filesystem.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB0F490C17CA57ED008798C5 /* SDL_filesystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 567E2F2017C44C35005F1892 /* SDL_filesystem.h */; settings = {ATTRIBUTES = (Public, ); }; };
DB313F7417554B71006C0E22 /* SDL_diskaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD8912E6671700899322 /* SDL_diskaudio.h */; };
DB313F7517554B71006C0E22 /* SDL_dummyaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD9512E6671700899322 /* SDL_dummyaudio.h */; };
DB313F7617554B71006C0E22 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDA112E6671700899322 /* SDL_coreaudio.h */; };
@@ -605,59 +613,59 @@
DB313FC517554B71006C0E22 /* SDL_shaders_gl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0435673D1303160F00BA5428 /* SDL_shaders_gl.h */; };
DB313FC617554B71006C0E22 /* SDL_rotate.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AC9159367B7005138DD /* SDL_rotate.h */; };
DB313FC717554B71006C0E22 /* SDL_x11xinput2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AD0159367F2005138DD /* SDL_x11xinput2.h */; };
- DB313FC817554B71006C0E22 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; };
- DB313FC917554B71006C0E22 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; };
- DB313FCA17554B71006C0E22 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; };
- DB313FCB17554B71006C0E22 /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; };
- DB313FCC17554B71006C0E22 /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; };
- DB313FCD17554B71006C0E22 /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; };
- DB313FCE17554B71006C0E22 /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; };
- DB313FCF17554B71006C0E22 /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; };
- DB313FD017554B71006C0E22 /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; };
- DB313FD117554B71006C0E22 /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; };
- DB313FD217554B71006C0E22 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; };
- DB313FD317554B71006C0E22 /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; };
- DB313FD417554B71006C0E22 /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; };
- DB313FD517554B71006C0E22 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; };
- DB313FD617554B71006C0E22 /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; };
- DB313FD717554B71006C0E22 /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; };
- DB313FD817554B71006C0E22 /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; };
- DB313FD917554B71006C0E22 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; };
- DB313FDA17554B71006C0E22 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; };
- DB313FDB17554B71006C0E22 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; };
- DB313FDC17554B71006C0E22 /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; };
- DB313FDD17554B71006C0E22 /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; };
- DB313FDE17554B71006C0E22 /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; };
- DB313FDF17554B71006C0E22 /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; };
- DB313FE017554B71006C0E22 /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; };
- DB313FE117554B71006C0E22 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; };
- DB313FE217554B71006C0E22 /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; };
- DB313FE317554B71006C0E22 /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; };
- DB313FE417554B71006C0E22 /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; };
- DB313FE517554B71006C0E22 /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; };
- DB313FE617554B71006C0E22 /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; };
- DB313FE717554B71006C0E22 /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; };
- DB313FE817554B71006C0E22 /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; };
- DB313FE917554B71006C0E22 /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; };
- DB313FEA17554B71006C0E22 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; };
- DB313FEB17554B71006C0E22 /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; };
- DB313FEC17554B71006C0E22 /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; };
- DB313FED17554B71006C0E22 /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; };
- DB313FEE17554B71006C0E22 /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; };
- DB313FEF17554B71006C0E22 /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; };
- DB313FF017554B71006C0E22 /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; };
- DB313FF117554B71006C0E22 /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; };
- DB313FF217554B71006C0E22 /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; };
- DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; };
- DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; };
- DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; };
- DB313FF617554B71006C0E22 /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; };
- DB313FF717554B71006C0E22 /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; };
- DB313FF817554B71006C0E22 /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; };
- DB313FF917554B71006C0E22 /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; };
+ DB313FC817554B71006C0E22 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FC917554B71006C0E22 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FCA17554B71006C0E22 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FCB17554B71006C0E22 /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FCC17554B71006C0E22 /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FCD17554B71006C0E22 /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FCE17554B71006C0E22 /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FCF17554B71006C0E22 /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD017554B71006C0E22 /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD117554B71006C0E22 /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD217554B71006C0E22 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD317554B71006C0E22 /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD417554B71006C0E22 /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD517554B71006C0E22 /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD617554B71006C0E22 /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD717554B71006C0E22 /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD817554B71006C0E22 /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FD917554B71006C0E22 /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FDA17554B71006C0E22 /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FDB17554B71006C0E22 /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FDC17554B71006C0E22 /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FDD17554B71006C0E22 /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FDE17554B71006C0E22 /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FDF17554B71006C0E22 /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE017554B71006C0E22 /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE117554B71006C0E22 /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE217554B71006C0E22 /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE317554B71006C0E22 /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE417554B71006C0E22 /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE517554B71006C0E22 /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE617554B71006C0E22 /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE717554B71006C0E22 /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE817554B71006C0E22 /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FE917554B71006C0E22 /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FEA17554B71006C0E22 /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FEB17554B71006C0E22 /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FEC17554B71006C0E22 /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FED17554B71006C0E22 /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FEE17554B71006C0E22 /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FEF17554B71006C0E22 /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF017554B71006C0E22 /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF117554B71006C0E22 /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF217554B71006C0E22 /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF617554B71006C0E22 /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF717554B71006C0E22 /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF817554B71006C0E22 /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FF917554B71006C0E22 /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; settings = {ATTRIBUTES = (Public, ); }; };
DB313FFA17554B71006C0E22 /* SDL_cocoamessagebox.h in Headers */ = {isa = PBXBuildFile; fileRef = AABCC38B164063D200AB8930 /* SDL_cocoamessagebox.h */; };
- DB313FFB17554B71006C0E22 /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; };
- DB313FFC17554B71006C0E22 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; };
+ DB313FFB17554B71006C0E22 /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ DB313FFC17554B71006C0E22 /* SDL_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = AADA5B8616CCAB3000107CF7 /* SDL_bits.h */; settings = {ATTRIBUTES = (Public, ); }; };
DB313FFE17554B71006C0E22 /* SDL_atomic.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD7412E6671700899322 /* SDL_atomic.c */; };
DB313FFF17554B71006C0E22 /* SDL_spinlock.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD7512E6671700899322 /* SDL_spinlock.c */; };
DB31400017554B71006C0E22 /* SDL_diskaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD8812E6671700899322 /* SDL_diskaudio.c */; };
@@ -984,6 +992,8 @@
04F7804712FB74A200FC43C0 /* SDL_drawpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_drawpoint.h; sourceTree = "<group>"; };
566CDE8D148F0AC200C5A9BB /* SDL_dropevents_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dropevents_c.h; sourceTree = "<group>"; };
566CDE8E148F0AC200C5A9BB /* SDL_dropevents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dropevents.c; sourceTree = "<group>"; };
+ 567E2F1B17C44BB2005F1892 /* SDL_sysfilesystem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_sysfilesystem.m; path = ../../src/filesystem/cocoa/SDL_sysfilesystem.m; sourceTree = "<group>"; };
+ 567E2F2017C44C35005F1892 /* SDL_filesystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_filesystem.h; sourceTree = "<group>"; };
A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gamecontroller.h; sourceTree = "<group>"; };
AA0F8490178D5ECC00823F9D /* SDL_systls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_systls.c; sourceTree = "<group>"; };
AA628AC8159367B7005138DD /* SDL_rotate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = "<group>"; };
@@ -1133,6 +1143,7 @@
AA7557D21595D4D800BBD41B /* SDL_endian.h */,
AA7557D31595D4D800BBD41B /* SDL_error.h */,
AA7557D41595D4D800BBD41B /* SDL_events.h */,
+ 567E2F2017C44C35005F1892 /* SDL_filesystem.h */,
A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */,
AA7557D51595D4D800BBD41B /* SDL_gesture.h */,
AA7557D61595D4D800BBD41B /* SDL_haptic.h */,
@@ -1641,6 +1652,7 @@
04BDFD7612E6671700899322 /* audio */,
04BDFDD312E6671700899322 /* cpuinfo */,
04BDFDD512E6671700899322 /* events */,
+ 567E2F1F17C44BBB005F1892 /* filesystem */,
04BDFDEC12E6671700899322 /* file */,
04BDFDF112E6671700899322 /* haptic */,
04BDFDFF12E6671700899322 /* joystick */,
@@ -1662,6 +1674,14 @@
name = "Library Source";
sourceTree = "<group>";
};
+ 567E2F1F17C44BBB005F1892 /* filesystem */ = {
+ isa = PBXGroup;
+ children = (
+ 567E2F1B17C44BB2005F1892 /* SDL_sysfilesystem.m */,
+ );
+ name = filesystem;
+ sourceTree = "<group>";
+ };
BEC562FE0761C0E800A33029 /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
@@ -1722,6 +1742,7 @@
AA7557FE1595D4D800BBD41B /* SDL_assert.h in Headers */,
AA7558001595D4D800BBD41B /* SDL_atomic.h in Headers */,
AA7558021595D4D800BBD41B /* SDL_audio.h in Headers */,
+ AADA5B8716CCAB3000107CF7 /* SDL_bits.h in Headers */,
AA7558041595D4D800BBD41B /* SDL_blendmode.h in Headers */,
AA7558061595D4D800BBD41B /* SDL_clipboard.h in Headers */,
AA7558081595D4D800BBD41B /* SDL_config_macosx.h in Headers */,
@@ -1731,6 +1752,7 @@
AA7558101595D4D800BBD41B /* SDL_endian.h in Headers */,
AA7558121595D4D800BBD41B /* SDL_error.h in Headers */,
AA7558141595D4D800BBD41B /* SDL_events.h in Headers */,
+ 567E2F2117C44C35005F1892 /* SDL_filesystem.h in Headers */,
A77E6EB4167AB0A90010E40B /* SDL_gamecontroller.h in Headers */,
AA7558161595D4D800BBD41B /* SDL_gesture.h in Headers */,
AA7558181595D4D800BBD41B /* SDL_haptic.h in Headers */,
@@ -1854,7 +1876,6 @@
AA628ACC159367B7005138DD /* SDL_rotate.h in Headers */,
AA628AD3159367F2005138DD /* SDL_x11xinput2.h in Headers */,
AABCC38D164063D200AB8930 /* SDL_cocoamessagebox.h in Headers */,
- AADA5B8716CCAB3000107CF7 /* SDL_bits.h in Headers */,
D55A1B81179F262300625D7C /* SDL_cocoamousetap.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1863,6 +1884,60 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ DB0F490B17CA57ED008798C5 /* SDL_filesystem.h in Headers */,
+ AA7557FB1595D4D800BBD41B /* begin_code.h in Headers */,
+ AA7557FD1595D4D800BBD41B /* close_code.h in Headers */,
+ AA75585F1595D4D800BBD41B /* SDL.h in Headers */,
+ AA7557FF1595D4D800BBD41B /* SDL_assert.h in Headers */,
+ AA7558011595D4D800BBD41B /* SDL_atomic.h in Headers */,
+ AA7558031595D4D800BBD41B /* SDL_audio.h in Headers */,
+ AADA5B8816CCAB3000107CF7 /* SDL_bits.h in Headers */,
+ AA7558051595D4D800BBD41B /* SDL_blendmode.h in Headers */,
+ AA7558071595D4D800BBD41B /* SDL_clipboard.h in Headers */,
+ AA75580B1595D4D800BBD41B /* SDL_config.h in Headers */,
+ AA7558091595D4D800BBD41B /* SDL_config_macosx.h in Headers */,
+ AA75580D1595D4D800BBD41B /* SDL_copying.h in Headers */,
+ AA75580F1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */,
+ AA7558111595D4D800BBD41B /* SDL_endian.h in Headers */,
+ AA7558131595D4D800BBD41B /* SDL_error.h in Headers */,
+ AA7558151595D4D800BBD41B /* SDL_events.h in Headers */,
+ A77E6EB5167AB0A90010E40B /* SDL_gamecontroller.h in Headers */,
+ AA7558171595D4D800BBD41B /* SDL_gesture.h in Headers */,
+ AA7558191595D4D800BBD41B /* SDL_haptic.h in Headers */,
+ AA75581B1595D4D800BBD41B /* SDL_hints.h in Headers */,
+ AA75581F1595D4D800BBD41B /* SDL_joystick.h in Headers */,
+ AA7558211595D4D800BBD41B /* SDL_keyboard.h in Headers */,
+ AA7558231595D4D800BBD41B /* SDL_keycode.h in Headers */,
+ AA7558251595D4D800BBD41B /* SDL_loadso.h in Headers */,
+ AA7558271595D4D800BBD41B /* SDL_log.h in Headers */,
+ AA7558291595D4D800BBD41B /* SDL_main.h in Headers */,
+ DB0F489417C400ED008798C5 /* SDL_messagebox.h in Headers */,
+ AA75582B1595D4D800BBD41B /* SDL_mouse.h in Headers */,
+ AA75582D1595D4D800BBD41B /* SDL_mutex.h in Headers */,
+ AA75582F1595D4D800BBD41B /* SDL_name.h in Headers */,
+ AA7558311595D4D800BBD41B /* SDL_opengl.h in Headers */,
+ AA7558331595D4D800BBD41B /* SDL_opengles.h in Headers */,
+ AA7558351595D4D800BBD41B /* SDL_opengles2.h in Headers */,
+ AA7558371595D4D800BBD41B /* SDL_pixels.h in Headers */,
+ AA7558391595D4D800BBD41B /* SDL_platform.h in Headers */,
+ AA75583B1595D4D800BBD41B /* SDL_power.h in Headers */,
+ AA75583D1595D4D800BBD41B /* SDL_quit.h in Headers */,
+ AA75583F1595D4D800BBD41B /* SDL_rect.h in Headers */,
+ AA7558411595D4D800BBD41B /* SDL_render.h in Headers */,
+ AA7558431595D4D800BBD41B /* SDL_revision.h in Headers */,
+ AA7558451595D4D800BBD41B /* SDL_rwops.h in Headers */,
+ AA7558471595D4D800BBD41B /* SDL_scancode.h in Headers */,
+ AA7558491595D4D800BBD41B /* SDL_shape.h in Headers */,
+ AA75584B1595D4D800BBD41B /* SDL_stdinc.h in Headers */,
+ AA75584D1595D4D800BBD41B /* SDL_surface.h in Headers */,
+ AA75584F1595D4D800BBD41B /* SDL_system.h in Headers */,
+ AA7558511595D4D800BBD41B /* SDL_syswm.h in Headers */,
+ AA7558531595D4D800BBD41B /* SDL_thread.h in Headers */,
+ AA7558551595D4D800BBD41B /* SDL_timer.h in Headers */,
+ AA7558571595D4D800BBD41B /* SDL_touch.h in Headers */,
+ AA7558591595D4D800BBD41B /* SDL_types.h in Headers */,
+ AA75585B1595D4D800BBD41B /* SDL_version.h in Headers */,
+ AA75585D1595D4D800BBD41B /* SDL_video.h in Headers */,
04BD022512E6671800899322 /* SDL_diskaudio.h in Headers */,
04BD022D12E6671800899322 /* SDL_dummyaudio.h in Headers */,
04BD023512E6671800899322 /* SDL_coreaudio.h in Headers */,
@@ -1946,59 +2021,7 @@
043567411303160F00BA5428 /* SDL_shaders_gl.h in Headers */,
AA628ACD159367B7005138DD /* SDL_rotate.h in Headers */,
AA628AD4159367F2005138DD /* SDL_x11xinput2.h in Headers */,
- AA7557FB1595D4D800BBD41B /* begin_code.h in Headers */,
- AA7557FD1595D4D800BBD41B /* close_code.h in Headers */,
- AA7557FF1595D4D800BBD41B /* SDL_assert.h in Headers */,
- AA7558011595D4D800BBD41B /* SDL_atomic.h in Headers */,
- AA7558031595D4D800BBD41B /* SDL_audio.h in Headers */,
- AA7558051595D4D800BBD41B /* SDL_blendmode.h in Headers */,
- AA7558071595D4D800BBD41B /* SDL_clipboard.h in Headers */,
- AA7558091595D4D800BBD41B /* SDL_config_macosx.h in Headers */,
- AA75580B1595D4D800BBD41B /* SDL_config.h in Headers */,
- AA75580D1595D4D800BBD41B /* SDL_copying.h in Headers */,
- AA75580F1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */,
- AA7558111595D4D800BBD41B /* SDL_endian.h in Headers */,
- AA7558131595D4D800BBD41B /* SDL_error.h in Headers */,
- AA7558151595D4D800BBD41B /* SDL_events.h in Headers */,
- AA7558171595D4D800BBD41B /* SDL_gesture.h in Headers */,
- AA7558191595D4D800BBD41B /* SDL_haptic.h in Headers */,
- AA75581B1595D4D800BBD41B /* SDL_hints.h in Headers */,
- AA75581F1595D4D800BBD41B /* SDL_joystick.h in Headers */,
- AA7558211595D4D800BBD41B /* SDL_keyboard.h in Headers */,
- AA7558231595D4D800BBD41B /* SDL_keycode.h in Headers */,
- AA7558251595D4D800BBD41B /* SDL_loadso.h in Headers */,
- AA7558271595D4D800BBD41B /* SDL_log.h in Headers */,
- AA7558291595D4D800BBD41B /* SDL_main.h in Headers */,
- AA75582B1595D4D800BBD41B /* SDL_mouse.h in Headers */,
- AA75582D1595D4D800BBD41B /* SDL_mutex.h in Headers */,
- AA75582F1595D4D800BBD41B /* SDL_name.h in Headers */,
- AA7558311595D4D800BBD41B /* SDL_opengl.h in Headers */,
- AA7558331595D4D800BBD41B /* SDL_opengles.h in Headers */,
- AA7558351595D4D800BBD41B /* SDL_opengles2.h in Headers */,
- AA7558371595D4D800BBD41B /* SDL_pixels.h in Headers */,
- AA7558391595D4D800BBD41B /* SDL_platform.h in Headers */,
- AA75583B1595D4D800BBD41B /* SDL_power.h in Headers */,
- AA75583D1595D4D800BBD41B /* SDL_quit.h in Headers */,
- AA75583F1595D4D800BBD41B /* SDL_rect.h in Headers */,
- AA7558411595D4D800BBD41B /* SDL_render.h in Headers */,
- AA7558431595D4D800BBD41B /* SDL_revision.h in Headers */,
- AA7558451595D4D800BBD41B /* SDL_rwops.h in Headers */,
- AA7558471595D4D800BBD41B /* SDL_scancode.h in Headers */,
- AA7558491595D4D800BBD41B /* SDL_shape.h in Headers */,
- AA75584B1595D4D800BBD41B /* SDL_stdinc.h in Headers */,
- AA75584D1595D4D800BBD41B /* SDL_surface.h in Headers */,
- AA75584F1595D4D800BBD41B /* SDL_system.h in Headers */,
- AA7558511595D4D800BBD41B /* SDL_syswm.h in Headers */,
- AA7558531595D4D800BBD41B /* SDL_thread.h in Headers */,
- AA7558551595D4D800BBD41B /* SDL_timer.h in Headers */,
- AA7558571595D4D800BBD41B /* SDL_touch.h in Headers */,
- AA7558591595D4D800BBD41B /* SDL_types.h in Headers */,
- AA75585B1595D4D800BBD41B /* SDL_version.h in Headers */,
- AA75585D1595D4D800BBD41B /* SDL_video.h in Headers */,
- AA75585F1595D4D800BBD41B /* SDL.h in Headers */,
AABCC38E164063D200AB8930 /* SDL_cocoamessagebox.h in Headers */,
- A77E6EB5167AB0A90010E40B /* SDL_gamecontroller.h in Headers */,
- AADA5B8816CCAB3000107CF7 /* SDL_bits.h in Headers */,
D55A1B85179F278E00625D7C /* SDL_cocoamousetap.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -2007,6 +2030,60 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ DB0F490C17CA57ED008798C5 /* SDL_filesystem.h in Headers */,
+ DB313FC817554B71006C0E22 /* begin_code.h in Headers */,
+ DB313FC917554B71006C0E22 /* close_code.h in Headers */,
+ DB313FF917554B71006C0E22 /* SDL.h in Headers */,
+ DB313FCA17554B71006C0E22 /* SDL_assert.h in Headers */,
+ DB313FCB17554B71006C0E22 /* SDL_atomic.h in Headers */,
+ DB313FCC17554B71006C0E22 /* SDL_audio.h in Headers */,
+ DB313FFC17554B71006C0E22 /* SDL_bits.h in Headers */,
+ DB313FCD17554B71006C0E22 /* SDL_blendmode.h in Headers */,
+ DB313FCE17554B71006C0E22 /* SDL_clipboard.h in Headers */,
+ DB313FD017554B71006C0E22 /* SDL_config.h in Headers */,
+ DB313FCF17554B71006C0E22 /* SDL_config_macosx.h in Headers */,
+ DB313FD117554B71006C0E22 /* SDL_copying.h in Headers */,
+ DB313FD217554B71006C0E22 /* SDL_cpuinfo.h in Headers */,
+ DB313FD317554B71006C0E22 /* SDL_endian.h in Headers */,
+ DB313FD417554B71006C0E22 /* SDL_error.h in Headers */,
+ DB313FD517554B71006C0E22 /* SDL_events.h in Headers */,
+ DB313FFB17554B71006C0E22 /* SDL_gamecontroller.h in Headers */,
+ DB313FD617554B71006C0E22 /* SDL_gesture.h in Headers */,
+ DB313FD717554B71006C0E22 /* SDL_haptic.h in Headers */,
+ DB313FD817554B71006C0E22 /* SDL_hints.h in Headers */,
+ DB313FD917554B71006C0E22 /* SDL_joystick.h in Headers */,
+ DB313FDA17554B71006C0E22 /* SDL_keyboard.h in Headers */,
+ DB313FDB17554B71006C0E22 /* SDL_keycode.h in Headers */,
+ DB313FDC17554B71006C0E22 /* SDL_loadso.h in Headers */,
+ DB313FDD17554B71006C0E22 /* SDL_log.h in Headers */,
+ DB313FDE17554B71006C0E22 /* SDL_main.h in Headers */,
+ DB0F489317C400E6008798C5 /* SDL_messagebox.h in Headers */,
+ DB313FDF17554B71006C0E22 /* SDL_mouse.h in Headers */,
+ DB313FE017554B71006C0E22 /* SDL_mutex.h in Headers */,
+ DB313FE117554B71006C0E22 /* SDL_name.h in Headers */,
+ DB313FE217554B71006C0E22 /* SDL_opengl.h in Headers */,
+ DB313FE317554B71006C0E22 /* SDL_opengles.h in Headers */,
+ DB313FE417554B71006C0E22 /* SDL_opengles2.h in Headers */,
+ DB313FE517554B71006C0E22 /* SDL_pixels.h in Headers */,
+ DB313FE617554B71006C0E22 /* SDL_platform.h in Headers */,
+ DB313FE717554B71006C0E22 /* SDL_power.h in Headers */,
+ DB313FE817554B71006C0E22 /* SDL_quit.h in Headers */,
+ DB313FE917554B71006C0E22 /* SDL_rect.h in Headers */,
+ DB313FEA17554B71006C0E22 /* SDL_render.h in Headers */,
+ DB313FEB17554B71006C0E22 /* SDL_revision.h in Headers */,
+ DB313FEC17554B71006C0E22 /* SDL_rwops.h in Headers */,
+ DB313FED17554B71006C0E22 /* SDL_scancode.h in Headers */,
+ DB313FEE17554B71006C0E22 /* SDL_shape.h in Headers */,
+ DB313FEF17554B71006C0E22 /* SDL_stdinc.h in Headers */,
+ DB313FF017554B71006C0E22 /* SDL_surface.h in Headers */,
+ DB313FF117554B71006C0E22 /* SDL_system.h in Headers */,
+ DB313FF217554B71006C0E22 /* SDL_syswm.h in Headers */,
+ DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */,
+ DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */,
+ DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */,
+ DB313FF617554B71006C0E22 /* SDL_types.h in Headers */,
+ DB313FF717554B71006C0E22 /* SDL_version.h in Headers */,
+ DB313FF817554B71006C0E22 /* SDL_video.h in Headers */,
DB313F7417554B71006C0E22 /* SDL_diskaudio.h in Headers */,
DB313F7517554B71006C0E22 /* SDL_dummyaudio.h in Headers */,
DB313F7617554B71006C0E22 /* SDL_coreaudio.h in Headers */,
@@ -2090,59 +2167,7 @@
DB313FC517554B71006C0E22 /* SDL_shaders_gl.h in Headers */,
DB313FC617554B71006C0E22 /* SDL_rotate.h in Headers */,
DB313FC717554B71006C0E22 /* SDL_x11xinput2.h in Headers */,
- DB313FC817554B71006C0E22 /* begin_code.h in Headers */,
- DB313FC917554B71006C0E22 /* close_code.h in Headers */,
- DB313FCA17554B71006C0E22 /* SDL_assert.h in Headers */,
- DB313FCB17554B71006C0E22 /* SDL_atomic.h in Headers */,
- DB313FCC17554B71006C0E22 /* SDL_audio.h in Headers */,
- DB313FCD17554B71006C0E22 /* SDL_blendmode.h in Headers */,
- DB313FCE17554B71006C0E22 /* SDL_clipboard.h in Headers */,
- DB313FCF17554B71006C0E22 /* SDL_config_macosx.h in Headers */,
- DB313FD017554B71006C0E22 /* SDL_config.h in Headers */,
- DB313FD117554B71006C0E22 /* SDL_copying.h in Headers */,
- DB313FD217554B71006C0E22 /* SDL_cpuinfo.h in Headers */,
- DB313FD317554B71006C0E22 /* SDL_endian.h in Headers */,
- DB313FD417554B71006C0E22 /* SDL_error.h in Headers */,
- DB313FD517554B71006C0E22 /* SDL_events.h in Headers */,
- DB313FD617554B71006C0E22 /* SDL_gesture.h in Headers */,
- DB313FD717554B71006C0E22 /* SDL_haptic.h in Headers */,
- DB313FD817554B71006C0E22 /* SDL_hints.h in Headers */,
- DB313FD917554B71006C0E22 /* SDL_joystick.h in Headers */,
- DB313FDA17554B71006C0E22 /* SDL_keyboard.h in Headers */,
- DB313FDB17554B71006C0E22 /* SDL_keycode.h in Headers */,
- DB313FDC17554B71006C0E22 /* SDL_loadso.h in Headers */,
- DB313FDD17554B71006C0E22 /* SDL_log.h in Headers */,
- DB313FDE17554B71006C0E22 /* SDL_main.h in Headers */,
- DB313FDF17554B71006C0E22 /* SDL_mouse.h in Headers */,
- DB313FE017554B71006C0E22 /* SDL_mutex.h in Headers */,
- DB313FE117554B71006C0E22 /* SDL_name.h in Headers */,
- DB313FE217554B71006C0E22 /* SDL_opengl.h in Headers */,
- DB313FE317554B71006C0E22 /* SDL_opengles.h in Headers */,
- DB313FE417554B71006C0E22 /* SDL_opengles2.h in Headers */,
- DB313FE517554B71006C0E22 /* SDL_pixels.h in Headers */,
- DB313FE617554B71006C0E22 /* SDL_platform.h in Headers */,
- DB313FE717554B71006C0E22 /* SDL_power.h in Headers */,
- DB313FE817554B71006C0E22 /* SDL_quit.h in Headers */,
- DB313FE917554B71006C0E22 /* SDL_rect.h in Headers */,
- DB313FEA17554B71006C0E22 /* SDL_render.h in Headers */,
- DB313FEB17554B71006C0E22 /* SDL_revision.h in Headers */,
- DB313FEC17554B71006C0E22 /* SDL_rwops.h in Headers */,
- DB313FED17554B71006C0E22 /* SDL_scancode.h in Headers */,
- DB313FEE17554B71006C0E22 /* SDL_shape.h in Headers */,
- DB313FEF17554B71006C0E22 /* SDL_stdinc.h in Headers */,
- DB313FF017554B71006C0E22 /* SDL_surface.h in Headers */,
- DB313FF117554B71006C0E22 /* SDL_system.h in Headers */,
- DB313FF217554B71006C0E22 /* SDL_syswm.h in Headers */,
- DB313FF317554B71006C0E22 /* SDL_thread.h in Headers */,
- DB313FF417554B71006C0E22 /* SDL_timer.h in Headers */,
- DB313FF517554B71006C0E22 /* SDL_touch.h in Headers */,
- DB313FF617554B71006C0E22 /* SDL_types.h in Headers */,
- DB313FF717554B71006C0E22 /* SDL_version.h in Headers */,
- DB313FF817554B71006C0E22 /* SDL_video.h in Headers */,
- DB313FF917554B71006C0E22 /* SDL.h in Headers */,
DB313FFA17554B71006C0E22 /* SDL_cocoamessagebox.h in Headers */,
- DB313FFB17554B71006C0E22 /* SDL_gamecontroller.h in Headers */,
- DB313FFC17554B71006C0E22 /* SDL_bits.h in Headers */,
D55A1B86179F278F00625D7C /* SDL_cocoamousetap.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -2427,6 +2452,7 @@
AA0AD09D16648D1700CE5896 /* SDL_gamecontroller.c in Sources */,
AA0F8491178D5ECC00823F9D /* SDL_systls.c in Sources */,
D55A1B82179F262300625D7C /* SDL_cocoamousetap.m in Sources */,
+ 567E2F1C17C44BB2005F1892 /* SDL_sysfilesystem.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2544,6 +2570,7 @@
AABCC390164063D200AB8930 /* SDL_cocoamessagebox.m in Sources */,
AA0F8492178D5ECC00823F9D /* SDL_systls.c in Sources */,
D55A1B84179F263600625D7C /* SDL_cocoamousetap.m in Sources */,
+ DB0F490817CA5292008798C5 /* SDL_sysfilesystem.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2661,6 +2688,7 @@
DB31406A17554B71006C0E22 /* SDL_cocoamessagebox.m in Sources */,
AA0F8493178D5ECC00823F9D /* SDL_systls.c in Sources */,
D55A1B83179F263500625D7C /* SDL_cocoamousetap.m in Sources */,
+ DB0F490A17CA5293008798C5 /* SDL_sysfilesystem.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
index bb4714d..152c3d2 100755
--- a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
+++ b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
@@ -13,6 +13,8 @@
buildPhases = (
);
dependencies = (
+ DB0F490517CA5249008798C5 /* PBXTargetDependency */,
+ DB0F490717CA5249008798C5 /* PBXTargetDependency */,
DB166E9816A1D7CF00A1396C /* PBXTargetDependency */,
DB166E9616A1D7CD00A1396C /* PBXTargetDependency */,
DB166E6C16A1D72000A1396C /* PBXTargetDependency */,
@@ -397,6 +399,28 @@
BEC567930761D90500A33029 /* testtimer.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4880006D86A17F000001 /* testtimer.c */; };
BEC567AD0761D90500A33029 /* testver.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4882006D86A17F000001 /* testver.c */; };
BEC567F00761D90600A33029 /* torturethread.c in Sources */ = {isa = PBXBuildFile; fileRef = 083E4887006D86A17F000001 /* torturethread.c */; };
+ DB0F48DD17CA51E5008798C5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
+ DB0F48DE17CA51E5008798C5 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863B10730545007319AE /* CoreAudio.framework */; };
+ DB0F48DF17CA51E5008798C5 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863C10730545007319AE /* ForceFeedback.framework */; };
+ DB0F48E017CA51E5008798C5 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; };
+ DB0F48E117CA51E5008798C5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; };
+ DB0F48E217CA51E5008798C5 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; };
+ DB0F48E317CA51E5008798C5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; };
+ DB0F48E417CA51E5008798C5 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; };
+ DB0F48E517CA51E5008798C5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; };
+ DB0F48E617CA51E5008798C5 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; };
+ DB0F48EE17CA51F8008798C5 /* testdrawchessboard.c in Sources */ = {isa = PBXBuildFile; fileRef = DB0F48D717CA51D2008798C5 /* testdrawchessboard.c */; };
+ DB0F48F317CA5212008798C5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F33A709CA188600EBEB88 /* Cocoa.framework */; };
+ DB0F48F417CA5212008798C5 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863B10730545007319AE /* CoreAudio.framework */; };
+ DB0F48F517CA5212008798C5 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863C10730545007319AE /* ForceFeedback.framework */; };
+ DB0F48F617CA5212008798C5 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A863D10730545007319AE /* IOKit.framework */; };
+ DB0F48F717CA5212008798C5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; };
+ DB0F48F817CA5212008798C5 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86A010730593007319AE /* CoreFoundation.framework */; };
+ DB0F48F917CA5212008798C5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A86F2107305CE007319AE /* OpenGL.framework */; };
+ DB0F48FA17CA5212008798C5 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; };
+ DB0F48FB17CA5212008798C5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; };
+ DB0F48FC17CA5212008798C5 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA645093FFD41000C53B3 /* libSDL2.a */; };
+ DB0F490317CA5225008798C5 /* testfilesystem.c in Sources */ = {isa = PBXBuildFile; fileRef = DB0F48D817CA51D2008798C5 /* testfilesystem.c */; };
DB166D7116A1CFB200A1396C /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A869F10730593007319AE /* AudioToolbox.framework */; };
DB166D7216A1CFB200A1396C /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A871410730623007319AE /* AudioUnit.framework */; };
DB166D7316A1CFB200A1396C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002A873910730675007319AE /* Carbon.framework */; };
@@ -780,6 +804,20 @@
remoteGlobalIDString = BECDF6BE0761BA81005FE872;
remoteInfo = "Standard DMG";
};
+ DB0F490417CA5249008798C5 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = DB0F48D917CA51E5008798C5;
+ remoteInfo = testdrawchessboard;
+ };
+ DB0F490617CA5249008798C5 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = DB0F48EF17CA5212008798C5;
+ remoteInfo = testfilesystem;
+ };
DB166D6D16A1CEAA00A1396C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -904,6 +942,24 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ DB0F48E717CA51E5008798C5 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 16;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ DB0F48FD17CA5212008798C5 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 16;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
DB166DDA16A1D40F00A1396C /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -1061,6 +1117,10 @@
BEC567980761D90500A33029 /* testtimer */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testtimer; sourceTree = BUILT_PRODUCTS_DIR; };
BEC567B20761D90500A33029 /* testversion */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = testversion; sourceTree = BUILT_PRODUCTS_DIR; };
BEC567F50761D90600A33029 /* torturethread */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = text; path = torturethread; sourceTree = BUILT_PRODUCTS_DIR; };
+ DB0F48D717CA51D2008798C5 /* testdrawchessboard.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = testdrawchessboard.c; path = ../../test/testdrawchessboard.c; sourceTree = "<group>"; };
+ DB0F48D817CA51D2008798C5 /* testfilesystem.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = testfilesystem.c; path = ../../test/testfilesystem.c; sourceTree = "<group>"; };
+ DB0F48EC17CA51E5008798C5 /* testdrawchessboard */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testdrawchessboard; sourceTree = BUILT_PRODUCTS_DIR; };
+ DB0F490117CA5212008798C5 /* testfilesystem */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testfilesystem; sourceTree = BUILT_PRODUCTS_DIR; };
DB166CBB16A1C74100A1396C /* testgesture.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = testgesture.c; path = ../../test/testgesture.c; sourceTree = "<group>"; };
DB166CBC16A1C74100A1396C /* testgles.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = testgles.c; path = ../../test/testgles.c; sourceTree = "<group>"; };
DB166CBD16A1C74100A1396C /* testmessage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = testmessage.c; path = ../../test/testmessage.c; sourceTree = "<group>"; };
@@ -1636,6 +1696,40 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ DB0F48DC17CA51E5008798C5 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DB0F48DD17CA51E5008798C5 /* Cocoa.framework in Frameworks */,
+ DB0F48DE17CA51E5008798C5 /* CoreAudio.framework in Frameworks */,
+ DB0F48DF17CA51E5008798C5 /* ForceFeedback.framework in Frameworks */,
+ DB0F48E017CA51E5008798C5 /* IOKit.framework in Frameworks */,
+ DB0F48E117CA51E5008798C5 /* AudioToolbox.framework in Frameworks */,
+ DB0F48E217CA51E5008798C5 /* CoreFoundation.framework in Frameworks */,
+ DB0F48E317CA51E5008798C5 /* OpenGL.framework in Frameworks */,
+ DB0F48E417CA51E5008798C5 /* AudioUnit.framework in Frameworks */,
+ DB0F48E517CA51E5008798C5 /* Carbon.framework in Frameworks */,
+ DB0F48E617CA51E5008798C5 /* libSDL2.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ DB0F48F217CA5212008798C5 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DB0F48F317CA5212008798C5 /* Cocoa.framework in Frameworks */,
+ DB0F48F417CA5212008798C5 /* CoreAudio.framework in Frameworks */,
+ DB0F48F517CA5212008798C5 /* ForceFeedback.framework in Frameworks */,
+ DB0F48F617CA5212008798C5 /* IOKit.framework in Frameworks */,
+ DB0F48F717CA5212008798C5 /* AudioToolbox.framework in Frameworks */,
+ DB0F48F817CA5212008798C5 /* CoreFoundation.framework in Frameworks */,
+ DB0F48F917CA5212008798C5 /* OpenGL.framework in Frameworks */,
+ DB0F48FA17CA5212008798C5 /* AudioUnit.framework in Frameworks */,
+ DB0F48FB17CA5212008798C5 /* Carbon.framework in Frameworks */,
+ DB0F48FC17CA5212008798C5 /* libSDL2.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
DB166D7C16A1D12400A1396C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -1883,8 +1977,10 @@
0017958F1074216E00F5D044 /* testatomic.c */,
001795B01074222D00F5D044 /* testaudioinfo.c */,
001797711074320D00F5D044 /* testdraw2.c */,
+ DB0F48D717CA51D2008798C5 /* testdrawchessboard.c */,
083E4878006D85357F000001 /* testerror.c */,
002F341709CA1C5B00EBEB88 /* testfile.c */,
+ DB0F48D817CA51D2008798C5 /* testfilesystem.c */,
BBFC088E164C6820003E6A99 /* testgamecontroller.c */,
DB166CBB16A1C74100A1396C /* testgesture.c */,
0017972710742FB900F5D044 /* testgl2.c */,
@@ -1972,6 +2068,8 @@
DB166E6816A1D6F300A1396C /* testshader */,
DB166E7E16A1D78400A1396C /* testspriteminimal */,
DB166E9116A1D78C00A1396C /* teststreaming */,
+ DB0F48EC17CA51E5008798C5 /* testdrawchessboard */,
+ DB0F490117CA5212008798C5 /* testfilesystem */,
);
name = Products;
sourceTree = "<group>";
@@ -2512,6 +2610,40 @@
productReference = BEC567F50761D90600A33029 /* torturethread */;
productType = "com.apple.product-type.tool";
};
+ DB0F48D917CA51E5008798C5 /* testdrawchessboard */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = DB0F48E917CA51E5008798C5 /* Build configuration list for PBXNativeTarget "testdrawchessboard" */;
+ buildPhases = (
+ DB0F48DA17CA51E5008798C5 /* Sources */,
+ DB0F48DC17CA51E5008798C5 /* Frameworks */,
+ DB0F48E717CA51E5008798C5 /* CopyFiles */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = testdrawchessboard;
+ productName = testalpha;
+ productReference = DB0F48EC17CA51E5008798C5 /* testdrawchessboard */;
+ productType = "com.apple.product-type.tool";
+ };
+ DB0F48EF17CA5212008798C5 /* testfilesystem */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = DB0F48FE17CA5212008798C5 /* Build configuration list for PBXNativeTarget "testfilesystem" */;
+ buildPhases = (
+ DB0F48F017CA5212008798C5 /* Sources */,
+ DB0F48F217CA5212008798C5 /* Frameworks */,
+ DB0F48FD17CA5212008798C5 /* CopyFiles */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = testfilesystem;
+ productName = testalpha;
+ productReference = DB0F490117CA5212008798C5 /* testfilesystem */;
+ productType = "com.apple.product-type.tool";
+ };
DB166D7E16A1D12400A1396C /* SDL_test */ = {
isa = PBXNativeTarget;
buildConfigurationList = DB166D8016A1D12400A1396C /* Build configuration list for PBXNativeTarget "SDL_test" */;
@@ -2730,8 +2862,10 @@
0017957410741F7900F5D044 /* testatomic */,
00179595107421BF00F5D044 /* testaudioinfo */,
00179756107431B300F5D044 /* testdraw2 */,
+ DB0F48D917CA51E5008798C5 /* testdrawchessboard */,
BEC566FB0761D90300A33029 /* testerror */,
002F340109CA1BFF00EBEB88 /* testfile */,
+ DB0F48EF17CA5212008798C5 /* testfilesystem */,
BBFC08B7164C6862003E6A99 /* testgamecontroller */,
DB166DAD16A1D2F600A1396C /* testgesture */,
0017970910742F3200F5D044 /* testgl2 */,
@@ -3052,6 +3186,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ DB0F48DA17CA51E5008798C5 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DB0F48EE17CA51F8008798C5 /* testdrawchessboard.c in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ DB0F48F017CA5212008798C5 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DB0F490317CA5225008798C5 /* testfilesystem.c in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
DB166D7B16A1D12400A1396C /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -3302,6 +3452,16 @@
target = BEC567EA0761D90600A33029 /* torturethread */;
targetProxy = 001799A11074403E00F5D044 /* PBXContainerItemProxy */;
};
+ DB0F490517CA5249008798C5 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = DB0F48D917CA51E5008798C5 /* testdrawchessboard */;
+ targetProxy = DB0F490417CA5249008798C5 /* PBXContainerItemProxy */;
+ };
+ DB0F490717CA5249008798C5 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = DB0F48EF17CA5212008798C5 /* testfilesystem */;
+ targetProxy = DB0F490617CA5249008798C5 /* PBXContainerItemProxy */;
+ };
DB166D6E16A1CEAA00A1396C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BBFC08B7164C6862003E6A99 /* testgamecontroller */;
@@ -3845,6 +4005,34 @@
};
name = Release;
};
+ DB0F48EA17CA51E5008798C5 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = testdrawchessboard;
+ };
+ name = Debug;
+ };
+ DB0F48EB17CA51E5008798C5 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = testdrawchessboard;
+ };
+ name = Release;
+ };
+ DB0F48FF17CA5212008798C5 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = testfilesystem;
+ };
+ name = Debug;
+ };
+ DB0F490017CA5212008798C5 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = testfilesystem;
+ };
+ name = Release;
+ };
DB166D8116A1D12400A1396C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -4301,6 +4489,24 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
+ DB0F48E917CA51E5008798C5 /* Build configuration list for PBXNativeTarget "testdrawchessboard" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ DB0F48EA17CA51E5008798C5 /* Debug */,
+ DB0F48EB17CA51E5008798C5 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
+ DB0F48FE17CA5212008798C5 /* Build configuration list for PBXNativeTarget "testfilesystem" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ DB0F48FF17CA5212008798C5 /* Debug */,
+ DB0F490017CA5212008798C5 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
DB166D8016A1D12400A1396C /* Build configuration list for PBXNativeTarget "SDL_test" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/android-project/jni/src/Android_static.mk b/android-project/jni/src/Android_static.mk
new file mode 100644
index 0000000..faed669
--- /dev/null
+++ b/android-project/jni/src/Android_static.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := main
+
+LOCAL_SRC_FILES := YourSourceHere.c
+
+LOCAL_STATIC_LIBRARIES := SDL2_static
+
+include $(BUILD_SHARED_LIBRARY)
+$(call import-module,SDL)LOCAL_PATH := $(call my-dir)
diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index ed6f4ef..49b014c 100644
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -1,10 +1,6 @@
package org.libsdl.app;
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-import javax.microedition.khronos.egl.EGLSurface;
+import java.util.Arrays;
import android.app.*;
import android.content.*;
@@ -43,13 +39,6 @@ public class SDLActivity extends Activity {
protected static Thread mAudioThread;
protected static AudioTrack mAudioTrack;
- // EGL objects
- protected static EGLContext mEGLContext;
- protected static EGLSurface mEGLSurface;
- protected static EGLDisplay mEGLDisplay;
- protected static EGLConfig mEGLConfig;
- protected static int mGLMajor, mGLMinor;
-
// Load the .so
static {
System.loadLibrary("SDL2");
@@ -70,9 +59,7 @@ public class SDLActivity extends Activity {
mSingleton = this;
// Set up the surface
- mEGLSurface = EGL10.EGL_NO_SURFACE;
mSurface = new SDLSurface(getApplication());
- mEGLContext = EGL10.EGL_NO_CONTEXT;
mLayout = new AbsoluteLayout(this);
mLayout.addView(mSurface);
@@ -137,9 +124,13 @@ public class SDLActivity extends Activity {
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
int keyCode = event.getKeyCode();
- // Ignore volume keys so they're handled by Android
+ // Ignore certain special keys so they're handled by Android
if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
- keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+ keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+ keyCode == KeyEvent.KEYCODE_CAMERA ||
+ keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
+ keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
+ ) {
return false;
}
return super.dispatchKeyEvent(event);
@@ -252,29 +243,12 @@ public class SDLActivity extends Activity {
int action, float x,
float y, float p);
public static native void onNativeAccel(float x, float y, float z);
-
- // Java functions called from C
-
- public static boolean createGLContext(int majorVersion, int minorVersion, int[] attribs) {
- return initEGL(majorVersion, minorVersion, attribs);
- }
-
- public static void deleteGLContext() {
- if (SDLActivity.mEGLDisplay != null && SDLActivity.mEGLContext != EGL10.EGL_NO_CONTEXT) {
- EGL10 egl = (EGL10)EGLContext.getEGL();
- egl.eglMakeCurrent(SDLActivity.mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
- egl.eglDestroyContext(SDLActivity.mEGLDisplay, SDLActivity.mEGLContext);
- SDLActivity.mEGLContext = EGL10.EGL_NO_CONTEXT;
-
- if (SDLActivity.mEGLSurface != EGL10.EGL_NO_SURFACE) {
- egl.eglDestroySurface(SDLActivity.mEGLDisplay, SDLActivity.mEGLSurface);
- SDLActivity.mEGLSurface = EGL10.EGL_NO_SURFACE;
- }
- }
- }
+ public static native void onNativeSurfaceChanged();
+ public static native void onNativeSurfaceDestroyed();
+ public static native void nativeFlipBuffers();
public static void flipBuffers() {
- flipEGL();
+ SDLActivity.nativeFlipBuffers();
}
public static boolean setActivityTitle(String title) {
@@ -332,147 +306,9 @@ public class SDLActivity extends Activity {
// Transfer the task to the main thread as a Runnable
return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
}
-
-
- // EGL functions
- public static boolean initEGL(int majorVersion, int minorVersion, int[] attribs) {
- try {
- EGL10 egl = (EGL10)EGLContext.getEGL();
-
- if (SDLActivity.mEGLDisplay == null) {
- SDLActivity.mEGLDisplay = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
- int[] version = new int[2];
- egl.eglInitialize(SDLActivity.mEGLDisplay, version);
- }
-
- if (SDLActivity.mEGLDisplay != null && SDLActivity.mEGLContext == EGL10.EGL_NO_CONTEXT) {
- // No current GL context exists, we will create a new one.
- Log.v("SDL", "Starting up OpenGL ES " + majorVersion + "." + minorVersion);
- EGLConfig[] configs = new EGLConfig[128];
- int[] num_config = new int[1];
- if (!egl.eglChooseConfig(SDLActivity.mEGLDisplay, attribs, configs, 1, num_config) || num_config[0] == 0) {
- Log.e("SDL", "No EGL config available");
- return false;
- }
- EGLConfig config = null;
- int bestdiff = -1, bitdiff;
- int[] value = new int[1];
-
- // eglChooseConfig returns a number of configurations that match or exceed the requested attribs.
- // From those, we select the one that matches our requirements more closely
- Log.v("SDL", "Got " + num_config[0] + " valid modes from egl");
- for(int i = 0; i < num_config[0]; i++) {
- bitdiff = 0;
- // Go through some of the attributes and compute the bit difference between what we want and what we get.
- for (int j = 0; ; j += 2) {
- if (attribs[j] == EGL10.EGL_NONE)
- break;
-
- if (attribs[j+1] != EGL10.EGL_DONT_CARE && (attribs[j] == EGL10.EGL_RED_SIZE ||
- attribs[j] == EGL10.EGL_GREEN_SIZE ||
- attribs[j] == EGL10.EGL_BLUE_SIZE ||
- attribs[j] == EGL10.EGL_ALPHA_SIZE ||
- attribs[j] == EGL10.EGL_DEPTH_SIZE ||
- attribs[j] == EGL10.EGL_STENCIL_SIZE)) {
- egl.eglGetConfigAttrib(SDLActivity.mEGLDisplay, configs[i], attribs[j], value);
- bitdiff += value[0] - attribs[j + 1]; // value is always >= attrib
- }
- }
-
- if (bitdiff < bestdiff || bestdiff == -1) {
- config = configs[i];
- bestdiff = bitdiff;
- }
-
- if (bitdiff == 0) break; // we found an exact match!
- }
-
- Log.d("SDL", "Selected mode with a total bit difference of " + bestdiff);
-
- SDLActivity.mEGLConfig = config;
- SDLActivity.mGLMajor = majorVersion;
- SDLActivity.mGLMinor = minorVersion;
- }
- return SDLActivity.createEGLSurface();
-
- } catch(Exception e) {
- Log.v("SDL", e + "");
- for (StackTraceElement s : e.getStackTrace()) {
- Log.v("SDL", s.toString());
- }
- return false;
- }
- }
-
- public static boolean createEGLContext() {
- EGL10 egl = (EGL10)EGLContext.getEGL();
- int EGL_CONTEXT_CLIENT_VERSION=0x3098;
- int contextAttrs[] = new int[] { EGL_CONTEXT_CLIENT_VERSION, SDLActivity.mGLMajor, EGL10.EGL_NONE };
- SDLActivity.mEGLContext = egl.eglCreateContext(SDLActivity.mEGLDisplay, SDLActivity.mEGLConfig, EGL10.EGL_NO_CONTEXT, contextAttrs);
- if (SDLActivity.mEGLContext == EGL10.EGL_NO_CONTEXT) {
- Log.e("SDL", "Couldn't create context");
- return false;
- }
- return true;
- }
-
- public static boolean createEGLSurface() {
- if (SDLActivity.mEGLDisplay != null && SDLActivity.mEGLConfig != null) {
- EGL10 egl = (EGL10)EGLContext.getEGL();
- if (SDLActivity.mEGLContext == EGL10.EGL_NO_CONTEXT) createEGLContext();
-
- if (SDLActivity.mEGLSurface == EGL10.EGL_NO_SURFACE) {
- Log.v("SDL", "Creating new EGL Surface");
- SDLActivity.mEGLSurface = egl.eglCreateWindowSurface(SDLActivity.mEGLDisplay, SDLActivity.mEGLConfig, SDLActivity.mSurface, null);
- if (SDLActivity.mEGLSurface == EGL10.EGL_NO_SURFACE) {
- Log.e("SDL", "Couldn't create surface");
- return false;
- }
- }
- else Log.v("SDL", "EGL Surface remains valid");
-
- if (egl.eglGetCurrentContext() != SDLActivity.mEGLContext) {
- if (!egl.eglMakeCurrent(SDLActivity.mEGLDisplay, SDLActivity.mEGLSurface, SDLActivity.mEGLSurface, SDLActivity.mEGLContext)) {
- Log.e("SDL", "Old EGL Context doesnt work, trying with a new one");
- // TODO: Notify the user via a message that the old context could not be restored, and that textures need to be manually restored.
- createEGLContext();
- if (!egl.eglMakeCurrent(SDLActivity.mEGLDisplay, SDLActivity.mEGLSurface, SDLActivity.mEGLSurface, SDLActivity.mEGLContext)) {
- Log.e("SDL", "Failed making EGL Context current");
- return false;
- }
- }
- else Log.v("SDL", "EGL Context made current");
- }
- else Log.v("SDL", "EGL Context remains current");
-
- return true;
- } else {
- Log.e("SDL", "Surface creation failed, display = " + SDLActivity.mEGLDisplay + ", config = " + SDLActivity.mEGLConfig);
- return false;
- }
- }
-
- // EGL buffer flip
- public static void flipEGL() {
- try {
- EGL10 egl = (EGL10)EGLContext.getEGL();
-
- egl.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
-
- // drawing here
-
- egl.eglWaitGL();
-
- egl.eglSwapBuffers(SDLActivity.mEGLDisplay, SDLActivity.mEGLSurface);
-
-
- } catch(Exception e) {
- Log.v("SDL", "flipEGL(): " + e);
- for (StackTraceElement s : e.getStackTrace()) {
- Log.v("SDL", s.toString());
- }
- }
+ public static Surface getNativeSurface() {
+ return SDLActivity.mSurface.getNativeSurface();
}
// Audio
@@ -552,6 +388,24 @@ public class SDLActivity extends Activity {
mAudioTrack = null;
}
}
+
+ // Input
+
+ /**
+ * @return an array which may be empty but is never null.
+ */
+ public static int[] inputGetInputDeviceIds(int sources) {
+ int[] ids = InputDevice.getDeviceIds();
+ int[] filtered = new int[ids.length];
+ int used = 0;
+ for (int i = 0; i < ids.length; ++i) {
+ InputDevice device = InputDevice.getDevice(ids[i]);
+ if ((device != null) && ((device.getSources() & sources) != 0)) {
+ filtered[used++] = device.getId();
+ }
+ }
+ return Arrays.copyOf(filtered, used);
+ }
}
/**
@@ -579,6 +433,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
// Sensors
protected static SensorManager mSensorManager;
+ protected static Display mDisplay;
// Keep track of the surface size to normalize touch events
protected static float mWidth, mHeight;
@@ -594,20 +449,23 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
setOnKeyListener(this);
setOnTouchListener(this);
+ mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
// Some arbitrary defaults to avoid a potential division by zero
mWidth = 1.0f;
mHeight = 1.0f;
}
+
+ public Surface getNativeSurface() {
+ return getHolder().getSurface();
+ }
// Called when we have a valid drawing surface
@Override
public void surfaceCreated(SurfaceHolder holder) {
Log.v("SDL", "surfaceCreated()");
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
- // Set mIsSurfaceReady to 'true' *before* any call to handleResume
- SDLActivity.mIsSurfaceReady = true;
}
// Called when we lose the surface
@@ -617,16 +475,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
// Call this *before* setting mIsSurfaceReady to 'false'
SDLActivity.handlePause();
SDLActivity.mIsSurfaceReady = false;
-
- /* We have to clear the current context and destroy the egl surface here
- * Otherwise there's BAD_NATIVE_WINDOW errors coming from eglCreateWindowSurface on resume
- * Ref: http://stackoverflow.com/questions/8762589/eglcreatewindowsurface-on-ics-and-switching-from-2d-to-3d
- */
-
- EGL10 egl = (EGL10)EGLContext.getEGL();
- egl.eglMakeCurrent(SDLActivity.mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
- egl.eglDestroySurface(SDLActivity.mEGLDisplay, SDLActivity.mEGLSurface);
- SDLActivity.mEGLSurface = EGL10.EGL_NO_SURFACE;
+ SDLActivity.onNativeSurfaceDestroyed();
}
// Called when the surface is resized
@@ -687,6 +536,8 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
// Set mIsSurfaceReady to 'true' *before* making a call to handleResume
SDLActivity.mIsSurfaceReady = true;
+ SDLActivity.onNativeSurfaceChanged();
+
if (SDLActivity.mSDLThread == null) {
// This is the entry point to the C app.
@@ -695,11 +546,6 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread");
enableSensor(Sensor.TYPE_ACCELEROMETER, true);
SDLActivity.mSDLThread.start();
- } else {
- // The app already exists, we resume via handleResume
- // Multiple sequential calls to surfaceChanged are handled internally by handleResume
-
- SDLActivity.handleResume();
}
}
@@ -777,9 +623,28 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
@Override
public void onSensorChanged(SensorEvent event) {
if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
- SDLActivity.onNativeAccel(event.values[0] / SensorManager.GRAVITY_EARTH,
- event.values[1] / SensorManager.GRAVITY_EARTH,
- event.values[2] / SensorManager.GRAVITY_EARTH);
+ float x, y;
+ switch (mDisplay.getRotation()) {
+ case Surface.ROTATION_90:
+ x = -event.values[1];
+ y = event.values[0];
+ break;
+ case Surface.ROTATION_270:
+ x = event.values[1];
+ y = -event.values[0];
+ break;
+ case Surface.ROTATION_180:
+ x = -event.values[1];
+ y = -event.values[0];
+ break;
+ default:
+ x = event.values[0];
+ y = event.values[1];
+ break;
+ }
+ SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+ y / SensorManager.GRAVITY_EARTH,
+ event.values[2] / SensorManager.GRAVITY_EARTH - 1);
}
}
diff --git a/build-scripts/androidbuild.sh b/build-scripts/androidbuild.sh
new file mode 100755
index 0000000..b4a8323
--- /dev/null
+++ b/build-scripts/androidbuild.sh
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+SOURCES=()
+MKSOURCES=""
+CURDIR=`pwd -P`
+
+# Fetch sources
+if [[ $# -ge 2 ]]; then
+ for src in ${@:2}
+ do
+ SOURCES+=($src)
+ MKSOURCES="$MKSOURCES $(basename $src)"
+ done
+else
+ if [ -n "$1" ]; then
+ while read src
+ do
+ SOURCES+=($src)
+ MKSOURCES="$MKSOURCES $(basename $src)"
+ done
+ fi
+fi
+
+if [ -z "$1" ] || [ -z "$SOURCES" ]; then
+ echo "Usage: androidbuild.sh com.yourcompany.yourapp < sources.list"
+ echo "Usage: androidbuild.sh com.yourcompany.yourapp source1.c source2.c ...sourceN.c"
+ exit 1
+fi
+
+
+
+SDLPATH="$( cd "$(dirname "$0")/.." ; pwd -P )"
+
+NDKBUILD=`which ndk-build`
+if [ -z "$NDKBUILD" ];then
+ echo "Could not find the ndk-build utility, install Android's NDK and add it to the path"
+ exit 1
+fi
+
+ANDROID=`which android`
+if [ -z "$ANDROID" ];then
+ echo "Could not find the android utility, install Android's SDK and add it to the path"
+ exit 1
+fi
+
+ANT=`which ant`
+
+if [ -z "$ANT" ];then
+ echo "Could not find the ant utility, install Android's SDK and add it to the path"
+ exit 1
+fi
+
+APP="$1"
+APPARR=(${APP//./ })
+BUILDPATH="$SDLPATH/build/$APP"
+
+# Start Building
+
+rm -rf $BUILDPATH
+mkdir -p $BUILDPATH
+
+cp -r $SDLPATH/android-project/* $BUILDPATH
+
+# Copy SDL sources
+mkdir -p $BUILDPATH/jni/SDL
+cp -r $SDLPATH/src $BUILDPATH/jni/SDL
+cp -r $SDLPATH/include $BUILDPATH/jni/SDL
+cp $SDLPATH/Android.mk $BUILDPATH/jni/SDL
+sed -i "s|YourSourceHere.c|$MKSOURCES|g" $BUILDPATH/jni/src/Android.mk
+sed -i "s|org\.libsdl\.app|$APP|g" $BUILDPATH/AndroidManifest.xml
+
+# Copy user sources
+for src in "${SOURCES[@]}"
+do
+ cp $src $BUILDPATH/jni/src
+done
+
+# Create an inherited Activity
+cd $BUILDPATH/src
+for folder in "${APPARR[@]}"
+do
+ mkdir -p $folder
+ cd $folder
+done
+
+ACTIVITY="${folder}Activity"
+sed -i "s|SDLActivity|$ACTIVITY|g" $BUILDPATH/AndroidManifest.xml
+sed -i "s|SDLActivity|$APP|g" $BUILDPATH/build.xml
+
+# Fill in a default Activity
+echo "package $APP;" > "$ACTIVITY.java"
+echo "import org.libsdl.app.SDLActivity;" >> "$ACTIVITY.java"
+echo "public class $ACTIVITY extends SDLActivity {}" >> "$ACTIVITY.java"
+
+# Update project and build
+cd $BUILDPATH
+android update project --path $BUILDPATH
+$NDKBUILD
+$ANT debug
+
+cd $CURDIR
+
+APK="$BUILDPATH/bin/$APP-debug.apk"
+
+if [ -f "$APK" ]; then
+ echo "Your APK is ready at $APK"
+ echo "To install to your device: "
+ echo "cd $BUILDPATH"
+ echo "ant debug install"
+ exit 0
+fi
+
+echo "There was an error building the APK"
+exit 1
\ No newline at end of file
diff --git a/build-scripts/config.guess b/build-scripts/config.guess
index 137bedf..ddb3622 100644
--- a/build-scripts/config.guess
+++ b/build-scripts/config.guess
@@ -896,12 +896,16 @@ EOF
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
+ case `sed -n '/^Hardware/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ BCM2708) MANUFACTURER=raspberry;;
+ *) MANUFACTURER=unknown;;
+ esac
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-${MANUFACTURER}-linux-gnueabi
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ echo ${UNAME_MACHINE}-${MANUFACTURER}-linux-gnueabihf
fi
fi
exit ;;
diff --git a/build-scripts/raspberrypi-buildbot.sh b/build-scripts/raspberrypi-buildbot.sh
new file mode 100755
index 0000000..4c746c0
--- /dev/null
+++ b/build-scripts/raspberrypi-buildbot.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# This is the script buildbot.libsdl.org uses to cross-compile SDL2 from
+# x86 Linux to Raspberry Pi.
+
+# The final tarball can be unpacked in the root directory of a RPi,
+# so the SDL2 install lands in /usr/local. Run ldconfig, and then
+# you should be able to build and run SDL2-based software on your
+# Pi. Standard configure scripts should be able to find SDL and
+# build against it, and sdl2-config should work correctly on the
+# actual device.
+
+TARBALL="$1"
+if [ -z $1 ]; then
+ TARBALL=sdl-raspberrypi.tar.bz2
+fi
+
+OSTYPE=`uname -s`
+if [ "$OSTYPE" != "Linux" ]; then
+ # !!! FIXME
+ echo "This only works on x86 or x64-64 Linux at the moment." 1>&2
+ exit 1
+fi
+
+if [ "x$MAKE" == "x" ]; then
+ NCPU=`cat /proc/cpuinfo |grep vendor_id |wc -l`
+ let NCPU=$NCPU+1
+ MAKE="make -j$NCPU"
+fi
+
+BUILDBOTDIR="raspberrypi-buildbot"
+PARENTDIR="$PWD"
+
+set -e
+set -x
+rm -f $TARBALL
+rm -rf $BUILDBOTDIR
+mkdir -p $BUILDBOTDIR
+pushd $BUILDBOTDIR
+
+SYSROOT="/opt/rpi-sysroot"
+export CC="/opt/rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc --sysroot=$SYSROOT -I$SYSROOT/opt/vc/include -I$SYSROOT/usr/include -I$SYSROOT/opt/vc/include/interface/vcos/pthreads -I$SYSROOT/opt/vc/include/interface/vmcs_host/linux"
+# -L$SYSROOT/usr/lib/arm-linux-gnueabihf"
+# !!! FIXME: shouldn't have to --disable-* things here.
+../configure --with-sysroot=$SYSROOT --host=arm-raspberry-linux-gnueabihf --prefix=$PWD/rpi-sdl2-installed --disable-pulseaudio --disable-esd
+$MAKE
+$MAKE install
+# Fix up a few things to a real install path on a real Raspberry Pi...
+perl -w -pi -e "s#$PWD/rpi-sdl2-installed#/usr/local#g;" ./rpi-sdl2-installed/lib/libSDL2.la ./rpi-sdl2-installed/lib/pkgconfig/sdl2.pc ./rpi-sdl2-installed/bin/sdl2-config
+mkdir -p ./usr
+mv ./rpi-sdl2-installed ./usr/local
+
+popd
+tar -cjvvf $TARBALL -C $BUILDBOTDIR usr
+rm -rf $BUILDBOTDIR
+
+set +x
+echo "All done. Final installable is in $TARBALL ...";
+
+
diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
index 14fb327..fe76378 100644
--- a/cmake/sdlchecks.cmake
+++ b/cmake/sdlchecks.cmake
@@ -304,6 +304,11 @@ macro(CheckX11)
endif()
endforeach()
+ find_path(X_INCLUDEDIR X11/Xlib.h)
+ if(X_INCLUDEDIR)
+ set(X_CFLAGS "-I${X_INCLUDEDIR}")
+ endif()
+
check_include_file(X11/Xcursor/Xcursor.h HAVE_XCURSOR_H)
check_include_file(X11/extensions/Xinerama.h HAVE_XINERAMA_H)
check_include_file(X11/extensions/XInput2.h HAVE_XINPUT_H)
@@ -345,6 +350,7 @@ macro(CheckX11)
endif(HAVE_SHMAT)
if(NOT HAVE_SHMAT)
add_definitions(-DNO_SHARED_MEMORY)
+ set(X_CFLAGS "${X_CFLAGS} -DNO_SHARED_MEMORY")
endif(NOT HAVE_SHMAT)
endif(NOT HAVE_SHMAT)
@@ -367,6 +373,8 @@ macro(CheckX11)
endif(HAVE_X11_SHARED)
endif(X11_SHARED)
+ set(SDL_CFLAGS "${SDL_CFLAGS} ${X_CFLAGS}")
+
set(CMAKE_REQUIRED_LIBRARIES ${X11_LIB} ${X11_LIB})
check_c_source_compiles("
#include <X11/Xlib.h>
@@ -563,25 +571,29 @@ macro(CheckOpenGLESX11)
if(VIDEO_OPENGLES)
check_c_source_compiles("
#include <EGL/egl.h>
- int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES)
- if(HAVE_VIDEO_OPENGLES)
- check_c_source_compiles("
- #include <GLES/gl.h>
- #include <GLES/glext.h>
- int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES_V1)
- if(HAVE_VIDEO_OPENGLES_V1)
+ int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGL_EGL)
+ if(HAVE_VIDEO_OPENGL_EGL)
+ set(SDL_VIDEO_OPENGL_EGL 1)
+ endif(HAVE_VIDEO_OPENGL_EGL)
+ check_c_source_compiles("
+ #include <GLES/gl.h>
+ #include <GLES/glext.h>
+ int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES_V1)
+ if(HAVE_VIDEO_OPENGLES_V1)
+ set(HAVE_VIDEO_OPENGLES TRUE)
set(SDL_VIDEO_OPENGL_ES 1)
set(SDL_VIDEO_RENDER_OGL_ES 1)
- endif(HAVE_VIDEO_OPENGLES_V1)
- check_c_source_compiles("
- #include <GLES2/gl2.h>
- #include <GLES2/gl2ext.h>
- int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES_V2)
- if(HAVE_VIDEO_OPENGLES_V2)
+ endif(HAVE_VIDEO_OPENGLES_V1)
+ check_c_source_compiles("
+ #include <GLES2/gl2.h>
+ #include <GLES2/gl2ext.h>
+ int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES_V2)
+ if(HAVE_VIDEO_OPENGLES_V2)
+ set(HAVE_VIDEO_OPENGLES TRUE)
set(SDL_VIDEO_OPENGL_ES2 1)
set(SDL_VIDEO_RENDER_OGL_ES2 1)
- endif(HAVE_VIDEO_OPENGLES_V2)
- endif(HAVE_VIDEO_OPENGLES)
+ endif(HAVE_VIDEO_OPENGLES_V2)
+
endif(VIDEO_OPENGLES)
endmacro(CheckOpenGLESX11)
diff --git a/configure b/configure
index 38084c2..ba24894 100755
--- a/configure
+++ b/configure
@@ -783,6 +783,7 @@ enable_events
enable_joystick
enable_haptic
enable_power
+enable_filesystem
enable_threads
enable_timers
enable_file
@@ -1496,6 +1497,7 @@ Optional Features:
--enable-haptic Enable the haptic (force feedback) subsystem
[[default=yes]]
--enable-power Enable the power subsystem [[default=yes]]
+ --enable-filesystem Enable the filesystem subsystem [[default=yes]]
--enable-threads Enable the threading subsystem [[default=yes]]
--enable-timers Enable the timer subsystem [[default=yes]]
--enable-file Enable the file subsystem [[default=yes]]
@@ -2658,9 +2660,9 @@ orig_CFLAGS="$CFLAGS"
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
-SDL_MICRO_VERSION=0
+SDL_MICRO_VERSION=1
SDL_INTERFACE_AGE=0
-SDL_BINARY_AGE=0
+SDL_BINARY_AGE=1
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
@@ -16767,6 +16769,7 @@ SOURCES="$SOURCES $srcdir/src/haptic/*.c"
SOURCES="$SOURCES $srcdir/src/joystick/*.c"
SOURCES="$SOURCES $srcdir/src/libm/*.c"
SOURCES="$SOURCES $srcdir/src/power/*.c"
+#SOURCES="$SOURCES $srcdir/src/filesystem/*.c"
SOURCES="$SOURCES $srcdir/src/render/*.c"
SOURCES="$SOURCES $srcdir/src/render/*/*.c"
SOURCES="$SOURCES $srcdir/src/stdlib/*.c"
@@ -16871,6 +16874,18 @@ if test x$enable_power != xyes; then
$as_echo "#define SDL_POWER_DISABLED 1" >>confdefs.h
fi
+# Check whether --enable-filesystem was given.
+if test "${enable_filesystem+set}" = set; then :
+ enableval=$enable_filesystem;
+else
+ enable_filesystem=yes
+fi
+
+if test x$enable_filesystem != xyes; then
+
+$as_echo "#define SDL_FILESYSTEM_DISABLED 1" >>confdefs.h
+
+fi
# Check whether --enable-threads was given.
if test "${enable_threads+set}" = set; then :
enableval=$enable_threads;
@@ -20547,9 +20562,9 @@ fi
CheckOpenGLESX11()
{
if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES (EGL) support" >&5
-$as_echo_n "checking for OpenGL ES (EGL) support... " >&6; }
- video_opengles=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGL support" >&5
+$as_echo_n "checking for EGL support... " >&6; }
+ video_opengl_egl=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20566,21 +20581,26 @@ main ()
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- video_opengles=yes
+ video_opengl_egl=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles" >&5
-$as_echo "$video_opengles" >&6; }
- if test x$video_opengles = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v1 headers" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengl_egl" >&5
+$as_echo "$video_opengl_egl" >&6; }
+ if test x$video_opengl_egl = xyes; then
+
+$as_echo "#define SDL_VIDEO_OPENGL_EGL 1" >>confdefs.h
+
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v1 headers" >&5
$as_echo_n "checking for OpenGL ES v1 headers... " >&6; }
- video_opengles_v1=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ video_opengles_v1=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <GLES/gl.h>
- #include <GLES/glext.h>
+ #include <GLES/gl.h>
+ #include <GLES/glext.h>
int
main ()
@@ -20593,28 +20613,29 @@ main ()
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- video_opengles_v1=yes
+ video_opengles_v1=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles_v1" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles_v1" >&5
$as_echo "$video_opengles_v1" >&6; }
- if test x$video_opengles_v1 = xyes; then
+ if test x$video_opengles_v1 = xyes; then
$as_echo "#define SDL_VIDEO_OPENGL_ES 1" >>confdefs.h
$as_echo "#define SDL_VIDEO_RENDER_OGL_ES 1" >>confdefs.h
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v2 headers" >&5
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v2 headers" >&5
$as_echo_n "checking for OpenGL ES v2 headers... " >&6; }
- video_opengles_v2=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ video_opengles_v2=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <GLES2/gl2.h>
- #include <GLES2/gl2ext.h>
+ #include <GLES2/gl2.h>
+ #include <GLES2/gl2ext.h>
int
main ()
@@ -20627,20 +20648,19 @@ main ()
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- video_opengles_v2=yes
+ video_opengles_v2=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles_v2" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengles_v2" >&5
$as_echo "$video_opengles_v2" >&6; }
- if test x$video_opengles_v2 = xyes; then
+ if test x$video_opengles_v2 = xyes; then
$as_echo "#define SDL_VIDEO_OPENGL_ES2 1" >>confdefs.h
$as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h
- fi
fi
fi
}
@@ -20734,6 +20754,45 @@ $as_echo "#define SDL_INPUT_LINUXEV 1" >>confdefs.h
fi
}
+CheckInputKD()
+{
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kd.h" >&5
+$as_echo_n "checking for Linux kd.h... " >&6; }
+ use_input_kd=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <linux/kd.h>
+ #include <linux/keyboard.h>
+
+int
+main ()
+{
+
+ struct kbentry kbe;
+ kbe.kb_table = KG_CTRL;
+ ioctl(0, KDGKBENT, &kbe);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ use_input_kd=yes
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_input_kd" >&5
+$as_echo "$use_input_kd" >&6; }
+ if test x$use_input_kd = xyes; then
+
+$as_echo "#define SDL_INPUT_LINUXKD 1" >>confdefs.h
+
+ fi
+}
+
CheckLibUDev()
{
# Check whether --enable-libudev was given.
@@ -21575,8 +21634,10 @@ $as_echo "#define SDL_LOADSO_DLOPEN 1" >>confdefs.h
CheckUSBHID()
{
- if test x$enable_joystick = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hid_init in -lusbhid" >&5
+ case "$host" in
+ *-*-*bsd*)
+ if test x$enable_joystick = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hid_init in -lusbhid" >&5
$as_echo_n "checking for hid_init in -lusbhid... " >&6; }
if ${ac_cv_lib_usbhid_hid_init+:} false; then :
$as_echo_n "(cached) " >&6
@@ -21616,34 +21677,34 @@ if test "x$ac_cv_lib_usbhid_hid_init" = xyes; then :
have_libusbhid=yes
fi
- if test x$have_libusbhid = xyes; then
- ac_fn_c_check_header_mongrel "$LINENO" "usbhid.h" "ac_cv_header_usbhid_h" "$ac_includes_default"
+ if test x$have_libusbhid = xyes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "usbhid.h" "ac_cv_header_usbhid_h" "$ac_includes_default"
if test "x$ac_cv_header_usbhid_h" = xyes; then :
USB_CFLAGS="-DHAVE_USBHID_H"
fi
- ac_fn_c_check_header_mongrel "$LINENO" "libusbhid.h" "ac_cv_header_libusbhid_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "libusbhid.h" "ac_cv_header_libusbhid_h" "$ac_includes_default"
if test "x$ac_cv_header_libusbhid_h" = xyes; then :
USB_CFLAGS="-DHAVE_LIBUSBHID_H"
fi
- USB_LIBS="$USB_LIBS -lusbhid"
- else
- ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+ USB_LIBS="$USB_LIBS -lusbhid"
+ else
+ ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
if test "x$ac_cv_header_usb_h" = xyes; then :
USB_CFLAGS="-DHAVE_USB_H"
fi
- ac_fn_c_check_header_mongrel "$LINENO" "libusb.h" "ac_cv_header_libusb_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "libusb.h" "ac_cv_header_libusb_h" "$ac_includes_default"
if test "x$ac_cv_header_libusb_h" = xyes; then :
USB_CFLAGS="-DHAVE_LIBUSB_H"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hid_init in -lusb" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hid_init in -lusb" >&5
$as_echo_n "checking for hid_init in -lusb... " >&6; }
if ${ac_cv_lib_usb_hid_init+:} false; then :
$as_echo_n "(cached) " >&6
@@ -21683,43 +21744,43 @@ if test "x$ac_cv_lib_usb_hid_init" = xyes; then :
USB_LIBS="$USB_LIBS -lusb"
fi
- fi
+ fi
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $USB_CFLAGS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $USB_CFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usbhid" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usbhid" >&5
$as_echo_n "checking for usbhid... " >&6; }
- have_usbhid=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ have_usbhid=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
- #ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
- #else
- # include <dev/usb/usb.h>
- # include <dev/usb/usbhid.h>
- #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
- #include <libusb.h>
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
+ #include <sys/types.h>
+ #if defined(HAVE_USB_H)
+ #include <usb.h>
+ #endif
+ #ifdef __DragonFly__
+ # include <bus/usb/usb.h>
+ # include <bus/usb/usbhid.h>
+ #else
+ # include <dev/usb/usb.h>
+ # include <dev/usb/usbhid.h>
+ #endif
+ #if defined(HAVE_USBHID_H)
+ #include <usbhid.h>
+ #elif defined(HAVE_LIBUSB_H)
+ #include <libusb.h>
+ #elif defined(HAVE_LIBUSBHID_H)
+ #include <libusbhid.h>
+ #endif
int
main ()
{
- struct report_desc *repdesc;
- struct usb_ctl_report *repbuf;
- hid_kind_t hidkind;
+ struct report_desc *repdesc;
+ struct usb_ctl_report *repbuf;
+ hid_kind_t hidkind;
;
return 0;
@@ -21727,45 +21788,45 @@ main ()
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- have_usbhid=yes
+ have_usbhid=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_usbhid" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_usbhid" >&5
$as_echo "$have_usbhid" >&6; }
- if test x$have_usbhid = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucr_data member of usb_ctl_report" >&5
+ if test x$have_usbhid = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucr_data member of usb_ctl_report" >&5
$as_echo_n "checking for ucr_data member of usb_ctl_report... " >&6; }
- have_usbhid_ucr_data=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ have_usbhid_ucr_data=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
- #ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
- #else
- # include <dev/usb/usb.h>
- # include <dev/usb/usbhid.h>
- #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
- #include <libusb.h>
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
+ #include <sys/types.h>
+ #if defined(HAVE_USB_H)
+ #include <usb.h>
+ #endif
+ #ifdef __DragonFly__
+ # include <bus/usb/usb.h>
+ # include <bus/usb/usbhid.h>
+ #else
+ # include <dev/usb/usb.h>
+ # include <dev/usb/usbhid.h>
+ #endif
+ #if defined(HAVE_USBHID_H)
+ #include <usbhid.h>
+ #elif defined(HAVE_LIBUSB_H)
+ #include <libusb.h>
+ #elif defined(HAVE_LIBUSBHID_H)
+ #include <libusbhid.h>
+ #endif
int
main ()
{
- struct usb_ctl_report buf;
- if (buf.ucr_data) { }
+ struct usb_ctl_report buf;
+ if (buf.ucr_data) { }
;
return 0;
@@ -21773,47 +21834,47 @@ main ()
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- have_usbhid_ucr_data=yes
+ have_usbhid_ucr_data=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test x$have_usbhid_ucr_data = xyes; then
- USB_CFLAGS="$USB_CFLAGS -DUSBHID_UCR_DATA"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_usbhid_ucr_data" >&5
+ if test x$have_usbhid_ucr_data = xyes; then
+ USB_CFLAGS="$USB_CFLAGS -DUSBHID_UCR_DATA"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_usbhid_ucr_data" >&5
$as_echo "$have_usbhid_ucr_data" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new usbhid API" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new usbhid API" >&5
$as_echo_n "checking for new usbhid API... " >&6; }
- have_usbhid_new=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ have_usbhid_new=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
- #ifdef __DragonFly__
- #include <bus/usb/usb.h>
- #include <bus/usb/usbhid.h>
- #else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
- #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
- #include <libusb.h>
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
+ #include <sys/types.h>
+ #if defined(HAVE_USB_H)
+ #include <usb.h>
+ #endif
+ #ifdef __DragonFly__
+ #include <bus/usb/usb.h>
+ #include <bus/usb/usbhid.h>
+ #else
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
+ #endif
+ #if defined(HAVE_USBHID_H)
+ #include <usbhid.h>
+ #elif defined(HAVE_LIBUSB_H)
+ #include <libusb.h>
+ #elif defined(HAVE_LIBUSBHID_H)
+ #include <libusbhid.h>
+ #endif
int
main ()
{
- report_desc_t d;
- hid_start_parse(d, 1, 1);
+ report_desc_t d;
+ hid_start_parse(d, 1, 1);
;
return 0;
@@ -21821,29 +21882,29 @@ main ()
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- have_usbhid_new=yes
+ have_usbhid_new=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test x$have_usbhid_new = xyes; then
- USB_CFLAGS="$USB_CFLAGS -DUSBHID_NEW"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_usbhid_new" >&5
+ if test x$have_usbhid_new = xyes; then
+ USB_CFLAGS="$USB_CFLAGS -DUSBHID_NEW"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_usbhid_new" >&5
$as_echo "$have_usbhid_new" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct joystick in machine/joystick.h" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct joystick in machine/joystick.h" >&5
$as_echo_n "checking for struct joystick in machine/joystick.h... " >&6; }
- have_machine_joystick=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ have_machine_joystick=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <machine/joystick.h>
+ #include <machine/joystick.h>
int
main ()
{
- struct joystick t;
+ struct joystick t;
;
return 0;
@@ -21851,28 +21912,30 @@ main ()
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- have_machine_joystick=yes
+ have_machine_joystick=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test x$have_machine_joystick = xyes; then
+ if test x$have_machine_joystick = xyes; then
$as_echo "#define SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H 1" >>confdefs.h
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_machine_joystick" >&5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_machine_joystick" >&5
$as_echo "$have_machine_joystick" >&6; }
$as_echo "#define SDL_JOYSTICK_USBHID 1" >>confdefs.h
- SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
- have_joystick=yes
- fi
- CFLAGS="$save_CFLAGS"
- fi
+ SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
+ have_joystick=yes
+ fi
+ CFLAGS="$save_CFLAGS"
+ fi
+ ;;
+ esac
}
CheckClockGettime()
@@ -22008,6 +22071,21 @@ fi
case "$host" in
*-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*)
case "$host" in
+ *-raspberry-linux*)
+ # Raspberry Pi
+ ARCH=linux
+ RPI_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
+ RPI_LDFLAGS="-L/opt/vc/lib -lbcm_host"
+ CFLAGS="$CFLAGS $RPI_CFLAGS"
+ SDL_CFLAGS="$SDL_CFLAGS $RPI_CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS $RPI_CFLAGS"
+ SDL_LIBS="$SDL_LIBS $RPI_LDFLAGS"
+
+ if test x$enable_video = xyes; then
+ SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c"
+ $as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
+ fi
+ ;;
*-*-linux*) ARCH=linux ;;
*-*-uclinux*) ARCH=linux ;;
*-*-kfreebsd*-gnu) ARCH=kfreebsd-gnu ;;
@@ -22045,6 +22123,7 @@ case "$host" in
CheckLibUDev
CheckDBus
CheckInputEvents
+ CheckInputKD
CheckTslib
CheckUSBHID
CheckPTHREAD
@@ -22115,6 +22194,14 @@ $as_echo "#define SDL_POWER_LINUX 1" >>confdefs.h
;;
esac
fi
+ # Set up files for the filesystem library
+ if test x$enable_filesystem = xyes; then
+
+$as_echo "#define SDL_FILESYSTEM_UNIX 1" >>confdefs.h
+
+ SOURCES="$SOURCES $srcdir/src/filesystem/unix/*.c"
+ have_filesystem=yes
+ fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
@@ -22123,6 +22210,14 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
have_timers=yes
fi
+ # Set up files for udev hotplugging support
+ if test x$enable_libudev = xyes && test x$have_libudev_h_hdr = xyes; then
+ SOURCES="$SOURCES $srcdir/src/core/linux/SDL_udev.c"
+ fi
+ # Set up files for evdev input
+ if test x$use_input_events = xyes; then
+ SOURCES="$SOURCES $srcdir/src/input/evdev/*.c"
+ fi
;;
*-*-cygwin* | *-*-mingw32*)
ARCH=win32
@@ -22217,6 +22312,13 @@ $as_echo "#define SDL_POWER_WINDOWS 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/power/windows/SDL_syspower.c"
have_power=yes
fi
+ if test x$enable_filesystem = xyes; then
+
+$as_echo "#define SDL_FILESYSTEM_WINDOWS 1" >>confdefs.h
+
+ SOURCES="$SOURCES $srcdir/src/filesystem/windows/SDL_sysfilesystem.c"
+ have_filesystem=yes
+ fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -22350,6 +22452,14 @@ $as_echo "#define SDL_POWER_BEOS 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/power/beos/*.c"
have_power=yes
fi
+ # Set up files for the system filesystem library
+ if test x$enable_filesystem = xyes; then
+
+$as_echo "#define SDL_FILESYSTEM_BEOS 1" >>confdefs.h
+
+ SOURCES="$SOURCES $srcdir/src/filesystem/beos/*.cc"
+ have_filesystem=yes
+ fi
# The BeOS platform requires special setup.
SOURCES="$srcdir/src/main/beos/*.cc $SOURCES"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
@@ -22389,6 +22499,11 @@ $as_echo "#define SDL_POWER_BEOS 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/power/uikit/*.m"
have_power=yes
fi
+ # Set up files for the filesystem library
+ if test x$enable_filesystem = xyes; then
+ SOURCES="$SOURCES $srcdir/src/filesystem/cocoa/*.m"
+ have_filesystem=yes
+ fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
@@ -22470,6 +22585,14 @@ $as_echo "#define SDL_POWER_MACOSX 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/power/macosx/*.c"
have_power=yes
fi
+ # Set up files for the filesystem library
+ if test x$enable_filesystem = xyes; then
+
+$as_echo "#define SDL_FILESYSTEM_COCOA 1" >>confdefs.h
+
+ SOURCES="$SOURCES $srcdir/src/filesystem/cocoa/*.m"
+ have_filesystem=yes
+ fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
@@ -22536,6 +22659,14 @@ $as_echo "#define SDL_TIMERS_DISABLED 1" >>confdefs.h
fi
SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"
fi
+if test x$have_filesystem != xyes; then
+ if test x$enable_filesystem = xyes; then
+
+$as_echo "#define SDL_FILESYSTEM_DISABLED 1" >>confdefs.h
+
+ fi
+ SOURCES="$SOURCES $srcdir/src/filesystem/dummy/*.c"
+fi
if test x$have_loadso != xyes; then
if test x$enable_loadso = xyes; then
diff --git a/configure.in b/configure.in
index 252efe4..5c56f00 100644
--- a/configure.in
+++ b/configure.in
@@ -20,9 +20,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
-SDL_MICRO_VERSION=0
+SDL_MICRO_VERSION=1
SDL_INTERFACE_AGE=0
-SDL_BINARY_AGE=0
+SDL_BINARY_AGE=1
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
AC_SUBST(SDL_MAJOR_VERSION)
@@ -325,6 +325,7 @@ SOURCES="$SOURCES $srcdir/src/haptic/*.c"
SOURCES="$SOURCES $srcdir/src/joystick/*.c"
SOURCES="$SOURCES $srcdir/src/libm/*.c"
SOURCES="$SOURCES $srcdir/src/power/*.c"
+#SOURCES="$SOURCES $srcdir/src/filesystem/*.c"
SOURCES="$SOURCES $srcdir/src/render/*.c"
SOURCES="$SOURCES $srcdir/src/render/*/*.c"
SOURCES="$SOURCES $srcdir/src/stdlib/*.c"
@@ -382,6 +383,12 @@ AC_HELP_STRING([--enable-power], [Enable the power subsystem [[default=yes]]]),
if test x$enable_power != xyes; then
AC_DEFINE(SDL_POWER_DISABLED, 1, [ ])
fi
+AC_ARG_ENABLE(filesystem,
+AC_HELP_STRING([--enable-filesystem], [Enable the filesystem subsystem [[default=yes]]]),
+ , enable_filesystem=yes)
+if test x$enable_filesystem != xyes; then
+ AC_DEFINE(SDL_FILESYSTEM_DISABLED, 1, [ ])
+fi
AC_ARG_ENABLE(threads,
AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]),
, enable_threads=yes)
@@ -1681,44 +1688,47 @@ dnl Find OpenGL ES
CheckOpenGLESX11()
{
if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then
- AC_MSG_CHECKING(for OpenGL ES (EGL) support)
- video_opengles=no
+ AC_MSG_CHECKING(for EGL support)
+ video_opengl_egl=no
AC_TRY_COMPILE([
#include <EGL/egl.h>
],[
],[
- video_opengles=yes
+ video_opengl_egl=yes
])
- AC_MSG_RESULT($video_opengles)
- if test x$video_opengles = xyes; then
- AC_MSG_CHECKING(for OpenGL ES v1 headers)
- video_opengles_v1=no
- AC_TRY_COMPILE([
- #include <GLES/gl.h>
- #include <GLES/glext.h>
- ],[
- ],[
- video_opengles_v1=yes
- ])
- AC_MSG_RESULT($video_opengles_v1)
- if test x$video_opengles_v1 = xyes; then
- AC_DEFINE(SDL_VIDEO_OPENGL_ES, 1, [ ])
- AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES, 1, [ ])
- fi
- AC_MSG_CHECKING(for OpenGL ES v2 headers)
- video_opengles_v2=no
- AC_TRY_COMPILE([
- #include <GLES2/gl2.h>
- #include <GLES2/gl2ext.h>
- ],[
- ],[
- video_opengles_v2=yes
- ])
- AC_MSG_RESULT($video_opengles_v2)
- if test x$video_opengles_v2 = xyes; then
- AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ])
- AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES2, 1, [ ])
- fi
+ AC_MSG_RESULT($video_opengl_egl)
+ if test x$video_opengl_egl = xyes; then
+ AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ])
+ fi
+
+ AC_MSG_CHECKING(for OpenGL ES v1 headers)
+ video_opengles_v1=no
+ AC_TRY_COMPILE([
+ #include <GLES/gl.h>
+ #include <GLES/glext.h>
+ ],[
+ ],[
+ video_opengles_v1=yes
+ ])
+ AC_MSG_RESULT($video_opengles_v1)
+ if test x$video_opengles_v1 = xyes; then
+ AC_DEFINE(SDL_VIDEO_OPENGL_ES, 1, [ ])
+ AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES, 1, [ ])
+ fi
+
+ AC_MSG_CHECKING(for OpenGL ES v2 headers)
+ video_opengles_v2=no
+ AC_TRY_COMPILE([
+ #include <GLES2/gl2.h>
+ #include <GLES2/gl2ext.h>
+ ],[
+ ],[
+ video_opengles_v2=yes
+ ])
+ AC_MSG_RESULT($video_opengles_v2)
+ if test x$video_opengles_v2 = xyes; then
+ AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ])
+ AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES2, 1, [ ])
fi
fi
}
@@ -1781,6 +1791,28 @@ CheckInputEvents()
fi
}
+dnl See if we can use the kernel kd.h header
+CheckInputKD()
+{
+
+ AC_MSG_CHECKING(for Linux kd.h)
+ use_input_kd=no
+ AC_TRY_COMPILE([
+ #include <linux/kd.h>
+ #include <linux/keyboard.h>
+ ],[
+ struct kbentry kbe;
+ kbe.kb_table = KG_CTRL;
+ ioctl(0, KDGKBENT, &kbe);
+ ],[
+ use_input_kd=yes
+ ])
+ AC_MSG_RESULT($use_input_kd)
+ if test x$use_input_kd = xyes; then
+ AC_DEFINE(SDL_INPUT_LINUXKD, 1, [ ])
+ fi
+}
+
dnl See if the platform offers libudev for device enumeration and hotplugging.
CheckLibUDev()
{
@@ -2157,138 +2189,142 @@ AC_HELP_STRING([--enable-sdl-dlopen], [use dlopen for shared object loading [[de
dnl Check for the usbhid(3) library on *BSD
CheckUSBHID()
{
- if test x$enable_joystick = xyes; then
- AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
- if test x$have_libusbhid = xyes; then
- AC_CHECK_HEADER(usbhid.h, [USB_CFLAGS="-DHAVE_USBHID_H"])
- AC_CHECK_HEADER(libusbhid.h, [USB_CFLAGS="-DHAVE_LIBUSBHID_H"])
- USB_LIBS="$USB_LIBS -lusbhid"
- else
- AC_CHECK_HEADER(usb.h, [USB_CFLAGS="-DHAVE_USB_H"])
- AC_CHECK_HEADER(libusb.h, [USB_CFLAGS="-DHAVE_LIBUSB_H"])
- AC_CHECK_LIB(usb, hid_init, [USB_LIBS="$USB_LIBS -lusb"])
- fi
-
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $USB_CFLAGS"
-
- AC_MSG_CHECKING(for usbhid)
- have_usbhid=no
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
- #ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
- #else
- # include <dev/usb/usb.h>
- # include <dev/usb/usbhid.h>
- #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
- #include <libusb.h>
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
- ],[
- struct report_desc *repdesc;
- struct usb_ctl_report *repbuf;
- hid_kind_t hidkind;
- ],[
- have_usbhid=yes
- ])
- AC_MSG_RESULT($have_usbhid)
+ case "$host" in
+ *-*-*bsd*)
+ if test x$enable_joystick = xyes; then
+ AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
+ if test x$have_libusbhid = xyes; then
+ AC_CHECK_HEADER(usbhid.h, [USB_CFLAGS="-DHAVE_USBHID_H"])
+ AC_CHECK_HEADER(libusbhid.h, [USB_CFLAGS="-DHAVE_LIBUSBHID_H"])
+ USB_LIBS="$USB_LIBS -lusbhid"
+ else
+ AC_CHECK_HEADER(usb.h, [USB_CFLAGS="-DHAVE_USB_H"])
+ AC_CHECK_HEADER(libusb.h, [USB_CFLAGS="-DHAVE_LIBUSB_H"])
+ AC_CHECK_LIB(usb, hid_init, [USB_LIBS="$USB_LIBS -lusb"])
+ fi
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $USB_CFLAGS"
- if test x$have_usbhid = xyes; then
- AC_MSG_CHECKING(for ucr_data member of usb_ctl_report)
- have_usbhid_ucr_data=no
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
- #ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
- #else
- # include <dev/usb/usb.h>
- # include <dev/usb/usbhid.h>
- #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
- #include <libusb.h>
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
- ],[
- struct usb_ctl_report buf;
- if (buf.ucr_data) { }
- ],[
- have_usbhid_ucr_data=yes
- ])
- if test x$have_usbhid_ucr_data = xyes; then
- USB_CFLAGS="$USB_CFLAGS -DUSBHID_UCR_DATA"
- fi
- AC_MSG_RESULT($have_usbhid_ucr_data)
-
- AC_MSG_CHECKING(for new usbhid API)
- have_usbhid_new=no
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
- #include <usb.h>
- #endif
- #ifdef __DragonFly__
- #include <bus/usb/usb.h>
- #include <bus/usb/usbhid.h>
- #else
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
- #endif
- #if defined(HAVE_USBHID_H)
- #include <usbhid.h>
- #elif defined(HAVE_LIBUSB_H)
- #include <libusb.h>
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
- ],[
- report_desc_t d;
- hid_start_parse(d, 1, 1);
- ],[
- have_usbhid_new=yes
- ])
- if test x$have_usbhid_new = xyes; then
- USB_CFLAGS="$USB_CFLAGS -DUSBHID_NEW"
- fi
- AC_MSG_RESULT($have_usbhid_new)
+ AC_MSG_CHECKING(for usbhid)
+ have_usbhid=no
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #if defined(HAVE_USB_H)
+ #include <usb.h>
+ #endif
+ #ifdef __DragonFly__
+ # include <bus/usb/usb.h>
+ # include <bus/usb/usbhid.h>
+ #else
+ # include <dev/usb/usb.h>
+ # include <dev/usb/usbhid.h>
+ #endif
+ #if defined(HAVE_USBHID_H)
+ #include <usbhid.h>
+ #elif defined(HAVE_LIBUSB_H)
+ #include <libusb.h>
+ #elif defined(HAVE_LIBUSBHID_H)
+ #include <libusbhid.h>
+ #endif
+ ],[
+ struct report_desc *repdesc;
+ struct usb_ctl_report *repbuf;
+ hid_kind_t hidkind;
+ ],[
+ have_usbhid=yes
+ ])
+ AC_MSG_RESULT($have_usbhid)
+
+ if test x$have_usbhid = xyes; then
+ AC_MSG_CHECKING(for ucr_data member of usb_ctl_report)
+ have_usbhid_ucr_data=no
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #if defined(HAVE_USB_H)
+ #include <usb.h>
+ #endif
+ #ifdef __DragonFly__
+ # include <bus/usb/usb.h>
+ # include <bus/usb/usbhid.h>
+ #else
+ # include <dev/usb/usb.h>
+ # include <dev/usb/usbhid.h>
+ #endif
+ #if defined(HAVE_USBHID_H)
+ #include <usbhid.h>
+ #elif defined(HAVE_LIBUSB_H)
+ #include <libusb.h>
+ #elif defined(HAVE_LIBUSBHID_H)
+ #include <libusbhid.h>
+ #endif
+ ],[
+ struct usb_ctl_report buf;
+ if (buf.ucr_data) { }
+ ],[
+ have_usbhid_ucr_data=yes
+ ])
+ if test x$have_usbhid_ucr_data = xyes; then
+ USB_CFLAGS="$USB_CFLAGS -DUSBHID_UCR_DATA"
+ fi
+ AC_MSG_RESULT($have_usbhid_ucr_data)
+
+ AC_MSG_CHECKING(for new usbhid API)
+ have_usbhid_new=no
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #if defined(HAVE_USB_H)
+ #include <usb.h>
+ #endif
+ #ifdef __DragonFly__
+ #include <bus/usb/usb.h>
+ #include <bus/usb/usbhid.h>
+ #else
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
+ #endif
+ #if defined(HAVE_USBHID_H)
+ #include <usbhid.h>
+ #elif defined(HAVE_LIBUSB_H)
+ #include <libusb.h>
+ #elif defined(HAVE_LIBUSBHID_H)
+ #include <libusbhid.h>
+ #endif
+ ],[
+ report_desc_t d;
+ hid_start_parse(d, 1, 1);
+ ],[
+ have_usbhid_new=yes
+ ])
+ if test x$have_usbhid_new = xyes; then
+ USB_CFLAGS="$USB_CFLAGS -DUSBHID_NEW"
+ fi
+ AC_MSG_RESULT($have_usbhid_new)
+
+ AC_MSG_CHECKING(for struct joystick in machine/joystick.h)
+ have_machine_joystick=no
+ AC_TRY_COMPILE([
+ #include <machine/joystick.h>
+ ],[
+ struct joystick t;
+ ],[
+ have_machine_joystick=yes
+ ])
+ if test x$have_machine_joystick = xyes; then
+ AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H, 1, [ ])
+ fi
+ AC_MSG_RESULT($have_machine_joystick)
- AC_MSG_CHECKING(for struct joystick in machine/joystick.h)
- have_machine_joystick=no
- AC_TRY_COMPILE([
- #include <machine/joystick.h>
- ],[
- struct joystick t;
- ],[
- have_machine_joystick=yes
- ])
- if test x$have_machine_joystick = xyes; then
- AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H, 1, [ ])
+ AC_DEFINE(SDL_JOYSTICK_USBHID, 1, [ ])
+ SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
+ have_joystick=yes
+ fi
+ CFLAGS="$save_CFLAGS"
fi
- AC_MSG_RESULT($have_machine_joystick)
-
- AC_DEFINE(SDL_JOYSTICK_USBHID, 1, [ ])
- SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
- have_joystick=yes
- fi
- CFLAGS="$save_CFLAGS"
- fi
+ ;;
+ esac
}
dnl Check for clock_gettime()
@@ -2333,6 +2369,21 @@ dnl Set up the configuration based on the host platform!
case "$host" in
*-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*)
case "$host" in
+ *-raspberry-linux*)
+ # Raspberry Pi
+ ARCH=linux
+ RPI_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
+ RPI_LDFLAGS="-L/opt/vc/lib -lbcm_host"
+ CFLAGS="$CFLAGS $RPI_CFLAGS"
+ SDL_CFLAGS="$SDL_CFLAGS $RPI_CFLAGS"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS $RPI_CFLAGS"
+ SDL_LIBS="$SDL_LIBS $RPI_LDFLAGS"
+
+ if test x$enable_video = xyes; then
+ SOURCES="$SOURCES $srcdir/src/video/raspberry/*.c"
+ $as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
+ fi
+ ;;
*-*-linux*) ARCH=linux ;;
*-*-uclinux*) ARCH=linux ;;
*-*-kfreebsd*-gnu) ARCH=kfreebsd-gnu ;;
@@ -2370,6 +2421,7 @@ case "$host" in
CheckLibUDev
CheckDBus
CheckInputEvents
+ CheckInputKD
CheckTslib
CheckUSBHID
CheckPTHREAD
@@ -2428,12 +2480,26 @@ case "$host" in
;;
esac
fi
+ # Set up files for the filesystem library
+ if test x$enable_filesystem = xyes; then
+ AC_DEFINE(SDL_FILESYSTEM_UNIX, 1, [ ])
+ SOURCES="$SOURCES $srcdir/src/filesystem/unix/*.c"
+ have_filesystem=yes
+ fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMER_UNIX, 1, [ ])
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
have_timers=yes
fi
+ # Set up files for udev hotplugging support
+ if test x$enable_libudev = xyes && test x$have_libudev_h_hdr = xyes; then
+ SOURCES="$SOURCES $srcdir/src/core/linux/SDL_udev.c"
+ fi
+ # Set up files for evdev input
+ if test x$use_input_events = xyes; then
+ SOURCES="$SOURCES $srcdir/src/input/evdev/*.c"
+ fi
;;
*-*-cygwin* | *-*-mingw32*)
ARCH=win32
@@ -2506,6 +2572,11 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
SOURCES="$SOURCES $srcdir/src/power/windows/SDL_syspower.c"
have_power=yes
fi
+ if test x$enable_filesystem = xyes; then
+ AC_DEFINE(SDL_FILESYSTEM_WINDOWS, 1, [ ])
+ SOURCES="$SOURCES $srcdir/src/filesystem/windows/SDL_sysfilesystem.c"
+ have_filesystem=yes
+ fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
AC_DEFINE(SDL_THREAD_WINDOWS, 1, [ ])
@@ -2588,6 +2659,12 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
SOURCES="$SOURCES $srcdir/src/power/beos/*.c"
have_power=yes
fi
+ # Set up files for the system filesystem library
+ if test x$enable_filesystem = xyes; then
+ AC_DEFINE(SDL_FILESYSTEM_BEOS, 1, [ ])
+ SOURCES="$SOURCES $srcdir/src/filesystem/beos/*.cc"
+ have_filesystem=yes
+ fi
# The BeOS platform requires special setup.
SOURCES="$srcdir/src/main/beos/*.cc $SOURCES"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
@@ -2627,6 +2704,11 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
SOURCES="$SOURCES $srcdir/src/power/uikit/*.m"
have_power=yes
fi
+ # Set up files for the filesystem library
+ if test x$enable_filesystem = xyes; then
+ SOURCES="$SOURCES $srcdir/src/filesystem/cocoa/*.m"
+ have_filesystem=yes
+ fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
@@ -2700,6 +2782,12 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
SOURCES="$SOURCES $srcdir/src/power/macosx/*.c"
have_power=yes
fi
+ # Set up files for the filesystem library
+ if test x$enable_filesystem = xyes; then
+ AC_DEFINE(SDL_FILESYSTEM_COCOA, 1, [ ])
+ SOURCES="$SOURCES $srcdir/src/filesystem/cocoa/*.m"
+ have_filesystem=yes
+ fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMER_UNIX, 1, [ ])
@@ -2757,6 +2845,12 @@ if test x$have_timers != xyes; then
fi
SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"
fi
+if test x$have_filesystem != xyes; then
+ if test x$enable_filesystem = xyes; then
+ AC_DEFINE(SDL_FILESYSTEM_DISABLED, 1, [ ])
+ fi
+ SOURCES="$SOURCES $srcdir/src/filesystem/dummy/*.c"
+fi
if test x$have_loadso != xyes; then
if test x$enable_loadso = xyes; then
AC_DEFINE(SDL_LOADSO_DISABLED, 1, [ ])
diff --git a/debian/changelog b/debian/changelog
index 1065a8a..8e9dd49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsdl2 (2.0.1) UNRELEASED; urgency=low
+
+ * Updated SDL to version 2.0.1
+
+ -- Sam Lantinga <slouken@libsdl.org> Wed, 23 Oct 2013 16:31:38 -0800
+
libsdl2 (2.0.0) UNRELEASED; urgency=low
* SDL is now a native debian package.
diff --git a/include/SDL.h b/include/SDL.h
index f2d760c..c0c067c 100644
--- a/include/SDL.h
+++ b/include/SDL.h
@@ -32,18 +32,20 @@
*
* \section intro_sec Introduction
*
- * This is the Simple DirectMedia Layer, a general API that provides low
- * level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
- * and 2D framebuffer across multiple platforms.
+ * Simple DirectMedia Layer is a cross-platform development library designed
+ * to provide low level access to audio, keyboard, mouse, joystick, and
+ * graphics hardware via OpenGL and Direct3D. It is used by video playback
+ * software, emulators, and popular games including Valve's award winning
+ * catalog and many Humble Bundle games.
*
- * SDL is written in C, but works with C++ natively, and has bindings to
- * several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
- * Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
- * Pike, Pliant, Python, Ruby, and Smalltalk.
+ * SDL officially supports Windows, Mac OS X, Linux, iOS, and Android.
+ * Support for other platforms may be found in the source code.
*
- * This library is distributed under the zlib license, which can be
- * found in the file "COPYING". This license allows you to use SDL
- * freely for any purpose as long as you retain the copyright notice.
+ * SDL is written in C, works natively with C++, and there are bindings
+ * available for several other languages, including C# and Python.
+ *
+ * This library is distributed under the zlib license, which can be found
+ * in the file "COPYING.txt".
*
* The best way to learn how to use SDL is to check out the header files in
* the "include" subdirectory and the programs in the "test" subdirectory.
@@ -72,6 +74,7 @@
#include "SDL_endian.h"
#include "SDL_error.h"
#include "SDL_events.h"
+#include "SDL_filesystem.h"
#include "SDL_joystick.h"
#include "SDL_gamecontroller.h"
#include "SDL_haptic.h"
@@ -103,7 +106,7 @@ extern "C" {
* These are the flags which may be passed to SDL_Init(). You should
* specify the subsystems which you will be using in your application.
*/
-/*@{*/
+/* @{ */
#define SDL_INIT_TIMER 0x00000001
#define SDL_INIT_AUDIO 0x00000010
#define SDL_INIT_VIDEO 0x00000020 /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
@@ -116,7 +119,7 @@ extern "C" {
SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \
)
-/*@}*/
+/* @} */
/**
* This function initializes the subsystems specified by \c flags
diff --git a/include/SDL_assert.h b/include/SDL_assert.h
index 5a6afc5..4329434 100644
--- a/include/SDL_assert.h
+++ b/include/SDL_assert.h
@@ -86,8 +86,14 @@ This also solves the problem of...
disable assertions.
*/
+#ifdef _MSC_VER /* stupid /W4 warnings. */
+#define SDL_NULL_WHILE_LOOP_CONDITION (-1 == __LINE__)
+#else
+#define SDL_NULL_WHILE_LOOP_CONDITION (0)
+#endif
+
#define SDL_disabled_assert(condition) \
- do { (void) sizeof ((condition)); } while (0)
+ do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION)
typedef enum
{
@@ -140,7 +146,7 @@ extern DECLSPEC SDL_assert_state SDLCALL SDL_ReportAssertion(SDL_assert_data *,
} \
break; /* not retrying. */ \
} \
- } while (0)
+ } while (SDL_NULL_WHILE_LOOP_CONDITION)
#endif /* enabled assertions support code */
@@ -165,6 +171,9 @@ extern DECLSPEC SDL_assert_state SDLCALL SDL_ReportAssertion(SDL_assert_data *,
# error Unknown assertion level.
#endif
+/* this assertion is never disabled at any level. */
+#define SDL_assert_always(condition) SDL_enabled_assert(condition)
+
typedef SDL_assert_state (SDLCALL *SDL_AssertionHandler)(
const SDL_assert_data* data, void* userdata);
diff --git a/include/SDL_atomic.h b/include/SDL_atomic.h
index 7bd669d..48b0053 100644
--- a/include/SDL_atomic.h
+++ b/include/SDL_atomic.h
@@ -91,7 +91,7 @@ extern "C" {
* The spin lock functions and type are required and can not be
* emulated because they are used in the atomic emulation code.
*/
-/*@{*/
+/* @{ */
typedef int SDL_SpinLock;
@@ -118,7 +118,7 @@ extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock);
*/
extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock);
-/*@}*//*SDL AtomicLock*/
+/* @} *//* SDL AtomicLock */
/**
diff --git a/include/SDL_audio.h b/include/SDL_audio.h
index 0b6f28a..b9da236 100644
--- a/include/SDL_audio.h
+++ b/include/SDL_audio.h
@@ -66,7 +66,7 @@ typedef Uint16 SDL_AudioFormat;
/**
* \name Audio flags
*/
-/*@{*/
+/* @{ */
#define SDL_AUDIO_MASK_BITSIZE (0xFF)
#define SDL_AUDIO_MASK_DATATYPE (1<<8)
@@ -85,7 +85,7 @@ typedef Uint16 SDL_AudioFormat;
*
* Defaults to LSB byte order.
*/
-/*@{*/
+/* @{ */
#define AUDIO_U8 0x0008 /**< Unsigned 8-bit samples */
#define AUDIO_S8 0x8008 /**< Signed 8-bit samples */
#define AUDIO_U16LSB 0x0010 /**< Unsigned 16-bit samples */
@@ -94,30 +94,30 @@ typedef Uint16 SDL_AudioFormat;
#define AUDIO_S16MSB 0x9010 /**< As above, but big-endian byte order */
#define AUDIO_U16 AUDIO_U16LSB
#define AUDIO_S16 AUDIO_S16LSB
-/*@}*/
+/* @} */
/**
* \name int32 support
*/
-/*@{*/
+/* @{ */
#define AUDIO_S32LSB 0x8020 /**< 32-bit integer samples */
#define AUDIO_S32MSB 0x9020 /**< As above, but big-endian byte order */
#define AUDIO_S32 AUDIO_S32LSB
-/*@}*/
+/* @} */
/**
* \name float32 support
*/
-/*@{*/
+/* @{ */
#define AUDIO_F32LSB 0x8120 /**< 32-bit floating point samples */
#define AUDIO_F32MSB 0x9120 /**< As above, but big-endian byte order */
#define AUDIO_F32 AUDIO_F32LSB
-/*@}*/
+/* @} */
/**
* \name Native audio byte ordering
*/
-/*@{*/
+/* @{ */
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define AUDIO_U16SYS AUDIO_U16LSB
#define AUDIO_S16SYS AUDIO_S16LSB
@@ -129,21 +129,21 @@ typedef Uint16 SDL_AudioFormat;
#define AUDIO_S32SYS AUDIO_S32MSB
#define AUDIO_F32SYS AUDIO_F32MSB
#endif
-/*@}*/
+/* @} */
/**
* \name Allow change flags
*
* Which audio format changes are allowed when opening a device.
*/
-/*@{*/
+/* @{ */
#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE 0x00000001
#define SDL_AUDIO_ALLOW_FORMAT_CHANGE 0x00000002
#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE 0x00000004
#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
-/*@}*/
+/* @} */
-/*@}*//*Audio flags*/
+/* @} *//* Audio flags */
/**
* This function is called when the audio device needs more data.
@@ -218,10 +218,10 @@ typedef struct SDL_AudioCVT
* These functions return the list of built in audio drivers, in the
* order that they are normally initialized by default.
*/
-/*@{*/
+/* @{ */
extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void);
extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
-/*@}*/
+/* @} */
/**
* \name Initialization and cleanup
@@ -230,10 +230,10 @@ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
* you have a specific need to specify the audio driver you want to
* use. You should normally use SDL_Init() or SDL_InitSubSystem().
*/
-/*@{*/
+/* @{ */
extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
-/*@}*/
+/* @} */
/**
* This function returns the name of the current audio driver, or NULL
@@ -359,7 +359,7 @@ extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
*
* Get the current audio state.
*/
-/*@{*/
+/* @{ */
typedef enum
{
SDL_AUDIO_STOPPED = 0,
@@ -370,7 +370,7 @@ extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void);
extern DECLSPEC SDL_AudioStatus SDLCALL
SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
-/*@}*//*Audio State*/
+/* @} *//* Audio State */
/**
* \name Pause audio functions
@@ -381,11 +381,11 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
* data for your callback function after opening the audio device.
* Silence will be written to the audio device during the pause.
*/
-/*@{*/
+/* @{ */
extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
int pause_on);
-/*@}*//*Pause audio functions*/
+/* @} *//* Pause audio functions */
/**
* This function loads a WAVE from the data source, automatically freeing
@@ -482,12 +482,12 @@ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst,
* the callback function is not running. Do not call these from the callback
* function or you will cause deadlock.
*/
-/*@{*/
+/* @{ */
extern DECLSPEC void SDLCALL SDL_LockAudio(void);
extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev);
extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev);
-/*@}*//*Audio lock functions*/
+/* @} *//* Audio lock functions */
/**
* This function shuts down audio processing and closes the audio device.
diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake
index 12c14fa..66107e4 100644
--- a/include/SDL_config.h.cmake
+++ b/include/SDL_config.h.cmake
@@ -182,6 +182,7 @@
#cmakedefine SDL_TIMERS_DISABLED @SDL_TIMERS_DISABLED@
#cmakedefine SDL_VIDEO_DISABLED @SDL_VIDEO_DISABLED@
#cmakedefine SDL_POWER_DISABLED @SDL_POWER_DISABLED@
+#cmakedefine SDL_FILESYSTEM_DISABLED @SDL_FILESYSTEM_DISABLED@
/* Enable various audio drivers */
#cmakedefine SDL_AUDIO_DRIVER_ALSA @SDL_AUDIO_DRIVER_ALSA@
@@ -287,10 +288,12 @@
/* Enable OpenGL support */
#cmakedefine SDL_VIDEO_OPENGL @SDL_VIDEO_OPENGL@
#cmakedefine SDL_VIDEO_OPENGL_ES @SDL_VIDEO_OPENGL_ES@
+#cmakedefine SDL_VIDEO_OPENGL_ES2 @SDL_VIDEO_OPENGL_ES2@
#cmakedefine SDL_VIDEO_OPENGL_BGL @SDL_VIDEO_OPENGL_BGL@
#cmakedefine SDL_VIDEO_OPENGL_CGL @SDL_VIDEO_OPENGL_CGL@
#cmakedefine SDL_VIDEO_OPENGL_GLX @SDL_VIDEO_OPENGL_GLX@
#cmakedefine SDL_VIDEO_OPENGL_WGL @SDL_VIDEO_OPENGL_WGL@
+#cmakedefine SDL_VIDEO_OPENGL_EGL @SDL_VIDEO_OPENGL_EGL@
#cmakedefine SDL_VIDEO_OPENGL_OSMESA @SDL_VIDEO_OPENGL_OSMESA@
#cmakedefine SDL_VIDEO_OPENGL_OSMESA_DYNAMIC @SDL_VIDEO_OPENGL_OSMESA_DYNAMIC@
@@ -301,6 +304,13 @@
#cmakedefine SDL_POWER_BEOS @SDL_POWER_BEOS@
#cmakedefine SDL_POWER_HARDWIRED @SDL_POWER_HARDWIRED@
+/* Enable system filesystem support */
+#cmakedefine SDL_FILESYSTEM_BEOS @SDL_FILESYSTEM_BEOS@
+#cmakedefine SDL_FILESYSTEM_COCOA @SDL_FILESYSTEM_COCOA@
+#cmakedefine SDL_FILESYSTEM_DUMMY @SDL_FILESYSTEM_DUMMY@
+#cmakedefine SDL_FILESYSTEM_UNIX @SDL_FILESYSTEM_UNIX@
+#cmakedefine SDL_FILESYSTEM_WINDOWS @SDL_FILESYSTEM_WINDOWS@
+
/* Enable assembly routines */
#cmakedefine SDL_ASSEMBLY_ROUTINES @SDL_ASSEMBLY_ROUTINES@
#cmakedefine SDL_ALTIVEC_BLITTERS @SDL_ALTIVEC_BLITTERS@
diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
index 04ee110..b2daf6f 100644
--- a/include/SDL_config.h.in
+++ b/include/SDL_config.h.in
@@ -184,6 +184,7 @@
#undef SDL_TIMERS_DISABLED
#undef SDL_VIDEO_DISABLED
#undef SDL_POWER_DISABLED
+#undef SDL_FILESYSTEM_DISABLED
/* Enable various audio drivers */
#undef SDL_AUDIO_DRIVER_ALSA
@@ -216,6 +217,7 @@
/* Enable various input drivers */
#undef SDL_INPUT_LINUXEV
+#undef SDL_INPUT_LINUXKD
#undef SDL_INPUT_TSLIB
#undef SDL_JOYSTICK_BEOS
#undef SDL_JOYSTICK_DINPUT
@@ -258,6 +260,7 @@
#undef SDL_VIDEO_DRIVER_DUMMY
#undef SDL_VIDEO_DRIVER_WINDOWS
#undef SDL_VIDEO_DRIVER_X11
+#undef SDL_VIDEO_DRIVER_RPI
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR
@@ -288,8 +291,10 @@
/* Enable OpenGL support */
#undef SDL_VIDEO_OPENGL
#undef SDL_VIDEO_OPENGL_ES
+#undef SDL_VIDEO_OPENGL_ES2
#undef SDL_VIDEO_OPENGL_BGL
#undef SDL_VIDEO_OPENGL_CGL
+#undef SDL_VIDEO_OPENGL_EGL
#undef SDL_VIDEO_OPENGL_GLX
#undef SDL_VIDEO_OPENGL_WGL
#undef SDL_VIDEO_OPENGL_OSMESA
@@ -302,6 +307,13 @@
#undef SDL_POWER_BEOS
#undef SDL_POWER_HARDWIRED
+/* Enable system filesystem support */
+#undef SDL_FILESYSTEM_BEOS
+#undef SDL_FILESYSTEM_COCOA
+#undef SDL_FILESYSTEM_DUMMY
+#undef SDL_FILESYSTEM_UNIX
+#undef SDL_FILESYSTEM_WINDOWS
+
/* Enable assembly routines */
#undef SDL_ASSEMBLY_ROUTINES
#undef SDL_ALTIVEC_BLITTERS
diff --git a/include/SDL_config_android.h b/include/SDL_config_android.h
index e0c019f..0826415 100644
--- a/include/SDL_config_android.h
+++ b/include/SDL_config_android.h
@@ -129,10 +129,14 @@
/* Enable OpenGL ES */
#define SDL_VIDEO_OPENGL_ES 1
+#define SDL_VIDEO_OPENGL_EGL 1
#define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_RENDER_OGL_ES2 1
/* Enable system power support */
#define SDL_POWER_ANDROID 1
+/* !!! FIXME: what does Android do for filesystem stuff? */
+#define SDL_FILESYSTEM_DUMMY 1
+
#endif /* _SDL_config_android_h */
diff --git a/include/SDL_config_iphoneos.h b/include/SDL_config_iphoneos.h
index b27b189..ade2966 100644
--- a/include/SDL_config_iphoneos.h
+++ b/include/SDL_config_iphoneos.h
@@ -148,4 +148,7 @@
*/
#define SDL_IPHONE_MAX_GFORCE 5.0
+/* enable filesystem support */
+#define SDL_FILESYSTEM_COCOA 1
+
#endif /* _SDL_config_iphoneos_h */
diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h
index 68a0ebb..9f2f76e 100644
--- a/include/SDL_config_macosx.h
+++ b/include/SDL_config_macosx.h
@@ -171,6 +171,9 @@
/* Enable system power support */
#define SDL_POWER_MACOSX 1
+/* enable filesystem support */
+#define SDL_FILESYSTEM_COCOA 1
+
/* Enable assembly routines */
#define SDL_ASSEMBLY_ROUTINES 1
#ifdef __ppc__
diff --git a/include/SDL_config_minimal.h b/include/SDL_config_minimal.h
index fe3cebc..3248bdd 100644
--- a/include/SDL_config_minimal.h
+++ b/include/SDL_config_minimal.h
@@ -75,4 +75,7 @@ typedef unsigned long uintptr_t;
/* Enable the dummy video driver (src/video/dummy/\*.c) */
#define SDL_VIDEO_DRIVER_DUMMY 1
+/* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */
+#define SDL_FILESYSTEM_DUMMY 1
+
#endif /* _SDL_config_minimal_h */
diff --git a/include/SDL_config_pandora.h b/include/SDL_config_pandora.h
index b93a1bc..4bfad48 100644
--- a/include/SDL_config_pandora.h
+++ b/include/SDL_config_pandora.h
@@ -114,6 +114,7 @@
#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1
#define SDL_TIMER_UNIX 1
+#define SDL_FILESYSTEM_UNIX 1
#define SDL_VIDEO_DRIVER_DUMMY 1
#define SDL_VIDEO_DRIVER_X11 1
diff --git a/include/SDL_config_psp.h b/include/SDL_config_psp.h
index bf456f6..31ac2b2 100644
--- a/include/SDL_config_psp.h
+++ b/include/SDL_config_psp.h
@@ -99,8 +99,8 @@
#define HAVE_SQRT 1
#define HAVE_SETJMP 1
#define HAVE_NANOSLEEP 1
-//#define HAVE_SYSCONF 1
-//#define HAVE_SIGACTION 1
+/* #define HAVE_SYSCONF 1 */
+/* #define HAVE_SIGACTION 1 */
/* PSP isn't that sophisticated */
@@ -126,6 +126,9 @@
#define SDL_POWER_PSP 1
+/* !!! FIXME: what does PSP do for filesystem stuff? */
+#define SDL_FILESYSTEM_DUMMY 1
+
/* PSP doesn't have haptic device (src/haptic/dummy/\*.c) */
#define SDL_HAPTIC_DISABLED 1
diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h
index 0b76215..4d5c7c2 100644
--- a/include/SDL_config_windows.h
+++ b/include/SDL_config_windows.h
@@ -105,12 +105,10 @@ typedef unsigned int uintptr_t;
#define HAVE_STRCHR 1
#define HAVE_STRRCHR 1
#define HAVE_STRSTR 1
-#define HAVE_ITOA 1
#define HAVE__LTOA 1
#define HAVE__ULTOA 1
#define HAVE_STRTOL 1
#define HAVE_STRTOUL 1
-#define HAVE_STRTOLL 1
#define HAVE_STRTOD 1
#define HAVE_ATOI 1
#define HAVE_ATOF 1
@@ -118,22 +116,27 @@ typedef unsigned int uintptr_t;
#define HAVE_STRNCMP 1
#define HAVE__STRICMP 1
#define HAVE__STRNICMP 1
-#define HAVE_SSCANF 1
-#define HAVE_M_PI 1
#define HAVE_ATAN 1
#define HAVE_ATAN2 1
#define HAVE_CEIL 1
-#define HAVE_COPYSIGN 1
#define HAVE_COS 1
#define HAVE_COSF 1
#define HAVE_FABS 1
#define HAVE_FLOOR 1
#define HAVE_LOG 1
#define HAVE_POW 1
-#define HAVE_SCALBN 1
#define HAVE_SIN 1
#define HAVE_SINF 1
#define HAVE_SQRT 1
+#if _MSC_VER >= 1800
+#define HAVE_STRTOLL 1
+#define HAVE_SSCANF 1
+#define HAVE_COPYSIGN 1
+#define HAVE_SCALBN 1
+#endif
+#if !defined(_MSC_VER) || defined(_USE_MATH_DEFINES)
+#define HAVE_M_PI 1
+#endif
#else
#define HAVE_STDARG_H 1
#define HAVE_STDDEF_H 1
@@ -181,6 +184,9 @@ typedef unsigned int uintptr_t;
/* Enable system power support */
#define SDL_POWER_WINDOWS 1
+/* Enable filesystem support */
+#define SDL_FILESYSTEM_WINDOWS 1
+
/* Enable assembly routines (Win64 doesn't have inline asm) */
#ifndef _WIN64
#define SDL_ASSEMBLY_ROUTINES 1
diff --git a/include/SDL_cpuinfo.h b/include/SDL_cpuinfo.h
index a722ee4..528a668 100644
--- a/include/SDL_cpuinfo.h
+++ b/include/SDL_cpuinfo.h
@@ -134,6 +134,11 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void);
*/
extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void);
+/**
+ * This function returns the amount of RAM configured in the system, in MB.
+ */
+extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void);
+
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
diff --git a/include/SDL_endian.h b/include/SDL_endian.h
index c58edcc..3450316 100644
--- a/include/SDL_endian.h
+++ b/include/SDL_endian.h
@@ -33,10 +33,10 @@
/**
* \name The two types of endianness
*/
-/*@{*/
+/* @{ */
#define SDL_LIL_ENDIAN 1234
#define SDL_BIG_ENDIAN 4321
-/*@}*/
+/* @} */
#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */
#ifdef __linux__
@@ -206,7 +206,7 @@ SDL_SwapFloat(float x)
* \name Swap to native
* Byteswap item from the specified endianness to the native endianness.
*/
-/*@{*/
+/* @{ */
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
#define SDL_SwapLE16(X) (X)
#define SDL_SwapLE32(X) (X)
@@ -226,7 +226,7 @@ SDL_SwapFloat(float x)
#define SDL_SwapBE64(X) (X)
#define SDL_SwapFloatBE(X) (X)
#endif
-/*@}*//*Swap to native*/
+/* @} *//* Swap to native */
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
diff --git a/include/SDL_error.h b/include/SDL_error.h
index 229b268..2b8bb41 100644
--- a/include/SDL_error.h
+++ b/include/SDL_error.h
@@ -48,7 +48,7 @@ extern DECLSPEC void SDLCALL SDL_ClearError(void);
* \internal
* Private error reporting function - used internally.
*/
-/*@{*/
+/* @{ */
#define SDL_OutOfMemory() SDL_Error(SDL_ENOMEM)
#define SDL_Unsupported() SDL_Error(SDL_UNSUPPORTED)
#define SDL_InvalidParamError(param) SDL_SetError("Parameter '%s' is invalid", (param))
@@ -63,7 +63,7 @@ typedef enum
} SDL_errorcode;
/* SDL_Error() unconditionally returns -1. */
extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
-/*@}*//*Internal error functions*/
+/* @} *//* Internal error functions */
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
diff --git a/include/SDL_events.h b/include/SDL_events.h
index b997b5e..c089030 100644
--- a/include/SDL_events.h
+++ b/include/SDL_events.h
@@ -541,7 +541,7 @@ typedef union SDL_Event
*/
extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
-/*@{*/
+/* @{ */
typedef enum
{
SDL_ADDEVENT,
@@ -570,7 +570,7 @@ typedef enum
extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
SDL_eventaction action,
Uint32 minType, Uint32 maxType);
-/*@}*/
+/* @} */
/**
* Checks to see if certain event types are in the event queue.
@@ -681,7 +681,7 @@ extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter,
extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
void *userdata);
-/*@{*/
+/* @{ */
#define SDL_QUERY -1
#define SDL_IGNORE 0
#define SDL_DISABLE 0
@@ -697,7 +697,7 @@ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
* current processing state of the specified event.
*/
extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state);
-/*@}*/
+/* @} */
#define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY)
/**
diff --git a/include/SDL_filesystem.h b/include/SDL_filesystem.h
new file mode 100644
index 0000000..ea8a1b5
--- /dev/null
+++ b/include/SDL_filesystem.h
@@ -0,0 +1,136 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * \file SDL_filesystem.h
+ *
+ * \brief Include file for filesystem SDL API functions
+ */
+
+#ifndef _SDL_filesystem_h
+#define _SDL_filesystem_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Get the path where the application resides.
+ *
+ * Get the "base path". This is the directory where the application was run
+ * from, which is probably the installation directory, and may or may not
+ * be the process's current working directory.
+ *
+ * This returns an absolute path in UTF-8 encoding, and is guaranteed to
+ * end with a path separator ('\\' on Windows, '/' most other places).
+ *
+ * The pointer returned by this function is owned by you. Please call
+ * SDL_free() on the pointer when you are done with it, or it will be a
+ * memory leak. This is not necessarily a fast call, though, so you should
+ * call this once near startup and save the string if you need it.
+ *
+ * Some platforms can't determine the application's path, and on other
+ * platforms, this might be meaningless. In such cases, this function will
+ * return NULL.
+ *
+ * \return String of base dir in UTF-8 encoding, or NULL on error.
+ *
+ * \sa SDL_GetPrefPath
+ */
+extern DECLSPEC char *SDLCALL SDL_GetBasePath(void);
+
+/**
+ * \brief Get the user-and-app-specific path where files can be written.
+ *
+ * Get the "pref dir". This is meant to be where users can write personal
+ * files (preferences and save games, etc) that are specific to your
+ * application. This directory is unique per user, per application.
+ *
+ * This function will decide the appropriate location in the native filesystem,
+ * create the directory if necessary, and return a string of the absolute
+ * path to the directory in UTF-8 encoding.
+ *
+ * On Windows, the string might look like:
+ * "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\"
+ *
+ * On Linux, the string might look like:
+ * "/home/bob/.local/share/My Program Name/"
+ *
+ * On Mac OS X, the string might look like:
+ * "/Users/bob/Library/Application Support/My Program Name/"
+ *
+ * (etc.)
+ *
+ * You specify the name of your organization (if it's not a real organization,
+ * your name or an Internet domain you own might do) and the name of your
+ * application. These should be untranslated proper names.
+ *
+ * Both the org and app strings may become part of a directory name, so
+ * please follow these rules:
+ *
+ * - Try to use the same org string (including case-sensitivity) for
+ * all your applications that use this function.
+ * - Always use a unique app string for each one, and make sure it never
+ * changes for an app once you've decided on it.
+ * - Unicode characters are legal, as long as it's UTF-8 encoded, but...
+ * - ...only use letters, numbers, and spaces. Avoid punctuation like
+ * "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient.
+ *
+ * This returns an absolute path in UTF-8 encoding, and is guaranteed to
+ * end with a path separator ('\\' on Windows, '/' most other places).
+ *
+ * The pointer returned by this function is owned by you. Please call
+ * SDL_free() on the pointer when you are done with it, or it will be a
+ * memory leak. This is not necessarily a fast call, though, so you should
+ * call this once near startup and save the string if you need it.
+ *
+ * You should assume the path returned by this function is the only safe
+ * place to write files (and that SDL_GetBasePath(), while it might be
+ * writable, or even the parent of the returned path, aren't where you
+ * should be writing things).
+ *
+ * Some platforms can't determine the pref path, and on other
+ * platforms, this might be meaningless. In such cases, this function will
+ * return NULL.
+ *
+ * \param org The name of your organization.
+ * \param app The name of your application.
+ * \return UTF-8 string of user dir in platform-dependent notation. NULL
+ * if there's a problem (creating directory failed, etc).
+ *
+ * \sa SDL_GetBasePath
+ */
+extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_system_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL_haptic.h b/include/SDL_haptic.h
index da555c9..a029eb9 100644
--- a/include/SDL_haptic.h
+++ b/include/SDL_haptic.h
@@ -140,12 +140,12 @@ typedef struct _SDL_Haptic SDL_Haptic;
*
* Different haptic features a device can have.
*/
-/*@{*/
+/* @{ */
/**
* \name Haptic effects
*/
-/*@{*/
+/* @{ */
/**
* \brief Constant effect supported.
@@ -177,7 +177,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
#define SDL_HAPTIC_LEFTRIGHT (1<<2)
/* !!! FIXME: put this back when we have more bits in 2.1 */
-/*#define SDL_HAPTIC_SQUARE (1<<2)*/
+/* #define SDL_HAPTIC_SQUARE (1<<2) */
/**
* \brief Triangle wave effect supported.
@@ -262,7 +262,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
*/
#define SDL_HAPTIC_CUSTOM (1<<11)
-/*@}*//*Haptic effects*/
+/* @} *//* Haptic effects */
/* These last few are features the device has, not effects */
@@ -305,7 +305,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
/**
* \name Direction encodings
*/
-/*@{*/
+/* @{ */
/**
* \brief Uses polar coordinates for the direction.
@@ -328,9 +328,9 @@ typedef struct _SDL_Haptic SDL_Haptic;
*/
#define SDL_HAPTIC_SPHERICAL 2
-/*@}*//*Direction encodings*/
+/* @} *//* Direction encodings */
-/*@}*//*Haptic features*/
+/* @} *//* Haptic features */
/*
* Misc defines.
diff --git a/include/SDL_hints.h b/include/SDL_hints.h
index 6e2a785..d195d96 100644
--- a/include/SDL_hints.h
+++ b/include/SDL_hints.h
@@ -95,6 +95,17 @@ extern "C" {
#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS"
/**
+ * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations.
+ *
+ * This variable can be set to the following values:
+ * "0" - Thread-safety is not enabled (faster)
+ * "1" - Thread-safety is enabled
+ *
+ * By default the Direct3D device is created with thread-safety disabled.
+ */
+#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE"
+
+/**
* \brief A variable controlling the scaling quality
*
* This variable can be set to the following values:
@@ -271,6 +282,11 @@ extern "C" {
#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION"
+/**
+ * \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac)
+ */
+#define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED"
+
/**
* \brief An enumeration of hint priorities
diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h
index 2667403..b0e4b5d 100644
--- a/include/SDL_joystick.h
+++ b/include/SDL_joystick.h
@@ -187,7 +187,7 @@ extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
/**
* \name Hat positions
*/
-/*@{*/
+/* @{ */
#define SDL_HAT_CENTERED 0x00
#define SDL_HAT_UP 0x01
#define SDL_HAT_RIGHT 0x02
@@ -197,7 +197,7 @@ extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
#define SDL_HAT_RIGHTDOWN (SDL_HAT_RIGHT|SDL_HAT_DOWN)
#define SDL_HAT_LEFTUP (SDL_HAT_LEFT|SDL_HAT_UP)
#define SDL_HAT_LEFTDOWN (SDL_HAT_LEFT|SDL_HAT_DOWN)
-/*@}*/
+/* @} */
/**
* Get the current state of a POV hat on a joystick.
diff --git a/include/SDL_main.h b/include/SDL_main.h
index 8151b4a..c373f63 100644
--- a/include/SDL_main.h
+++ b/include/SDL_main.h
@@ -106,7 +106,7 @@ extern C_LINKAGE int SDL_main(int argc, char *argv[]);
extern "C" {
#endif
-/*
+/**
* This is called by the real SDL main function to let the rest of the
* library know that initialization was done properly.
*
diff --git a/include/SDL_mutex.h b/include/SDL_mutex.h
index 3efc4a8..2b5df0e 100644
--- a/include/SDL_mutex.h
+++ b/include/SDL_mutex.h
@@ -52,9 +52,9 @@ extern "C" {
/**
* \name Mutex functions
*/
-/*@{*/
+/* @{ */
-/* The SDL mutex structure, defined in SDL_mutex.c */
+/* The SDL mutex structure, defined in SDL_sysmutex.c */
struct SDL_mutex;
typedef struct SDL_mutex SDL_mutex;
@@ -94,15 +94,15 @@ extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex);
*/
extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex);
-/*@}*//*Mutex functions*/
+/* @} *//* Mutex functions */
/**
* \name Semaphore functions
*/
-/*@{*/
+/* @{ */
-/* The SDL semaphore structure, defined in SDL_sem.c */
+/* The SDL semaphore structure, defined in SDL_syssem.c */
struct SDL_semaphore;
typedef struct SDL_semaphore SDL_sem;
@@ -154,15 +154,15 @@ extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem);
*/
extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem);
-/*@}*//*Semaphore functions*/
+/* @} *//* Semaphore functions */
/**
* \name Condition variable functions
*/
-/*@{*/
+/* @{ */
-/* The SDL condition variable structure, defined in SDL_cond.c */
+/* The SDL condition variable structure, defined in SDL_syscond.c */
struct SDL_cond;
typedef struct SDL_cond SDL_cond;
@@ -237,7 +237,7 @@ extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex);
extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
SDL_mutex * mutex, Uint32 ms);
-/*@}*//*Condition variable functions*/
+/* @} *//* Condition variable functions */
/* Ends C function definitions when using C++ */
diff --git a/include/SDL_pixels.h b/include/SDL_pixels.h
index 5e17cba..99fcd9a 100644
--- a/include/SDL_pixels.h
+++ b/include/SDL_pixels.h
@@ -39,10 +39,10 @@ extern "C" {
*
* These define alpha as the opacity of a surface.
*/
-/*@{*/
+/* @{ */
#define SDL_ALPHA_OPAQUE 255
#define SDL_ALPHA_TRANSPARENT 0
-/*@}*/
+/* @} */
/** Pixel type. */
enum
diff --git a/include/SDL_platform.h b/include/SDL_platform.h
index 419b633..8a7bc56 100644
--- a/include/SDL_platform.h
+++ b/include/SDL_platform.h
@@ -1,168 +1,172 @@
-/*
- Simple DirectMedia Layer
- Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- * \file SDL_platform.h
- *
- * Try to get a standard set of platform defines.
- */
-
-#ifndef _SDL_platform_h
-#define _SDL_platform_h
-
-#if defined(_AIX)
-#undef __AIX__
-#define __AIX__ 1
-#endif
-#if defined(__BEOS__)
-#undef __BEOS__
-#define __BEOS__ 1
-#endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__ 1
-#endif
-#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__ 1
-#endif
-#if defined(_arch_dreamcast)
-#undef __DREAMCAST__
-#define __DREAMCAST__ 1
-#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__ 1
-#endif
-#if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__ 1
-#endif
-#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__ 1
-#endif
-#if defined(linux) || defined(__linux) || defined(__linux__)
-#undef __LINUX__
-#define __LINUX__ 1
-#endif
-#if defined(ANDROID)
-#undef __ANDROID__
-#undef __LINUX__ /*do we need to do this?*/
-#define __ANDROID__ 1
-#endif
-
-#if defined(__APPLE__)
-/* lets us know what version of Mac OS X we're compiling on */
-#include "AvailabilityMacros.h"
-#include "TargetConditionals.h"
-#if TARGET_OS_IPHONE
-/* if compiling for iPhone */
-#undef __IPHONEOS__
-#define __IPHONEOS__ 1
-#undef __MACOSX__
-#else
-/* if not compiling for iPhone */
-#undef __MACOSX__
-#define __MACOSX__ 1
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-# error SDL for Mac OS X only supports deploying on 10.5 and above.
-#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-# error SDL for Mac OS X must be built with a 10.6 SDK or above.
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
-#endif /* TARGET_OS_IPHONE */
-#endif /* defined(__APPLE__) */
-
-#if defined(__NetBSD__)
-#undef __NETBSD__
-#define __NETBSD__ 1
-#endif
-#if defined(__OpenBSD__)
-#undef __OPENBSD__
-#define __OPENBSD__ 1
-#endif
-#if defined(__OS2__)
-#undef __OS2__
-#define __OS2__ 1
-#endif
-#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__ 1
-#endif
-#if defined(__QNXNTO__)
-#undef __QNXNTO__
-#define __QNXNTO__ 1
-#endif
-#if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__ 1
-#endif
-#if defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__ 1
-#endif
-
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * \file SDL_platform.h
+ *
+ * Try to get a standard set of platform defines.
+ */
+
+#ifndef _SDL_platform_h
+#define _SDL_platform_h
+
+#if defined(_AIX)
+#undef __AIX__
+#define __AIX__ 1
+#endif
+#if defined(__BEOS__)
+#undef __BEOS__
+#define __BEOS__ 1
+#endif
+#if defined(__HAIKU__)
+#undef __HAIKU__
+#define __HAIKU__ 1
+#endif
+#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
+#undef __BSDI__
+#define __BSDI__ 1
+#endif
+#if defined(_arch_dreamcast)
+#undef __DREAMCAST__
+#define __DREAMCAST__ 1
+#endif
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#undef __FREEBSD__
+#define __FREEBSD__ 1
+#endif
+#if defined(hpux) || defined(__hpux) || defined(__hpux__)
+#undef __HPUX__
+#define __HPUX__ 1
+#endif
+#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
+#undef __IRIX__
+#define __IRIX__ 1
+#endif
+#if defined(linux) || defined(__linux) || defined(__linux__)
+#undef __LINUX__
+#define __LINUX__ 1
+#endif
+#if defined(ANDROID)
+#undef __ANDROID__
+#undef __LINUX__ /* do we need to do this? */
+#define __ANDROID__ 1
+#endif
+
+#if defined(__APPLE__)
+/* lets us know what version of Mac OS X we're compiling on */
+#include "AvailabilityMacros.h"
+#include "TargetConditionals.h"
+#if TARGET_OS_IPHONE
+/* if compiling for iPhone */
+#undef __IPHONEOS__
+#define __IPHONEOS__ 1
+#undef __MACOSX__
+#else
+/* if not compiling for iPhone */
+#undef __MACOSX__
+#define __MACOSX__ 1
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+# error SDL for Mac OS X only supports deploying on 10.5 and above.
+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+# error SDL for Mac OS X must be built with a 10.6 SDK or above.
+#endif /* MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
+#endif /* TARGET_OS_IPHONE */
+#endif /* defined(__APPLE__) */
+
+#if defined(__NetBSD__)
+#undef __NETBSD__
+#define __NETBSD__ 1
+#endif
+#if defined(__OpenBSD__)
+#undef __OPENBSD__
+#define __OPENBSD__ 1
+#endif
+#if defined(__OS2__)
+#undef __OS2__
+#define __OS2__ 1
+#endif
+#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
+#undef __OSF__
+#define __OSF__ 1
+#endif
+#if defined(__QNXNTO__)
+#undef __QNXNTO__
+#define __QNXNTO__ 1
+#endif
+#if defined(riscos) || defined(__riscos) || defined(__riscos__)
+#undef __RISCOS__
+#define __RISCOS__ 1
+#endif
+#if defined(__SVR4)
+#undef __SOLARIS__
+#define __SOLARIS__ 1
+#endif
+
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
-/* Try to find out what version of Windows we are compiling for */
+/* Try to find out if we're compiling for WinRT or non-WinRT */
#if defined(_MSC_VER) && (_MSC_VER >= 1700) /* _MSC_VER==1700 for MSVC 2012 */
#include <winapifamily.h>
-#endif
-/* Default to classic, Win32 / Desktop compilation either if:
+#endif /* _MSC_VER >= 1700 */
+/* Default to classic, Win32/Win64/Desktop compilation either if:
1. the version of Windows is explicity set to a 'Desktop' (non-Metro) app
2. the version of Windows cannot be determined via winapifamily.h
- If neither is true, see if we're compiling for WinRT.
+ If neither is true, then see if we're compiling for WinRT.
*/
#if ! defined(WINAPI_FAMILY_PARTITION) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#undef __WIN32__
-#define __WIN32__ 1
+#undef __WINDOWS__
+#define __WINDOWS__ 1
/* See if we're compiling for WinRT: */
#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
#undef __WINRT__
#define __WINRT__ 1
#endif /* ! defined(WINAPI_FAMILY_PARTITION) */
-#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */
-
-#if defined(__PSP__)
-#undef __PSP__
-#define __PSP__ 1
-#endif
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief Gets the name of the platform.
- */
-extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_platform_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
+#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */
+
+#if defined(__WINDOWS__)
+#undef __WIN32__
+#define __WIN32__ 1
+#endif
+#if defined(__PSP__)
+#undef __PSP__
+#define __PSP__ 1
+#endif
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Gets the name of the platform.
+ */
+extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_platform_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL_rect.h b/include/SDL_rect.h
index c8af7c1..7132e1b 100644
--- a/include/SDL_rect.h
+++ b/include/SDL_rect.h
@@ -44,7 +44,7 @@ extern "C" {
*
* \sa SDL_EnclosePoints
*/
-typedef struct
+typedef struct SDL_Point
{
int x;
int y;
diff --git a/include/SDL_render.h b/include/SDL_render.h
index 1e24619..a765dc7 100644
--- a/include/SDL_render.h
+++ b/include/SDL_render.h
@@ -382,6 +382,31 @@ extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture,
const void *pixels, int pitch);
/**
+ * \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data.
+ *
+ * \param texture The texture to update
+ * \param rect A pointer to the rectangle of pixels to update, or NULL to
+ * update the entire texture.
+ * \param Yplane The raw pixel data for the Y plane.
+ * \param Ypitch The number of bytes between rows of pixel data for the Y plane.
+ * \param Uplane The raw pixel data for the U plane.
+ * \param Upitch The number of bytes between rows of pixel data for the U plane.
+ * \param Vplane The raw pixel data for the V plane.
+ * \param Vpitch The number of bytes between rows of pixel data for the V plane.
+ *
+ * \return 0 on success, or -1 if the texture is not valid.
+ *
+ * \note You can use SDL_UpdateTexture() as long as your pixel data is
+ * a contiguous block of Y and U/V planes in the proper order, but
+ * this function is available if your pixel data is not contiguous.
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture,
+ const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch);
+
+/**
* \brief Lock a portion of the texture for write-only pixel access.
*
* \param texture The texture to lock for access, which was created with
diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h
index 0461ff7..d257442 100644
--- a/include/SDL_rwops.h
+++ b/include/SDL_rwops.h
@@ -148,7 +148,7 @@ typedef struct SDL_RWops
*
* Functions to create SDL_RWops structures from various data streams.
*/
-/*@{*/
+/* @{ */
extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file,
const char *mode);
@@ -165,7 +165,7 @@ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size);
extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem,
int size);
-/*@}*//*RWFrom functions*/
+/* @} *//* RWFrom functions */
extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void);
@@ -180,14 +180,14 @@ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
*
* Macros to easily read and write from an SDL_RWops structure.
*/
-/*@{*/
+/* @{ */
#define SDL_RWsize(ctx) (ctx)->size(ctx)
#define SDL_RWseek(ctx, offset, whence) (ctx)->seek(ctx, offset, whence)
#define SDL_RWtell(ctx) (ctx)->seek(ctx, 0, RW_SEEK_CUR)
#define SDL_RWread(ctx, ptr, size, n) (ctx)->read(ctx, ptr, size, n)
#define SDL_RWwrite(ctx, ptr, size, n) (ctx)->write(ctx, ptr, size, n)
#define SDL_RWclose(ctx) (ctx)->close(ctx)
-/*@}*//*Read/write macros*/
+/* @} *//* Read/write macros */
/**
@@ -195,7 +195,7 @@ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
*
* Read an item of the specified endianness and return in native format.
*/
-/*@{*/
+/* @{ */
extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src);
extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src);
extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src);
@@ -203,14 +203,14 @@ extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src);
extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src);
extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src);
extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src);
-/*@}*//*Read endian functions*/
+/* @} *//* Read endian functions */
/**
* \name Write endian functions
*
* Write an item of native format to the specified endianness.
*/
-/*@{*/
+/* @{ */
extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value);
extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
@@ -218,7 +218,7 @@ extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
-/*@}*//*Write endian functions*/
+/* @} *//* Write endian functions */
/* Ends C function definitions when using C++ */
diff --git a/include/SDL_scancode.h b/include/SDL_scancode.h
index d3f8748..00b47a3 100644
--- a/include/SDL_scancode.h
+++ b/include/SDL_scancode.h
@@ -49,7 +49,7 @@ typedef enum
*
* These values are from usage page 0x07 (USB keyboard page).
*/
- /*@{*/
+ /* @{ */
SDL_SCANCODE_A = 4,
SDL_SCANCODE_B = 5,
@@ -339,14 +339,14 @@ typedef enum
* special KMOD_MODE for it I'm adding it here
*/
- /*@}*//*Usage page 0x07*/
+ /* @} *//* Usage page 0x07 */
/**
* \name Usage page 0x0C
*
* These values are mapped from usage page 0x0C (USB consumer page).
*/
- /*@{*/
+ /* @{ */
SDL_SCANCODE_AUDIONEXT = 258,
SDL_SCANCODE_AUDIOPREV = 259,
@@ -366,14 +366,14 @@ typedef enum
SDL_SCANCODE_AC_REFRESH = 273,
SDL_SCANCODE_AC_BOOKMARKS = 274,
- /*@}*//*Usage page 0x0C*/
+ /* @} *//* Usage page 0x0C */
/**
* \name Walther keys
*
* These are values that Christian Walther added (for mac keyboard?).
*/
- /*@{*/
+ /* @{ */
SDL_SCANCODE_BRIGHTNESSDOWN = 275,
SDL_SCANCODE_BRIGHTNESSUP = 276,
@@ -388,7 +388,7 @@ typedef enum
SDL_SCANCODE_APP1 = 283,
SDL_SCANCODE_APP2 = 284,
- /*@}*//*Walther keys*/
+ /* @} *//* Walther keys */
/* Add any other keys here. */
diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
index e4a71d3..7a6557a 100644
--- a/include/SDL_stdinc.h
+++ b/include/SDL_stdinc.h
@@ -99,7 +99,7 @@
* Use proper C++ casts when compiled as C++ to be compatible with the option
* -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above).
*/
-/*@{*/
+/* @{ */
#ifdef __cplusplus
#define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
#define SDL_static_cast(type, expression) static_cast<type>(expression)
@@ -109,7 +109,7 @@
#define SDL_static_cast(type, expression) ((type)(expression))
#define SDL_const_cast(type, expression) ((type)(expression))
#endif
-/*@}*//*Cast operators*/
+/* @} *//* Cast operators */
/* Define a four character code as a Uint32 */
#define SDL_FOURCC(A, B, C, D) \
@@ -121,7 +121,7 @@
/**
* \name Basic data types
*/
-/*@{*/
+/* @{ */
typedef enum
{
@@ -163,7 +163,7 @@ typedef int64_t Sint64;
*/
typedef uint64_t Uint64;
-/*@}*//*Basic data types*/
+/* @} *//* Basic data types */
#define SDL_COMPILE_TIME_ASSERT(name, x) \
diff --git a/include/SDL_surface.h b/include/SDL_surface.h
index fece797..e18153a 100644
--- a/include/SDL_surface.h
+++ b/include/SDL_surface.h
@@ -48,12 +48,12 @@ extern "C" {
* \internal
* Used internally (read-only).
*/
-/*@{*/
+/* @{ */
#define SDL_SWSURFACE 0 /**< Just here for compatibility */
#define SDL_PREALLOC 0x00000001 /**< Surface uses preallocated memory */
#define SDL_RLEACCEL 0x00000002 /**< Surface is RLE encoded */
#define SDL_DONTFREE 0x00000004 /**< Surface is referenced internally */
-/*@}*//*Surface flags*/
+/* @} *//* Surface flags */
/**
* Evaluates to true if the surface needs to be locked before access.
@@ -357,7 +357,7 @@ extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface,
* surface.
*/
extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface
- (SDL_Surface * src, SDL_PixelFormat * fmt, Uint32 flags);
+ (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags);
extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat
(SDL_Surface * src, Uint32 pixel_format, Uint32 flags);
diff --git a/include/SDL_system.h b/include/SDL_system.h
index 056d07f..5dc64cc 100644
--- a/include/SDL_system.h
+++ b/include/SDL_system.h
@@ -1,169 +1,185 @@
-/*
- Simple DirectMedia Layer
- Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- * \file SDL_system.h
- *
- * Include file for platform specific SDL API functions
- */
-
-#ifndef _SDL_system_h
-#define _SDL_system_h
-
-#include "SDL_stdinc.h"
-
-#if defined(__IPHONEOS__) && __IPHONEOS__
-#include "SDL_video.h"
-#include "SDL_keyboard.h"
-#endif
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Platform specific functions for iOS */
-#if defined(__IPHONEOS__) && __IPHONEOS__
-
-extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
-extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
-
-#endif /* __IPHONEOS__ */
-
-
-/* Platform specific functions for Android */
-#if defined(__ANDROID__) && __ANDROID__
-
-/* Get the JNI environment for the current thread
- This returns JNIEnv*, but the prototype is void* so we don't need jni.h
- */
-extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv();
-
-/* Get the SDL Activity object for the application
- This returns jobject, but the prototype is void* so we don't need jni.h
- The jobject returned by SDL_AndroidGetActivity is a local reference.
- It is the caller's responsibility to properly release it
- (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef)
- */
-extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity();
-
-/* See the official Android developer guide for more information:
- http://developer.android.com/guide/topics/data/data-storage.html
-*/
-#define SDL_ANDROID_EXTERNAL_STORAGE_READ 0x01
-#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE 0x02
-
-/* Get the path used for internal storage for this application.
- This path is unique to your application and cannot be written to
- by other applications.
- */
-extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath();
-
-/* Get the current state of external storage, a bitmask of these values:
- SDL_ANDROID_EXTERNAL_STORAGE_READ
- SDL_ANDROID_EXTERNAL_STORAGE_WRITE
- If external storage is currently unavailable, this will return 0.
-*/
-extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState();
-
-/* Get the path used for external storage for this application.
- This path is unique to your application, but is public and can be
- written to by other applications.
- */
-extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath();
-
-#endif /* __ANDROID__ */
-
-
-/* Platform specific functions for WinRT */
-#if defined(__WINRT__) && __WINRT__
-
-/**
- * \brief WinRT / Windows Phone path types
- */
-typedef enum
-{
- /** \brief The installed app's root directory.
- Files here are likely to be read-only. */
- SDL_WINRT_PATH_INSTALLED_LOCATION,
-
- /** \brief The app's local data store. Files may be written here */
- SDL_WINRT_PATH_LOCAL_FOLDER,
-
- /** \brief The app's roaming data store. Unsupported on Windows Phone.
- Files written here may be copied to other machines via a network
- connection.
- */
- SDL_WINRT_PATH_ROAMING_FOLDER,
-
- /** \brief The app's temporary data store. Unsupported on Windows Phone.
- Files written here may be deleted at any time. */
- SDL_WINRT_PATH_TEMP_FOLDER
-} SDL_WinRT_Path;
-
-
-/**
- * \brief Retrieves a WinRT defined path on the local file system
- *
- * \note Documentation on most app-specific path types on WinRT
- * can be found on MSDN, at the URL:
- * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
- *
- * \param pathType The type of path to retrieve.
- * \ret A UCS-2 string (16-bit, wide-char) containing the path, or NULL
- * if the path is not available for any reason. Not all paths are
- * available on all versions of Windows. This is especially true on
- * Windows Phone. Check the documentation for the given
- * SDL_WinRT_Path for more information on which path types are
- * supported where.
- */
-extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType);
-
-/**
- * \brief Retrieves a WinRT defined path on the local file system
- *
- * \note Documentation on most app-specific path types on WinRT
- * can be found on MSDN, at the URL:
- * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
- *
- * \param pathType The type of path to retrieve.
- * \ret A UTF-8 string (8-bit, multi-byte) containing the path, or NULL
- * if the path is not available for any reason. Not all paths are
- * available on all versions of Windows. This is especially true on
- * Windows Phone. Check the documentation for the given
- * SDL_WinRT_Path for more information on which path types are
- * supported where.
- */
-extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType);
-
-#endif /* __WINRT__ */
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_system_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * \file SDL_system.h
+ *
+ * Include file for platform specific SDL API functions
+ */
+
+#ifndef _SDL_system_h
+#define _SDL_system_h
+
+#include "SDL_stdinc.h"
+#include "SDL_keyboard.h"
+#include "SDL_render.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Platform specific functions for Windows */
+#ifdef __WIN32__
+
+/* Returns the D3D9 adapter index that matches the specified display index.
+ This adapter index can be passed to IDirect3D9::CreateDevice and controls
+ on which monitor a full screen application will appear.
+*/
+extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex );
+
+/* Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer.
+ Once you are done using the device, you should release it to avoid a resource leak.
+ */
+typedef struct IDirect3DDevice9 IDirect3DDevice9;
+extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer);
+
+#endif /* __WIN32__ */
+
+
+/* Platform specific functions for iOS */
+#if defined(__IPHONEOS__) && __IPHONEOS__
+
+extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
+extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
+
+#endif /* __IPHONEOS__ */
+
+
+/* Platform specific functions for Android */
+#if defined(__ANDROID__) && __ANDROID__
+
+/* Get the JNI environment for the current thread
+ This returns JNIEnv*, but the prototype is void* so we don't need jni.h
+ */
+extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv();
+
+/* Get the SDL Activity object for the application
+ This returns jobject, but the prototype is void* so we don't need jni.h
+ The jobject returned by SDL_AndroidGetActivity is a local reference.
+ It is the caller's responsibility to properly release it
+ (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef)
+ */
+extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity();
+
+/* See the official Android developer guide for more information:
+ http://developer.android.com/guide/topics/data/data-storage.html
+*/
+#define SDL_ANDROID_EXTERNAL_STORAGE_READ 0x01
+#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE 0x02
+
+/* Get the path used for internal storage for this application.
+ This path is unique to your application and cannot be written to
+ by other applications.
+ */
+extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath();
+
+/* Get the current state of external storage, a bitmask of these values:
+ SDL_ANDROID_EXTERNAL_STORAGE_READ
+ SDL_ANDROID_EXTERNAL_STORAGE_WRITE
+ If external storage is currently unavailable, this will return 0.
+*/
+extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState();
+
+/* Get the path used for external storage for this application.
+ This path is unique to your application, but is public and can be
+ written to by other applications.
+ */
+extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath();
+
+#endif /* __ANDROID__ */
+
+/* Platform specific functions for WinRT */
+#if defined(__WINRT__) && __WINRT__
+
+/**
+ * \brief WinRT / Windows Phone path types
+ */
+typedef enum
+{
+ /** \brief The installed app's root directory.
+ Files here are likely to be read-only. */
+ SDL_WINRT_PATH_INSTALLED_LOCATION,
+
+ /** \brief The app's local data store. Files may be written here */
+ SDL_WINRT_PATH_LOCAL_FOLDER,
+
+ /** \brief The app's roaming data store. Unsupported on Windows Phone.
+ Files written here may be copied to other machines via a network
+ connection.
+ */
+ SDL_WINRT_PATH_ROAMING_FOLDER,
+
+ /** \brief The app's temporary data store. Unsupported on Windows Phone.
+ Files written here may be deleted at any time. */
+ SDL_WINRT_PATH_TEMP_FOLDER
+} SDL_WinRT_Path;
+
+
+/**
+ * \brief Retrieves a WinRT defined path on the local file system
+ *
+ * \note Documentation on most app-specific path types on WinRT
+ * can be found on MSDN, at the URL:
+ * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
+ *
+ * \param pathType The type of path to retrieve.
+ * \ret A UCS-2 string (16-bit, wide-char) containing the path, or NULL
+ * if the path is not available for any reason. Not all paths are
+ * available on all versions of Windows. This is especially true on
+ * Windows Phone. Check the documentation for the given
+ * SDL_WinRT_Path for more information on which path types are
+ * supported where.
+ */
+extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType);
+
+/**
+ * \brief Retrieves a WinRT defined path on the local file system
+ *
+ * \note Documentation on most app-specific path types on WinRT
+ * can be found on MSDN, at the URL:
+ * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
+ *
+ * \param pathType The type of path to retrieve.
+ * \ret A UTF-8 string (8-bit, multi-byte) containing the path, or NULL
+ * if the path is not available for any reason. Not all paths are
+ * available on all versions of Windows. This is especially true on
+ * Windows Phone. Check the documentation for the given
+ * SDL_WinRT_Path for more information on which path types are
+ * supported where.
+ */
+extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType);
+
+#endif /* __WINRT__ */
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_system_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL_test_common.h b/include/SDL_test_common.h
index f07acf7..57f3114 100644
--- a/include/SDL_test_common.h
+++ b/include/SDL_test_common.h
@@ -108,6 +108,7 @@ typedef struct
int gl_major_version;
int gl_minor_version;
int gl_debug;
+ int gl_profile_mask;
} SDLTest_CommonState;
#include "begin_code.h"
diff --git a/include/SDL_test_harness.h b/include/SDL_test_harness.h
index d2da04f..935038e 100644
--- a/include/SDL_test_harness.h
+++ b/include/SDL_test_harness.h
@@ -43,43 +43,43 @@ extern "C" {
#endif
-//! Definitions for test case structures
+/* ! Definitions for test case structures */
#define TEST_ENABLED 1
#define TEST_DISABLED 0
-//! Definition of all the possible test return values of the test case method
+/* ! Definition of all the possible test return values of the test case method */
#define TEST_ABORTED -1
#define TEST_STARTED 0
#define TEST_COMPLETED 1
#define TEST_SKIPPED 2
-//! Definition of all the possible test results for the harness
+/* ! Definition of all the possible test results for the harness */
#define TEST_RESULT_PASSED 0
#define TEST_RESULT_FAILED 1
#define TEST_RESULT_NO_ASSERT 2
#define TEST_RESULT_SKIPPED 3
#define TEST_RESULT_SETUP_FAILURE 4
-//!< Function pointer to a test case setup function (run before every test)
+/* !< Function pointer to a test case setup function (run before every test) */
typedef void (*SDLTest_TestCaseSetUpFp)(void *arg);
-//!< Function pointer to a test case function
+/* !< Function pointer to a test case function */
typedef int (*SDLTest_TestCaseFp)(void *arg);
-//!< Function pointer to a test case teardown function (run after every test)
+/* !< Function pointer to a test case teardown function (run after every test) */
typedef void (*SDLTest_TestCaseTearDownFp)(void *arg);
/**
* Holds information about a single test case.
*/
typedef struct SDLTest_TestCaseReference {
- /*!< Func2Stress */
+ /* !< Func2Stress */
SDLTest_TestCaseFp testCase;
- /*!< Short name (or function name) "Func2Stress" */
+ /* !< Short name (or function name) "Func2Stress" */
char *name;
- /*!< Long name or full description "This test pushes func2() to the limit." */
+ /* !< Long name or full description "This test pushes func2() to the limit." */
char *description;
- /*!< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
+ /* !< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
int enabled;
} SDLTest_TestCaseReference;
@@ -87,13 +87,13 @@ typedef struct SDLTest_TestCaseReference {
* Holds information about a test suite (multiple test cases).
*/
typedef struct SDLTest_TestSuiteReference {
- /*!< "PlatformSuite" */
+ /* !< "PlatformSuite" */
char *name;
- /*!< The function that is run before each test. NULL skips. */
+ /* !< The function that is run before each test. NULL skips. */
SDLTest_TestCaseSetUpFp testSetUp;
- /*!< The test cases that are run as part of the suite. Last item should be NULL. */
+ /* !< The test cases that are run as part of the suite. Last item should be NULL. */
const SDLTest_TestCaseReference **testCases;
- /*!< The function that is run after each test. NULL skips. */
+ /* !< The function that is run after each test. NULL skips. */
SDLTest_TestCaseTearDownFp testTearDown;
} SDLTest_TestSuiteReference;
diff --git a/include/SDL_thread.h b/include/SDL_thread.h
index c878c3a..f248c3d 100644
--- a/include/SDL_thread.h
+++ b/include/SDL_thread.h
@@ -51,9 +51,10 @@ typedef unsigned long SDL_threadID;
/* Thread local storage ID, 0 is the invalid ID */
typedef unsigned int SDL_TLSID;
-/* The SDL thread priority
+/**
+ * The SDL thread priority.
*
- * Note: On many systems you require special privileges to set high priority.
+ * \note On many systems you require special privileges to set high priority.
*/
typedef enum {
SDL_THREAD_PRIORITY_LOW,
@@ -61,8 +62,9 @@ typedef enum {
SDL_THREAD_PRIORITY_HIGH
} SDL_ThreadPriority;
-/* The function passed to SDL_CreateThread()
- It is passed a void* user context parameter and returns an int.
+/**
+ * The function passed to SDL_CreateThread().
+ * It is passed a void* user context parameter and returns an int.
*/
typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
diff --git a/include/SDL_timer.h b/include/SDL_timer.h
index e065cf4..28ab415 100644
--- a/include/SDL_timer.h
+++ b/include/SDL_timer.h
@@ -45,6 +45,17 @@ extern "C" {
extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);
/**
+ * \brief Compare SDL ticks values, and return true if A has passed B
+ *
+ * e.g. if you want to wait 100 ms, you could do this:
+ * Uint32 timeout = SDL_GetTicks() + 100;
+ * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) {
+ * ... do work until timeout has elapsed
+ * }
+ */
+#define SDL_TICKS_PASSED(A, B) ((Sint32)((B) - (A)) <= 0)
+
+/**
* \brief Get the current value of the high resolution counter
*/
extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void);
diff --git a/include/SDL_version.h b/include/SDL_version.h
index a9ced80..dc52c85 100644
--- a/include/SDL_version.h
+++ b/include/SDL_version.h
@@ -59,7 +59,7 @@ typedef struct SDL_version
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 0
-#define SDL_PATCHLEVEL 0
+#define SDL_PATCHLEVEL 1
/**
* \brief Macro to determine SDL version program was compiled against.
diff --git a/include/SDL_video.h b/include/SDL_video.h
index f3a9619..4a53f9b 100644
--- a/include/SDL_video.h
+++ b/include/SDL_video.h
@@ -107,7 +107,8 @@ typedef enum
SDL_WINDOW_INPUT_FOCUS = 0x00000200, /**< window has input focus */
SDL_WINDOW_MOUSE_FOCUS = 0x00000400, /**< window has mouse focus */
SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ),
- SDL_WINDOW_FOREIGN = 0x00000800 /**< window not created by SDL */
+ SDL_WINDOW_FOREIGN = 0x00000800, /**< window not created by SDL */
+ SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000 /**< window should be created in high-DPI mode if supported */
} SDL_WindowFlags;
/**
@@ -186,14 +187,15 @@ typedef enum
SDL_GL_CONTEXT_EGL,
SDL_GL_CONTEXT_FLAGS,
SDL_GL_CONTEXT_PROFILE_MASK,
- SDL_GL_SHARE_WITH_CURRENT_CONTEXT
+ SDL_GL_SHARE_WITH_CURRENT_CONTEXT,
+ SDL_GL_FRAMEBUFFER_SRGB_CAPABLE
} SDL_GLattr;
typedef enum
{
SDL_GL_CONTEXT_PROFILE_CORE = 0x0001,
SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002,
- SDL_GL_CONTEXT_PROFILE_ES = 0x0004
+ SDL_GL_CONTEXT_PROFILE_ES = 0x0004 /* GLX_CONTEXT_ES2_PROFILE_BIT_EXT */
} SDL_GLprofile;
typedef enum
@@ -393,10 +395,11 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window);
* \param w The width of the window.
* \param h The height of the window.
* \param flags The flags for the window, a mask of any of the following:
- * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL,
- * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS,
- * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED,
- * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED.
+ * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL,
+ * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS,
+ * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED,
+ * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED,
+ * ::SDL_WINDOW_ALLOW_HIGHDPI.
*
* \return The id of the window created, or zero if window creation failed.
*
@@ -821,7 +824,7 @@ extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void);
/**
* \name OpenGL support functions
*/
-/*@{*/
+/* @{ */
/**
* \brief Dynamically load an OpenGL library.
@@ -900,6 +903,24 @@ extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void);
extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void);
/**
+ * \brief Get the size of a window's underlying drawable (for use with glViewport).
+ *
+ * \param window Window from which the drawable size should be queried
+ * \param w Pointer to variable for storing the width, may be NULL
+ * \param h Pointer to variable for storing the height, may be NULL
+ *
+ * This may differ from SDL_GetWindowSize if we're rendering to a high-DPI
+ * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a
+ * platform with high-DPI support (Apple calls this "Retina"), and not disabled
+ * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint.
+ *
+ * \sa SDL_GetWindowSize()
+ * \sa SDL_CreateWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w,
+ int *h);
+
+/**
* \brief Set the swap interval for the current OpenGL context.
*
* \param interval 0 for immediate updates, 1 for updates synchronized with the
@@ -939,7 +960,7 @@ extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window);
*/
extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
-/*@}*//*OpenGL support functions*/
+/* @} *//* OpenGL support functions */
/* Ends C function definitions when using C++ */
diff --git a/include/begin_code.h b/include/begin_code.h
index 8997a72..1a5aa31 100644
--- a/include/begin_code.h
+++ b/include/begin_code.h
@@ -1,150 +1,140 @@
-/*
- Simple DirectMedia Layer
- Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- * \file begin_code.h
- *
- * This file sets things up for C dynamic library function definitions,
- * static inlined functions, and structures aligned at 4-byte alignment.
- * If you don't like ugly C preprocessor code, don't look at this file. :)
- */
-
-/* This shouldn't be nested -- included it around code only. */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
-#endif
-#define _begin_code_h
-
-/* Some compilers use a special export keyword */
-#ifndef DECLSPEC
-# if defined(__BEOS__) || defined(__HAIKU__)
-# if defined(__GNUC__)
-# define DECLSPEC __declspec(dllexport)
-# else
-# define DECLSPEC __declspec(export)
-# endif
-# elif defined(__WIN32__) || defined(__WINRT__)
-# ifdef __BORLANDC__
-# ifdef BUILD_SDL
-# define DECLSPEC
-# else
-# define DECLSPEC __declspec(dllimport)
-# endif
-# else
-# define DECLSPEC __declspec(dllexport)
-# endif
-# else
-# if defined(__GNUC__) && __GNUC__ >= 4
-# define DECLSPEC __attribute__ ((visibility("default")))
-# else
-# define DECLSPEC
-# endif
-# endif
-#endif
-
-/* By default SDL uses the C calling convention */
-#ifndef SDLCALL
-#if (defined(__WIN32__) || defined(__WINRT__)) && !defined(__GNUC__)
-#define SDLCALL __cdecl
-#else
-#define SDLCALL
-#endif
-#endif /* SDLCALL */
-
-/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
-#ifdef __SYMBIAN32__
-#undef DECLSPEC
-#define DECLSPEC
-#endif /* __SYMBIAN32__ */
-
-/* Force structure packing at 4 byte alignment.
- This is necessary if the header is included in code which has structure
- packing set to an alternate value, say for loading structures from disk.
- The packing is reset to the previous value in close_code.h
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
-#ifdef _MSC_VER
-#pragma warning(disable: 4103)
-#endif
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#ifdef _M_X64
-/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
-#pragma pack(push,8)
-#else
-#pragma pack(push,4)
-#endif
-#endif /* Compiler needs structure packing set */
-
-/* Set up compiler-specific options for inlining functions */
-#ifndef SDL_INLINE_OKAY
-#ifdef __GNUC__
-#define SDL_INLINE_OKAY
-#else
-/* Add any special compiler-specific cases here */
-#if defined(_MSC_VER) || defined(__BORLANDC__) || \
- defined(__DMC__) || defined(__SC__) || \
- defined(__WATCOMC__) || defined(__LCC__) || \
- defined(__DECC)
-#ifndef __inline__
-#define __inline__ __inline
-#endif
-#define SDL_INLINE_OKAY
-#else
-#if !defined(__MRC__) && !defined(_SGI_SOURCE)
-#ifndef __inline__
-#define __inline__ inline
-#endif
-#define SDL_INLINE_OKAY
-#endif /* Not a funky compiler */
-#endif /* Visual C++ */
-#endif /* GNU C */
-#endif /* SDL_INLINE_OKAY */
-
-/* If inlining isn't supported, remove "__inline__", turning static
- inlined functions into static functions (resulting in code bloat
- in all files which include the offending header files)
-*/
-#ifndef SDL_INLINE_OKAY
-#define __inline__
-#endif
-
-#ifndef SDL_FORCE_INLINE
-#if defined(_MSC_VER)
-#define SDL_FORCE_INLINE __forceinline
-#elif ( (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) )
-#define SDL_FORCE_INLINE __attribute__((always_inline)) static inline
-#else
-#define SDL_FORCE_INLINE static __inline__
-#endif
-#endif
-
-/* Apparently this is needed by several Windows compilers */
-#if !defined(__MACH__)
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif /* NULL */
-#endif /* ! Mac OS X - breaks precompiled headers */
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * \file begin_code.h
+ *
+ * This file sets things up for C dynamic library function definitions,
+ * static inlined functions, and structures aligned at 4-byte alignment.
+ * If you don't like ugly C preprocessor code, don't look at this file. :)
+ */
+
+/* This shouldn't be nested -- included it around code only. */
+#ifdef _begin_code_h
+#error Nested inclusion of begin_code.h
+#endif
+#define _begin_code_h
+
+#ifndef SDL_DEPRECATED
+# if (__GNUC__ >= 4) /* technically, this arrived in gcc 3.1, but oh well. */
+# define SDL_DEPRECATED __attribute__((deprecated))
+# else
+# define SDL_DEPRECATED
+# endif
+#endif
+
+/* Some compilers use a special export keyword */
+#ifndef DECLSPEC
+# if defined(__WIN32__) || defined(__WINRT__)
+# ifdef __BORLANDC__
+# ifdef BUILD_SDL
+# define DECLSPEC
+# else
+# define DECLSPEC __declspec(dllimport)
+# endif
+# else
+# define DECLSPEC __declspec(dllexport)
+# endif
+# else
+# if defined(__GNUC__) && __GNUC__ >= 4
+# define DECLSPEC __attribute__ ((visibility("default")))
+# elif defined(__GNUC__) && __GNUC__ >= 2
+# define DECLSPEC __declspec(dllexport)
+# else
+# define DECLSPEC
+# endif
+# endif
+#endif
+
+/* By default SDL uses the C calling convention */
+#ifndef SDLCALL
+#if (defined(__WIN32__) || defined(__WINRT__)) && !defined(__GNUC__)
+#define SDLCALL __cdecl
+#else
+#define SDLCALL
+#endif
+#endif /* SDLCALL */
+
+/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
+#ifdef __SYMBIAN32__
+#undef DECLSPEC
+#define DECLSPEC
+#endif /* __SYMBIAN32__ */
+
+/* Force structure packing at 4 byte alignment.
+ This is necessary if the header is included in code which has structure
+ packing set to an alternate value, say for loading structures from disk.
+ The packing is reset to the previous value in close_code.h
+ */
+#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
+#ifdef _MSC_VER
+#pragma warning(disable: 4103)
+#endif
+#ifdef __BORLANDC__
+#pragma nopackwarning
+#endif
+#ifdef _M_X64
+/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
+#pragma pack(push,8)
+#else
+#pragma pack(push,4)
+#endif
+#endif /* Compiler needs structure packing set */
+
+#ifndef SDL_INLINE
+#if defined(__GNUC__)
+#define SDL_INLINE __inline__
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || \
+ defined(__DMC__) || defined(__SC__) || \
+ defined(__WATCOMC__) || defined(__LCC__) || \
+ defined(__DECC)
+#define SDL_INLINE __inline
+#ifndef __inline__
+#define __inline__ __inline
+#endif
+#else
+#define SDL_INLINE inline
+#ifndef __inline__
+#define __inline__ inline
+#endif
+#endif
+#endif /* SDL_INLINE not defined */
+
+#ifndef SDL_FORCE_INLINE
+#if defined(_MSC_VER)
+#define SDL_FORCE_INLINE __forceinline
+#elif ( (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) )
+#define SDL_FORCE_INLINE __attribute__((always_inline)) static __inline__
+#else
+#define SDL_FORCE_INLINE static SDL_INLINE
+#endif
+#endif /* SDL_FORCE_INLINE not defined */
+
+/* Apparently this is needed by several Windows compilers */
+#if !defined(__MACH__)
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL 0
+#else
+#define NULL ((void *)0)
+#endif
+#endif /* NULL */
+#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/src/SDL.c b/src/SDL.c
index d8c05fb..0f6de9f 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -20,6 +20,10 @@
*/
#include "SDL_config.h"
+#if defined(__WIN32__)
+#include "core/windows/SDL_windows.h"
+#endif
+
/* Initialization code for SDL */
#include "SDL.h"
@@ -441,7 +445,6 @@ SDL_GetPlatform()
#if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
/* Need to include DllMain() on Watcom C for some reason.. */
-#include "core/windows/SDL_windows.h"
BOOL APIENTRY
_DllMainCRTStartup(HANDLE hModule,
diff --git a/src/SDL_assert.c b/src/SDL_assert.c
index 73ebfe5..5fa8424 100644
--- a/src/SDL_assert.c
+++ b/src/SDL_assert.c
@@ -20,6 +20,10 @@
*/
#include "SDL_config.h"
+#if defined(__WIN32__)
+#include "core/windows/SDL_windows.h"
+#endif
+
#include "SDL.h"
#include "SDL_atomic.h"
#include "SDL_messagebox.h"
@@ -29,8 +33,6 @@
#include "video/SDL_sysvideo.h"
#ifdef __WIN32__
-#include "core/windows/SDL_windows.h"
-
#ifndef WS_OVERLAPPEDWINDOW
#define WS_OVERLAPPEDWINDOW 0
#endif
diff --git a/src/SDL_hints.c b/src/SDL_hints.c
index b00e961..a1eae9f 100644
--- a/src/SDL_hints.c
+++ b/src/SDL_hints.c
@@ -72,14 +72,8 @@ SDL_SetHintWithPriority(const char *name, const char *value,
entry->callback(entry->userdata, name, hint->value, value);
entry = next;
}
- if (hint->value) {
- SDL_free(hint->value);
- }
- if (value) {
- hint->value = SDL_strdup(value);
- } else {
- hint->value = NULL;
- }
+ SDL_free(hint->value);
+ hint->value = value ? SDL_strdup(value) : NULL;
}
hint->priority = priority;
return SDL_TRUE;
@@ -210,9 +204,7 @@ void SDL_ClearHints(void)
SDL_hints = hint->next;
SDL_free(hint->name);
- if (hint->value) {
- SDL_free(hint->value);
- }
+ SDL_free(hint->value);
for (entry = hint->callbacks; entry; ) {
SDL_HintWatch *freeable = entry;
entry = entry->next;
diff --git a/src/SDL_log.c b/src/SDL_log.c
index 1bd8ae6..4ad5c42 100644
--- a/src/SDL_log.c
+++ b/src/SDL_log.c
@@ -1,436 +1,439 @@
-/*
- Simple DirectMedia Layer
- Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
-#include "SDL_config.h"
-
-/* Simple log messages in SDL */
-
-#include "SDL_log.h"
-
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif
-
-#if defined(__WIN32__) || defined(__WINRT__)
-#include "core/windows/SDL_windows.h"
-#elif defined(__ANDROID__)
-#include <android/log.h>
-#endif
-
-#define DEFAULT_PRIORITY SDL_LOG_PRIORITY_CRITICAL
-#define DEFAULT_ASSERT_PRIORITY SDL_LOG_PRIORITY_WARN
-#define DEFAULT_APPLICATION_PRIORITY SDL_LOG_PRIORITY_INFO
-#define DEFAULT_TEST_PRIORITY SDL_LOG_PRIORITY_VERBOSE
-
-/* Forward definition of error function */
-extern int SDL_SetError(const char *fmt, ...);
-
-typedef struct SDL_LogLevel
-{
- int category;
- SDL_LogPriority priority;
- struct SDL_LogLevel *next;
-} SDL_LogLevel;
-
-/* The default log output function */
-static void SDL_LogOutput(void *userdata,
- int category, SDL_LogPriority priority,
- const char *message);
-
-static SDL_LogLevel *SDL_loglevels;
-static SDL_LogPriority SDL_default_priority = DEFAULT_PRIORITY;
-static SDL_LogPriority SDL_assert_priority = DEFAULT_ASSERT_PRIORITY;
-static SDL_LogPriority SDL_application_priority = DEFAULT_APPLICATION_PRIORITY;
-static SDL_LogPriority SDL_test_priority = DEFAULT_TEST_PRIORITY;
-static SDL_LogOutputFunction SDL_log_function = SDL_LogOutput;
-static void *SDL_log_userdata = NULL;
-
-static const char *SDL_priority_prefixes[SDL_NUM_LOG_PRIORITIES] = {
- NULL,
- "VERBOSE",
- "DEBUG",
- "INFO",
- "WARN",
- "ERROR",
- "CRITICAL"
-};
-
-#ifdef __ANDROID__
-static const char *SDL_category_prefixes[SDL_LOG_CATEGORY_RESERVED1] = {
- "APP",
- "ERROR",
- "SYSTEM",
- "AUDIO",
- "VIDEO",
- "RENDER",
- "INPUT"
-};
-
-static int SDL_android_priority[SDL_NUM_LOG_PRIORITIES] = {
- ANDROID_LOG_VERBOSE,
- ANDROID_LOG_DEBUG,
- ANDROID_LOG_INFO,
- ANDROID_LOG_WARN,
- ANDROID_LOG_ERROR,
- ANDROID_LOG_FATAL
-};
-#endif /* __ANDROID__ */
-
-
-void
-SDL_LogSetAllPriority(SDL_LogPriority priority)
-{
- SDL_LogLevel *entry;
-
- for (entry = SDL_loglevels; entry; entry = entry->next) {
- entry->priority = priority;
- }
- SDL_default_priority = priority;
- SDL_assert_priority = priority;
- SDL_application_priority = priority;
-}
-
-void
-SDL_LogSetPriority(int category, SDL_LogPriority priority)
-{
- SDL_LogLevel *entry;
-
- for (entry = SDL_loglevels; entry; entry = entry->next) {
- if (entry->category == category) {
- entry->priority = priority;
- return;
- }
- }
-
- /* Create a new entry */
- entry = (SDL_LogLevel *)SDL_malloc(sizeof(*entry));
- if (entry) {
- entry->category = category;
- entry->priority = priority;
- entry->next = SDL_loglevels;
- SDL_loglevels = entry;
- }
-}
-
-SDL_LogPriority
-SDL_LogGetPriority(int category)
-{
- SDL_LogLevel *entry;
-
- for (entry = SDL_loglevels; entry; entry = entry->next) {
- if (entry->category == category) {
- return entry->priority;
- }
- }
-
- if (category == SDL_LOG_CATEGORY_TEST) {
- return SDL_test_priority;
- } else if (category == SDL_LOG_CATEGORY_APPLICATION) {
- return SDL_application_priority;
- } else if (category == SDL_LOG_CATEGORY_ASSERT) {
- return SDL_assert_priority;
- } else {
- return SDL_default_priority;
- }
-}
-
-void
-SDL_LogResetPriorities(void)
-{
- SDL_LogLevel *entry;
-
- while (SDL_loglevels) {
- entry = SDL_loglevels;
- SDL_loglevels = entry->next;
- SDL_free(entry);
- }
-
- SDL_default_priority = DEFAULT_PRIORITY;
- SDL_assert_priority = DEFAULT_ASSERT_PRIORITY;
- SDL_application_priority = DEFAULT_APPLICATION_PRIORITY;
- SDL_test_priority = DEFAULT_TEST_PRIORITY;
-}
-
-void
-SDL_Log(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- SDL_LogMessageV(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, fmt, ap);
- va_end(ap);
-}
-
-void
-SDL_LogVerbose(int category, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- SDL_LogMessageV(category, SDL_LOG_PRIORITY_VERBOSE, fmt, ap);
- va_end(ap);
-}
-
-void
-SDL_LogDebug(int category, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- SDL_LogMessageV(category, SDL_LOG_PRIORITY_DEBUG, fmt, ap);
- va_end(ap);
-}
-
-void
-SDL_LogInfo(int category, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- SDL_LogMessageV(category, SDL_LOG_PRIORITY_INFO, fmt, ap);
- va_end(ap);
-}
-
-void
-SDL_LogWarn(int category, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- SDL_LogMessageV(category, SDL_LOG_PRIORITY_WARN, fmt, ap);
- va_end(ap);
-}
-
-void
-SDL_LogError(int category, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- SDL_LogMessageV(category, SDL_LOG_PRIORITY_ERROR, fmt, ap);
- va_end(ap);
-}
-
-void
-SDL_LogCritical(int category, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- SDL_LogMessageV(category, SDL_LOG_PRIORITY_CRITICAL, fmt, ap);
- va_end(ap);
-}
-
-void
-SDL_LogMessage(int category, SDL_LogPriority priority, const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- SDL_LogMessageV(category, priority, fmt, ap);
- va_end(ap);
-}
-
-#ifdef __ANDROID__
-static const char *
-GetCategoryPrefix(int category)
-{
- if (category < SDL_LOG_CATEGORY_RESERVED1) {
- return SDL_category_prefixes[category];
- }
- if (category < SDL_LOG_CATEGORY_CUSTOM) {
- return "RESERVED";
- }
- return "CUSTOM";
-}
-#endif /* __ANDROID__ */
-
-void
-SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
-{
- char *message;
- size_t len;
-
- /* Nothing to do if we don't have an output function */
- if (!SDL_log_function) {
- return;
- }
-
- /* Make sure we don't exceed array bounds */
- if ((int)priority < 0 || priority >= SDL_NUM_LOG_PRIORITIES) {
- return;
- }
-
- /* See if we want to do anything with this message */
- if (priority < SDL_LogGetPriority(category)) {
- return;
- }
-
- message = SDL_stack_alloc(char, SDL_MAX_LOG_MESSAGE);
- if (!message) {
- return;
- }
-
- SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, ap);
-
- /* Chop off final endline. */
- len = SDL_strlen(message);
- if ((len > 0) && (message[len-1] == '\n')) {
- message[--len] = '\0';
- if ((len > 0) && (message[len-1] == '\r')) { /* catch "\r\n", too. */
- message[--len] = '\0';
- }
- }
-
- SDL_log_function(SDL_log_userdata, category, priority, message);
- SDL_stack_free(message);
-}
-
-#if defined(__WIN32__)
-/* Flag tracking the attachment of the console: 0=unattached, 1=attached, -1=error */
-static int consoleAttached = 0;
-
-/* Handle to stderr output of console. */
-static HANDLE stderrHandle = NULL;
-#endif
-
-static void
-SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
- const char *message)
-{
-#if defined(__WIN32__) || defined(__WINRT__)
- /* Way too many allocations here, urgh */
- /* Note: One can't call SDL_SetError here, since that function itself logs. */
- {
- char *output;
- size_t length;
- LPTSTR tstr;
-
-#ifndef __WINRT__
- BOOL attachResult;
- DWORD attachError;
- unsigned long charsWritten;
-
- /* Maybe attach console and get stderr handle */
- if (consoleAttached == 0) {
- attachResult = AttachConsole(ATTACH_PARENT_PROCESS);
- if (!attachResult) {
- attachError = GetLastError();
- if (attachError == ERROR_INVALID_HANDLE) {
- OutputDebugString(TEXT("Parent process has no console"));
- consoleAttached = -1;
- } else if (attachError == ERROR_GEN_FAILURE) {
- OutputDebugString(TEXT("Could not attach to console of parent process"));
- consoleAttached = -1;
- } else if (attachError == ERROR_ACCESS_DENIED) {
- /* Already attached */
- consoleAttached = 1;
- } else {
- OutputDebugString(TEXT("Error attaching console"));
- consoleAttached = -1;
- }
- } else {
- /* Newly attached */
- consoleAttached = 1;
- }
-
- if (consoleAttached == 1) {
- stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
- }
- }
-#endif /* ifndef __WINRT__ */
-
- length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1 + 1;
- output = SDL_stack_alloc(char, length);
- SDL_snprintf(output, length, "%s: %s\n", SDL_priority_prefixes[priority], message);
- tstr = WIN_UTF8ToString(output);
-
- /* Output to debugger */
- OutputDebugString(tstr);
-
-#ifndef __WINRT__
- /* Screen output to stderr, if console was attached. */
- if (consoleAttached == 1) {
- if (!WriteConsole(stderrHandle, tstr, lstrlen(tstr), &charsWritten, NULL)) {
- OutputDebugString(TEXT("Error calling WriteConsole"));
- }
- if (charsWritten == ERROR_NOT_ENOUGH_MEMORY) {
- OutputDebugString(TEXT("Insufficient heap memory to write message"));
- }
- }
-#endif /* ifndef __WINRT__ */
-
- SDL_free(tstr);
- SDL_stack_free(output);
- }
-#elif defined(__ANDROID__)
- {
- char tag[32];
-
- SDL_snprintf(tag, SDL_arraysize(tag), "SDL/%s", GetCategoryPrefix(category));
- __android_log_write(SDL_android_priority[priority], tag, message);
- }
-#elif defined(__APPLE__) && defined(SDL_VIDEO_DRIVER_COCOA)
- /* Technically we don't need SDL_VIDEO_DRIVER_COCOA, but that's where this function is defined for now.
- */
- extern void SDL_NSLog(const char *text);
- {
- char *text;
-
- text = SDL_stack_alloc(char, SDL_MAX_LOG_MESSAGE);
- if (text) {
- SDL_snprintf(text, SDL_MAX_LOG_MESSAGE, "%s: %s", SDL_priority_prefixes[priority], message);
- SDL_NSLog(text);
- SDL_stack_free(text);
- return;
- }
- }
-#elif defined(__PSP__)
- {
- FILE* pFile;
- pFile = fopen ("SDL_Log.txt", "a");
- fprintf(pFile, "%s: %s\n", SDL_priority_prefixes[priority], message);
- fclose (pFile);
- }
-#endif
-#if HAVE_STDIO_H
- fprintf(stderr, "%s: %s\n", SDL_priority_prefixes[priority], message);
-#endif
-}
-
-void
-SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata)
-{
- if (callback) {
- *callback = SDL_log_function;
- }
- if (userdata) {
- *userdata = SDL_log_userdata;
- }
-}
-
-void
-SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata)
-{
- SDL_log_function = callback;
- SDL_log_userdata = userdata;
-}
-
-/* vi: set ts=4 sw=4 expandtab: */
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#if defined(__WIN32__)
+#include "core/windows/SDL_windows.h"
+#endif
+
+/* Simple log messages in SDL */
+
+#include "SDL_log.h"
+
+#if HAVE_STDIO_H
+#include <stdio.h>
+#endif
+
+#if defined(__ANDROID__)
+#include <android/log.h>
+#endif
+
+#define DEFAULT_PRIORITY SDL_LOG_PRIORITY_CRITICAL
+#define DEFAULT_ASSERT_PRIORITY SDL_LOG_PRIORITY_WARN
+#define DEFAULT_APPLICATION_PRIORITY SDL_LOG_PRIORITY_INFO
+#define DEFAULT_TEST_PRIORITY SDL_LOG_PRIORITY_VERBOSE
+
+/* Forward definition of error function */
+extern int SDL_SetError(const char *fmt, ...);
+
+typedef struct SDL_LogLevel
+{
+ int category;
+ SDL_LogPriority priority;
+ struct SDL_LogLevel *next;
+} SDL_LogLevel;
+
+/* The default log output function */
+static void SDL_LogOutput(void *userdata,
+ int category, SDL_LogPriority priority,
+ const char *message);
+
+static SDL_LogLevel *SDL_loglevels;
+static SDL_LogPriority SDL_default_priority = DEFAULT_PRIORITY;
+static SDL_LogPriority SDL_assert_priority = DEFAULT_ASSERT_PRIORITY;
+static SDL_LogPriority SDL_application_priority = DEFAULT_APPLICATION_PRIORITY;
+static SDL_LogPriority SDL_test_priority = DEFAULT_TEST_PRIORITY;
+static SDL_LogOutputFunction SDL_log_function = SDL_LogOutput;
+static void *SDL_log_userdata = NULL;
+
+static const char *SDL_priority_prefixes[SDL_NUM_LOG_PRIORITIES] = {
+ NULL,
+ "VERBOSE",
+ "DEBUG",
+ "INFO",
+ "WARN",
+ "ERROR",
+ "CRITICAL"
+};
+
+#ifdef __ANDROID__
+static const char *SDL_category_prefixes[SDL_LOG_CATEGORY_RESERVED1] = {
+ "APP",
+ "ERROR",
+ "SYSTEM",
+ "AUDIO",
+ "VIDEO",
+ "RENDER",
+ "INPUT"
+};
+
+static int SDL_android_priority[SDL_NUM_LOG_PRIORITIES] = {
+ ANDROID_LOG_UNKNOWN,
+ ANDROID_LOG_VERBOSE,
+ ANDROID_LOG_DEBUG,
+ ANDROID_LOG_INFO,
+ ANDROID_LOG_WARN,
+ ANDROID_LOG_ERROR,
+ ANDROID_LOG_FATAL
+};
+#endif /* __ANDROID__ */
+
+
+void
+SDL_LogSetAllPriority(SDL_LogPriority priority)
+{
+ SDL_LogLevel *entry;
+
+ for (entry = SDL_loglevels; entry; entry = entry->next) {
+ entry->priority = priority;
+ }
+ SDL_default_priority = priority;
+ SDL_assert_priority = priority;
+ SDL_application_priority = priority;
+}
+
+void
+SDL_LogSetPriority(int category, SDL_LogPriority priority)
+{
+ SDL_LogLevel *entry;
+
+ for (entry = SDL_loglevels; entry; entry = entry->next) {
+ if (entry->category == category) {
+ entry->priority = priority;
+ return;
+ }
+ }
+
+ /* Create a new entry */
+ entry = (SDL_LogLevel *)SDL_malloc(sizeof(*entry));
+ if (entry) {
+ entry->category = category;
+ entry->priority = priority;
+ entry->next = SDL_loglevels;
+ SDL_loglevels = entry;
+ }
+}
+
+SDL_LogPriority
+SDL_LogGetPriority(int category)
+{
+ SDL_LogLevel *entry;
+
+ for (entry = SDL_loglevels; entry; entry = entry->next) {
+ if (entry->category == category) {
+ return entry->priority;
+ }
+ }
+
+ if (category == SDL_LOG_CATEGORY_TEST) {
+ return SDL_test_priority;
+ } else if (category == SDL_LOG_CATEGORY_APPLICATION) {
+ return SDL_application_priority;
+ } else if (category == SDL_LOG_CATEGORY_ASSERT) {
+ return SDL_assert_priority;
+ } else {
+ return SDL_default_priority;
+ }
+}
+
+void
+SDL_LogResetPriorities(void)
+{
+ SDL_LogLevel *entry;
+
+ while (SDL_loglevels) {
+ entry = SDL_loglevels;
+ SDL_loglevels = entry->next;
+ SDL_free(entry);
+ }
+
+ SDL_default_priority = DEFAULT_PRIORITY;
+ SDL_assert_priority = DEFAULT_ASSERT_PRIORITY;
+ SDL_application_priority = DEFAULT_APPLICATION_PRIORITY;
+ SDL_test_priority = DEFAULT_TEST_PRIORITY;
+}
+
+void
+SDL_Log(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ SDL_LogMessageV(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, fmt, ap);
+ va_end(ap);
+}
+
+void
+SDL_LogVerbose(int category, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ SDL_LogMessageV(category, SDL_LOG_PRIORITY_VERBOSE, fmt, ap);
+ va_end(ap);
+}
+
+void
+SDL_LogDebug(int category, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ SDL_LogMessageV(category, SDL_LOG_PRIORITY_DEBUG, fmt, ap);
+ va_end(ap);
+}
+
+void
+SDL_LogInfo(int category, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ SDL_LogMessageV(category, SDL_LOG_PRIORITY_INFO, fmt, ap);
+ va_end(ap);
+}
+
+void
+SDL_LogWarn(int category, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ SDL_LogMessageV(category, SDL_LOG_PRIORITY_WARN, fmt, ap);
+ va_end(ap);
+}
+
+void
+SDL_LogError(int category, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ SDL_LogMessageV(category, SDL_LOG_PRIORITY_ERROR, fmt, ap);
+ va_end(ap);
+}
+
+void
+SDL_LogCritical(int category, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ SDL_LogMessageV(category, SDL_LOG_PRIORITY_CRITICAL, fmt, ap);
+ va_end(ap);
+}
+
+void
+SDL_LogMessage(int category, SDL_LogPriority priority, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ SDL_LogMessageV(category, priority, fmt, ap);
+ va_end(ap);
+}
+
+#ifdef __ANDROID__
+static const char *
+GetCategoryPrefix(int category)
+{
+ if (category < SDL_LOG_CATEGORY_RESERVED1) {
+ return SDL_category_prefixes[category];
+ }
+ if (category < SDL_LOG_CATEGORY_CUSTOM) {
+ return "RESERVED";
+ }
+ return "CUSTOM";
+}
+#endif /* __ANDROID__ */
+
+void
+SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
+{
+ char *message;
+ size_t len;
+
+ /* Nothing to do if we don't have an output function */
+ if (!SDL_log_function) {
+ return;
+ }
+
+ /* Make sure we don't exceed array bounds */
+ if ((int)priority < 0 || priority >= SDL_NUM_LOG_PRIORITIES) {
+ return;
+ }
+
+ /* See if we want to do anything with this message */
+ if (priority < SDL_LogGetPriority(category)) {
+ return;
+ }
+
+ message = SDL_stack_alloc(char, SDL_MAX_LOG_MESSAGE);
+ if (!message) {
+ return;
+ }
+
+ SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, ap);
+
+ /* Chop off final endline. */
+ len = SDL_strlen(message);
+ if ((len > 0) && (message[len-1] == '\n')) {
+ message[--len] = '\0';
+ if ((len > 0) && (message[len-1] == '\r')) { /* catch "\r\n", too. */
+ message[--len] = '\0';
+ }
+ }
+
+ SDL_log_function(SDL_log_userdata, category, priority, message);
+ SDL_stack_free(message);
+}
+
+#if defined(__WIN32__)
+/* Flag tracking the attachment of the console: 0=unattached, 1=attached, -1=error */
+static int consoleAttached = 0;
+
+/* Handle to stderr output of console. */
+static HANDLE stderrHandle = NULL;
+#endif
+
+static void
+SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
+ const char *message)
+{
+#if defined(__WIN32__) || defined(__WINRT__)
+ /* Way too many allocations here, urgh */
+ /* Note: One can't call SDL_SetError here, since that function itself logs. */
+ {
+ char *output;
+ size_t length;
+ LPTSTR tstr;
+
+#ifndef __WINRT__
+ BOOL attachResult;
+ DWORD attachError;
+ unsigned long charsWritten;
+
+ /* Maybe attach console and get stderr handle */
+ if (consoleAttached == 0) {
+ attachResult = AttachConsole(ATTACH_PARENT_PROCESS);
+ if (!attachResult) {
+ attachError = GetLastError();
+ if (attachError == ERROR_INVALID_HANDLE) {
+ OutputDebugString(TEXT("Parent process has no console\r\n"));
+ consoleAttached = -1;
+ } else if (attachError == ERROR_GEN_FAILURE) {
+ OutputDebugString(TEXT("Could not attach to console of parent process\r\n"));
+ consoleAttached = -1;
+ } else if (attachError == ERROR_ACCESS_DENIED) {
+ /* Already attached */
+ consoleAttached = 1;
+ } else {
+ OutputDebugString(TEXT("Error attaching console\r\n"));
+ consoleAttached = -1;
+ }
+ } else {
+ /* Newly attached */
+ consoleAttached = 1;
+ }
+
+ if (consoleAttached == 1) {
+ stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
+ }
+ }
+#endif /* ifndef __WINRT__ */
+
+ length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1 + 1 + 1;
+ output = SDL_stack_alloc(char, length);
+ SDL_snprintf(output, length, "%s: %s\r\n", SDL_priority_prefixes[priority], message);
+ tstr = WIN_UTF8ToString(output);
+
+ /* Output to debugger */
+ OutputDebugString(tstr);
+
+#ifndef __WINRT__
+ /* Screen output to stderr, if console was attached. */
+ if (consoleAttached == 1) {
+ if (!WriteConsole(stderrHandle, tstr, lstrlen(tstr), &charsWritten, NULL)) {
+ OutputDebugString(TEXT("Error calling WriteConsole\r\n"));
+ }
+ if (charsWritten == ERROR_NOT_ENOUGH_MEMORY) {
+ OutputDebugString(TEXT("Insufficient heap memory to write message\r\n"));
+ }
+ }
+#endif /* ifndef __WINRT__ */
+
+ SDL_free(tstr);
+ SDL_stack_free(output);
+ }
+#elif defined(__ANDROID__)
+ {
+ char tag[32];
+
+ SDL_snprintf(tag, SDL_arraysize(tag), "SDL/%s", GetCategoryPrefix(category));
+ __android_log_write(SDL_android_priority[priority], tag, message);
+ }
+#elif defined(__APPLE__) && defined(SDL_VIDEO_DRIVER_COCOA)
+ /* Technically we don't need SDL_VIDEO_DRIVER_COCOA, but that's where this function is defined for now.
+ */
+ extern void SDL_NSLog(const char *text);
+ {
+ char *text;
+
+ text = SDL_stack_alloc(char, SDL_MAX_LOG_MESSAGE);
+ if (text) {
+ SDL_snprintf(text, SDL_MAX_LOG_MESSAGE, "%s: %s", SDL_priority_prefixes[priority], message);
+ SDL_NSLog(text);
+ SDL_stack_free(text);
+ return;
+ }
+ }
+#elif defined(__PSP__)
+ {
+ FILE* pFile;
+ pFile = fopen ("SDL_Log.txt", "a");
+ fprintf(pFile, "%s: %s\n", SDL_priority_prefixes[priority], message);
+ fclose (pFile);
+ }
+#endif
+#if HAVE_STDIO_H
+ fprintf(stderr, "%s: %s\n", SDL_priority_prefixes[priority], message);
+#endif
+}
+
+void
+SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata)
+{
+ if (callback) {
+ *callback = SDL_log_function;
+ }
+ if (userdata) {
+ *userdata = SDL_log_userdata;
+ }
+}
+
+void
+SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata)
+{
+ SDL_log_function = callback;
+ SDL_log_userdata = userdata;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/atomic/SDL_atomic.c b/src/atomic/SDL_atomic.c
index c747b12..e9b636f 100644
--- a/src/atomic/SDL_atomic.c
+++ b/src/atomic/SDL_atomic.c
@@ -55,7 +55,7 @@
static SDL_SpinLock locks[32];
-static __inline__ void
+static SDL_INLINE void
enterLock(void *a)
{
uintptr_t index = ((((uintptr_t)a) >> 3) & 0x1f);
@@ -63,7 +63,7 @@ enterLock(void *a)
SDL_AtomicLock(&locks[index]);
}
-static __inline__ void
+static SDL_INLINE void
leaveLock(void *a)
{
uintptr_t index = ((((uintptr_t)a) >> 3) & 0x1f);
diff --git a/src/atomic/SDL_spinlock.c b/src/atomic/SDL_spinlock.c
index f90528c..ac9b61e 100644
--- a/src/atomic/SDL_spinlock.c
+++ b/src/atomic/SDL_spinlock.c
@@ -1,126 +1,126 @@
-/*
- Simple DirectMedia Layer
- Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
-#include "SDL_config.h"
-
-#include "SDL_atomic.h"
-#include "SDL_mutex.h"
-#include "SDL_timer.h"
-
-/* Don't do the check for Visual Studio 2005, it's safe here */
-#if defined(__WIN32__) || defined(__WINRT__)
-#include "../core/windows/SDL_windows.h"
-#endif
-
-/* This function is where all the magic happens... */
-SDL_bool
-SDL_AtomicTryLock(SDL_SpinLock *lock)
-{
-#if SDL_ATOMIC_DISABLED
- /* Terrible terrible damage */
- static SDL_mutex *_spinlock_mutex;
-
- if (!_spinlock_mutex) {
- /* Race condition on first lock... */
- _spinlock_mutex = SDL_CreateMutex();
- }
- SDL_LockMutex(_spinlock_mutex);
- if (*lock == 0) {
- *lock = 1;
- SDL_UnlockMutex(_spinlock_mutex);
- return SDL_TRUE;
- } else {
- SDL_UnlockMutex(_spinlock_mutex);
- return SDL_FALSE;
- }
-
-#elif defined(_MSC_VER)
- SDL_COMPILE_TIME_ASSERT(locksize, sizeof(*lock) == sizeof(long));
- return (InterlockedExchange((long*)lock, 1) == 0);
-
-#elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET
- return (__sync_lock_test_and_set(lock, 1) == 0);
-
-#elif defined(__GNUC__) && defined(__arm__) && \
- (defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || \
- defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5TE__) || \
- defined(__ARM_ARCH_5TEJ__))
- int result;
- __asm__ __volatile__ (
- "swp %0, %1, [%2]\n"
- : "=&r,&r" (result) : "r,0" (1), "r,r" (lock) : "memory");
- return (result == 0);
-
-#elif defined(__GNUC__) && defined(__arm__)
- int result;
- __asm__ __volatile__ (
- "ldrex %0, [%2]\nteq %0, #0\nstrexeq %0, %1, [%2]"
- : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory");
- return (result == 0);
-
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
- int result;
- __asm__ __volatile__(
- "lock ; xchgl %0, (%1)\n"
- : "=r" (result) : "r" (lock), "0" (1) : "cc", "memory");
- return (result == 0);
-
-#elif defined(__MACOSX__) || defined(__IPHONEOS__)
- /* Maybe used for PowerPC, but the Intel asm or gcc atomics are favored. */
- return OSAtomicCompareAndSwap32Barrier(0, 1, lock);
-
-#elif HAVE_PTHREAD_SPINLOCK
- /* pthread instructions */
- return (pthread_spin_trylock(lock) == 0);
-
-#else
-#error Please implement for your platform.
- return SDL_FALSE;
-#endif
-}
-
-void
-SDL_AtomicLock(SDL_SpinLock *lock)
-{
- /* FIXME: Should we have an eventual timeout? */
- while (!SDL_AtomicTryLock(lock)) {
- SDL_Delay(0);
- }
-}
-
-void
-SDL_AtomicUnlock(SDL_SpinLock *lock)
-{
-#if defined(_MSC_VER)
- _ReadWriteBarrier();
- *lock = 0;
-
-#elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET
- __sync_lock_release(lock);
-
-#elif HAVE_PTHREAD_SPINLOCK
- pthread_spin_unlock(lock);
-
-#else
- *lock = 0;
-#endif
-}
-
-/* vi: set ts=4 sw=4 expandtab: */
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifdef __WIN32__
+#include "../core/windows/SDL_windows.h"
+#endif
+
+#include "SDL_atomic.h"
+#include "SDL_mutex.h"
+#include "SDL_timer.h"
+
+
+/* This function is where all the magic happens... */
+SDL_bool
+SDL_AtomicTryLock(SDL_SpinLock *lock)
+{
+#if SDL_ATOMIC_DISABLED
+ /* Terrible terrible damage */
+ static SDL_mutex *_spinlock_mutex;
+
+ if (!_spinlock_mutex) {
+ /* Race condition on first lock... */
+ _spinlock_mutex = SDL_CreateMutex();
+ }
+ SDL_LockMutex(_spinlock_mutex);
+ if (*lock == 0) {
+ *lock = 1;
+ SDL_UnlockMutex(_spinlock_mutex);
+ return SDL_TRUE;
+ } else {
+ SDL_UnlockMutex(_spinlock_mutex);
+ return SDL_FALSE;
+ }
+
+#elif defined(_MSC_VER)
+ SDL_COMPILE_TIME_ASSERT(locksize, sizeof(*lock) == sizeof(long));
+ return (InterlockedExchange((long*)lock, 1) == 0);
+
+#elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET
+ return (__sync_lock_test_and_set(lock, 1) == 0);
+
+#elif defined(__GNUC__) && defined(__arm__) && \
+ (defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || \
+ defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5TE__) || \
+ defined(__ARM_ARCH_5TEJ__))
+ int result;
+ __asm__ __volatile__ (
+ "swp %0, %1, [%2]\n"
+ : "=&r,&r" (result) : "r,0" (1), "r,r" (lock) : "memory");
+ return (result == 0);
+
+#elif defined(__GNUC__) && defined(__arm__)
+ int result;
+ __asm__ __volatile__ (
+ "ldrex %0, [%2]\nteq %0, #0\nstrexeq %0, %1, [%2]"
+ : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory");
+ return (result == 0);
+
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ int result;
+ __asm__ __volatile__(
+ "lock ; xchgl %0, (%1)\n"
+ : "=r" (result) : "r" (lock), "0" (1) : "cc", "memory");
+ return (result == 0);
+
+#elif defined(__MACOSX__) || defined(__IPHONEOS__)
+ /* Maybe used for PowerPC, but the Intel asm or gcc atomics are favored. */
+ return OSAtomicCompareAndSwap32Barrier(0, 1, lock);
+
+#elif HAVE_PTHREAD_SPINLOCK
+ /* pthread instructions */
+ return (pthread_spin_trylock(lock) == 0);
+
+#else
+#error Please implement for your platform.
+ return SDL_FALSE;
+#endif
+}
+
+void
+SDL_AtomicLock(SDL_SpinLock *lock)
+{
+ /* FIXME: Should we have an eventual timeout? */
+ while (!SDL_AtomicTryLock(lock)) {
+ SDL_Delay(0);
+ }
+}
+
+void
+SDL_AtomicUnlock(SDL_SpinLock *lock)
+{
+#if defined(_MSC_VER)
+ _ReadWriteBarrier();
+ *lock = 0;
+
+#elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET
+ __sync_lock_release(lock);
+
+#elif HAVE_PTHREAD_SPINLOCK
+ pthread_spin_unlock(lock);
+
+#else
+ *lock = 0;
+#endif
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 4d53e82..5631bb2 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -300,9 +300,7 @@ SDL_StreamInit(SDL_AudioStreamer * stream, int max_len, Uint8 silence)
static void
SDL_StreamDeinit(SDL_AudioStreamer * stream)
{
- if (stream->buffer != NULL) {
- SDL_free(stream->buffer);
- }
+ SDL_free(stream->buffer);
}
#if defined(ANDROID)
@@ -419,7 +417,7 @@ SDL_RunAudio(void *devicep)
if (istream == NULL) {
istream = device->fake_stream;
}
- /*SDL_memcpy(istream, device->convert.buf, device->convert.len_cvt); */
+ /* SDL_memcpy(istream, device->convert.buf, device->convert.len_cvt); */
SDL_StreamWrite(&device->streamer, device->convert.buf,
device->convert.len_cvt);
} else {
@@ -632,9 +630,7 @@ free_device_list(char ***devices, int *devCount)
}
}
- if (*devices != NULL) {
- SDL_free(*devices);
- }
+ SDL_free(*devices);
*devices = NULL;
*devCount = 0;
@@ -761,9 +757,7 @@ close_audio_device(SDL_AudioDevice * device)
if (device->mixer_lock != NULL) {
SDL_DestroyMutex(device->mixer_lock);
}
- if (device->fake_stream != NULL) {
- SDL_FreeAudioMem(device->fake_stream);
- }
+ SDL_FreeAudioMem(device->fake_stream);
if (device->convert.needed) {
SDL_FreeAudioMem(device->convert.buf);
}
diff --git a/src/audio/SDL_audiodev.c b/src/audio/SDL_audiodev.c
index 91b60c3..af45a8b 100644
--- a/src/audio/SDL_audiodev.c
+++ b/src/audio/SDL_audiodev.c
@@ -46,7 +46,7 @@
#define _PATH_DEV_AUDIO "/dev/audio"
#endif
-static inline void
+static SDL_INLINE void
test_device(const char *fname, int flags, int (*test) (int fd),
SDL_AddAudioDevice addfn)
{
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
index 18fdcac..fac24cb 100644
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@@ -61,7 +61,7 @@ InitMS_ADPCM(WaveFMT * format)
SDL_SwapLE16(format->bitspersample);
rogue_feel = (Uint8 *) format + sizeof(*format);
if (sizeof(*format) == 16) {
- /*const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);*/
+ /* const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
rogue_feel += sizeof(Uint16);
}
MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
@@ -242,7 +242,7 @@ InitIMA_ADPCM(WaveFMT * format)
SDL_SwapLE16(format->bitspersample);
rogue_feel = (Uint8 *) format + sizeof(*format);
if (sizeof(*format) == 16) {
- /*const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);*/
+ /* const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
rogue_feel += sizeof(Uint16);
}
IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
@@ -449,10 +449,8 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
/* Read the audio data format chunk */
chunk.data = NULL;
do {
- if (chunk.data != NULL) {
- SDL_free(chunk.data);
- chunk.data = NULL;
- }
+ SDL_free(chunk.data);
+ chunk.data = NULL;
lenread = ReadChunk(src, &chunk);
if (lenread < 0) {
was_error = 1;
@@ -549,10 +547,8 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
/* Read the audio data chunk */
*audio_buf = NULL;
do {
- if (*audio_buf != NULL) {
- SDL_free(*audio_buf);
- *audio_buf = NULL;
- }
+ SDL_free(*audio_buf);
+ *audio_buf = NULL;
lenread = ReadChunk(src, &chunk);
if (lenread < 0) {
was_error = 1;
@@ -583,9 +579,7 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
*audio_len &= ~(samplesize - 1);
done:
- if (format != NULL) {
- SDL_free(format);
- }
+ SDL_free(format);
if (src) {
if (freesrc) {
SDL_RWclose(src);
@@ -606,9 +600,7 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
void
SDL_FreeWAV(Uint8 * audio_buf)
{
- if (audio_buf != NULL) {
- SDL_free(audio_buf);
- }
+ SDL_free(audio_buf);
}
static int
diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c
index 13cc77b..5ff4cef 100644
--- a/src/audio/alsa/SDL_alsa_audio.c
+++ b/src/audio/alsa/SDL_alsa_audio.c
@@ -241,25 +241,25 @@ ALSA_WaitDevice(_THIS)
tmp = ptr[3]; ptr[3] = ptr[5]; ptr[5] = tmp; \
}
-static __inline__ void
+static SDL_INLINE void
swizzle_alsa_channels_6_64bit(_THIS)
{
SWIZ6(Uint64);
}
-static __inline__ void
+static SDL_INLINE void
swizzle_alsa_channels_6_32bit(_THIS)
{
SWIZ6(Uint32);
}
-static __inline__ void
+static SDL_INLINE void
swizzle_alsa_channels_6_16bit(_THIS)
{
SWIZ6(Uint16);
}
-static __inline__ void
+static SDL_INLINE void
swizzle_alsa_channels_6_8bit(_THIS)
{
SWIZ6(Uint8);
@@ -272,7 +272,7 @@ swizzle_alsa_channels_6_8bit(_THIS)
* Called right before feeding this->hidden->mixbuf to the hardware. Swizzle
* channels from Windows/Mac order to the format alsalib will want.
*/
-static __inline__ void
+static SDL_INLINE void
swizzle_alsa_channels(_THIS)
{
if (this->spec.channels == 6) {
@@ -304,7 +304,7 @@ ALSA_PlayDevice(_THIS)
while ( frames_left > 0 && this->enabled ) {
/* !!! FIXME: This works, but needs more testing before going live */
- /*ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1);*/
+ /* ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1); */
status = ALSA_snd_pcm_writei(this->hidden->pcm_handle,
sample_buf, frames_left);
@@ -340,10 +340,8 @@ static void
ALSA_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->pcm_handle) {
ALSA_snd_pcm_drain(this->hidden->pcm_handle);
ALSA_snd_pcm_close(this->hidden->pcm_handle);
diff --git a/src/audio/arts/SDL_artsaudio.c b/src/audio/arts/SDL_artsaudio.c
index ac0bb9d..7e835c1 100644
--- a/src/audio/arts/SDL_artsaudio.c
+++ b/src/audio/arts/SDL_artsaudio.c
@@ -204,10 +204,8 @@ static void
ARTS_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->stream) {
SDL_NAME(arts_close_stream) (this->hidden->stream);
this->hidden->stream = 0;
@@ -222,7 +220,7 @@ static int
ARTS_Suspend(void)
{
const Uint32 abortms = SDL_GetTicks() + 3000; /* give up after 3 secs */
- while ( (!SDL_NAME(arts_suspended)()) && (SDL_GetTicks() < abortms) ) {
+ while ( (!SDL_NAME(arts_suspended)()) && !SDL_TICKS_PASSED(SDL_GetTicks(), abortms) ) {
if ( SDL_NAME(arts_suspend)() ) {
break;
}
diff --git a/src/audio/bsd/SDL_bsdaudio.c b/src/audio/bsd/SDL_bsdaudio.c
index b63c838..6694683 100644
--- a/src/audio/bsd/SDL_bsdaudio.c
+++ b/src/audio/bsd/SDL_bsdaudio.c
@@ -125,9 +125,7 @@ BSDAUDIO_WaitDevice(_THIS)
/* Use timer for general audio synchronization */
Sint32 ticks;
- ticks =
- ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) -
- FUDGE_TICKS;
+ ticks = ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS;
if (ticks > 0) {
SDL_Delay(ticks);
}
@@ -214,10 +212,8 @@ static void
BSDAUDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
this->hidden->audio_fd = -1;
diff --git a/src/audio/directsound/SDL_directsound.c b/src/audio/directsound/SDL_directsound.c
index 686d466..86563a6 100644
--- a/src/audio/directsound/SDL_directsound.c
+++ b/src/audio/directsound/SDL_directsound.c
@@ -91,14 +91,6 @@ DSOUND_Load(void)
return loaded;
}
-static __inline__ char *
-utf16_to_utf8(const WCHAR *S)
-{
- /* !!! FIXME: this should be UTF-16, not UCS-2! */
- return SDL_iconv_string("UTF-8", "UCS-2", (char *)(S),
- (SDL_wcslen(S)+1)*sizeof(WCHAR));
-}
-
static int
SetDSerror(const char *function, int code)
{
@@ -158,7 +150,7 @@ FindAllDevs(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID data)
{
SDL_AddAudioDevice addfn = (SDL_AddAudioDevice) data;
if (guid != NULL) { /* skip default device */
- char *str = utf16_to_utf8(desc);
+ char *str = WIN_StringToUTF8(desc);
if (str != NULL) {
addfn(str);
SDL_free(str); /* addfn() makes a copy of this string. */
@@ -439,7 +431,7 @@ FindDevGUID(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID _data)
{
if (guid != NULL) { /* skip the default device. */
FindDevGUIDData *data = (FindDevGUIDData *) _data;
- char *str = utf16_to_utf8(desc);
+ char *str = WIN_StringToUTF8(desc);
const int match = (SDL_strcmp(str, data->devname) == 0);
SDL_free(str);
if (match) {
@@ -510,7 +502,7 @@ DSOUND_OpenDevice(_THIS, const char *devname, int iscapture)
if (!valid_format) {
DSOUND_CloseDevice(this);
if (tried_format) {
- return -1; // CreateSecondary() should have called SDL_SetError().
+ return -1; /* CreateSecondary() should have called SDL_SetError(). */
}
return SDL_SetError("DirectSound: Unsupported audio format");
}
diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c
index 2286ba0..0dc650e 100644
--- a/src/audio/disk/SDL_diskaudio.c
+++ b/src/audio/disk/SDL_diskaudio.c
@@ -88,10 +88,8 @@ static void
DISKAUD_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->output != NULL) {
SDL_RWclose(this->hidden->output);
this->hidden->output = NULL;
diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c
index c62a22f..e319017 100644
--- a/src/audio/dsp/SDL_dspaudio.c
+++ b/src/audio/dsp/SDL_dspaudio.c
@@ -61,10 +61,8 @@ static void
DSP_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
this->hidden->audio_fd = -1;
diff --git a/src/audio/esd/SDL_esdaudio.c b/src/audio/esd/SDL_esdaudio.c
index 92716f3..8bba640 100644
--- a/src/audio/esd/SDL_esdaudio.c
+++ b/src/audio/esd/SDL_esdaudio.c
@@ -135,8 +135,7 @@ ESD_WaitDevice(_THIS)
}
/* Use timer for general audio synchronization */
- ticks =
- ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS;
+ ticks = ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS;
if (ticks > 0) {
SDL_Delay(ticks);
}
@@ -176,10 +175,8 @@ static void
ESD_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->audio_fd >= 0) {
SDL_NAME(esd_close) (this->hidden->audio_fd);
this->hidden->audio_fd = -1;
diff --git a/src/audio/fusionsound/SDL_fsaudio.c b/src/audio/fusionsound/SDL_fsaudio.c
index 2e468d5..49ad2c1 100644
--- a/src/audio/fusionsound/SDL_fsaudio.c
+++ b/src/audio/fusionsound/SDL_fsaudio.c
@@ -169,10 +169,8 @@ static void
SDL_FS_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->stream) {
this->hidden->stream->Release(this->hidden->stream);
this->hidden->stream = NULL;
diff --git a/src/audio/nas/SDL_nasaudio.c b/src/audio/nas/SDL_nasaudio.c
index 4e3dc0a..c2bf677 100644
--- a/src/audio/nas/SDL_nasaudio.c
+++ b/src/audio/nas/SDL_nasaudio.c
@@ -191,10 +191,8 @@ static void
NAS_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->aud) {
NAS_AuCloseServer(this->hidden->aud);
this->hidden->aud = 0;
diff --git a/src/audio/paudio/SDL_paudio.c b/src/audio/paudio/SDL_paudio.c
index 5a18b45..8a248af 100644
--- a/src/audio/paudio/SDL_paudio.c
+++ b/src/audio/paudio/SDL_paudio.c
@@ -133,9 +133,7 @@ PAUDIO_WaitDevice(_THIS)
/* Use timer for general audio synchronization */
Sint32 ticks;
- ticks =
- ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) -
- FUDGE_TICKS;
+ ticks = ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS;
if (ticks > 0) {
SDL_Delay(ticks);
}
@@ -231,10 +229,8 @@ static void
PAUDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
this->hidden->audio_fd = -1;
diff --git a/src/audio/psp/SDL_pspaudio.c b/src/audio/psp/SDL_pspaudio.c
index 4b5534a..8576d95 100644
--- a/src/audio/psp/SDL_pspaudio.c
+++ b/src/audio/psp/SDL_pspaudio.c
@@ -63,7 +63,7 @@ PSPAUD_OpenDevice(_THIS, const char *devname, int iscapture)
this->spec.freq = 44100;
/* Update the fragment size as size in bytes. */
-// SDL_CalculateAudioSpec(this->spec); MOD
+/* SDL_CalculateAudioSpec(this->spec); MOD */
switch (this->spec.format) {
case AUDIO_U8:
this->spec.silence = 0x80;
@@ -76,7 +76,7 @@ PSPAUD_OpenDevice(_THIS, const char *devname, int iscapture)
this->spec.size *= this->spec.channels;
this->spec.size *= this->spec.samples;
-//==========================================
+/* ========================================== */
/* Allocate the mixing buffer. Its size and starting address must
be a multiple of 64 bytes. Our sample count is already a multiple of
@@ -162,7 +162,7 @@ static int
PSPAUD_Init(SDL_AudioDriverImpl * impl)
{
- // Set the function pointers
+ /* Set the function pointers */
impl->OpenDevice = PSPAUD_OpenDevice;
impl->PlayDevice = PSPAUD_PlayDevice;
impl->WaitDevice = PSPAUD_WaitDevice;
@@ -171,7 +171,7 @@ PSPAUD_Init(SDL_AudioDriverImpl * impl)
impl->CloseDevice = PSPAUD_CloseDevice;
impl->ThreadInit = PSPAUD_ThreadInit;
- //PSP audio device
+ /* PSP audio device */
impl->OnlyHasDefaultOutputDevice = 1;
/*
impl->HasCaptureSupport = 1;
@@ -189,7 +189,7 @@ AudioBootStrap PSPAUD_bootstrap = {
"psp", "PSP audio driver", PSPAUD_Init, 0
};
- /* SDL_AUDI*/
+ /* SDL_AUDI */
diff --git a/src/audio/pulseaudio/SDL_pulseaudio.c b/src/audio/pulseaudio/SDL_pulseaudio.c
index 46269d1..5923eae 100644
--- a/src/audio/pulseaudio/SDL_pulseaudio.c
+++ b/src/audio/pulseaudio/SDL_pulseaudio.c
@@ -49,7 +49,7 @@
#if (PA_API_VERSION < 12)
/** Return non-zero if the passed state is one of the connected states */
-static __inline__ int PA_CONTEXT_IS_GOOD(pa_context_state_t x) {
+static SDL_INLINE int PA_CONTEXT_IS_GOOD(pa_context_state_t x) {
return
x == PA_CONTEXT_CONNECTING ||
x == PA_CONTEXT_AUTHORIZING ||
@@ -57,7 +57,7 @@ static __inline__ int PA_CONTEXT_IS_GOOD(pa_context_state_t x) {
x == PA_CONTEXT_READY;
}
/** Return non-zero if the passed state is one of the connected states */
-static __inline__ int PA_STREAM_IS_GOOD(pa_stream_state_t x) {
+static SDL_INLINE int PA_STREAM_IS_GOOD(pa_stream_state_t x) {
return
x == PA_STREAM_CREATING ||
x == PA_STREAM_READY;
@@ -300,10 +300,8 @@ static void
PULSEAUDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->stream) {
PULSEAUDIO_pa_stream_disconnect(this->hidden->stream);
PULSEAUDIO_pa_stream_unref(this->hidden->stream);
@@ -324,7 +322,7 @@ PULSEAUDIO_CloseDevice(_THIS)
}
-static __inline__ int
+static SDL_INLINE int
squashVersion(const int major, const int minor, const int patch)
{
return ((major & 0xFF) << 16) | ((minor & 0xFF) << 8) | (patch & 0xFF);
diff --git a/src/audio/qsa/SDL_qsa_audio.c b/src/audio/qsa/SDL_qsa_audio.c
index e3877b4..78f69c0 100644
--- a/src/audio/qsa/SDL_qsa_audio.c
+++ b/src/audio/qsa/SDL_qsa_audio.c
@@ -83,7 +83,7 @@ uint32_t qsa_playback_devices;
QSA_Device qsa_capture_device[QSA_MAX_DEVICES];
uint32_t qsa_capture_devices;
-static inline int
+static SDL_INLINE int
QSA_SetError(const char *fn, int status)
{
return SDL_SetError("QSA: %s() failed: %s", fn, snd_strerror(status));
@@ -328,10 +328,8 @@ QSA_CloseDevice(_THIS)
this->hidden->audio_handle = NULL;
}
- if (this->hidden->pcm_buf != NULL) {
- SDL_FreeAudioMem(this->hidden->pcm_buf);
- this->hidden->pcm_buf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->pcm_buf);
+ this->hidden->pcm_buf = NULL;
SDL_free(this->hidden);
this->hidden = NULL;
diff --git a/src/audio/sndio/SDL_sndioaudio.c b/src/audio/sndio/SDL_sndioaudio.c
index 16d0ec3..309472d 100644
--- a/src/audio/sndio/SDL_sndioaudio.c
+++ b/src/audio/sndio/SDL_sndioaudio.c
@@ -181,10 +181,8 @@ static void
SNDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if ( this->hidden->dev != NULL ) {
SNDIO_sio_close(this->hidden->dev);
this->hidden->dev = NULL;
diff --git a/src/audio/sun/SDL_sunaudio.c b/src/audio/sun/SDL_sunaudio.c
index 950ba44..98acf44 100644
--- a/src/audio/sun/SDL_sunaudio.c
+++ b/src/audio/sun/SDL_sunaudio.c
@@ -184,14 +184,10 @@ static void
SUNAUDIO_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
- if (this->hidden->mixbuf != NULL) {
- SDL_FreeAudioMem(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
- if (this->hidden->ulaw_buf != NULL) {
- SDL_free(this->hidden->ulaw_buf);
- this->hidden->ulaw_buf = NULL;
- }
+ SDL_FreeAudioMem(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
+ SDL_free(this->hidden->ulaw_buf);
+ this->hidden->ulaw_buf = NULL;
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
this->hidden->audio_fd = -1;
diff --git a/src/audio/winmm/SDL_winmm.c b/src/audio/winmm/SDL_winmm.c
index 9c8da7a..4220afd 100644
--- a/src/audio/winmm/SDL_winmm.c
+++ b/src/audio/winmm/SDL_winmm.c
@@ -176,11 +176,9 @@ WINMM_CloseDevice(_THIS)
}
}
- if (this->hidden->mixbuf != NULL) {
- /* Free raw mixing buffer */
- SDL_free(this->hidden->mixbuf);
- this->hidden->mixbuf = NULL;
- }
+ /* Free raw mixing buffer */
+ SDL_free(this->hidden->mixbuf);
+ this->hidden->mixbuf = NULL;
if (this->hidden->hin) {
waveInClose(this->hidden->hin);
diff --git a/src/audio/xaudio2/SDL_xaudio2.c b/src/audio/xaudio2/SDL_xaudio2.c
index 88803e6..3335a8f 100644
--- a/src/audio/xaudio2/SDL_xaudio2.c
+++ b/src/audio/xaudio2/SDL_xaudio2.c
@@ -98,6 +98,18 @@
#include "SDL_xaudio2_winrthelpers.h"
#endif
+/* Fixes bug 1210 where some versions of gcc need named parameters */
+#ifdef __GNUC__
+#ifdef THIS
+#undef THIS
+#endif
+#define THIS INTERFACE *p
+#ifdef THIS_
+#undef THIS_
+#endif
+#define THIS_ INTERFACE *p,
+#endif
+
struct SDL_PrivateAudioData
{
IXAudio2 *ixa2;
@@ -263,9 +275,7 @@ XAUDIO2_CloseDevice(_THIS)
if (ixa2 != NULL) {
IXAudio2_Release(ixa2);
}
- if (this->hidden->mixbuf != NULL) {
- SDL_free(this->hidden->mixbuf);
- }
+ SDL_free(this->hidden->mixbuf);
if (this->hidden->semaphore != NULL) {
SDL_DestroySemaphore(this->hidden->semaphore);
}
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index b7d1ff6..763715e 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -33,19 +33,20 @@
#include "../../video/android/SDL_androidkeyboard.h"
#include "../../video/android/SDL_androidtouch.h"
#include "../../video/android/SDL_androidvideo.h"
+#include "../../video/android/SDL_androidwindow.h"
#include <android/log.h>
#include <pthread.h>
#include <sys/types.h>
#include <unistd.h>
#define LOG_TAG "SDL_android"
-//#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
-//#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
+/* #define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__) */
+/* #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__) */
#define LOGI(...) do {} while (false)
#define LOGE(...) do {} while (false)
/* Uncomment this to log messages entering and exiting methods in this file */
-//#define DEBUG_JNI
+/* #define DEBUG_JNI */
static void Android_JNI_ThreadDestroyed(void*);
@@ -63,19 +64,18 @@ static void Android_JNI_ThreadDestroyed(void*);
static pthread_key_t mThreadKey;
static JavaVM* mJavaVM;
-// Main activity
+/* Main activity */
static jclass mActivityClass;
-// method signatures
-static jmethodID midCreateGLContext;
-static jmethodID midDeleteGLContext;
+/* method signatures */
+static jmethodID midGetNativeSurface;
static jmethodID midFlipBuffers;
static jmethodID midAudioInit;
static jmethodID midAudioWriteShortBuffer;
static jmethodID midAudioWriteByteBuffer;
static jmethodID midAudioQuit;
-// Accelerometer data storage
+/* Accelerometer data storage */
static float fLastAccelerometer[3];
static bool bHasNewData;
@@ -83,7 +83,7 @@ static bool bHasNewData;
Functions called by JNI
*******************************************************************************/
-// Library init
+/* Library init */
jint JNI_OnLoad(JavaVM* vm, void* reserved)
{
JNIEnv *env;
@@ -107,7 +107,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
return JNI_VERSION_1_4;
}
-// Called before SDL_main() to initialize JNI bindings
+/* Called before SDL_main() to initialize JNI bindings */
void SDL_Android_Init(JNIEnv* mEnv, jclass cls)
{
__android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init()");
@@ -116,10 +116,8 @@ void SDL_Android_Init(JNIEnv* mEnv, jclass cls)
mActivityClass = (jclass)((*mEnv)->NewGlobalRef(mEnv, cls));
- midCreateGLContext = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
- "createGLContext","(II[I)Z");
- midDeleteGLContext = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
- "deleteGLContext","()V");
+ midGetNativeSurface = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+ "getNativeSurface","()Landroid/view/Surface;");
midFlipBuffers = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
"flipBuffers","()V");
midAudioInit = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
@@ -133,14 +131,14 @@ void SDL_Android_Init(JNIEnv* mEnv, jclass cls)
bHasNewData = false;
- if(!midCreateGLContext || !midFlipBuffers || !midAudioInit ||
+ if(!midGetNativeSurface || !midFlipBuffers || !midAudioInit ||
!midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit) {
__android_log_print(ANDROID_LOG_WARN, "SDL", "SDL: Couldn't locate Java callbacks, check that they're named and typed correctly");
}
__android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init() finished!");
}
-// Resize
+/* Resize */
void Java_org_libsdl_app_SDLActivity_onNativeResize(
JNIEnv* env, jclass jcls,
jint width, jint height, jint format)
@@ -148,21 +146,80 @@ void Java_org_libsdl_app_SDLActivity_onNativeResize(
Android_SetScreenResolution(width, height, format);
}
-// Keydown
+
+/* Surface Created */
+void Java_org_libsdl_app_SDLActivity_onNativeSurfaceChanged(JNIEnv* env, jclass jcls)
+{
+ SDL_WindowData *data;
+ SDL_VideoDevice *_this;
+
+ if (Android_Window == NULL || Android_Window->driverdata == NULL ) {
+ return;
+ }
+
+ _this = SDL_GetVideoDevice();
+ data = (SDL_WindowData *) Android_Window->driverdata;
+
+ /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
+ if (data->egl_surface == EGL_NO_SURFACE) {
+ if(data->native_window) {
+ ANativeWindow_release(data->native_window);
+ }
+ data->native_window = Android_JNI_GetNativeWindow();
+ data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->native_window);
+ }
+
+ /* GL Context handling is done in the event loop because this function is run from the Java thread */
+
+}
+
+/* Surface Destroyed */
+void Java_org_libsdl_app_SDLActivity_onNativeSurfaceDestroyed(JNIEnv* env, jclass jcls)
+{
+ /* We have to clear the current context and destroy the egl surface here
+ * Otherwise there's BAD_NATIVE_WINDOW errors coming from eglCreateWindowSurface on resume
+ * Ref: http://stackoverflow.com/questions/8762589/eglcreatewindowsurface-on-ics-and-switching-from-2d-to-3d
+ */
+ SDL_WindowData *data;
+ SDL_VideoDevice *_this;
+
+ if (Android_Window == NULL || Android_Window->driverdata == NULL ) {
+ return;
+ }
+
+ _this = SDL_GetVideoDevice();
+ data = (SDL_WindowData *) Android_Window->driverdata;
+
+ if (data->egl_surface != EGL_NO_SURFACE) {
+ SDL_EGL_MakeCurrent(_this, NULL, NULL);
+ SDL_EGL_DestroySurface(_this, data->egl_surface);
+ data->egl_surface = EGL_NO_SURFACE;
+ }
+
+ /* GL Context handling is done in the event loop because this function is run from the Java thread */
+
+}
+
+void Java_org_libsdl_app_SDLActivity_nativeFlipBuffers(JNIEnv* env, jclass jcls)
+{
+ SDL_GL_SwapWindow(Android_Window);
+}
+
+/* Keydown */
void Java_org_libsdl_app_SDLActivity_onNativeKeyDown(
JNIEnv* env, jclass jcls, jint keycode)
{
Android_OnKeyDown(keycode);
}
-// Keyup
+/* Keyup */
void Java_org_libsdl_app_SDLActivity_onNativeKeyUp(
JNIEnv* env, jclass jcls, jint keycode)
{
Android_OnKeyUp(keycode);
}
-// Keyboard Focus Lost
+/* Keyboard Focus Lost */
void Java_org_libsdl_app_SDLActivity_onNativeKeyboardFocusLost(
JNIEnv* env, jclass jcls)
{
@@ -171,7 +228,7 @@ void Java_org_libsdl_app_SDLActivity_onNativeKeyboardFocusLost(
}
-// Touch
+/* Touch */
void Java_org_libsdl_app_SDLActivity_onNativeTouch(
JNIEnv* env, jclass jcls,
jint touch_device_id_in, jint pointer_finger_id_in,
@@ -180,7 +237,7 @@ void Java_org_libsdl_app_SDLActivity_onNativeTouch(
Android_OnTouch(touch_device_id_in, pointer_finger_id_in, action, x, y, p);
}
-// Accelerometer
+/* Accelerometer */
void Java_org_libsdl_app_SDLActivity_onNativeAccel(
JNIEnv* env, jclass jcls,
jfloat x, jfloat y, jfloat z)
@@ -191,23 +248,23 @@ void Java_org_libsdl_app_SDLActivity_onNativeAccel(
bHasNewData = true;
}
-// Low memory
+/* Low memory */
void Java_org_libsdl_app_SDLActivity_nativeLowMemory(
JNIEnv* env, jclass cls)
{
SDL_SendAppEvent(SDL_APP_LOWMEMORY);
}
-// Quit
+/* Quit */
void Java_org_libsdl_app_SDLActivity_nativeQuit(
JNIEnv* env, jclass cls)
{
- // Inject a SDL_QUIT event
+ /* Inject a SDL_QUIT event */
SDL_SendQuit();
SDL_SendAppEvent(SDL_APP_TERMINATING);
}
-// Pause
+/* Pause */
void Java_org_libsdl_app_SDLActivity_nativePause(
JNIEnv* env, jclass cls)
{
@@ -223,7 +280,7 @@ void Java_org_libsdl_app_SDLActivity_nativePause(
SDL_SendAppEvent(SDL_APP_DIDENTERBACKGROUND);
}
-// Resume
+/* Resume */
void Java_org_libsdl_app_SDLActivity_nativeResume(
JNIEnv* env, jclass cls)
{
@@ -317,47 +374,17 @@ static SDL_bool LocalReferenceHolder_IsActive()
return s_active > 0;
}
-
-SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion,
- int red, int green, int blue, int alpha,
- int buffer, int depth, int stencil,
- int buffers, int samples)
+ANativeWindow* Android_JNI_GetNativeWindow(void)
{
+ ANativeWindow* anw;
+ jobject s;
JNIEnv *env = Android_JNI_GetEnv();
- jint attribs[] = {
- EGL_RED_SIZE, red,
- EGL_GREEN_SIZE, green,
- EGL_BLUE_SIZE, blue,
- EGL_ALPHA_SIZE, alpha,
- EGL_BUFFER_SIZE, buffer,
- EGL_DEPTH_SIZE, depth,
- EGL_STENCIL_SIZE, stencil,
- EGL_SAMPLE_BUFFERS, buffers,
- EGL_SAMPLES, samples,
- EGL_RENDERABLE_TYPE, (majorVersion == 1 ? EGL_OPENGL_ES_BIT : EGL_OPENGL_ES2_BIT),
- EGL_NONE
- };
- int len = SDL_arraysize(attribs);
-
- jintArray array;
-
- array = (*env)->NewIntArray(env, len);
- (*env)->SetIntArrayRegion(env, array, 0, len, attribs);
-
- jboolean success = (*env)->CallStaticBooleanMethod(env, mActivityClass, midCreateGLContext, majorVersion, minorVersion, array);
-
- (*env)->DeleteLocalRef(env, array);
-
- return success ? SDL_TRUE : SDL_FALSE;
-}
-
-SDL_bool Android_JNI_DeleteContext(void)
-{
- /* There's only one context, so no parameter for now */
- JNIEnv *env = Android_JNI_GetEnv();
- (*env)->CallStaticVoidMethod(env, mActivityClass, midDeleteGLContext);
- return SDL_TRUE;
+ s = (*env)->CallStaticObjectMethod(env, mActivityClass, midGetNativeSurface);
+ anw = ANativeWindow_fromSurface(env, s);
+ (*env)->DeleteLocalRef(env, s);
+
+ return anw;
}
void Android_JNI_SwapWindow()
@@ -441,9 +468,9 @@ int Android_JNI_SetupThread(void) {
return 1;
}
-//
-// Audio support
-//
+/*
+ * Audio support
+ */
static jboolean audioBuffer16Bit = JNI_FALSE;
static jboolean audioBufferStereo = JNI_FALSE;
static jobject audioBuffer = NULL;
@@ -541,8 +568,8 @@ void Android_JNI_CloseAudioDevice()
}
}
-// Test for an exception and call SDL_SetError with its detail if one occurs
-// If the parameter silent is truthy then SDL_SetError() will not be called.
+/* Test for an exception and call SDL_SetError with its detail if one occurs */
+/* If the parameter silent is truthy then SDL_SetError() will not be called. */
static bool Android_JNI_ExceptionOccurred(bool silent)
{
SDL_assert(LocalReferenceHolder_IsActive());
@@ -552,7 +579,7 @@ static bool Android_JNI_ExceptionOccurred(bool silent)
if (exception != NULL) {
jmethodID mid;
- // Until this happens most JNI operations have undefined behaviour
+ /* Until this happens most JNI operations have undefined behaviour */
(*mEnv)->ExceptionClear(mEnv);
if (!silent) {
@@ -608,13 +635,13 @@ static int Internal_Android_JNI_FileOpen(SDL_RWops* ctx)
fileNameJString = (jstring)ctx->hidden.androidio.fileNameRef;
ctx->hidden.androidio.position = 0;
- // context = SDLActivity.getContext();
+ /* context = SDLActivity.getContext(); */
mid = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
"getContext","()Landroid/content/Context;");
context = (*mEnv)->CallStaticObjectMethod(mEnv, mActivityClass, mid);
- // assetManager = context.getAssets();
+ /* assetManager = context.getAssets(); */
mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, context),
"getAssets", "()Landroid/content/res/AssetManager;");
assetManager = (*mEnv)->CallObjectMethod(mEnv, context, mid);
@@ -647,34 +674,35 @@ static int Internal_Android_JNI_FileOpen(SDL_RWops* ctx)
ctx->hidden.androidio.fd = (*mEnv)->GetIntField(mEnv, fd, descriptor);
ctx->hidden.androidio.assetFileDescriptorRef = (*mEnv)->NewGlobalRef(mEnv, inputStream);
- // Seek to the correct offset in the file.
+ /* Seek to the correct offset in the file. */
lseek(ctx->hidden.androidio.fd, (off_t)ctx->hidden.androidio.offset, SEEK_SET);
if (false) {
fallback:
- // Disabled log message because of spam on the Nexus 7
- //__android_log_print(ANDROID_LOG_DEBUG, "SDL", "Falling back to legacy InputStream method for opening file");
+ /* Disabled log message because of spam on the Nexus 7 */
+ /* __android_log_print(ANDROID_LOG_DEBUG, "SDL", "Falling back to legacy InputStream method for opening file"); */
/* Try the old method using InputStream */
ctx->hidden.androidio.assetFileDescriptorRef = NULL;
- // inputStream = assetManager.open(<filename>);
+ /* inputStream = assetManager.open(<filename>); */
mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, assetManager),
"open", "(Ljava/lang/String;I)Ljava/io/InputStream;");
- inputStream = (*mEnv)->CallObjectMethod(mEnv, assetManager, mid, fileNameJString, 1 /*ACCESS_RANDOM*/);
+ inputStream = (*mEnv)->CallObjectMethod(mEnv, assetManager, mid, fileNameJString, 1 /* ACCESS_RANDOM */);
if (Android_JNI_ExceptionOccurred(false)) {
goto failure;
}
ctx->hidden.androidio.inputStreamRef = (*mEnv)->NewGlobalRef(mEnv, inputStream);
- // Despite all the visible documentation on [Asset]InputStream claiming
- // that the .available() method is not guaranteed to return the entire file
- // size, comments in <sdk>/samples/<ver>/ApiDemos/src/com/example/ ...
- // android/apis/content/ReadAsset.java imply that Android's
- // AssetInputStream.available() /will/ always return the total file size
-
- // size = inputStream.available();
+ /* Despite all the visible documentation on [Asset]InputStream claiming
+ * that the .available() method is not guaranteed to return the entire file
+ * size, comments in <sdk>/samples/<ver>/ApiDemos/src/com/example/ ...
+ * android/apis/content/ReadAsset.java imply that Android's
+ * AssetInputStream.available() /will/ always return the total file size
+ */
+
+ /* size = inputStream.available(); */
mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream),
"available", "()I");
ctx->hidden.androidio.size = (long)(*mEnv)->CallIntMethod(mEnv, inputStream, mid);
@@ -682,7 +710,7 @@ fallback:
goto failure;
}
- // readableByteChannel = Channels.newChannel(inputStream);
+ /* readableByteChannel = Channels.newChannel(inputStream); */
channels = (*mEnv)->FindClass(mEnv, "java/nio/channels/Channels");
mid = (*mEnv)->GetStaticMethodID(mEnv, channels,
"newChannel",
@@ -696,7 +724,7 @@ fallback:
ctx->hidden.androidio.readableByteChannelRef =
(*mEnv)->NewGlobalRef(mEnv, readableByteChannel);
- // Store .read id for reading purposes
+ /* Store .read id for reading purposes */
mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, readableByteChannel),
"read", "(Ljava/nio/ByteBuffer;)I");
ctx->hidden.androidio.readMethod = mid;
@@ -762,7 +790,7 @@ size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer,
if (ctx->hidden.androidio.assetFileDescriptorRef) {
size_t bytesMax = size * maxnum;
- if (ctx->hidden.androidio.size != -1 /*UNKNOWN_LENGTH*/ && ctx->hidden.androidio.position + bytesMax > ctx->hidden.androidio.size) {
+ if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && ctx->hidden.androidio.position + bytesMax > ctx->hidden.androidio.size) {
bytesMax = ctx->hidden.androidio.size - ctx->hidden.androidio.position;
}
size_t result = read(ctx->hidden.androidio.fd, buffer, bytesMax );
@@ -792,7 +820,7 @@ size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer,
jobject byteBuffer = (*mEnv)->NewDirectByteBuffer(mEnv, buffer, bytesRemaining);
while (bytesRemaining > 0) {
- // result = readableByteChannel.read(...);
+ /* result = readableByteChannel.read(...); */
int result = (*mEnv)->CallIntMethod(mEnv, readableByteChannel, readMethod, byteBuffer);
if (Android_JNI_ExceptionOccurred(false)) {
@@ -850,7 +878,7 @@ static int Internal_Android_JNI_FileClose(SDL_RWops* ctx, bool release)
else {
jobject inputStream = (jobject)ctx->hidden.androidio.inputStreamRef;
- // inputStream.close();
+ /* inputStream.close(); */
jmethodID mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream),
"close", "()V");
(*mEnv)->CallVoidMethod(mEnv, inputStream, mid);
@@ -881,12 +909,12 @@ Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence)
if (ctx->hidden.androidio.assetFileDescriptorRef) {
switch (whence) {
case RW_SEEK_SET:
- if (ctx->hidden.androidio.size != -1 /*UNKNOWN_LENGTH*/ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
+ if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
offset += ctx->hidden.androidio.offset;
break;
case RW_SEEK_CUR:
offset += ctx->hidden.androidio.position;
- if (ctx->hidden.androidio.size != -1 /*UNKNOWN_LENGTH*/ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
+ if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
offset += ctx->hidden.androidio.offset;
break;
case RW_SEEK_END:
@@ -929,7 +957,7 @@ Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence)
if (movement > 0) {
unsigned char buffer[4096];
- // The easy case where we're seeking forwards
+ /* The easy case where we're seeking forwards */
while (movement > 0) {
Sint64 amount = sizeof (buffer);
if (amount > movement) {
@@ -937,7 +965,7 @@ Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence)
}
size_t result = Android_JNI_FileRead(ctx, buffer, 1, amount);
if (result <= 0) {
- // Failed to read/skip the required amount, so fail
+ /* Failed to read/skip the required amount, so fail */
return -1;
}
@@ -945,8 +973,8 @@ Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence)
}
} else if (movement < 0) {
- // We can't seek backwards so we have to reopen the file and seek
- // forwards which obviously isn't very efficient
+ /* We can't seek backwards so we have to reopen the file and seek */
+ /* forwards which obviously isn't very efficient */
Internal_Android_JNI_FileClose(ctx, false);
Internal_Android_JNI_FileOpen(ctx);
Android_JNI_FileSeek(ctx, newPosition, RW_SEEK_SET);
@@ -962,7 +990,7 @@ int Android_JNI_FileClose(SDL_RWops* ctx)
return Internal_Android_JNI_FileClose(ctx, true);
}
-// returns a new global reference which needs to be released later
+/* returns a new global reference which needs to be released later */
static jobject Android_JNI_GetSystemServiceObject(const char* name)
{
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
@@ -1062,9 +1090,10 @@ SDL_bool Android_JNI_HasClipboardText()
}
-// returns 0 on success or -1 on error (others undefined then)
-// returns truthy or falsy value in plugged, charged and battery
-// returns the value in seconds and percent or -1 if not available
+/* returns 0 on success or -1 on error (others undefined then)
+ * returns truthy or falsy value in plugged, charged and battery
+ * returns the value in seconds and percent or -1 if not available
+ */
int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seconds, int* percent)
{
struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
@@ -1112,38 +1141,38 @@ int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seco
(*env)->DeleteLocalRef(env, bname);
if (plugged) {
- GET_INT_EXTRA(plug, "plugged") // == BatteryManager.EXTRA_PLUGGED (API 5)
+ GET_INT_EXTRA(plug, "plugged") /* == BatteryManager.EXTRA_PLUGGED (API 5) */
if (plug == -1) {
LocalReferenceHolder_Cleanup(&refs);
return -1;
}
- // 1 == BatteryManager.BATTERY_PLUGGED_AC
- // 2 == BatteryManager.BATTERY_PLUGGED_USB
+ /* 1 == BatteryManager.BATTERY_PLUGGED_AC */
+ /* 2 == BatteryManager.BATTERY_PLUGGED_USB */
*plugged = (0 < plug) ? 1 : 0;
}
if (charged) {
- GET_INT_EXTRA(status, "status") // == BatteryManager.EXTRA_STATUS (API 5)
+ GET_INT_EXTRA(status, "status") /* == BatteryManager.EXTRA_STATUS (API 5) */
if (status == -1) {
LocalReferenceHolder_Cleanup(&refs);
return -1;
}
- // 5 == BatteryManager.BATTERY_STATUS_FULL
+ /* 5 == BatteryManager.BATTERY_STATUS_FULL */
*charged = (status == 5) ? 1 : 0;
}
if (battery) {
- GET_BOOL_EXTRA(present, "present") // == BatteryManager.EXTRA_PRESENT (API 5)
+ GET_BOOL_EXTRA(present, "present") /* == BatteryManager.EXTRA_PRESENT (API 5) */
*battery = present ? 1 : 0;
}
if (seconds) {
- *seconds = -1; // not possible
+ *seconds = -1; /* not possible */
}
if (percent) {
- GET_INT_EXTRA(level, "level") // == BatteryManager.EXTRA_LEVEL (API 5)
- GET_INT_EXTRA(scale, "scale") // == BatteryManager.EXTRA_SCALE (API 5)
+ GET_INT_EXTRA(level, "level") /* == BatteryManager.EXTRA_LEVEL (API 5) */
+ GET_INT_EXTRA(scale, "scale") /* == BatteryManager.EXTRA_SCALE (API 5) */
if ((level == -1) || (scale == -1)) {
LocalReferenceHolder_Cleanup(&refs);
return -1;
@@ -1157,7 +1186,33 @@ int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seco
return 0;
}
-// sends message to be handled on the UI event dispatch thread
+/* returns number of found touch devices as return value and ids in parameter ids */
+int Android_JNI_GetTouchDeviceIds(int **ids) {
+ JNIEnv *env = Android_JNI_GetEnv();
+ jint sources = 4098; /* == InputDevice.SOURCE_TOUCHSCREEN */
+ jmethodID mid = (*env)->GetStaticMethodID(env, mActivityClass, "inputGetInputDeviceIds", "(I)[I");
+ jintArray array = (jintArray) (*env)->CallStaticObjectMethod(env, mActivityClass, mid, sources);
+ int number = 0;
+ *ids = NULL;
+ if (array) {
+ number = (int) (*env)->GetArrayLength(env, array);
+ if (0 < number) {
+ jint* elements = (*env)->GetIntArrayElements(env, array, NULL);
+ if (elements) {
+ int i;
+ *ids = SDL_malloc(number * sizeof (**ids));
+ for (i = 0; i < number; ++i) { /* not assuming sizeof (jint) == sizeof (int) */
+ (*ids)[i] = elements[i];
+ }
+ (*env)->ReleaseIntArrayElements(env, array, elements, JNI_ABORT);
+ }
+ }
+ (*env)->DeleteLocalRef(env, array);
+ }
+ return number;
+}
+
+/* sends message to be handled on the UI event dispatch thread */
int Android_JNI_SendMessage(int command, int param)
{
JNIEnv *env = Android_JNI_GetEnv();
@@ -1192,15 +1247,17 @@ void Android_JNI_ShowTextInput(SDL_Rect *inputRect)
void Android_JNI_HideTextInput()
{
- // has to match Activity constant
+ /* has to match Activity constant */
const int COMMAND_TEXTEDIT_HIDE = 3;
Android_JNI_SendMessage(COMMAND_TEXTEDIT_HIDE, 0);
}
+/*
//////////////////////////////////////////////////////////////////////////////
//
// Functions exposed to SDL applications in SDL_system.h
-//
+//////////////////////////////////////////////////////////////////////////////
+*/
void *SDL_AndroidGetJNIEnv()
{
@@ -1220,7 +1277,7 @@ void *SDL_AndroidGetActivity()
return NULL;
}
- // return SDLActivity.getContext();
+ /* return SDLActivity.getContext(); */
mid = (*env)->GetStaticMethodID(env, mActivityClass,
"getContext","()Landroid/content/Context;");
return (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
@@ -1244,12 +1301,12 @@ const char * SDL_AndroidGetInternalStoragePath()
return NULL;
}
- // context = SDLActivity.getContext();
+ /* context = SDLActivity.getContext(); */
mid = (*env)->GetStaticMethodID(env, mActivityClass,
"getContext","()Landroid/content/Context;");
context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
- // fileObj = context.getFilesDir();
+ /* fileObj = context.getFilesDir(); */
mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, context),
"getFilesDir", "()Ljava/io/File;");
fileObject = (*env)->CallObjectMethod(env, context, mid);
@@ -1259,7 +1316,7 @@ const char * SDL_AndroidGetInternalStoragePath()
return NULL;
}
- // path = fileObject.getAbsolutePath();
+ /* path = fileObject.getAbsolutePath(); */
mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, fileObject),
"getAbsolutePath", "()Ljava/lang/String;");
pathString = (jstring)(*env)->CallObjectMethod(env, fileObject, mid);
@@ -1295,7 +1352,7 @@ int SDL_AndroidGetExternalStorageState()
state = (*env)->GetStringUTFChars(env, stateString, NULL);
- // Print an info message so people debugging know the storage state
+ /* Print an info message so people debugging know the storage state */
__android_log_print(ANDROID_LOG_INFO, "SDL", "external storage state: %s", state);
if (SDL_strcmp(state, "mounted") == 0) {
@@ -1330,12 +1387,12 @@ const char * SDL_AndroidGetExternalStoragePath()
return NULL;
}
- // context = SDLActivity.getContext();
+ /* context = SDLActivity.getContext(); */
mid = (*env)->GetStaticMethodID(env, mActivityClass,
"getContext","()Landroid/content/Context;");
context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
- // fileObj = context.getExternalFilesDir();
+ /* fileObj = context.getExternalFilesDir(); */
mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, context),
"getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");
fileObject = (*env)->CallObjectMethod(env, context, mid, NULL);
@@ -1345,7 +1402,7 @@ const char * SDL_AndroidGetExternalStoragePath()
return NULL;
}
- // path = fileObject.getAbsolutePath();
+ /* path = fileObject.getAbsolutePath(); */
mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, fileObject),
"getAbsolutePath", "()Ljava/lang/String;");
pathString = (jstring)(*env)->CallObjectMethod(env, fileObject, mid);
diff --git a/src/core/android/SDL_android.h b/src/core/android/SDL_android.h
index 973f588..6181a15 100644
--- a/src/core/android/SDL_android.h
+++ b/src/core/android/SDL_android.h
@@ -27,16 +27,20 @@ extern "C" {
/* *INDENT-ON* */
#endif
+#include <EGL/eglplatform.h>
+#include <android/native_window_jni.h>
+
#include "SDL_rect.h"
/* Interface from the SDL library into the Android Java activity */
-extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples);
-extern SDL_bool Android_JNI_DeleteContext(void);
+/* extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples);
+extern SDL_bool Android_JNI_DeleteContext(void); */
extern void Android_JNI_SwapWindow();
extern void Android_JNI_SetActivityTitle(const char *title);
extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
extern void Android_JNI_ShowTextInput(SDL_Rect *inputRect);
extern void Android_JNI_HideTextInput();
+extern ANativeWindow* Android_JNI_GetNativeWindow(void);
/* Audio support */
extern int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames);
@@ -61,6 +65,9 @@ SDL_bool Android_JNI_HasClipboardText();
/* Power support */
int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seconds, int* percent);
+/* Touch support */
+int Android_JNI_GetTouchDeviceIds(int **ids);
+
/* Threads */
#include <jni.h>
JNIEnv *Android_JNI_GetEnv(void);
diff --git a/src/core/linux/SDL_udev.c b/src/core/linux/SDL_udev.c
new file mode 100644
index 0000000..c08c287
--- /dev/null
+++ b/src/core/linux/SDL_udev.c
@@ -0,0 +1,398 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+ * To list the properties of a device, try something like:
+ * udevadm info -a -n snd/hwC0D0 (for a sound card)
+ * udevadm info --query=all -n input/event3 (for a keyboard, mouse, etc)
+ * udevadm info --query=property -n input/event2
+ */
+
+#include "SDL_udev.h"
+
+#ifdef SDL_USE_LIBUDEV
+
+static char* SDL_UDEV_LIBS[] = { "libudev.so.1", "libudev.so.0" };
+
+#define _THIS SDL_UDEV_PrivateData *_this
+static _THIS = NULL;
+
+#include "SDL.h"
+
+static SDL_bool SDL_UDEV_load_sym(const char *fn, void **addr);
+static int SDL_UDEV_load_syms(void);
+static SDL_bool SDL_UDEV_hotplug_update_available(void);
+static void device_event(SDL_UDEV_deviceevent type, struct udev_device *dev);
+
+static SDL_bool
+SDL_UDEV_load_sym(const char *fn, void **addr)
+{
+ *addr = SDL_LoadFunction(_this->udev_handle, fn);
+ if (*addr == NULL) {
+ /* Don't call SDL_SetError(): SDL_LoadFunction already did. */
+ return SDL_FALSE;
+ }
+
+ return SDL_TRUE;
+}
+
+static int
+SDL_UDEV_load_syms(void)
+{
+ /* cast funcs to char* first, to please GCC's strict aliasing rules. */
+ #define SDL_UDEV_SYM(x) \
+ if (!SDL_UDEV_load_sym(#x, (void **) (char *) & _this->x)) return -1
+
+ SDL_UDEV_SYM(udev_device_get_action);
+ SDL_UDEV_SYM(udev_device_get_devnode);
+ SDL_UDEV_SYM(udev_device_get_subsystem);
+ SDL_UDEV_SYM(udev_device_get_property_value);
+ SDL_UDEV_SYM(udev_device_new_from_syspath);
+ SDL_UDEV_SYM(udev_device_unref);
+ SDL_UDEV_SYM(udev_enumerate_add_match_property);
+ SDL_UDEV_SYM(udev_enumerate_add_match_subsystem);
+ SDL_UDEV_SYM(udev_enumerate_get_list_entry);
+ SDL_UDEV_SYM(udev_enumerate_new);
+ SDL_UDEV_SYM(udev_enumerate_scan_devices);
+ SDL_UDEV_SYM(udev_enumerate_unref);
+ SDL_UDEV_SYM(udev_list_entry_get_name);
+ SDL_UDEV_SYM(udev_list_entry_get_next);
+ SDL_UDEV_SYM(udev_monitor_enable_receiving);
+ SDL_UDEV_SYM(udev_monitor_filter_add_match_subsystem_devtype);
+ SDL_UDEV_SYM(udev_monitor_get_fd);
+ SDL_UDEV_SYM(udev_monitor_new_from_netlink);
+ SDL_UDEV_SYM(udev_monitor_receive_device);
+ SDL_UDEV_SYM(udev_monitor_unref);
+ SDL_UDEV_SYM(udev_new);
+ SDL_UDEV_SYM(udev_unref);
+ SDL_UDEV_SYM(udev_device_new_from_devnum);
+ SDL_UDEV_SYM(udev_device_get_devnum);
+ #undef SDL_UDEV_SYM
+
+ return 0;
+}
+
+static SDL_bool
+SDL_UDEV_hotplug_update_available(void)
+{
+ if (_this->udev_mon != NULL) {
+ const int fd = _this->udev_monitor_get_fd(_this->udev_mon);
+ fd_set fds;
+ struct timeval tv;
+
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
+ if ((select(fd+1, &fds, NULL, NULL, &tv) > 0) && (FD_ISSET(fd, &fds))) {
+ return SDL_TRUE;
+ }
+ }
+ return SDL_FALSE;
+}
+
+
+int
+SDL_UDEV_Init(void)
+{
+ int retval = 0;
+
+ if (_this == NULL) {
+ _this = (SDL_UDEV_PrivateData *) SDL_calloc(1, sizeof(*_this));
+ if(_this == NULL) {
+ return SDL_OutOfMemory();
+ }
+
+ retval = SDL_UDEV_LoadLibrary();
+ if (retval < 0) {
+ SDL_UDEV_Quit();
+ return retval;
+ }
+
+ /* Set up udev monitoring
+ * Listen for input devices (mouse, keyboard, joystick, etc) and sound devices
+ */
+
+ _this->udev = _this->udev_new();
+ if (_this->udev == NULL) {
+ SDL_UDEV_Quit();
+ return SDL_SetError("udev_new() failed");
+ }
+
+ _this->udev_mon = _this->udev_monitor_new_from_netlink(_this->udev, "udev");
+ if (_this->udev_mon == NULL) {
+ SDL_UDEV_Quit();
+ return SDL_SetError("udev_monitor_new_from_netlink() failed");
+ }
+
+ _this->udev_monitor_filter_add_match_subsystem_devtype(_this->udev_mon, "input", NULL);
+ _this->udev_monitor_filter_add_match_subsystem_devtype(_this->udev_mon, "sound", NULL);
+ _this->udev_monitor_enable_receiving(_this->udev_mon);
+
+ /* Do an initial scan of existing devices */
+ SDL_UDEV_Scan();
+
+ }
+
+ _this->ref_count += 1;
+
+ return retval;
+}
+
+void
+SDL_UDEV_Quit(void)
+{
+ SDL_UDEV_CallbackList *item;
+
+ if (_this == NULL) {
+ return;
+ }
+
+ _this->ref_count -= 1;
+
+ if (_this->ref_count < 1) {
+
+ if (_this->udev_mon != NULL) {
+ _this->udev_monitor_unref(_this->udev_mon);
+ _this->udev_mon = NULL;
+ }
+ if (_this->udev != NULL) {
+ _this->udev_unref(_this->udev);
+ _this->udev = NULL;
+ }
+
+ /* Remove existing devices */
+ while (_this->first != NULL) {
+ item = _this->first;
+ _this->first = _this->first->next;
+ SDL_free(item);
+ }
+
+ SDL_UDEV_UnloadLibrary();
+ SDL_free(_this);
+ _this = NULL;
+ }
+}
+
+void
+SDL_UDEV_Scan(void)
+{
+ struct udev_enumerate *enumerate = NULL;
+ struct udev_list_entry *devs = NULL;
+ struct udev_list_entry *item = NULL;
+
+ if (_this == NULL) {
+ return;
+ }
+
+ enumerate = _this->udev_enumerate_new(_this->udev);
+ if (enumerate == NULL) {
+ SDL_UDEV_Quit();
+ SDL_SetError("udev_monitor_new_from_netlink() failed");
+ return;
+ }
+
+ _this->udev_enumerate_add_match_subsystem(enumerate, "input");
+ _this->udev_enumerate_add_match_subsystem(enumerate, "sound");
+
+ _this->udev_enumerate_scan_devices(enumerate);
+ devs = _this->udev_enumerate_get_list_entry(enumerate);
+ for (item = devs; item; item = _this->udev_list_entry_get_next(item)) {
+ const char *path = _this->udev_list_entry_get_name(item);
+ struct udev_device *dev = _this->udev_device_new_from_syspath(_this->udev, path);
+ if (dev != NULL) {
+ device_event(SDL_UDEV_DEVICEADDED, dev);
+ _this->udev_device_unref(dev);
+ }
+ }
+
+ _this->udev_enumerate_unref(enumerate);
+}
+
+
+void
+SDL_UDEV_UnloadLibrary(void)
+{
+ if (_this == NULL) {
+ return;
+ }
+
+ if (_this->udev_handle != NULL) {
+ SDL_UnloadObject(_this->udev_handle);
+ _this->udev_handle = NULL;
+ }
+}
+
+int
+SDL_UDEV_LoadLibrary(void)
+{
+ int retval = 0, i;
+
+ if (_this == NULL) {
+ return SDL_SetError("UDEV not initialized");
+ }
+
+
+ if (_this->udev_handle == NULL) {
+ for( i = 0 ; i < SDL_arraysize(SDL_UDEV_LIBS); i++) {
+ _this->udev_handle = SDL_LoadObject(SDL_UDEV_LIBS[i]);
+ if (_this->udev_handle != NULL) {
+ retval = SDL_UDEV_load_syms();
+ if (retval < 0) {
+ SDL_UDEV_UnloadLibrary();
+ }
+ else {
+ break;
+ }
+ }
+ }
+
+ if (_this->udev_handle == NULL) {
+ retval = -1;
+ /* Don't call SDL_SetError(): SDL_LoadObject already did. */
+ }
+ }
+
+ return retval;
+}
+
+static void
+device_event(SDL_UDEV_deviceevent type, struct udev_device *dev)
+{
+ const char *subsystem;
+ const char *val = NULL;
+ int devclass = 0;
+ const char *path;
+ SDL_UDEV_CallbackList *item;
+
+ path = _this->udev_device_get_devnode(dev);
+ if (path == NULL) {
+ return;
+ }
+
+ subsystem = _this->udev_device_get_subsystem(dev);
+ if (SDL_strcmp(subsystem, "sound") == 0) {
+ devclass = SDL_UDEV_DEVICE_SOUND;
+ } else if (SDL_strcmp(subsystem, "input") == 0) {
+ val = _this->udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");
+ if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+ devclass |= SDL_UDEV_DEVICE_JOYSTICK;
+ }
+
+ val = _this->udev_device_get_property_value(dev, "ID_INPUT_MOUSE");
+ if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+ devclass |= SDL_UDEV_DEVICE_MOUSE;
+ }
+
+ val = _this->udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD");
+ if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+ devclass |= SDL_UDEV_DEVICE_KEYBOARD;
+ }
+
+ if (devclass == 0) {
+ return;
+ }
+ } else {
+ return;
+ }
+
+ /* Process callbacks */
+ for (item = _this->first; item != NULL; item = item->next) {
+ item->callback(type, devclass, path);
+ }
+}
+
+void
+SDL_UDEV_Poll(void)
+{
+ struct udev_device *dev = NULL;
+ const char *action = NULL;
+
+ if (_this == NULL) {
+ return;
+ }
+
+ while (SDL_UDEV_hotplug_update_available()) {
+ dev = _this->udev_monitor_receive_device(_this->udev_mon);
+ if (dev == NULL) {
+ break;
+ }
+ action = _this->udev_device_get_action(dev);
+
+ if (SDL_strcmp(action, "add") == 0) {
+ device_event(SDL_UDEV_DEVICEADDED, dev);
+ } else if (SDL_strcmp(action, "remove") == 0) {
+ device_event(SDL_UDEV_DEVICEREMOVED, dev);
+ }
+
+ _this->udev_device_unref(dev);
+ }
+}
+
+int
+SDL_UDEV_AddCallback(SDL_UDEV_Callback cb)
+{
+ SDL_UDEV_CallbackList *item;
+ item = (SDL_UDEV_CallbackList *) SDL_calloc(1, sizeof (SDL_UDEV_CallbackList));
+ if (item == NULL) {
+ return SDL_OutOfMemory();
+ }
+
+ item->callback = cb;
+
+ if (_this->last == NULL) {
+ _this->first = _this->last = item;
+ } else {
+ _this->last->next = item;
+ _this->last = item;
+ }
+
+ return 1;
+}
+
+void
+SDL_UDEV_DelCallback(SDL_UDEV_Callback cb)
+{
+ SDL_UDEV_CallbackList *item;
+ SDL_UDEV_CallbackList *prev = NULL;
+
+ for (item = _this->first; item != NULL; item = item->next) {
+ /* found it, remove it. */
+ if (item->callback == cb) {
+ if (prev != NULL) {
+ prev->next = item->next;
+ } else {
+ SDL_assert(_this->first == item);
+ _this->first = item->next;
+ }
+ if (item == _this->last) {
+ _this->last = prev;
+ }
+ SDL_free(item);
+ return;
+ }
+ prev = item;
+ }
+
+}
+
+
+#endif /* SDL_USE_LIBUDEV */
diff --git a/src/core/linux/SDL_udev.h b/src/core/linux/SDL_udev.h
new file mode 100644
index 0000000..1c26f11
--- /dev/null
+++ b/src/core/linux/SDL_udev.h
@@ -0,0 +1,115 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_config.h"
+
+#ifndef _SDL_udev_h
+#define _SDL_udev_h
+
+#if HAVE_LIBUDEV_H
+
+#ifndef SDL_USE_LIBUDEV
+#define SDL_USE_LIBUDEV 1
+#endif
+
+#include "SDL_loadso.h"
+#include "SDL_events.h"
+#include <libudev.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+/**
+ * \brief Device type
+ */
+
+typedef enum
+{
+ SDL_UDEV_DEVICEADDED = 0x0001,
+ SDL_UDEV_DEVICEREMOVED
+} SDL_UDEV_deviceevent;
+
+/* A device can be any combination of these classes */
+typedef enum
+{
+ SDL_UDEV_DEVICE_MOUSE = 0x0001,
+ SDL_UDEV_DEVICE_KEYBOARD = 0x0002,
+ SDL_UDEV_DEVICE_JOYSTICK = 0x0004,
+ SDL_UDEV_DEVICE_SOUND = 0x0008
+} SDL_UDEV_deviceclass;
+
+typedef void (*SDL_UDEV_Callback)(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
+
+typedef struct SDL_UDEV_CallbackList {
+ SDL_UDEV_Callback callback;
+ struct SDL_UDEV_CallbackList *next;
+} SDL_UDEV_CallbackList;
+
+typedef struct SDL_UDEV_PrivateData
+{
+ const char *udev_library;
+ void *udev_handle;
+ struct udev *udev;
+ struct udev_monitor *udev_mon;
+ int ref_count;
+ SDL_UDEV_CallbackList *first, *last;
+
+ /* Function pointers */
+ const char *(*udev_device_get_action)(struct udev_device *);
+ const char *(*udev_device_get_devnode)(struct udev_device *);
+ const char *(*udev_device_get_subsystem)(struct udev_device *);
+ const char *(*udev_device_get_property_value)(struct udev_device *, const char *);
+ struct udev_device *(*udev_device_new_from_syspath)(struct udev *, const char *);
+ void (*udev_device_unref)(struct udev_device *);
+ int (*udev_enumerate_add_match_property)(struct udev_enumerate *, const char *, const char *);
+ int (*udev_enumerate_add_match_subsystem)(struct udev_enumerate *, const char *);
+ struct udev_list_entry *(*udev_enumerate_get_list_entry)(struct udev_enumerate *);
+ struct udev_enumerate *(*udev_enumerate_new)(struct udev *);
+ int (*udev_enumerate_scan_devices)(struct udev_enumerate *);
+ void (*udev_enumerate_unref)(struct udev_enumerate *);
+ const char *(*udev_list_entry_get_name)(struct udev_list_entry *);
+ struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *);
+ int (*udev_monitor_enable_receiving)(struct udev_monitor *);
+ int (*udev_monitor_filter_add_match_subsystem_devtype)(struct udev_monitor *, const char *, const char *);
+ int (*udev_monitor_get_fd)(struct udev_monitor *);
+ struct udev_monitor *(*udev_monitor_new_from_netlink)(struct udev *, const char *);
+ struct udev_device *(*udev_monitor_receive_device)(struct udev_monitor *);
+ void (*udev_monitor_unref)(struct udev_monitor *);
+ struct udev *(*udev_new)(void);
+ void (*udev_unref)(struct udev *);
+ struct udev_device * (*udev_device_new_from_devnum)(struct udev *udev, char type, dev_t devnum);
+ dev_t (*udev_device_get_devnum) (struct udev_device *udev_device);
+} SDL_UDEV_PrivateData;
+
+extern int SDL_UDEV_Init(void);
+extern void SDL_UDEV_Quit(void);
+extern void SDL_UDEV_UnloadLibrary(void);
+extern int SDL_UDEV_LoadLibrary(void);
+extern void SDL_UDEV_Poll(void);
+extern void SDL_UDEV_Scan(void);
+extern int SDL_UDEV_AddCallback(SDL_UDEV_Callback cb);
+extern void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb);
+
+
+
+
+#endif /* HAVE_LIBUDEV_H */
+
+#endif /* _SDL_udev_h */
diff --git a/src/core/windows/SDL_windows.c b/src/core/windows/SDL_windows.c
index 2388f93..5df7140 100644
--- a/src/core/windows/SDL_windows.c
+++ b/src/core/windows/SDL_windows.c
@@ -22,8 +22,8 @@
#if defined(__WIN32__) || defined(__WINRT__)
-#include "SDL_error.h"
#include "SDL_windows.h"
+#include "SDL_error.h"
#include "SDL_assert.h"
#include <objbase.h> /* for CoInitialize/CoUninitialize (Win32 only) */
diff --git a/src/core/windows/SDL_windows.h b/src/core/windows/SDL_windows.h
index ce614a9..a9b34fe 100644
--- a/src/core/windows/SDL_windows.h
+++ b/src/core/windows/SDL_windows.h
@@ -38,9 +38,10 @@
/* Routines to convert from UTF8 to native Windows text */
#if UNICODE
-#define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "UCS-2-INTERNAL", (char *)(S), (SDL_wcslen(S)+1)*sizeof(WCHAR))
-#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", (char *)(S), SDL_strlen(S)+1)
+#define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "UTF-16LE", (char *)(S), (SDL_wcslen(S)+1)*sizeof(WCHAR))
+#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UTF-16LE", "UTF-8", (char *)(S), SDL_strlen(S)+1)
#else
+/* !!! FIXME: UTF8ToString() can just be a SDL_strdup() here. */
#define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)(S), (SDL_strlen(S)+1))
#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)(S), SDL_strlen(S)+1)
#endif
diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
index 3054985..fcb6006 100644
--- a/src/cpuinfo/SDL_cpuinfo.c
+++ b/src/cpuinfo/SDL_cpuinfo.c
@@ -20,6 +20,10 @@
*/
#include "SDL_config.h"
+#if defined(__WIN32__)
+#include "../core/windows/SDL_windows.h"
+#endif
+
/* CPU feature detection for SDL */
#include "SDL_cpuinfo.h"
@@ -41,9 +45,6 @@
#include <signal.h>
#include <setjmp.h>
#endif
-#ifdef __WIN32__
-#include "../core/windows/SDL_windows.h"
-#endif
#define CPU_HAS_RDTSC 0x00000001
#define CPU_HAS_ALTIVEC 0x00000002
@@ -67,7 +68,7 @@ illegal_instruction(int sig)
}
#endif /* HAVE_SETJMP */
-static __inline__ int
+static SDL_INLINE int
CPU_haveCPUID(void)
{
int has_CPUID = 0;
@@ -191,7 +192,7 @@ done:
a = b = c = d = 0
#endif
-static __inline__ int
+static SDL_INLINE int
CPU_getCPUIDFeatures(void)
{
int features = 0;
@@ -205,7 +206,7 @@ CPU_getCPUIDFeatures(void)
return features;
}
-static __inline__ int
+static SDL_INLINE int
CPU_haveRDTSC(void)
{
if (CPU_haveCPUID()) {
@@ -214,7 +215,7 @@ CPU_haveRDTSC(void)
return 0;
}
-static __inline__ int
+static SDL_INLINE int
CPU_haveAltiVec(void)
{
volatile int altivec = 0;
@@ -241,7 +242,7 @@ CPU_haveAltiVec(void)
return altivec;
}
-static __inline__ int
+static SDL_INLINE int
CPU_haveMMX(void)
{
if (CPU_haveCPUID()) {
@@ -250,7 +251,7 @@ CPU_haveMMX(void)
return 0;
}
-static __inline__ int
+static SDL_INLINE int
CPU_have3DNow(void)
{
if (CPU_haveCPUID()) {
@@ -265,7 +266,7 @@ CPU_have3DNow(void)
return 0;
}
-static __inline__ int
+static SDL_INLINE int
CPU_haveSSE(void)
{
if (CPU_haveCPUID()) {
@@ -274,7 +275,7 @@ CPU_haveSSE(void)
return 0;
}
-static __inline__ int
+static SDL_INLINE int
CPU_haveSSE2(void)
{
if (CPU_haveCPUID()) {
@@ -283,7 +284,7 @@ CPU_haveSSE2(void)
return 0;
}
-static __inline__ int
+static SDL_INLINE int
CPU_haveSSE3(void)
{
if (CPU_haveCPUID()) {
@@ -298,7 +299,7 @@ CPU_haveSSE3(void)
return 0;
}
-static __inline__ int
+static SDL_INLINE int
CPU_haveSSE41(void)
{
if (CPU_haveCPUID()) {
@@ -313,7 +314,7 @@ CPU_haveSSE41(void)
return 0;
}
-static __inline__ int
+static SDL_INLINE int
CPU_haveSSE42(void)
{
if (CPU_haveCPUID()) {
@@ -607,6 +608,51 @@ SDL_HasSSE42(void)
return SDL_FALSE;
}
+static int SDL_SystemRAM = 0;
+
+int
+SDL_GetSystemRAM(void)
+{
+ if (!SDL_SystemRAM) {
+#if defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
+ if (SDL_SystemRAM <= 0) {
+ SDL_SystemRAM = (int)((Sint64)sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / (1024*1024));
+ }
+#endif
+#ifdef HAVE_SYSCTLBYNAME
+ if (SDL_SystemRAM <= 0) {
+#ifdef __FreeBSD__
+#ifdef HW_REALMEM
+ int mib[2] = {CTL_HW, HW_REALMEM};
+#else
+ /* might only report up to 2 GiB */
+ int mib[2] = {CTL_HW, HW_PHYSMEM};
+#endif /* HW_REALMEM */
+#else
+ int mib[2] = {CTL_HW, HW_MEMSIZE};
+#endif /* __FreeBSD__ */
+ Uint64 memsize = 0;
+ size_t len = sizeof(memsize);
+
+ if (sysctl(mib, 2, &memsize, &len, NULL, 0) == 0) {
+ SDL_SystemRAM = (int)(memsize / (1024*1024));
+ }
+ }
+#endif
+#ifdef __WIN32__
+ if (SDL_SystemRAM <= 0) {
+ MEMORYSTATUSEX stat;
+ stat.dwLength = sizeof(stat);
+ if (GlobalMemoryStatusEx(&stat)) {
+ SDL_SystemRAM = (int)(stat.ullTotalPhys / (1024 * 1024));
+ }
+ }
+#endif
+ }
+ return SDL_SystemRAM;
+}
+
+
#ifdef TEST_MAIN
#include <stdio.h>
@@ -627,6 +673,7 @@ main()
printf("SSE3: %d\n", SDL_HasSSE3());
printf("SSE4.1: %d\n", SDL_HasSSE41());
printf("SSE4.2: %d\n", SDL_HasSSE42());
+ printf("RAM: %d MB\n", SDL_GetSystemRAM());
return 0;
}
diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index 06cb0f2..9984503 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -83,7 +83,7 @@ static struct
} SDL_EventQ = { NULL, SDL_TRUE };
-static __inline__ SDL_bool
+static SDL_INLINE SDL_bool
SDL_ShouldPollJoystick()
{
#if !SDL_JOYSTICK_DISABLED
@@ -141,10 +141,8 @@ SDL_StopEventLoop(void)
/* Clear disabled event state */
for (i = 0; i < SDL_arraysize(SDL_disabled_events); ++i) {
- if (SDL_disabled_events[i]) {
- SDL_free(SDL_disabled_events[i]);
- SDL_disabled_events[i] = NULL;
- }
+ SDL_free(SDL_disabled_events[i]);
+ SDL_disabled_events[i] = NULL;
}
while (SDL_event_watchers) {
@@ -445,7 +443,7 @@ SDL_WaitEventTimeout(SDL_Event * event, int timeout)
/* Polling and no events, just return */
return 0;
}
- if (timeout > 0 && ((int) (SDL_GetTicks() - expiration) >= 0)) {
+ if (timeout > 0 && SDL_TICKS_PASSED(SDL_GetTicks(), expiration)) {
/* Timeout expired and no events */
return 0;
}
diff --git a/src/events/SDL_gesture.c b/src/events/SDL_gesture.c
index e987fcf..20ce57b 100644
--- a/src/events/SDL_gesture.c
+++ b/src/events/SDL_gesture.c
@@ -121,8 +121,8 @@ static int SaveTemplate(SDL_DollarTemplate *templ, SDL_RWops * src)
if (src == NULL) return 0;
- //No Longer storing the Hash, rehash on load
- //if(SDL_RWops.write(src,&(templ->hash),sizeof(templ->hash),1) != 1) return 0;
+ /* No Longer storing the Hash, rehash on load */
+ /* if(SDL_RWops.write(src,&(templ->hash),sizeof(templ->hash),1) != 1) return 0; */
if (SDL_RWwrite(src,templ->path,
sizeof(templ->path[0]),DOLLARNPOINTS) != DOLLARNPOINTS)
@@ -158,8 +158,8 @@ int SDL_SaveDollarTemplate(SDL_GestureID gestureId, SDL_RWops *src)
return SDL_SetError("Unknown gestureId");
}
-//path is an already sampled set of points
-//Returns the index of the gesture on success, or -1
+/* path is an already sampled set of points
+Returns the index of the gesture on success, or -1 */
static int SDL_AddDollarGesture_one(SDL_GestureTouch* inTouch, SDL_FloatPoint* path)
{
SDL_DollarTemplate* dollarTemplate;
@@ -196,7 +196,7 @@ static int SDL_AddDollarGesture(SDL_GestureTouch* inTouch, SDL_FloatPoint* path)
if (index < 0)
return -1;
}
- // Use the index of the last one added.
+ /* Use the index of the last one added. */
return index;
} else {
return SDL_AddDollarGesture_one(inTouch, path);
@@ -223,16 +223,16 @@ int SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src)
DOLLARNPOINTS) break;
if (touchId >= 0) {
- //printf("Adding loaded gesture to 1 touch\n");
+ /* printf("Adding loaded gesture to 1 touch\n"); */
if (SDL_AddDollarGesture(touch, templ.path) >= 0)
loaded++;
}
else {
- //printf("Adding to: %i touches\n",SDL_numGestureTouches);
+ /* printf("Adding to: %i touches\n",SDL_numGestureTouches); */
for (i = 0; i < SDL_numGestureTouches; i++) {
touch = &SDL_gestureTouch[i];
- //printf("Adding loaded gesture to + touches\n");
- //TODO: What if this fails?
+ /* printf("Adding loaded gesture to + touches\n"); */
+ /* TODO: What if this fails? */
SDL_AddDollarGesture(touch,templ.path);
}
loaded++;
@@ -245,7 +245,7 @@ int SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src)
static float dollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ,float ang)
{
- // SDL_FloatPoint p[DOLLARNPOINTS];
+ /* SDL_FloatPoint p[DOLLARNPOINTS]; */
float dist = 0;
SDL_FloatPoint p;
int i;
@@ -261,9 +261,10 @@ static float dollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ,float
static float bestDollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ)
{
- //------------BEGIN DOLLAR BLACKBOX----------------//
- //-TRANSLATED DIRECTLY FROM PSUDEO-CODE AVAILABLE AT-//
- //-"http://depts.washington.edu/aimgroup/proj/dollar/"-//
+ /*------------BEGIN DOLLAR BLACKBOX------------------
+ -TRANSLATED DIRECTLY FROM PSUDEO-CODE AVAILABLE AT-
+ -"http://depts.washington.edu/aimgroup/proj/dollar/"
+ */
double ta = -M_PI/4;
double tb = M_PI/4;
double dt = M_PI/90;
@@ -296,7 +297,7 @@ static float bestDollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ)
return SDL_min(f1,f2);
}
-//DollarPath contains raw points, plus (possibly) the calculated length
+/* DollarPath contains raw points, plus (possibly) the calculated length */
static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
{
int i;
@@ -309,7 +310,7 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
float w,h;
float length = path->length;
- //Calculate length if it hasn't already been done
+ /* Calculate length if it hasn't already been done */
if (length <= 0) {
for (i=1;i < path->numPoints; i++) {
float dx = path->p[i ].x - path->p[i-1].x;
@@ -318,17 +319,17 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
}
}
- //Resample
+ /* Resample */
interval = length/(DOLLARNPOINTS - 1);
dist = interval;
centroid.x = 0;centroid.y = 0;
- //printf("(%f,%f)\n",path->p[path->numPoints-1].x,path->p[path->numPoints-1].y);
+ /* printf("(%f,%f)\n",path->p[path->numPoints-1].x,path->p[path->numPoints-1].y); */
for (i = 1; i < path->numPoints; i++) {
float d = (float)(SDL_sqrt((path->p[i-1].x-path->p[i].x)*(path->p[i-1].x-path->p[i].x)+
(path->p[i-1].y-path->p[i].y)*(path->p[i-1].y-path->p[i].y)));
- //printf("d = %f dist = %f/%f\n",d,dist,interval);
+ /* printf("d = %f dist = %f/%f\n",d,dist,interval); */
while (dist + d > interval) {
points[numPoints].x = path->p[i-1].x +
((interval-dist)/d)*(path->p[i].x-path->p[i-1].x);
@@ -346,15 +347,15 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
SDL_SetError("ERROR: NumPoints = %i\n",numPoints);
return 0;
}
- //copy the last point
+ /* copy the last point */
points[DOLLARNPOINTS-1] = path->p[path->numPoints-1];
numPoints = DOLLARNPOINTS;
centroid.x /= numPoints;
centroid.y /= numPoints;
- //printf("Centroid (%f,%f)",centroid.x,centroid.y);
- //Rotate Points so point 0 is left of centroid and solve for the bounding box
+ /* printf("Centroid (%f,%f)",centroid.x,centroid.y); */
+ /* Rotate Points so point 0 is left of centroid and solve for the bounding box */
xmin = centroid.x;
xmax = centroid.x;
ymin = centroid.y;
@@ -378,7 +379,7 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
if (points[i].y > ymax) ymax = points[i].y;
}
- //Scale points to DOLLARSIZE, and translate to the origin
+ /* Scale points to DOLLARSIZE, and translate to the origin */
w = xmax-xmin;
h = ymax-ymin;
@@ -399,7 +400,7 @@ static float dollarRecognize(const SDL_DollarPath *path,int *bestTempl,SDL_Gestu
dollarNormalize(path,points);
- //PrintPath(points);
+ /* PrintPath(points); */
*bestTempl = -1;
for (i = 0; i < touch->numDollarTemplates; i++) {
float diff = bestDollarDifference(points,touch->dollarTemplate[i].path);
@@ -435,7 +436,7 @@ static SDL_GestureTouch * SDL_GetGestureTouch(SDL_TouchID id)
{
int i;
for (i = 0; i < SDL_numGestureTouches; i++) {
- //printf("%i ?= %i\n",SDL_gestureTouch[i].id,id);
+ /* printf("%i ?= %i\n",SDL_gestureTouch[i].id,id); */
if (SDL_gestureTouch[i].id == id)
return &SDL_gestureTouch[i];
}
@@ -465,7 +466,7 @@ static int SDL_SendGestureDollar(SDL_GestureTouch* touch,
event.mgesture.y = touch->centroid.y;
event.dgesture.gestureId = gestureId;
event.dgesture.error = error;
- //A finger came up to trigger this event.
+ /* A finger came up to trigger this event. */
event.dgesture.numFingers = touch->numDownFingers + 1;
return SDL_PushEvent(&event) > 0;
}
@@ -500,13 +501,13 @@ void SDL_GestureProcessEvent(SDL_Event* event)
event->type == SDL_FINGERUP) {
SDL_GestureTouch* inTouch = SDL_GetGestureTouch(event->tfinger.touchId);
- //Shouldn't be possible
+ /* Shouldn't be possible */
if (inTouch == NULL) return;
x = event->tfinger.x;
y = event->tfinger.y;
- //Finger Up
+ /* Finger Up */
if (event->type == SDL_FINGERUP) {
inTouch->numDownFingers--;
@@ -514,7 +515,7 @@ void SDL_GestureProcessEvent(SDL_Event* event)
if (inTouch->recording) {
inTouch->recording = SDL_FALSE;
dollarNormalize(&inTouch->dollarPath,path);
- //PrintPath(path);
+ /* PrintPath(path); */
if (recordAll) {
index = SDL_AddDollarGesture(NULL,path);
for (i = 0; i < SDL_numGestureTouches; i++)
@@ -537,14 +538,14 @@ void SDL_GestureProcessEvent(SDL_Event* event)
error = dollarRecognize(&inTouch->dollarPath,
&bestTempl,inTouch);
if (bestTempl >= 0){
- //Send Event
+ /* Send Event */
unsigned long gestureId = inTouch->dollarTemplate[bestTempl].hash;
SDL_SendGestureDollar(inTouch,gestureId,error);
- //printf ("%s\n",);("Dollar error: %f\n",error);
+ /* printf ("%s\n",);("Dollar error: %f\n",error); */
}
}
#endif
- //inTouch->gestureLast[j] = inTouch->gestureLast[inTouch->numDownFingers];
+ /* inTouch->gestureLast[j] = inTouch->gestureLast[inTouch->numDownFingers]; */
if (inTouch->numDownFingers > 0) {
inTouch->centroid.x = (inTouch->centroid.x*(inTouch->numDownFingers+1)-
x)/inTouch->numDownFingers;
@@ -574,22 +575,22 @@ void SDL_GestureProcessEvent(SDL_Event* event)
inTouch->centroid.x += dx/inTouch->numDownFingers;
inTouch->centroid.y += dy/inTouch->numDownFingers;
- //printf("Centrid : (%f,%f)\n",inTouch->centroid.x,inTouch->centroid.y);
+ /* printf("Centrid : (%f,%f)\n",inTouch->centroid.x,inTouch->centroid.y); */
if (inTouch->numDownFingers > 1) {
- SDL_FloatPoint lv; //Vector from centroid to last x,y position
- SDL_FloatPoint v; //Vector from centroid to current x,y position
- //lv = inTouch->gestureLast[j].cv;
+ SDL_FloatPoint lv; /* Vector from centroid to last x,y position */
+ SDL_FloatPoint v; /* Vector from centroid to current x,y position */
+ /* lv = inTouch->gestureLast[j].cv; */
lv.x = lastP.x - lastCentroid.x;
lv.y = lastP.y - lastCentroid.y;
lDist = (float)SDL_sqrt(lv.x*lv.x + lv.y*lv.y);
- //printf("lDist = %f\n",lDist);
+ /* printf("lDist = %f\n",lDist); */
v.x = x - inTouch->centroid.x;
v.y = y - inTouch->centroid.y;
- //inTouch->gestureLast[j].cv = v;
+ /* inTouch->gestureLast[j].cv = v; */
Dist = (float)SDL_sqrt(v.x*v.x+v.y*v.y);
- // SDL_cos(dTheta) = (v . lv)/(|v| * |lv|)
+ /* SDL_cos(dTheta) = (v . lv)/(|v| * |lv|) */
- //Normalize Vectors to simplify angle calculation
+ /* Normalize Vectors to simplify angle calculation */
lv.x/=lDist;
lv.y/=lDist;
v.x/=Dist;
@@ -597,30 +598,30 @@ void SDL_GestureProcessEvent(SDL_Event* event)
dtheta = (float)SDL_atan2(lv.x*v.y - lv.y*v.x,lv.x*v.x + lv.y*v.y);
dDist = (Dist - lDist);
- if (lDist == 0) {dDist = 0;dtheta = 0;} //To avoid impossible values
-
- //inTouch->gestureLast[j].dDist = dDist;
- //inTouch->gestureLast[j].dtheta = dtheta;
-
- //printf("dDist = %f, dTheta = %f\n",dDist,dtheta);
- //gdtheta = gdtheta*.9 + dtheta*.1;
- //gdDist = gdDist*.9 + dDist*.1
- //knob.r += dDist/numDownFingers;
- //knob.ang += dtheta;
- //printf("thetaSum = %f, distSum = %f\n",gdtheta,gdDist);
- //printf("id: %i dTheta = %f, dDist = %f\n",j,dtheta,dDist);
+ if (lDist == 0) {dDist = 0;dtheta = 0;} /* To avoid impossible values */
+
+ /* inTouch->gestureLast[j].dDist = dDist;
+ inTouch->gestureLast[j].dtheta = dtheta;
+
+ printf("dDist = %f, dTheta = %f\n",dDist,dtheta);
+ gdtheta = gdtheta*.9 + dtheta*.1;
+ gdDist = gdDist*.9 + dDist*.1
+ knob.r += dDist/numDownFingers;
+ knob.ang += dtheta;
+ printf("thetaSum = %f, distSum = %f\n",gdtheta,gdDist);
+ printf("id: %i dTheta = %f, dDist = %f\n",j,dtheta,dDist); */
SDL_SendGestureMulti(inTouch,dtheta,dDist);
}
else {
- //inTouch->gestureLast[j].dDist = 0;
- //inTouch->gestureLast[j].dtheta = 0;
- //inTouch->gestureLast[j].cv.x = 0;
- //inTouch->gestureLast[j].cv.y = 0;
+ /* inTouch->gestureLast[j].dDist = 0;
+ inTouch->gestureLast[j].dtheta = 0;
+ inTouch->gestureLast[j].cv.x = 0;
+ inTouch->gestureLast[j].cv.y = 0; */
}
- //inTouch->gestureLast[j].f.p.x = x;
- //inTouch->gestureLast[j].f.p.y = y;
- //break;
- //pressure?
+ /* inTouch->gestureLast[j].f.p.x = x;
+ inTouch->gestureLast[j].f.p.y = y;
+ break;
+ pressure? */
}
if (event->type == SDL_FINGERDOWN) {
@@ -630,8 +631,8 @@ void SDL_GestureProcessEvent(SDL_Event* event)
x)/inTouch->numDownFingers;
inTouch->centroid.y = (inTouch->centroid.y*(inTouch->numDownFingers - 1)+
y)/inTouch->numDownFingers;
- //printf("Finger Down: (%f,%f). Centroid: (%f,%f\n",x,y,
- // inTouch->centroid.x,inTouch->centroid.y);
+ /* printf("Finger Down: (%f,%f). Centroid: (%f,%f\n",x,y,
+ inTouch->centroid.x,inTouch->centroid.y); */
#ifdef ENABLE_DOLLAR
inTouch->dollarPath.length = 0;
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
index a3ed168..34d94d0 100644
--- a/src/events/SDL_keyboard.c
+++ b/src/events/SDL_keyboard.c
@@ -28,7 +28,7 @@
#include "../video/SDL_sysvideo.h"
-/*#define DEBUG_KEYBOARD*/
+/* #define DEBUG_KEYBOARD */
/* Global keyboard information */
@@ -507,7 +507,7 @@ static const char *SDL_scancode_names[SDL_NUM_SCANCODES] = {
};
/* Taken from SDL_iconv() */
-static char *
+char *
SDL_UCS4ToUTF8(Uint32 ch, char *dst)
{
Uint8 *p = (Uint8 *) dst;
diff --git a/src/events/SDL_keyboard_c.h b/src/events/SDL_keyboard_c.h
index 1720399..cd9f1bb 100644
--- a/src/events/SDL_keyboard_c.h
+++ b/src/events/SDL_keyboard_c.h
@@ -59,6 +59,9 @@ extern int SDL_SendEditingText(const char *text, int start, int end);
/* Shutdown the keyboard subsystem */
extern void SDL_KeyboardQuit(void);
+/* Convert to UTF-8 */
+extern char *SDL_UCS4ToUTF8(Uint32 ch, char *dst);
+
#endif /* _SDL_keyboard_c_h */
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index e9404f0..0886f54 100644
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -28,7 +28,7 @@
#include "default_cursor.h"
#include "../video/SDL_sysvideo.h"
-/*#define DEBUG_MOUSE*/
+/* #define DEBUG_MOUSE */
/* The mouse state */
static SDL_Mouse SDL_mouse;
@@ -246,13 +246,11 @@ SDL_PrivateSendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relativ
mouse->xdelta += xrel;
mouse->ydelta += yrel;
-#if 0 /* FIXME */
/* Move the mouse cursor, if needed */
if (mouse->cursor_shown && !mouse->relative_mode &&
mouse->MoveCursor && mouse->cur_cursor) {
mouse->MoveCursor(mouse->cur_cursor);
}
-#endif
/* Post the event, if desired */
posted = 0;
@@ -571,9 +569,7 @@ SDL_CreateColorCursor(SDL_Surface *surface, int hot_x, int hot_y)
mouse->cursors = cursor;
}
- if (temp) {
- SDL_FreeSurface(temp);
- }
+ SDL_FreeSurface(temp);
return cursor;
}
diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c
index 3429b57..1874ba7 100644
--- a/src/events/SDL_touch.c
+++ b/src/events/SDL_touch.c
@@ -355,10 +355,8 @@ SDL_TouchQuit(void)
}
SDL_assert(SDL_num_touch == 0);
- if (SDL_touchDevices) {
- SDL_free(SDL_touchDevices);
- SDL_touchDevices = NULL;
- }
+ SDL_free(SDL_touchDevices);
+ SDL_touchDevices = NULL;
}
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/scancodes_windows.h b/src/events/scancodes_windows.h
index 1034b1b..3462e14 100644
--- a/src/events/scancodes_windows.h
+++ b/src/events/scancodes_windows.h
@@ -26,30 +26,30 @@
/* *INDENT-OFF* */
static const SDL_Scancode windows_scancode_table[] =
{
- // 0 1 2 3 4 5 6 7
- // 8 9 A B C D E F
- SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_ESCAPE, SDL_SCANCODE_1, SDL_SCANCODE_2, SDL_SCANCODE_3, SDL_SCANCODE_4, SDL_SCANCODE_5, SDL_SCANCODE_6, // 0
- SDL_SCANCODE_7, SDL_SCANCODE_8, SDL_SCANCODE_9, SDL_SCANCODE_0, SDL_SCANCODE_MINUS, SDL_SCANCODE_EQUALS, SDL_SCANCODE_BACKSPACE, SDL_SCANCODE_TAB, // 0
+ /* 0 1 2 3 4 5 6 7 */
+ /* 8 9 A B C D E F */
+ SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_ESCAPE, SDL_SCANCODE_1, SDL_SCANCODE_2, SDL_SCANCODE_3, SDL_SCANCODE_4, SDL_SCANCODE_5, SDL_SCANCODE_6, /* 0 */
+ SDL_SCANCODE_7, SDL_SCANCODE_8, SDL_SCANCODE_9, SDL_SCANCODE_0, SDL_SCANCODE_MINUS, SDL_SCANCODE_EQUALS, SDL_SCANCODE_BACKSPACE, SDL_SCANCODE_TAB, /* 0 */
- SDL_SCANCODE_Q, SDL_SCANCODE_W, SDL_SCANCODE_E, SDL_SCANCODE_R, SDL_SCANCODE_T, SDL_SCANCODE_Y, SDL_SCANCODE_U, SDL_SCANCODE_I, // 1
- SDL_SCANCODE_O, SDL_SCANCODE_P, SDL_SCANCODE_LEFTBRACKET, SDL_SCANCODE_RIGHTBRACKET, SDL_SCANCODE_RETURN, SDL_SCANCODE_LCTRL, SDL_SCANCODE_A, SDL_SCANCODE_S, // 1
+ SDL_SCANCODE_Q, SDL_SCANCODE_W, SDL_SCANCODE_E, SDL_SCANCODE_R, SDL_SCANCODE_T, SDL_SCANCODE_Y, SDL_SCANCODE_U, SDL_SCANCODE_I, /* 1 */
+ SDL_SCANCODE_O, SDL_SCANCODE_P, SDL_SCANCODE_LEFTBRACKET, SDL_SCANCODE_RIGHTBRACKET, SDL_SCANCODE_RETURN, SDL_SCANCODE_LCTRL, SDL_SCANCODE_A, SDL_SCANCODE_S, /* 1 */
- SDL_SCANCODE_D, SDL_SCANCODE_F, SDL_SCANCODE_G, SDL_SCANCODE_H, SDL_SCANCODE_J, SDL_SCANCODE_K, SDL_SCANCODE_L, SDL_SCANCODE_SEMICOLON, // 2
- SDL_SCANCODE_APOSTROPHE, SDL_SCANCODE_GRAVE, SDL_SCANCODE_LSHIFT, SDL_SCANCODE_BACKSLASH, SDL_SCANCODE_Z, SDL_SCANCODE_X, SDL_SCANCODE_C, SDL_SCANCODE_V, // 2
+ SDL_SCANCODE_D, SDL_SCANCODE_F, SDL_SCANCODE_G, SDL_SCANCODE_H, SDL_SCANCODE_J, SDL_SCANCODE_K, SDL_SCANCODE_L, SDL_SCANCODE_SEMICOLON, /* 2 */
+ SDL_SCANCODE_APOSTROPHE, SDL_SCANCODE_GRAVE, SDL_SCANCODE_LSHIFT, SDL_SCANCODE_BACKSLASH, SDL_SCANCODE_Z, SDL_SCANCODE_X, SDL_SCANCODE_C, SDL_SCANCODE_V, /* 2 */
- SDL_SCANCODE_B, SDL_SCANCODE_N, SDL_SCANCODE_M, SDL_SCANCODE_COMMA, SDL_SCANCODE_PERIOD, SDL_SCANCODE_SLASH, SDL_SCANCODE_RSHIFT, SDL_SCANCODE_PRINTSCREEN,// 3
- SDL_SCANCODE_LALT, SDL_SCANCODE_SPACE, SDL_SCANCODE_CAPSLOCK, SDL_SCANCODE_F1, SDL_SCANCODE_F2, SDL_SCANCODE_F3, SDL_SCANCODE_F4, SDL_SCANCODE_F5, // 3
+ SDL_SCANCODE_B, SDL_SCANCODE_N, SDL_SCANCODE_M, SDL_SCANCODE_COMMA, SDL_SCANCODE_PERIOD, SDL_SCANCODE_SLASH, SDL_SCANCODE_RSHIFT, SDL_SCANCODE_PRINTSCREEN,/* 3 */
+ SDL_SCANCODE_LALT, SDL_SCANCODE_SPACE, SDL_SCANCODE_CAPSLOCK, SDL_SCANCODE_F1, SDL_SCANCODE_F2, SDL_SCANCODE_F3, SDL_SCANCODE_F4, SDL_SCANCODE_F5, /* 3 */
- SDL_SCANCODE_F6, SDL_SCANCODE_F7, SDL_SCANCODE_F8, SDL_SCANCODE_F9, SDL_SCANCODE_F10, SDL_SCANCODE_NUMLOCKCLEAR, SDL_SCANCODE_SCROLLLOCK, SDL_SCANCODE_HOME, // 4
- SDL_SCANCODE_UP, SDL_SCANCODE_PAGEUP, SDL_SCANCODE_KP_MINUS, SDL_SCANCODE_LEFT, SDL_SCANCODE_KP_5, SDL_SCANCODE_RIGHT, SDL_SCANCODE_KP_PLUS, SDL_SCANCODE_END, // 4
+ SDL_SCANCODE_F6, SDL_SCANCODE_F7, SDL_SCANCODE_F8, SDL_SCANCODE_F9, SDL_SCANCODE_F10, SDL_SCANCODE_NUMLOCKCLEAR, SDL_SCANCODE_SCROLLLOCK, SDL_SCANCODE_HOME, /* 4 */
+ SDL_SCANCODE_UP, SDL_SCANCODE_PAGEUP, SDL_SCANCODE_KP_MINUS, SDL_SCANCODE_LEFT, SDL_SCANCODE_KP_5, SDL_SCANCODE_RIGHT, SDL_SCANCODE_KP_PLUS, SDL_SCANCODE_END, /* 4 */
- SDL_SCANCODE_DOWN, SDL_SCANCODE_PAGEDOWN, SDL_SCANCODE_INSERT, SDL_SCANCODE_DELETE, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_NONUSBACKSLASH,SDL_SCANCODE_F11, // 5
- SDL_SCANCODE_F12, SDL_SCANCODE_PAUSE, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_LGUI, SDL_SCANCODE_RGUI, SDL_SCANCODE_APPLICATION, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, // 5
+ SDL_SCANCODE_DOWN, SDL_SCANCODE_PAGEDOWN, SDL_SCANCODE_INSERT, SDL_SCANCODE_DELETE, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_NONUSBACKSLASH,SDL_SCANCODE_F11, /* 5 */
+ SDL_SCANCODE_F12, SDL_SCANCODE_PAUSE, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_LGUI, SDL_SCANCODE_RGUI, SDL_SCANCODE_APPLICATION, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, /* 5 */
- SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_F13, SDL_SCANCODE_F14, SDL_SCANCODE_F15, SDL_SCANCODE_F16, // 6
- SDL_SCANCODE_F17, SDL_SCANCODE_F18, SDL_SCANCODE_F19, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, // 6
+ SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_F13, SDL_SCANCODE_F14, SDL_SCANCODE_F15, SDL_SCANCODE_F16, /* 6 */
+ SDL_SCANCODE_F17, SDL_SCANCODE_F18, SDL_SCANCODE_F19, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, /* 6 */
- SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, // 7
- SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN // 7
+ SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, /* 7 */
+ SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN, SDL_SCANCODE_UNKNOWN /* 7 */
};
/* *INDENT-ON* */
diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c
index 3a6f7db..73e9846 100644
--- a/src/file/SDL_rwops.c
+++ b/src/file/SDL_rwops.c
@@ -22,6 +22,11 @@
#define _LARGEFILE64_SOURCE
#include "SDL_config.h"
+#if defined(__WIN32__)
+#include "../core/windows/SDL_windows.h"
+#endif
+
+
/* This file provides a general interface for SDL to read and write
data sources. It can easily be extended to files, memory, etc.
*/
@@ -42,8 +47,6 @@
/* Functions to read/write Win32 API file pointers */
-#include "../core/windows/SDL_windows.h"
-
#ifndef INVALID_SET_FILE_POINTER
#define INVALID_SET_FILE_POINTER 0xFFFFFFFF
#endif
@@ -275,10 +278,8 @@ windows_file_close(SDL_RWops * context)
CloseHandle(context->hidden.windowsio.h);
context->hidden.windowsio.h = INVALID_HANDLE_VALUE; /* to be sure */
}
- if (context->hidden.windowsio.buffer.data) {
- SDL_free(context->hidden.windowsio.buffer.data);
- context->hidden.windowsio.buffer.data = NULL;
- }
+ SDL_free(context->hidden.windowsio.buffer.data);
+ context->hidden.windowsio.buffer.data = NULL;
SDL_FreeRW(context);
}
return (0);
diff --git a/src/filesystem/beos/SDL_sysfilesystem.cc b/src/filesystem/beos/SDL_sysfilesystem.cc
new file mode 100644
index 0000000..dc7a970
--- /dev/null
+++ b/src/filesystem/beos/SDL_sysfilesystem.cc
@@ -0,0 +1,93 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifdef SDL_FILESYSTEM_BEOS
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines */
+
+#include <os/kernel/image.h>
+#include <os/storage/Directory.h>
+#include <os/storage/Entry.h>
+#include <os/storage/Path.h>
+
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_assert.h"
+#include "SDL_filesystem.h"
+
+char *
+SDL_GetBasePath(void)
+{
+ image_info info;
+ int32 cookie = 0;
+
+ while (get_next_image_info(0, &cookie, &info) == B_OK) {
+ if (info.type == B_APP_IMAGE) {
+ break;
+ }
+ }
+
+ BEntry entry(info.name, true);
+ BPath path;
+ status_t rc = entry.GetPath(&path); /* (path) now has binary's path. */
+ SDL_assert(rc == B_OK);
+ rc = path.GetParent(&path); /* chop filename, keep directory. */
+ SDL_assert(rc == B_OK);
+ const char *str = path.Path();
+ SDL_assert(str != NULL);
+
+ const size_t len = SDL_strlen(str);
+ char *retval = (char *) SDL_malloc(len + 2);
+ if (!retval) {
+ SDL_OutOfMemory();
+ return NULL;
+ }
+
+ SDL_memcpy(retval, str, len);
+ retval[len] = '/';
+ retval[len+1] = '\0';
+ return retval;
+}
+
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+ // !!! FIXME: is there a better way to do this?
+ const char *home = SDL_getenv("HOME");
+ const char *append = "config/settings/";
+ const size_t len = SDL_strlen(home) + SDL_strlen(append) + SDL_strlen(org) + SDL_strlen(app) + 3;
+ char *retval = (char *) SDL_malloc(len);
+ if (!retval) {
+ SDL_OutOfMemory();
+ } else {
+ SDL_snprintf(retval, len, "%s%s%s/%s/", home, append, org, app);
+ create_directory(retval, 0700); // BeOS api: creates missing dirs
+ }
+
+ return retval;
+}
+
+#endif /* SDL_FILESYSTEM_BEOS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/cocoa/SDL_sysfilesystem.m b/src/filesystem/cocoa/SDL_sysfilesystem.m
new file mode 100644
index 0000000..587c35c
--- /dev/null
+++ b/src/filesystem/cocoa/SDL_sysfilesystem.m
@@ -0,0 +1,105 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifdef SDL_FILESYSTEM_COCOA
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines */
+
+#include <Foundation/Foundation.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_filesystem.h"
+
+char *
+SDL_GetBasePath(void)
+{
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSBundle *bundle = [NSBundle mainBundle];
+ const char* baseType = [[[bundle infoDictionary] objectForKey:@"SDL_FILESYSTEM_BASE_DIR_TYPE"] UTF8String];
+ const char *base = NULL;
+ char *retval = NULL;
+ if (baseType == NULL) {
+ baseType = "resource";
+ }
+ if (SDL_strcasecmp(baseType, "bundle")==0) {
+ base = [[bundle bundlePath] fileSystemRepresentation];
+ } else if (SDL_strcasecmp(baseType, "parent")==0) {
+ base = [[[bundle bundlePath] stringByDeletingLastPathComponent] fileSystemRepresentation];
+ } else {
+ /* this returns the exedir for non-bundled and the resourceDir for bundled apps */
+ base = [[bundle resourcePath] fileSystemRepresentation];
+ }
+ if (base) {
+ const size_t len = SDL_strlen(base) + 2;
+ retval = (char *) SDL_malloc(len);
+ if (retval == NULL) {
+ SDL_OutOfMemory();
+ } else {
+ SDL_snprintf(retval, len, "%s/", base);
+ }
+ }
+
+ [pool release];
+ return retval;
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSArray *array = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+ char *retval = NULL;
+
+ if ([array count] > 0) { /* we only want the first item in the list. */
+ NSString *str = [array objectAtIndex:0];
+ const char *base = [str fileSystemRepresentation];
+ if (base) {
+ const size_t len = SDL_strlen(base) + SDL_strlen(org) + SDL_strlen(app) + 4;
+ retval = (char *) SDL_malloc(len);
+ if (retval == NULL) {
+ SDL_OutOfMemory();
+ } else {
+ char *ptr;
+ SDL_snprintf(retval, len, "%s/%s/%s/", base, org, app);
+ for (ptr = retval+1; *ptr; ptr++) {
+ if (*ptr == '/') {
+ *ptr = '\0';
+ mkdir(retval, 0700);
+ *ptr = '/';
+ }
+ }
+ mkdir(retval, 0700);
+ }
+ }
+ }
+
+ [pool release];
+ return retval;
+}
+
+#endif /* SDL_FILESYSTEM_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/dummy/SDL_sysfilesystem.c b/src/filesystem/dummy/SDL_sysfilesystem.c
new file mode 100644
index 0000000..a6bd577
--- /dev/null
+++ b/src/filesystem/dummy/SDL_sysfilesystem.c
@@ -0,0 +1,47 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifdef SDL_FILESYSTEM_DUMMY
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines */
+
+#include "SDL_error.h"
+#include "SDL_filesystem.h"
+
+char *
+SDL_GetBasePath(void)
+{
+ SDL_Unsupported();
+ return NULL;
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+ SDL_Unsupported();
+ return NULL;
+}
+
+#endif /* SDL_FILESYSTEM_DUMMY */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/unix/SDL_sysfilesystem.c b/src/filesystem/unix/SDL_sysfilesystem.c
new file mode 100644
index 0000000..0f6e62e
--- /dev/null
+++ b/src/filesystem/unix/SDL_sysfilesystem.c
@@ -0,0 +1,210 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifdef SDL_FILESYSTEM_UNIX
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines */
+
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <limits.h>
+
+#ifdef __FREEBSD__
+#include <sys/sysctl.h>
+#endif
+
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_filesystem.h"
+
+static char *
+readSymLink(const char *path)
+{
+ char *retval = NULL;
+ ssize_t len = 64;
+ ssize_t rc = -1;
+
+ while (1)
+ {
+ char *ptr = (char *) SDL_realloc(retval, (size_t) len);
+ if (ptr == NULL) {
+ SDL_OutOfMemory();
+ break;
+ }
+
+ retval = ptr;
+
+ rc = readlink(path, retval, len);
+ if (rc == -1) {
+ break; /* not a symlink, i/o error, etc. */
+ } else if (rc < len) {
+ retval[rc] = '\0'; /* readlink doesn't null-terminate. */
+ return retval; /* we're good to go. */
+ }
+
+ len *= 2; /* grow buffer, try again. */
+ }
+
+ SDL_free(retval);
+ return NULL;
+}
+
+
+char *
+SDL_GetBasePath(void)
+{
+ char *retval = NULL;
+
+#if defined(__FREEBSD__)
+ char fullpath[PATH_MAX];
+ size_t buflen = sizeof (fullpath);
+ const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ if (sysctl(mib, SDL_arraysize(mib), fullpath, &buflen, NULL, 0) != -1) {
+ retval = SDL_strdup(fullpath);
+ if (!retval) {
+ SDL_OutOfMemory();
+ return NULL;
+ }
+ }
+#elif defined(__SOLARIS__)
+ const char *path = getexecname();
+ if ((path != NULL) && (path[0] == '/')) { /* must be absolute path... */
+ retval = SDL_strdup(path);
+ if (!retval) {
+ SDL_OutOfMemory();
+ return NULL;
+ }
+ }
+#endif
+
+ /* is a Linux-style /proc filesystem available? */
+ if (!retval && (access("/proc", F_OK) == 0)) {
+#if defined(__FREEBSD__)
+ retval = readSymLink("/proc/curproc/file");
+#elif defined(__NETBSD__)
+ retval = readSymLink("/proc/curproc/exe");
+#else
+ retval = readSymLink("/proc/self/exe"); /* linux. */
+#endif
+ if (retval == NULL) {
+ /* older kernels don't have /proc/self ... try PID version... */
+ char path[64];
+ const int rc = (int) SDL_snprintf(path, sizeof(path),
+ "/proc/%llu/exe",
+ (unsigned long long) getpid());
+ if ( (rc > 0) && (rc < sizeof(path)) ) {
+ retval = readSymLink(path);
+ }
+ }
+ }
+
+ /* If we had access to argv[0] here, we could check it for a path,
+ or troll through $PATH looking for it, too. */
+
+ if (retval != NULL) { /* chop off filename. */
+ char *ptr = SDL_strrchr(retval, '/');
+ if (ptr != NULL) {
+ *(ptr+1) = '\0';
+ } else { /* shouldn't happen, but just in case... */
+ SDL_free(retval);
+ retval = NULL;
+ }
+ }
+
+ if (retval != NULL) {
+ /* try to shrink buffer... */
+ char *ptr = (char *) SDL_realloc(retval, strlen(retval) + 1);
+ if (ptr != NULL)
+ retval = ptr; /* oh well if it failed. */
+ }
+
+ return retval;
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+ /*
+ * We use XDG's base directory spec, even if you're not on Linux.
+ * This isn't strictly correct, but the results are relatively sane
+ * in any case.
+ *
+ * http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+ */
+ const char *envr = SDL_getenv("XDG_DATA_HOME");
+ const char *append;
+ char *retval = NULL;
+ char *ptr = NULL;
+ size_t len = 0;
+
+ if (!envr) {
+ /* You end up with "$HOME/.local/share/Game Name 2" */
+ envr = SDL_getenv("HOME");
+ if (!envr) {
+ /* we could take heroic measures with /etc/passwd, but oh well. */
+ SDL_SetError("neither XDG_DATA_HOME nor HOME environment is set");
+ return NULL;
+ }
+ append = "/.local/share/";
+ } else {
+ append = "/";
+ }
+
+ len = SDL_strlen(envr);
+ if (envr[len - 1] == '/')
+ append += 1;
+
+ len += SDL_strlen(append) + SDL_strlen(org) + SDL_strlen(app) + 3;
+ retval = (char *) SDL_malloc(len);
+ if (!retval) {
+ SDL_OutOfMemory();
+ return NULL;
+ }
+
+ SDL_snprintf(retval, len, "%s%s%s/%s/", envr, append, org, app);
+
+ for (ptr = retval+1; *ptr; ptr++) {
+ if (*ptr == '/') {
+ *ptr = '\0';
+ if (mkdir(retval, 0700) != 0 && errno != EEXIST)
+ goto error;
+ *ptr = '/';
+ }
+ }
+ if (mkdir(retval, 0700) != 0 && errno != EEXIST) {
+error:
+ SDL_SetError("Couldn't create directory '%s': ", retval, strerror(errno));
+ SDL_free(retval);
+ return NULL;
+ }
+
+ return retval;
+}
+
+#endif /* SDL_FILESYSTEM_UNIX */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/windows/SDL_sysfilesystem.c b/src/filesystem/windows/SDL_sysfilesystem.c
new file mode 100644
index 0000000..7b101ff
--- /dev/null
+++ b/src/filesystem/windows/SDL_sysfilesystem.c
@@ -0,0 +1,99 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifdef SDL_FILESYSTEM_WINDOWS
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines */
+
+#include "../../core/windows/SDL_windows.h"
+#include <shlobj.h>
+
+#include "SDL_assert.h"
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_filesystem.h"
+
+char *
+SDL_GetBasePath(void)
+{
+ TCHAR path[MAX_PATH];
+ const DWORD len = GetModuleFileName(NULL, path, SDL_arraysize(path));
+ size_t i;
+
+ SDL_assert(len < SDL_arraysize(path));
+
+ if (len == 0) {
+ WIN_SetError("Couldn't locate our .exe");
+ return NULL;
+ }
+
+ for (i = len-1; i > 0; i--) {
+ if (path[i] == '\\') {
+ break;
+ }
+ }
+
+ SDL_assert(i > 0); /* Should have been an absolute path. */
+ path[i+1] = '\0'; /* chop off filename. */
+ return WIN_StringToUTF8(path);
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+ /*
+ * Vista and later has a new API for this, but SHGetFolderPath works there,
+ * and apparently just wraps the new API. This is the new way to do it:
+ *
+ * SHGetKnownFolderPath(FOLDERID_RoamingAppData, KF_FLAG_CREATE,
+ * NULL, &wszPath);
+ */
+
+ TCHAR path[MAX_PATH];
+ char *utf8 = NULL;
+ char *retval = NULL;
+
+ if (!SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, path))) {
+ WIN_SetError("Couldn't locate our prefpath");
+ return NULL;
+ }
+
+ utf8 = WIN_StringToUTF8(path);
+ if (utf8) {
+ const size_t len = SDL_strlen(utf8) + SDL_strlen(org) + SDL_strlen(app) + 4;
+ retval = (char *) SDL_malloc(len);
+ if (!retval) {
+ SDL_free(utf8);
+ SDL_OutOfMemory();
+ return NULL;
+ }
+ SDL_snprintf(retval, len, "%s\\%s\\%s\\", utf8, org, app);
+ SDL_free(utf8);
+ }
+
+ return retval;
+}
+
+#endif /* SDL_FILESYSTEM_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/SDL_haptic.c b/src/haptic/SDL_haptic.c
index d7e1c50..33dd427 100644
--- a/src/haptic/SDL_haptic.c
+++ b/src/haptic/SDL_haptic.c
@@ -379,10 +379,8 @@ void
SDL_HapticQuit(void)
{
SDL_SYS_HapticQuit();
- if (SDL_haptics != NULL) {
- SDL_free(SDL_haptics);
- SDL_haptics = NULL;
- }
+ SDL_free(SDL_haptics);
+ SDL_haptics = NULL;
SDL_numhaptics = 0;
}
diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c
index ec88904..c999a77 100644
--- a/src/haptic/darwin/SDL_syshaptic.c
+++ b/src/haptic/darwin/SDL_syshaptic.c
@@ -93,7 +93,7 @@ FFStrError(HRESULT err)
case FFERR_DEVICEFULL:
return "device full";
/* This should be valid, but for some reason isn't defined... */
- /*case FFERR_DEVICENOTREG:
+ /* case FFERR_DEVICENOTREG:
return "device not registered"; */
case FFERR_DEVICEPAUSED:
return "device paused";
@@ -343,7 +343,7 @@ GetSupportedFeatures(SDL_Haptic * haptic)
FF_TEST(FFCAP_ET_CONSTANTFORCE, SDL_HAPTIC_CONSTANT);
FF_TEST(FFCAP_ET_RAMPFORCE, SDL_HAPTIC_RAMP);
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*FF_TEST(FFCAP_ET_SQUARE, SDL_HAPTIC_SQUARE);*/
+ /* FF_TEST(FFCAP_ET_SQUARE, SDL_HAPTIC_SQUARE); */
FF_TEST(FFCAP_ET_SINE, SDL_HAPTIC_SINE);
FF_TEST(FFCAP_ET_TRIANGLE, SDL_HAPTIC_TRIANGLE);
FF_TEST(FFCAP_ET_SAWTOOTHUP, SDL_HAPTIC_SAWTOOTHUP);
@@ -506,7 +506,7 @@ SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
/*
- * Checks to see if the haptic device and joystick and in reality the same.
+ * Checks to see if the haptic device and joystick are in reality the same.
*/
int
SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
@@ -752,7 +752,7 @@ SDL_SYS_ToFFEFFECT(SDL_Haptic * haptic, FFEFFECT * dest,
case SDL_HAPTIC_SINE:
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*case SDL_HAPTIC_SQUARE:*/
+ /* case SDL_HAPTIC_SQUARE: */
case SDL_HAPTIC_TRIANGLE:
case SDL_HAPTIC_SAWTOOTHUP:
case SDL_HAPTIC_SAWTOOTHDOWN:
@@ -943,14 +943,10 @@ SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type)
{
FFCUSTOMFORCE *custom;
- if (effect->lpEnvelope != NULL) {
- SDL_free(effect->lpEnvelope);
- effect->lpEnvelope = NULL;
- }
- if (effect->rgdwAxes != NULL) {
- SDL_free(effect->rgdwAxes);
- effect->rgdwAxes = NULL;
- }
+ SDL_free(effect->lpEnvelope);
+ effect->lpEnvelope = NULL;
+ SDL_free(effect->rgdwAxes);
+ effect->rgdwAxes = NULL;
if (effect->lpvTypeSpecificParams != NULL) {
if (type == SDL_HAPTIC_CUSTOM) { /* Must free the custom data. */
custom = (FFCUSTOMFORCE *) effect->lpvTypeSpecificParams;
@@ -960,10 +956,8 @@ SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type)
SDL_free(effect->lpvTypeSpecificParams);
effect->lpvTypeSpecificParams = NULL;
}
- if (effect->rglDirection != NULL) {
- SDL_free(effect->rglDirection);
- effect->rglDirection = NULL;
- }
+ SDL_free(effect->rglDirection);
+ effect->rglDirection = NULL;
}
@@ -981,8 +975,8 @@ SDL_SYS_HapticEffectType(Uint16 type)
return kFFEffectType_RampForce_ID;
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*case SDL_HAPTIC_SQUARE:
- return kFFEffectType_Square_ID;*/
+ /* case SDL_HAPTIC_SQUARE:
+ return kFFEffectType_Square_ID; */
case SDL_HAPTIC_SINE:
return kFFEffectType_Sine_ID;
@@ -1061,10 +1055,8 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
err_effectdone:
SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect, base->type);
err_hweffect:
- if (effect->hweffect != NULL) {
- SDL_free(effect->hweffect);
- effect->hweffect = NULL;
- }
+ SDL_free(effect->hweffect);
+ effect->hweffect = NULL;
return -1;
}
diff --git a/src/haptic/linux/SDL_syshaptic.c b/src/haptic/linux/SDL_syshaptic.c
index ad34fc2..e209d05 100644
--- a/src/haptic/linux/SDL_syshaptic.c
+++ b/src/haptic/linux/SDL_syshaptic.c
@@ -100,7 +100,7 @@ EV_IsHaptic(int fd)
EV_TEST(FF_CONSTANT, SDL_HAPTIC_CONSTANT);
EV_TEST(FF_SINE, SDL_HAPTIC_SINE);
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*EV_TEST(FF_SQUARE, SDL_HAPTIC_SQUARE);*/
+ /* EV_TEST(FF_SQUARE, SDL_HAPTIC_SQUARE); */
EV_TEST(FF_TRIANGLE, SDL_HAPTIC_TRIANGLE);
EV_TEST(FF_SAW_UP, SDL_HAPTIC_SAWTOOTHUP);
EV_TEST(FF_SAW_DOWN, SDL_HAPTIC_SAWTOOTHDOWN);
@@ -368,7 +368,7 @@ SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
/*
- * Checks to see if the haptic device and joystick and in reality the same.
+ * Checks to see if the haptic device and joystick are in reality the same.
*/
int
SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
@@ -600,7 +600,7 @@ SDL_SYS_ToFFEffect(struct ff_effect *dest, SDL_HapticEffect * src)
case SDL_HAPTIC_SINE:
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*case SDL_HAPTIC_SQUARE:*/
+ /* case SDL_HAPTIC_SQUARE: */
case SDL_HAPTIC_TRIANGLE:
case SDL_HAPTIC_SAWTOOTHUP:
case SDL_HAPTIC_SAWTOOTHDOWN:
@@ -625,8 +625,8 @@ SDL_SYS_ToFFEffect(struct ff_effect *dest, SDL_HapticEffect * src)
if (periodic->type == SDL_HAPTIC_SINE)
dest->u.periodic.waveform = FF_SINE;
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*else if (periodic->type == SDL_HAPTIC_SQUARE)
- dest->u.periodic.waveform = FF_SQUARE;*/
+ /* else if (periodic->type == SDL_HAPTIC_SQUARE)
+ dest->u.periodic.waveform = FF_SQUARE; */
else if (periodic->type == SDL_HAPTIC_TRIANGLE)
dest->u.periodic.waveform = FF_TRIANGLE;
else if (periodic->type == SDL_HAPTIC_SAWTOOTHUP)
diff --git a/src/haptic/windows/SDL_syshaptic.c b/src/haptic/windows/SDL_syshaptic.c
index 9b13496..1506235 100644
--- a/src/haptic/windows/SDL_syshaptic.c
+++ b/src/haptic/windows/SDL_syshaptic.c
@@ -304,7 +304,7 @@ DI_EffectCallback(LPCDIEFFECTINFO pei, LPVOID pv)
EFFECT_TEST(GUID_CustomForce, SDL_HAPTIC_CUSTOM);
EFFECT_TEST(GUID_Sine, SDL_HAPTIC_SINE);
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*EFFECT_TEST(GUID_Square, SDL_HAPTIC_SQUARE);*/
+ /* EFFECT_TEST(GUID_Square, SDL_HAPTIC_SQUARE); */
EFFECT_TEST(GUID_Triangle, SDL_HAPTIC_TRIANGLE);
EFFECT_TEST(GUID_SawtoothUp, SDL_HAPTIC_SAWTOOTHUP);
EFFECT_TEST(GUID_SawtoothDown, SDL_HAPTIC_SAWTOOTHDOWN);
@@ -631,14 +631,16 @@ SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
/*
- * Checks to see if the haptic device and joystick and in reality the same.
+ * Checks to see if the haptic device and joystick are in reality the same.
*/
int
SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
{
- if ((joystick->hwdata->bXInputHaptic == haptic->hwdata->bXInputHaptic) && (haptic->hwdata->userid == joystick->hwdata->userid)) {
- return 1;
- } else {
+ if (joystick->hwdata->bXInputHaptic != haptic->hwdata->bXInputHaptic) {
+ return 0; /* one is XInput, one is not; not the same device. */
+ } else if (joystick->hwdata->bXInputHaptic) { /* XInput */
+ return (haptic->hwdata->userid == joystick->hwdata->userid);
+ } else { /* DirectInput */
HRESULT ret;
DIDEVICEINSTANCE hap_instance, joy_instance;
@@ -751,10 +753,8 @@ SDL_SYS_HapticQuit(void)
}
for (i = 0; i < SDL_arraysize(SDL_hapticlist); ++i) {
- if (SDL_hapticlist[i].name) {
- SDL_free(SDL_hapticlist[i].name);
- SDL_hapticlist[i].name = NULL;
- }
+ SDL_free(SDL_hapticlist[i].name);
+ SDL_hapticlist[i].name = NULL;
}
if (dinput != NULL) {
@@ -936,7 +936,7 @@ SDL_SYS_ToDIEFFECT(SDL_Haptic * haptic, DIEFFECT * dest,
case SDL_HAPTIC_SINE:
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*case SDL_HAPTIC_SQUARE:*/
+ /* case SDL_HAPTIC_SQUARE: */
case SDL_HAPTIC_TRIANGLE:
case SDL_HAPTIC_SAWTOOTHUP:
case SDL_HAPTIC_SAWTOOTHDOWN:
@@ -1127,14 +1127,10 @@ SDL_SYS_HapticFreeDIEFFECT(DIEFFECT * effect, int type)
{
DICUSTOMFORCE *custom;
- if (effect->lpEnvelope != NULL) {
- SDL_free(effect->lpEnvelope);
- effect->lpEnvelope = NULL;
- }
- if (effect->rgdwAxes != NULL) {
- SDL_free(effect->rgdwAxes);
- effect->rgdwAxes = NULL;
- }
+ SDL_free(effect->lpEnvelope);
+ effect->lpEnvelope = NULL;
+ SDL_free(effect->rgdwAxes);
+ effect->rgdwAxes = NULL;
if (effect->lpvTypeSpecificParams != NULL) {
if (type == SDL_HAPTIC_CUSTOM) { /* Must free the custom data. */
custom = (DICUSTOMFORCE *) effect->lpvTypeSpecificParams;
@@ -1144,10 +1140,8 @@ SDL_SYS_HapticFreeDIEFFECT(DIEFFECT * effect, int type)
SDL_free(effect->lpvTypeSpecificParams);
effect->lpvTypeSpecificParams = NULL;
}
- if (effect->rglDirection != NULL) {
- SDL_free(effect->rglDirection);
- effect->rglDirection = NULL;
- }
+ SDL_free(effect->rglDirection);
+ effect->rglDirection = NULL;
}
@@ -1165,8 +1159,8 @@ SDL_SYS_HapticEffectType(SDL_HapticEffect * effect)
return &GUID_RampForce;
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*case SDL_HAPTIC_SQUARE:
- return &GUID_Square;*/
+ /* case SDL_HAPTIC_SQUARE:
+ return &GUID_Square; */
case SDL_HAPTIC_SINE:
return &GUID_Sine;
@@ -1196,7 +1190,6 @@ SDL_SYS_HapticEffectType(SDL_HapticEffect * effect)
return &GUID_CustomForce;
default:
- SDL_SetError("Haptic: Unknown effect type.");
return NULL;
}
}
@@ -1213,6 +1206,7 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
REFGUID type = SDL_SYS_HapticEffectType(base);
if ((type == NULL) && (!haptic->hwdata->bXInputHaptic)) {
+ SDL_SetError("Haptic: Unknown effect type.");
goto err_hweffect;
}
@@ -1250,10 +1244,8 @@ SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
err_effectdone:
SDL_SYS_HapticFreeDIEFFECT(&effect->hweffect->effect, base->type);
err_hweffect:
- if (effect->hweffect != NULL) {
- SDL_free(effect->hweffect);
- effect->hweffect = NULL;
- }
+ SDL_free(effect->hweffect);
+ effect->hweffect = NULL;
return -1;
}
@@ -1332,7 +1324,16 @@ SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
XINPUT_VIBRATION *vib = &effect->hweffect->vibration;
SDL_assert(effect->effect.type == SDL_HAPTIC_LEFTRIGHT); /* should catch this at higher level */
SDL_LockMutex(haptic->hwdata->mutex);
- haptic->hwdata->stopTicks = SDL_GetTicks() + (effect->effect.leftright.length * iterations);
+ if(effect->effect.leftright.length == SDL_HAPTIC_INFINITY || iterations == SDL_HAPTIC_INFINITY) {
+ haptic->hwdata->stopTicks = SDL_HAPTIC_INFINITY;
+ } else if ((!effect->effect.leftright.length) || (!iterations)) {
+ /* do nothing. Effect runs for zero milliseconds. */
+ } else {
+ haptic->hwdata->stopTicks = SDL_GetTicks() + (effect->effect.leftright.length * iterations);
+ if ((haptic->hwdata->stopTicks == SDL_HAPTIC_INFINITY) || (haptic->hwdata->stopTicks == 0)) {
+ haptic->hwdata->stopTicks = 1; /* fix edge cases. */
+ }
+ }
SDL_UnlockMutex(haptic->hwdata->mutex);
return (XINPUTSETSTATE(haptic->hwdata->userid, vib) == ERROR_SUCCESS) ? 0 : -1;
}
@@ -1565,10 +1566,12 @@ SDL_RunXInputHaptic(void *arg)
SDL_Delay(50);
SDL_LockMutex(hwdata->mutex);
/* If we're currently running and need to stop... */
- if ((hwdata->stopTicks) && (hwdata->stopTicks < SDL_GetTicks())) {
- XINPUT_VIBRATION vibration = { 0, 0 };
- hwdata->stopTicks = 0;
- XINPUTSETSTATE(hwdata->userid, &vibration);
+ if (hwdata->stopTicks) {
+ if ((hwdata->stopTicks != SDL_HAPTIC_INFINITY) && SDL_TICKS_PASSED(SDL_GetTicks(), hwdata->stopTicks)) {
+ XINPUT_VIBRATION vibration = { 0, 0 };
+ hwdata->stopTicks = 0;
+ XINPUTSETSTATE(hwdata->userid, &vibration);
+ }
}
SDL_UnlockMutex(hwdata->mutex);
}
diff --git a/src/input/evdev/SDL_evdev.c b/src/input/evdev/SDL_evdev.c
new file mode 100644
index 0000000..92dc4fe
--- /dev/null
+++ b/src/input/evdev/SDL_evdev.c
@@ -0,0 +1,805 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifdef SDL_INPUT_LINUXEV
+
+/* This is based on the linux joystick driver */
+/* References: https://www.kernel.org/doc/Documentation/input/input.txt
+ * https://www.kernel.org/doc/Documentation/input/event-codes.txt
+ * /usr/include/linux/input.h
+ * The evtest application is also useful to debug the protocol
+ */
+
+
+#include "SDL_evdev.h"
+#define _THIS SDL_EVDEV_PrivateData *_this
+static _THIS = NULL;
+
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <limits.h> /* For the definition of PATH_MAX */
+#include <linux/input.h>
+#ifdef SDL_INPUT_LINUXKD
+#include <linux/kd.h>
+#include <linux/keyboard.h>
+#endif
+
+
+/* We need this to prevent keystrokes from appear in the console */
+#ifndef KDSKBMUTE
+#define KDSKBMUTE 0x4B51
+#endif
+#ifndef KDSKBMODE
+#define KDSKBMODE 0x4B45
+#endif
+#ifndef K_OFF
+#define K_OFF 0x04
+#endif
+
+#include "SDL.h"
+#include "SDL_assert.h"
+#include "SDL_endian.h"
+#include "../../core/linux/SDL_udev.h"
+#include "SDL_scancode.h"
+#include "../../events/SDL_events_c.h"
+
+/* This isn't defined in older Linux kernel headers */
+#ifndef SYN_DROPPED
+#define SYN_DROPPED 3
+#endif
+
+static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode);
+static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item);
+static int SDL_EVDEV_device_removed(const char *devpath);
+
+#if SDL_USE_LIBUDEV
+static int SDL_EVDEV_device_added(const char *devpath);
+void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
+#endif /* SDL_USE_LIBUDEV */
+
+static SDL_Scancode EVDEV_Keycodes[] = {
+ SDL_SCANCODE_UNKNOWN, /* KEY_RESERVED 0 */
+ SDL_SCANCODE_ESCAPE, /* KEY_ESC 1 */
+ SDL_SCANCODE_1, /* KEY_1 2 */
+ SDL_SCANCODE_2, /* KEY_2 3 */
+ SDL_SCANCODE_3, /* KEY_3 4 */
+ SDL_SCANCODE_4, /* KEY_4 5 */
+ SDL_SCANCODE_5, /* KEY_5 6 */
+ SDL_SCANCODE_6, /* KEY_6 7 */
+ SDL_SCANCODE_7, /* KEY_7 8 */
+ SDL_SCANCODE_8, /* KEY_8 9 */
+ SDL_SCANCODE_9, /* KEY_9 10 */
+ SDL_SCANCODE_0, /* KEY_0 11 */
+ SDL_SCANCODE_MINUS, /* KEY_MINUS 12 */
+ SDL_SCANCODE_EQUALS, /* KEY_EQUAL 13 */
+ SDL_SCANCODE_BACKSPACE, /* KEY_BACKSPACE 14 */
+ SDL_SCANCODE_TAB, /* KEY_TAB 15 */
+ SDL_SCANCODE_Q, /* KEY_Q 16 */
+ SDL_SCANCODE_W, /* KEY_W 17 */
+ SDL_SCANCODE_E, /* KEY_E 18 */
+ SDL_SCANCODE_R, /* KEY_R 19 */
+ SDL_SCANCODE_T, /* KEY_T 20 */
+ SDL_SCANCODE_Y, /* KEY_Y 21 */
+ SDL_SCANCODE_U, /* KEY_U 22 */
+ SDL_SCANCODE_I, /* KEY_I 23 */
+ SDL_SCANCODE_O, /* KEY_O 24 */
+ SDL_SCANCODE_P, /* KEY_P 25 */
+ SDL_SCANCODE_LEFTBRACKET, /* KEY_LEFTBRACE 26 */
+ SDL_SCANCODE_RIGHTBRACKET, /* KEY_RIGHTBRACE 27 */
+ SDL_SCANCODE_RETURN, /* KEY_ENTER 28 */
+ SDL_SCANCODE_LCTRL, /* KEY_LEFTCTRL 29 */
+ SDL_SCANCODE_A, /* KEY_A 30 */
+ SDL_SCANCODE_S, /* KEY_S 31 */
+ SDL_SCANCODE_D, /* KEY_D 32 */
+ SDL_SCANCODE_F, /* KEY_F 33 */
+ SDL_SCANCODE_G, /* KEY_G 34 */
+ SDL_SCANCODE_H, /* KEY_H 35 */
+ SDL_SCANCODE_J, /* KEY_J 36 */
+ SDL_SCANCODE_K, /* KEY_K 37 */
+ SDL_SCANCODE_L, /* KEY_L 38 */
+ SDL_SCANCODE_SEMICOLON, /* KEY_SEMICOLON 39 */
+ SDL_SCANCODE_APOSTROPHE, /* KEY_APOSTROPHE 40 */
+ SDL_SCANCODE_GRAVE, /* KEY_GRAVE 41 */
+ SDL_SCANCODE_LSHIFT, /* KEY_LEFTSHIFT 42 */
+ SDL_SCANCODE_BACKSLASH, /* KEY_BACKSLASH 43 */
+ SDL_SCANCODE_Z, /* KEY_Z 44 */
+ SDL_SCANCODE_X, /* KEY_X 45 */
+ SDL_SCANCODE_C, /* KEY_C 46 */
+ SDL_SCANCODE_V, /* KEY_V 47 */
+ SDL_SCANCODE_B, /* KEY_B 48 */
+ SDL_SCANCODE_N, /* KEY_N 49 */
+ SDL_SCANCODE_M, /* KEY_M 50 */
+ SDL_SCANCODE_COMMA, /* KEY_COMMA 51 */
+ SDL_SCANCODE_PERIOD, /* KEY_DOT 52 */
+ SDL_SCANCODE_SLASH, /* KEY_SLASH 53 */
+ SDL_SCANCODE_RSHIFT, /* KEY_RIGHTSHIFT 54 */
+ SDL_SCANCODE_KP_MULTIPLY, /* KEY_KPASTERISK 55 */
+ SDL_SCANCODE_LALT, /* KEY_LEFTALT 56 */
+ SDL_SCANCODE_SPACE, /* KEY_SPACE 57 */
+ SDL_SCANCODE_CAPSLOCK, /* KEY_CAPSLOCK 58 */
+ SDL_SCANCODE_F1, /* KEY_F1 59 */
+ SDL_SCANCODE_F2, /* KEY_F2 60 */
+ SDL_SCANCODE_F3, /* KEY_F3 61 */
+ SDL_SCANCODE_F4, /* KEY_F4 62 */
+ SDL_SCANCODE_F5, /* KEY_F5 63 */
+ SDL_SCANCODE_F6, /* KEY_F6 64 */
+ SDL_SCANCODE_F7, /* KEY_F7 65 */
+ SDL_SCANCODE_F8, /* KEY_F8 66 */
+ SDL_SCANCODE_F9, /* KEY_F9 67 */
+ SDL_SCANCODE_F10, /* KEY_F10 68 */
+ SDL_SCANCODE_NUMLOCKCLEAR, /* KEY_NUMLOCK 69 */
+ SDL_SCANCODE_SCROLLLOCK, /* KEY_SCROLLLOCK 70 */
+ SDL_SCANCODE_KP_7, /* KEY_KP7 71 */
+ SDL_SCANCODE_KP_8, /* KEY_KP8 72 */
+ SDL_SCANCODE_KP_9, /* KEY_KP9 73 */
+ SDL_SCANCODE_KP_MINUS, /* KEY_KPMINUS 74 */
+ SDL_SCANCODE_KP_4, /* KEY_KP4 75 */
+ SDL_SCANCODE_KP_5, /* KEY_KP5 76 */
+ SDL_SCANCODE_KP_6, /* KEY_KP6 77 */
+ SDL_SCANCODE_KP_PLUS, /* KEY_KPPLUS 78 */
+ SDL_SCANCODE_KP_1, /* KEY_KP1 79 */
+ SDL_SCANCODE_KP_2, /* KEY_KP2 80 */
+ SDL_SCANCODE_KP_3, /* KEY_KP3 81 */
+ SDL_SCANCODE_KP_0, /* KEY_KP0 82 */
+ SDL_SCANCODE_KP_PERIOD, /* KEY_KPDOT 83 */
+ SDL_SCANCODE_UNKNOWN, /* 84 */
+ SDL_SCANCODE_LANG5, /* KEY_ZENKAKUHANKAKU 85 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_102ND 86 */
+ SDL_SCANCODE_F11, /* KEY_F11 87 */
+ SDL_SCANCODE_F12, /* KEY_F12 88 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_RO 89 */
+ SDL_SCANCODE_LANG3, /* KEY_KATAKANA 90 */
+ SDL_SCANCODE_LANG4, /* KEY_HIRAGANA 91 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_HENKAN 92 */
+ SDL_SCANCODE_LANG3, /* KEY_KATAKANAHIRAGANA 93 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_MUHENKAN 94 */
+ SDL_SCANCODE_KP_COMMA, /* KEY_KPJPCOMMA 95 */
+ SDL_SCANCODE_KP_ENTER, /* KEY_KPENTER 96 */
+ SDL_SCANCODE_RCTRL, /* KEY_RIGHTCTRL 97 */
+ SDL_SCANCODE_KP_DIVIDE, /* KEY_KPSLASH 98 */
+ SDL_SCANCODE_SYSREQ, /* KEY_SYSRQ 99 */
+ SDL_SCANCODE_RALT, /* KEY_RIGHTALT 100 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_LINEFEED 101 */
+ SDL_SCANCODE_HOME, /* KEY_HOME 102 */
+ SDL_SCANCODE_UP, /* KEY_UP 103 */
+ SDL_SCANCODE_PAGEUP, /* KEY_PAGEUP 104 */
+ SDL_SCANCODE_LEFT, /* KEY_LEFT 105 */
+ SDL_SCANCODE_RIGHT, /* KEY_RIGHT 106 */
+ SDL_SCANCODE_END, /* KEY_END 107 */
+ SDL_SCANCODE_DOWN, /* KEY_DOWN 108 */
+ SDL_SCANCODE_PAGEDOWN, /* KEY_PAGEDOWN 109 */
+ SDL_SCANCODE_INSERT, /* KEY_INSERT 110 */
+ SDL_SCANCODE_DELETE, /* KEY_DELETE 111 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_MACRO 112 */
+ SDL_SCANCODE_MUTE, /* KEY_MUTE 113 */
+ SDL_SCANCODE_VOLUMEDOWN, /* KEY_VOLUMEDOWN 114 */
+ SDL_SCANCODE_VOLUMEUP, /* KEY_VOLUMEUP 115 */
+ SDL_SCANCODE_POWER, /* KEY_POWER 116 SC System Power Down */
+ SDL_SCANCODE_KP_EQUALS, /* KEY_KPEQUAL 117 */
+ SDL_SCANCODE_KP_MINUS, /* KEY_KPPLUSMINUS 118 */
+ SDL_SCANCODE_PAUSE, /* KEY_PAUSE 119 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SCALE 120 AL Compiz Scale (Expose) */
+ SDL_SCANCODE_KP_COMMA, /* KEY_KPCOMMA 121 */
+ SDL_SCANCODE_LANG1, /* KEY_HANGEUL,KEY_HANGUEL 122 */
+ SDL_SCANCODE_LANG2, /* KEY_HANJA 123 */
+ SDL_SCANCODE_INTERNATIONAL3,/* KEY_YEN 124 */
+ SDL_SCANCODE_LGUI, /* KEY_LEFTMETA 125 */
+ SDL_SCANCODE_RGUI, /* KEY_RIGHTMETA 126 */
+ SDL_SCANCODE_APPLICATION, /* KEY_COMPOSE 127 */
+ SDL_SCANCODE_STOP, /* KEY_STOP 128 AC Stop */
+ SDL_SCANCODE_AGAIN, /* KEY_AGAIN 129 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_PROPS 130 AC Properties */
+ SDL_SCANCODE_UNDO, /* KEY_UNDO 131 AC Undo */
+ SDL_SCANCODE_UNKNOWN, /* KEY_FRONT 132 */
+ SDL_SCANCODE_COPY, /* KEY_COPY 133 AC Copy */
+ SDL_SCANCODE_UNKNOWN, /* KEY_OPEN 134 AC Open */
+ SDL_SCANCODE_PASTE, /* KEY_PASTE 135 AC Paste */
+ SDL_SCANCODE_FIND, /* KEY_FIND 136 AC Search */
+ SDL_SCANCODE_CUT, /* KEY_CUT 137 AC Cut */
+ SDL_SCANCODE_HELP, /* KEY_HELP 138 AL Integrated Help Center */
+ SDL_SCANCODE_MENU, /* KEY_MENU 139 Menu (show menu) */
+ SDL_SCANCODE_CALCULATOR, /* KEY_CALC 140 AL Calculator */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SETUP 141 */
+ SDL_SCANCODE_SLEEP, /* KEY_SLEEP 142 SC System Sleep */
+ SDL_SCANCODE_UNKNOWN, /* KEY_WAKEUP 143 System Wake Up */
+ SDL_SCANCODE_UNKNOWN, /* KEY_FILE 144 AL Local Machine Browser */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SENDFILE 145 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_DELETEFILE 146 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_XFER 147 */
+ SDL_SCANCODE_APP1, /* KEY_PROG1 148 */
+ SDL_SCANCODE_APP1, /* KEY_PROG2 149 */
+ SDL_SCANCODE_WWW, /* KEY_WWW 150 AL Internet Browser */
+ SDL_SCANCODE_UNKNOWN, /* KEY_MSDOS 151 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_COFFEE,KEY_SCREENLOCK 152 AL Terminal Lock/Screensaver */
+ SDL_SCANCODE_UNKNOWN, /* KEY_DIRECTION 153 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_CYCLEWINDOWS 154 */
+ SDL_SCANCODE_MAIL, /* KEY_MAIL 155 */
+ SDL_SCANCODE_AC_BOOKMARKS, /* KEY_BOOKMARKS 156 AC Bookmarks */
+ SDL_SCANCODE_COMPUTER, /* KEY_COMPUTER 157 */
+ SDL_SCANCODE_AC_BACK, /* KEY_BACK 158 AC Back */
+ SDL_SCANCODE_AC_FORWARD, /* KEY_FORWARD 159 AC Forward */
+ SDL_SCANCODE_UNKNOWN, /* KEY_CLOSECD 160 */
+ SDL_SCANCODE_EJECT, /* KEY_EJECTCD 161 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_EJECTCLOSECD 162 */
+ SDL_SCANCODE_AUDIONEXT, /* KEY_NEXTSONG 163 */
+ SDL_SCANCODE_AUDIOPLAY, /* KEY_PLAYPAUSE 164 */
+ SDL_SCANCODE_AUDIOPREV, /* KEY_PREVIOUSSONG 165 */
+ SDL_SCANCODE_AUDIOSTOP, /* KEY_STOPCD 166 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_RECORD 167 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_REWIND 168 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_PHONE 169 Media Select Telephone */
+ SDL_SCANCODE_UNKNOWN, /* KEY_ISO 170 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_CONFIG 171 AL Consumer Control Configuration */
+ SDL_SCANCODE_AC_HOME, /* KEY_HOMEPAGE 172 AC Home */
+ SDL_SCANCODE_AC_REFRESH, /* KEY_REFRESH 173 AC Refresh */
+ SDL_SCANCODE_UNKNOWN, /* KEY_EXIT 174 AC Exit */
+ SDL_SCANCODE_UNKNOWN, /* KEY_MOVE 175 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_EDIT 176 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SCROLLUP 177 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SCROLLDOWN 178 */
+ SDL_SCANCODE_KP_LEFTPAREN, /* KEY_KPLEFTPAREN 179 */
+ SDL_SCANCODE_KP_RIGHTPAREN, /* KEY_KPRIGHTPAREN 180 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_NEW 181 AC New */
+ SDL_SCANCODE_AGAIN, /* KEY_REDO 182 AC Redo/Repeat */
+ SDL_SCANCODE_F13, /* KEY_F13 183 */
+ SDL_SCANCODE_F14, /* KEY_F14 184 */
+ SDL_SCANCODE_F15, /* KEY_F15 185 */
+ SDL_SCANCODE_F16, /* KEY_F16 186 */
+ SDL_SCANCODE_F17, /* KEY_F17 187 */
+ SDL_SCANCODE_F18, /* KEY_F18 188 */
+ SDL_SCANCODE_F19, /* KEY_F19 189 */
+ SDL_SCANCODE_F20, /* KEY_F20 190 */
+ SDL_SCANCODE_F21, /* KEY_F21 191 */
+ SDL_SCANCODE_F22, /* KEY_F22 192 */
+ SDL_SCANCODE_F23, /* KEY_F23 193 */
+ SDL_SCANCODE_F24, /* KEY_F24 194 */
+ SDL_SCANCODE_UNKNOWN, /* 195 */
+ SDL_SCANCODE_UNKNOWN, /* 196 */
+ SDL_SCANCODE_UNKNOWN, /* 197 */
+ SDL_SCANCODE_UNKNOWN, /* 198 */
+ SDL_SCANCODE_UNKNOWN, /* 199 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_PLAYCD 200 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_PAUSECD 201 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_PROG3 202 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_PROG4 203 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_DASHBOARD 204 AL Dashboard */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SUSPEND 205 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_CLOSE 206 AC Close */
+ SDL_SCANCODE_UNKNOWN, /* KEY_PLAY 207 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_FASTFORWARD 208 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_BASSBOOST 209 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_PRINT 210 AC Print */
+ SDL_SCANCODE_UNKNOWN, /* KEY_HP 211 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_CAMERA 212 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SOUND 213 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_QUESTION 214 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_EMAIL 215 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_CHAT 216 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SEARCH 217 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_CONNECT 218 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_FINANCE 219 AL Checkbook/Finance */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SPORT 220 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SHOP 221 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_ALTERASE 222 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_CANCEL 223 AC Cancel */
+ SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESSDOWN 224 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESSUP 225 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_MEDIA 226 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SWITCHVIDEOMODE 227 Cycle between available video outputs (Monitor/LCD/TV-out/etc) */
+ SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMTOGGLE 228 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMDOWN 229 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMUP 230 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SEND 231 AC Send */
+ SDL_SCANCODE_UNKNOWN, /* KEY_REPLY 232 AC Reply */
+ SDL_SCANCODE_UNKNOWN, /* KEY_FORWARDMAIL 233 AC Forward Msg */
+ SDL_SCANCODE_UNKNOWN, /* KEY_SAVE 234 AC Save */
+ SDL_SCANCODE_UNKNOWN, /* KEY_DOCUMENTS 235 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_BATTERY 236 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_BLUETOOTH 237 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_WLAN 238 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_UWB 239 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_UNKNOWN 240 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_VIDEO_NEXT 241 drive next video source */
+ SDL_SCANCODE_UNKNOWN, /* KEY_VIDEO_PREV 242 drive previous video source */
+ SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESS_CYCLE 243 brightness up, after max is min */
+ SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESS_ZERO 244 brightness off, use ambient */
+ SDL_SCANCODE_UNKNOWN, /* KEY_DISPLAY_OFF 245 display device to off state */
+ SDL_SCANCODE_UNKNOWN, /* KEY_WIMAX 246 */
+ SDL_SCANCODE_UNKNOWN, /* KEY_RFKILL 247 Key that controls all radios */
+ SDL_SCANCODE_UNKNOWN, /* KEY_MICMUTE 248 Mute / unmute the microphone */
+};
+
+static Uint8 EVDEV_MouseButtons[] = {
+ SDL_BUTTON_LEFT, /* BTN_LEFT 0x110 */
+ SDL_BUTTON_RIGHT, /* BTN_RIGHT 0x111 */
+ SDL_BUTTON_MIDDLE, /* BTN_MIDDLE 0x112 */
+ SDL_BUTTON_X1, /* BTN_SIDE 0x113 */
+ SDL_BUTTON_X2, /* BTN_EXTRA 0x114 */
+ SDL_BUTTON_X2 + 1, /* BTN_FORWARD 0x115 */
+ SDL_BUTTON_X2 + 2, /* BTN_BACK 0x116 */
+ SDL_BUTTON_X2 + 3 /* BTN_TASK 0x117 */
+};
+
+static char* EVDEV_consoles[] = {
+ "/proc/self/fd/0",
+ "/dev/tty",
+ "/dev/tty0",
+ "/dev/tty1",
+ "/dev/tty2",
+ "/dev/tty3",
+ "/dev/tty4",
+ "/dev/tty5",
+ "/dev/tty6",
+ "/dev/vc/0",
+ "/dev/console"
+};
+
+#define IS_CONSOLE(fd) isatty (fd) && ioctl(fd, KDGKBTYPE, &arg) == 0 && ((arg == KB_101) || (arg == KB_84))
+
+static int SDL_EVDEV_get_console_fd(void)
+{
+ int fd, i;
+ char arg = 0;
+
+ /* Try a few consoles to see which one we have read access to */
+
+ for( i = 0; i < SDL_arraysize(EVDEV_consoles); i++) {
+ fd = open(EVDEV_consoles[i], O_RDONLY);
+ if (fd >= 0) {
+ if (IS_CONSOLE(fd)) return fd;
+ close(fd);
+ }
+ }
+
+ /* Try stdin, stdout, stderr */
+
+ for( fd = 0; fd < 3; fd++) {
+ if (IS_CONSOLE(fd)) return fd;
+ }
+
+ /* We won't be able to send SDL_TEXTINPUT events */
+ return -1;
+}
+
+/* Prevent keystrokes from reaching the tty */
+static int SDL_EVDEV_mute_keyboard(int tty, int *kb_mode)
+{
+ char arg;
+
+ *kb_mode = 0; /* FIXME: Is this a sane default in case KDGKBMODE fails? */
+ if (!IS_CONSOLE(tty)) {
+ return SDL_SetError("Tried to mute an invalid tty");
+ }
+ ioctl(tty, KDGKBMODE, kb_mode); /* It's not fatal if this fails */
+ if (ioctl(tty, KDSKBMUTE, 1) && ioctl(tty, KDSKBMODE, K_OFF)) {
+ return SDL_SetError("EVDEV: Failed muting keyboard");
+ }
+
+ return 0;
+}
+
+/* Restore the keyboard mode for given tty */
+static void SDL_EVDEV_unmute_keyboard(int tty, int kb_mode)
+{
+ if (ioctl(tty, KDSKBMUTE, 0) && ioctl(tty, KDSKBMODE, kb_mode)) {
+ SDL_Log("EVDEV: Failed restoring keyboard mode");
+ }
+}
+
+/* Read /sys/class/tty/tty0/active and open the tty */
+static int SDL_EVDEV_get_active_tty()
+{
+ int fd, len;
+ char ttyname[NAME_MAX + 1];
+ char ttypath[PATH_MAX+1] = "/dev/";
+ char arg;
+
+ fd = open("/sys/class/tty/tty0/active", O_RDONLY);
+ if (fd < 0) {
+ return SDL_SetError("Could not determine which tty is active");
+ }
+
+ len = read(fd, ttyname, NAME_MAX);
+ close(fd);
+
+ if (len <= 0) {
+ return SDL_SetError("Could not read which tty is active");
+ }
+
+ if (ttyname[len-1] == '\n') {
+ ttyname[len-1] = '\0';
+ }
+ else {
+ ttyname[len] = '\0';
+ }
+
+ SDL_strlcat(ttypath, ttyname, PATH_MAX);
+ fd = open(ttypath, O_RDWR | O_NOCTTY);
+ if (fd < 0) {
+ return SDL_SetError("Could not open tty: %s", ttypath);
+ }
+
+ if (!IS_CONSOLE(fd)) {
+ close(fd);
+ return SDL_SetError("Invalid tty obtained: %s", ttypath);
+ }
+
+ return fd;
+}
+
+int
+SDL_EVDEV_Init(void)
+{
+ int retval = 0;
+
+ if (_this == NULL) {
+
+ _this = (SDL_EVDEV_PrivateData *) SDL_calloc(1, sizeof(*_this));
+ if(_this == NULL) {
+ return SDL_OutOfMemory();
+ }
+
+#if SDL_USE_LIBUDEV
+ if (SDL_UDEV_Init() < 0) {
+ SDL_free(_this);
+ _this = NULL;
+ return -1;
+ }
+
+ /* Set up the udev callback */
+ if ( SDL_UDEV_AddCallback(SDL_EVDEV_udev_callback) < 0) {
+ SDL_EVDEV_Quit();
+ return -1;
+ }
+
+ /* Force a scan to build the initial device list */
+ SDL_UDEV_Scan();
+#else
+ /* TODO: Scan the devices manually, like a caveman */
+#endif /* SDL_USE_LIBUDEV */
+
+ /* We need a physical terminal (not PTS) to be able to translate key code to symbols via the kernel tables */
+ _this->console_fd = SDL_EVDEV_get_console_fd();
+
+ /* Mute the keyboard so keystrokes only generate evdev events and do not leak through to the console */
+ _this->tty = STDIN_FILENO;
+ if (SDL_EVDEV_mute_keyboard(_this->tty, &_this->kb_mode) < 0) {
+ /* stdin is not a tty, probably we were launched remotely, so we try to disable the active tty */
+ _this->tty = SDL_EVDEV_get_active_tty();
+ if (_this->tty >= 0) {
+ if (SDL_EVDEV_mute_keyboard(_this->tty, &_this->kb_mode) < 0) {
+ close(_this->tty);
+ _this->tty = -1;
+ }
+ }
+ }
+ }
+
+ _this->ref_count += 1;
+
+ return retval;
+}
+
+void
+SDL_EVDEV_Quit(void)
+{
+ if (_this == NULL) {
+ return;
+ }
+
+ _this->ref_count -= 1;
+
+ if (_this->ref_count < 1) {
+
+#if SDL_USE_LIBUDEV
+ SDL_UDEV_DelCallback(SDL_EVDEV_udev_callback);
+ SDL_UDEV_Quit();
+#endif /* SDL_USE_LIBUDEV */
+
+ if (_this->console_fd >= 0) {
+ close(_this->console_fd);
+ }
+
+ if (_this->tty >= 0) {
+ SDL_EVDEV_unmute_keyboard(_this->tty, _this->kb_mode);
+ close(_this->tty);
+ }
+
+ /* Remove existing devices */
+ while(_this->first != NULL) {
+ SDL_EVDEV_device_removed(_this->first->path);
+ }
+
+ SDL_assert(_this->first == NULL);
+ SDL_assert(_this->last == NULL);
+ SDL_assert(_this->numdevices == 0);
+
+ SDL_free(_this);
+ _this = NULL;
+ }
+}
+
+#if SDL_USE_LIBUDEV
+void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath)
+{
+ if (devpath == NULL) {
+ return;
+ }
+
+ if (!(udev_class & (SDL_UDEV_DEVICE_MOUSE|SDL_UDEV_DEVICE_KEYBOARD))) {
+ return;
+ }
+
+ switch( udev_type ) {
+ case SDL_UDEV_DEVICEADDED:
+ SDL_EVDEV_device_added(devpath);
+ break;
+
+ case SDL_UDEV_DEVICEREMOVED:
+ SDL_EVDEV_device_removed(devpath);
+ break;
+
+ default:
+ break;
+ }
+}
+
+#endif /* SDL_USE_LIBUDEV */
+
+void
+SDL_EVDEV_Poll(void)
+{
+ struct input_event events[32];
+ int i, len;
+ SDL_evdevlist_item *item;
+ SDL_Scancode scan_code;
+ int mouse_button;
+ SDL_Mouse *mouse;
+#ifdef SDL_INPUT_LINUXKD
+ Uint16 modstate;
+ struct kbentry kbe;
+ static char keysym[8];
+ char *end;
+ Uint32 kval;
+#endif
+
+#if SDL_USE_LIBUDEV
+ SDL_UDEV_Poll();
+#endif
+
+ mouse = SDL_GetMouse();
+
+ for (item = _this->first; item != NULL; item = item->next) {
+ while ((len = read(item->fd, events, (sizeof events))) > 0) {
+ len /= sizeof(events[0]);
+ for (i = 0; i < len; ++i) {
+ switch (events[i].type) {
+ case EV_KEY:
+ if (events[i].code >= BTN_MOUSE && events[i].code < BTN_MOUSE + SDL_arraysize(EVDEV_MouseButtons)) {
+ mouse_button = events[i].code - BTN_MOUSE;
+ if (events[i].value == 0) {
+ SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, EVDEV_MouseButtons[mouse_button]);
+ } else if (events[i].value == 1) {
+ SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_PRESSED, EVDEV_MouseButtons[mouse_button]);
+ }
+ break;
+ }
+
+ /* Probably keyboard */
+ scan_code = SDL_EVDEV_translate_keycode(events[i].code);
+ if (scan_code != SDL_SCANCODE_UNKNOWN) {
+ if (events[i].value == 0) {
+ SDL_SendKeyboardKey(SDL_RELEASED, scan_code);
+ } else if (events[i].value == 1 || events[i].value == 2 /* Key repeated */ ) {
+ SDL_SendKeyboardKey(SDL_PRESSED, scan_code);
+#ifdef SDL_INPUT_LINUXKD
+ if (_this->console_fd >= 0) {
+ kbe.kb_index = events[i].code;
+ /* Convert the key to an UTF-8 char */
+ /* Ref: http://www.linuxjournal.com/article/2783 */
+ modstate = SDL_GetModState();
+ kbe.kb_table = 0;
+
+ /* Ref: http://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching */
+ kbe.kb_table |= -( (modstate & KMOD_LCTRL) != 0) & (1 << KG_CTRLL | 1 << KG_CTRL);
+ kbe.kb_table |= -( (modstate & KMOD_RCTRL) != 0) & (1 << KG_CTRLR | 1 << KG_CTRL);
+ kbe.kb_table |= -( (modstate & KMOD_LSHIFT) != 0) & (1 << KG_SHIFTL | 1 << KG_SHIFT);
+ kbe.kb_table |= -( (modstate & KMOD_RSHIFT) != 0) & (1 << KG_SHIFTR | 1 << KG_SHIFT);
+ kbe.kb_table |= -( (modstate & KMOD_LALT) != 0) & (1 << KG_ALT);
+ kbe.kb_table |= -( (modstate & KMOD_RALT) != 0) & (1 << KG_ALTGR);
+
+ if (ioctl(_this->console_fd, KDGKBENT, (unsigned long)&kbe) == 0 &&
+ ((KTYP(kbe.kb_value) == KT_LATIN) || (KTYP(kbe.kb_value) == KT_ASCII) || (KTYP(kbe.kb_value) == KT_LETTER)))
+ {
+ kval = KVAL(kbe.kb_value);
+
+ /* While there's a KG_CAPSSHIFT symbol, it's not useful to build the table index with it
+ * because 1 << KG_CAPSSHIFT overflows the 8 bits of kb_table
+ * So, we do the CAPS LOCK logic here. Note that isalpha depends on the locale!
+ */
+ if ( modstate & KMOD_CAPS && isalpha(kval) ) {
+ if ( isupper(kval) ) {
+ kval = tolower(kval);
+ } else {
+ kval = toupper(kval);
+ }
+ }
+
+ /* Convert to UTF-8 and send */
+ end = SDL_UCS4ToUTF8( kval, keysym);
+ *end = '\0';
+ SDL_SendKeyboardText(keysym);
+ }
+ }
+#endif /* SDL_INPUT_LINUXKD */
+ }
+ }
+ break;
+ case EV_ABS:
+ switch(events[i].code) {
+ case ABS_X:
+ SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_FALSE, events[i].value, mouse->y);
+ break;
+ case ABS_Y:
+ SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_FALSE, mouse->x, events[i].value);
+ break;
+ default:
+ break;
+ }
+ break;
+ case EV_REL:
+ switch(events[i].code) {
+ case REL_X:
+ SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_TRUE, events[i].value, 0);
+ break;
+ case REL_Y:
+ SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_TRUE, 0, events[i].value);
+ break;
+ case REL_WHEEL:
+ SDL_SendMouseWheel(mouse->focus, mouse->mouseID, 0, events[i].value);
+ break;
+ case REL_HWHEEL:
+ SDL_SendMouseWheel(mouse->focus, mouse->mouseID, events[i].value, 0);
+ break;
+ default:
+ break;
+ }
+ break;
+ case EV_SYN:
+ switch (events[i].code) {
+ case SYN_DROPPED:
+ SDL_EVDEV_sync_device(item);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ }
+ }
+ }
+}
+
+static SDL_Scancode
+SDL_EVDEV_translate_keycode(int keycode)
+{
+ SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
+
+ if (keycode < SDL_arraysize(EVDEV_Keycodes)) {
+ scancode = EVDEV_Keycodes[keycode];
+ }
+ if (scancode == SDL_SCANCODE_UNKNOWN) {
+ SDL_Log("The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list <sdl@libsdl.org> EVDEV KeyCode %d \n", keycode);
+ }
+ return scancode;
+}
+
+static void
+SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
+{
+ /* TODO: get full state of device and report whatever is required */
+}
+
+#if SDL_USE_LIBUDEV
+static int
+SDL_EVDEV_device_added(const char *devpath)
+{
+ SDL_evdevlist_item *item;
+
+ /* Check to make sure it's not already in list. */
+ for (item = _this->first; item != NULL; item = item->next) {
+ if (strcmp(devpath, item->path) == 0) {
+ return -1; /* already have this one */
+ }
+ }
+
+ item = (SDL_evdevlist_item *) SDL_calloc(1, sizeof (SDL_evdevlist_item));
+ if (item == NULL) {
+ return SDL_OutOfMemory();
+ }
+
+ item->fd = open(devpath, O_RDONLY, 0);
+ if (item->fd < 0) {
+ SDL_free(item);
+ return SDL_SetError("Unable to open %s", devpath);
+ }
+
+ item->path = SDL_strdup(devpath);
+ if (item->path == NULL) {
+ close(item->fd);
+ SDL_free(item);
+ return SDL_OutOfMemory();
+ }
+
+ /* Non blocking read mode */
+ fcntl(item->fd, F_SETFL, O_NONBLOCK);
+
+ if (_this->last == NULL) {
+ _this->first = _this->last = item;
+ } else {
+ _this->last->next = item;
+ _this->last = item;
+ }
+
+ SDL_EVDEV_sync_device(item);
+
+ return _this->numdevices++;
+}
+#endif /* SDL_USE_LIBUDEV */
+
+static int
+SDL_EVDEV_device_removed(const char *devpath)
+{
+ SDL_evdevlist_item *item;
+ SDL_evdevlist_item *prev = NULL;
+
+ for (item = _this->first; item != NULL; item = item->next) {
+ /* found it, remove it. */
+ if ( strcmp(devpath, item->path) ==0 ) {
+ if (prev != NULL) {
+ prev->next = item->next;
+ } else {
+ SDL_assert(_this->first == item);
+ _this->first = item->next;
+ }
+ if (item == _this->last) {
+ _this->last = prev;
+ }
+ close(item->fd);
+ SDL_free(item->path);
+ SDL_free(item);
+ _this->numdevices--;
+ return 0;
+ }
+ prev = item;
+ }
+
+ return -1;
+}
+
+
+#endif /* SDL_INPUT_LINUXEV */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/input/evdev/SDL_evdev.h b/src/input/evdev/SDL_evdev.h
new file mode 100644
index 0000000..b9311d4
--- /dev/null
+++ b/src/input/evdev/SDL_evdev.h
@@ -0,0 +1,59 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_config.h"
+
+#ifndef _SDL_evdev_h
+#define _SDL_evdev_h
+
+#ifdef SDL_INPUT_LINUXEV
+
+#include "SDL_events.h"
+#include <sys/stat.h>
+
+typedef struct SDL_evdevlist_item
+{
+ char *path;
+ int fd;
+ struct SDL_evdevlist_item *next;
+} SDL_evdevlist_item;
+
+typedef struct SDL_EVDEV_PrivateData
+{
+ SDL_evdevlist_item *first;
+ SDL_evdevlist_item *last;
+ int numdevices;
+ int ref_count;
+ int console_fd;
+ int kb_mode;
+ int tty;
+} SDL_EVDEV_PrivateData;
+
+extern int SDL_EVDEV_Init(void);
+extern void SDL_EVDEV_Quit(void);
+extern void SDL_EVDEV_Poll(void);
+
+
+#endif /* SDL_INPUT_LINUXEV */
+
+#endif /* _SDL_evdev_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index 414e591..1ffa5b5 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -52,7 +52,7 @@ struct _SDL_HatMapping
*/
#define k_nMaxHatEntries 0x3f + 1
-/* our in memory mapping db between joystick objects and controller mappings*/
+/* our in memory mapping db between joystick objects and controller mappings */
struct _SDL_ControllerMapping
{
SDL_JoystickGUID guid;
@@ -758,7 +758,7 @@ SDL_GameControllerLoadHints()
{
const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG);
if ( hint && hint[0] ) {
- int nchHints = SDL_strlen( hint );
+ size_t nchHints = SDL_strlen( hint );
char *pUserMappings = SDL_malloc( nchHints + 1 );
char *pTempMappings = pUserMappings;
SDL_memcpy( pUserMappings, hint, nchHints );
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index bb8652f..3906ec2 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -437,22 +437,13 @@ SDL_JoystickClose(SDL_Joystick * joystick)
joysticklist = joysticklist->next;
}
- if (joystick->name)
- SDL_free(joystick->name);
+ SDL_free(joystick->name);
/* Free the data associated with this joystick */
- if (joystick->axes) {
- SDL_free(joystick->axes);
- }
- if (joystick->hats) {
- SDL_free(joystick->hats);
- }
- if (joystick->balls) {
- SDL_free(joystick->balls);
- }
- if (joystick->buttons) {
- SDL_free(joystick->buttons);
- }
+ SDL_free(joystick->axes);
+ SDL_free(joystick->hats);
+ SDL_free(joystick->balls);
+ SDL_free(joystick->buttons);
SDL_free(joystick);
}
@@ -488,14 +479,14 @@ SDL_PrivateJoystickShouldIgnoreEvent()
if (SDL_WasInit(SDL_INIT_VIDEO)) {
if (SDL_GetKeyboardFocus() == NULL) {
- // Video is initialized and we don't have focus, ignore the event.
+ /* Video is initialized and we don't have focus, ignore the event. */
return SDL_TRUE;
} else {
return SDL_FALSE;
}
}
- // Video subsystem wasn't initialized, always allow the event
+ /* Video subsystem wasn't initialized, always allow the event */
return SDL_FALSE;
}
@@ -772,6 +763,11 @@ SDL_JoystickGUID SDL_JoystickGetDeviceGUID(int device_index)
/* return the guid for this opened device */
SDL_JoystickGUID SDL_JoystickGetGUID(SDL_Joystick * joystick)
{
+ if (!SDL_PrivateJoystickValid(joystick)) {
+ SDL_JoystickGUID emptyGUID;
+ SDL_zero( emptyGUID );
+ return emptyGUID;
+ }
return SDL_SYS_JoystickGetGUID( joystick );
}
@@ -785,7 +781,7 @@ void SDL_JoystickGetGUIDString( SDL_JoystickGUID guid, char *pszGUID, int cbGUID
return;
}
- for ( i = 0; i < sizeof(guid.data) && i < (cbGUID-1); i++ )
+ for ( i = 0; i < sizeof(guid.data) && i < (cbGUID-1)/2; i++ )
{
/* each input byte writes 2 ascii chars, and might write a null byte. */
/* If we don't have room for next input byte, stop */
@@ -834,7 +830,7 @@ SDL_JoystickGUID SDL_JoystickGetGUIDFromString(const char *pchGUID)
{
SDL_JoystickGUID guid;
int maxoutputbytes= sizeof(guid);
- int len = SDL_strlen( pchGUID );
+ size_t len = SDL_strlen( pchGUID );
Uint8 *p;
int i;
diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h
index f75aabc..1b515be 100644
--- a/src/joystick/SDL_sysjoystick.h
+++ b/src/joystick/SDL_sysjoystick.h
@@ -111,6 +111,7 @@ extern SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick);
#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
/* Function to get the current instance id of the joystick located at device_index */
extern SDL_bool SDL_SYS_IsXInputDeviceIndex( int device_index );
+extern SDL_bool SDL_SYS_IsXInputJoystick(SDL_Joystick * joystick);
#endif
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/beos/SDL_bejoystick.cc b/src/joystick/beos/SDL_bejoystick.cc
index 4e342ed..c324581 100644
--- a/src/joystick/beos/SDL_bejoystick.cc
+++ b/src/joystick/beos/SDL_bejoystick.cc
@@ -231,12 +231,8 @@ extern "C"
if (joystick->hwdata) {
joystick->hwdata->stick->Close();
delete joystick->hwdata->stick;
- if (joystick->hwdata->new_hats) {
- SDL_free(joystick->hwdata->new_hats);
- }
- if (joystick->hwdata->new_axes) {
- SDL_free(joystick->hwdata->new_axes);
- }
+ SDL_free(joystick->hwdata->new_hats);
+ SDL_free(joystick->hwdata->new_axes);
SDL_free(joystick->hwdata);
joystick->hwdata = NULL;
}
diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c
index 6d35d91..41a8693 100644
--- a/src/joystick/bsd/SDL_sysjoystick.c
+++ b/src/joystick/bsd/SDL_sysjoystick.c
@@ -446,48 +446,47 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joy)
static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
if (joy->hwdata->type == BSDJOY_JOY) {
- if (read(joy->hwdata->fd, &gameport, sizeof gameport) !=
- sizeof gameport)
- return;
- if (abs(x - gameport.x) > 8) {
- x = gameport.x;
- if (x < xmin) {
- xmin = x;
- }
- if (x > xmax) {
- xmax = x;
- }
- if (xmin == xmax) {
- xmin--;
- xmax++;
+ while (read(joy->hwdata->fd, &gameport, sizeof gameport) == sizeof gameport) {
+ if (abs(x - gameport.x) > 8) {
+ x = gameport.x;
+ if (x < xmin) {
+ xmin = x;
+ }
+ if (x > xmax) {
+ xmax = x;
+ }
+ if (xmin == xmax) {
+ xmin--;
+ xmax++;
+ }
+ v = (Sint32) x;
+ v -= (xmax + xmin + 1) / 2;
+ v *= 32768 / ((xmax - xmin + 1) / 2);
+ SDL_PrivateJoystickAxis(joy, 0, v);
}
- v = (Sint32) x;
- v -= (xmax + xmin + 1) / 2;
- v *= 32768 / ((xmax - xmin + 1) / 2);
- SDL_PrivateJoystickAxis(joy, 0, v);
- }
- if (abs(y - gameport.y) > 8) {
- y = gameport.y;
- if (y < ymin) {
- ymin = y;
+ if (abs(y - gameport.y) > 8) {
+ y = gameport.y;
+ if (y < ymin) {
+ ymin = y;
+ }
+ if (y > ymax) {
+ ymax = y;
+ }
+ if (ymin == ymax) {
+ ymin--;
+ ymax++;
+ }
+ v = (Sint32) y;
+ v -= (ymax + ymin + 1) / 2;
+ v *= 32768 / ((ymax - ymin + 1) / 2);
+ SDL_PrivateJoystickAxis(joy, 1, v);
}
- if (y > ymax) {
- ymax = y;
+ if (gameport.b1 != joy->buttons[0]) {
+ SDL_PrivateJoystickButton(joy, 0, gameport.b1);
}
- if (ymin == ymax) {
- ymin--;
- ymax++;
+ if (gameport.b2 != joy->buttons[1]) {
+ SDL_PrivateJoystickButton(joy, 1, gameport.b2);
}
- v = (Sint32) y;
- v -= (ymax + ymin + 1) / 2;
- v *= 32768 / ((ymax - ymin + 1) / 2);
- SDL_PrivateJoystickAxis(joy, 1, v);
- }
- if (gameport.b1 != joy->buttons[0]) {
- SDL_PrivateJoystickButton(joy, 0, gameport.b1);
- }
- if (gameport.b2 != joy->buttons[1]) {
- SDL_PrivateJoystickButton(joy, 1, gameport.b2);
}
return;
}
@@ -495,65 +494,62 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joy)
rep = &joy->hwdata->inreport;
- if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) {
- return;
- }
+ while (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) == rep->size) {
#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__)
- hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
+ hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
#else
- hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
+ hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
#endif
- if (hdata == NULL) {
- fprintf(stderr, "%s: Cannot start HID parser\n", joy->hwdata->path);
- return;
- }
+ if (hdata == NULL) {
+ /*fprintf(stderr, "%s: Cannot start HID parser\n", joy->hwdata->path);*/
+ continue;
+ }
- for (nbutton = 0; hid_get_item(hdata, &hitem) > 0;) {
- switch (hitem.kind) {
- case hid_input:
- switch (HID_PAGE(hitem.usage)) {
- case HUP_GENERIC_DESKTOP:
- {
- unsigned usage = HID_USAGE(hitem.usage);
- int joyaxe = usage_to_joyaxe(usage);
- if (joyaxe >= 0) {
- naxe = joy->hwdata->axis_map[joyaxe];
- /* scaleaxe */
- v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
- v -= (hitem.logical_maximum +
- hitem.logical_minimum + 1) / 2;
- v *= 32768 /
- ((hitem.logical_maximum -
- hitem.logical_minimum + 1) / 2);
- if (v != joy->axes[naxe]) {
- SDL_PrivateJoystickAxis(joy, naxe, v);
+ for (nbutton = 0; hid_get_item(hdata, &hitem) > 0;) {
+ switch (hitem.kind) {
+ case hid_input:
+ switch (HID_PAGE(hitem.usage)) {
+ case HUP_GENERIC_DESKTOP:
+ {
+ unsigned usage = HID_USAGE(hitem.usage);
+ int joyaxe = usage_to_joyaxe(usage);
+ if (joyaxe >= 0) {
+ naxe = joy->hwdata->axis_map[joyaxe];
+ /* scaleaxe */
+ v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
+ v -= (hitem.logical_maximum +
+ hitem.logical_minimum + 1) / 2;
+ v *= 32768 /
+ ((hitem.logical_maximum -
+ hitem.logical_minimum + 1) / 2);
+ if (v != joy->axes[naxe]) {
+ SDL_PrivateJoystickAxis(joy, naxe, v);
+ }
+ } else if (usage == HUG_HAT_SWITCH) {
+ v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
+ SDL_PrivateJoystickHat(joy, 0,
+ hatval_to_sdl(v) -
+ hitem.logical_minimum);
}
- } else if (usage == HUG_HAT_SWITCH) {
- v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
- SDL_PrivateJoystickHat(joy, 0,
- hatval_to_sdl(v) -
- hitem.logical_minimum);
+ break;
}
+ case HUP_BUTTON:
+ v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
+ if (joy->buttons[nbutton] != v) {
+ SDL_PrivateJoystickButton(joy, nbutton, v);
+ }
+ nbutton++;
break;
+ default:
+ continue;
}
- case HUP_BUTTON:
- v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
- if (joy->buttons[nbutton] != v) {
- SDL_PrivateJoystickButton(joy, nbutton, v);
- }
- nbutton++;
break;
default:
- continue;
+ break;
}
- break;
- default:
- break;
}
+ hid_end_parse(hdata);
}
- hid_end_parse(hdata);
-
- return;
}
/* Function to close a joystick after use */
@@ -577,10 +573,8 @@ SDL_SYS_JoystickQuit(void)
int i;
for (i = 0; i < MAX_JOYS; i++) {
- if (joynames[i] != NULL)
- SDL_free(joynames[i]);
- if (joydevnames[i] != NULL)
- SDL_free(joydevnames[i]);
+ SDL_free(joynames[i]);
+ SDL_free(joydevnames[i]);
}
return;
@@ -657,9 +651,7 @@ report_alloc(struct report *r, struct report_desc *rd, int repind)
static void
report_free(struct report *r)
{
- if (r->buf != NULL) {
- SDL_free(r->buf);
- }
+ SDL_free(r->buf);
r->status = SREPORT_UNINIT;
}
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index 4e50e4d..55ec41e 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/src/joystick/darwin/SDL_sysjoystick.c
@@ -589,7 +589,6 @@ HIDBuildDevice(io_object_t hidDevice)
if (kIOReturnSuccess == result) {
HIDGetDeviceInfo(hidDevice, hidProperties, pDevice); /* hidDevice used to find parents in registry tree */
HIDGetCollectionElements(hidProperties, pDevice);
- pDevice->instance_id = ++s_joystick_instance_id;
} else {
DisposePtr((Ptr) pDevice);
pDevice = NULL;
@@ -678,6 +677,9 @@ AddDeviceHelper( io_object_t ioHIDDeviceObject )
return 0;
}
+ /* Allocate an instance ID for this device */
+ device->instance_id = ++s_joystick_instance_id;
+
/* We have to do some storage of the io_service_t for
* SDL_HapticOpenFromJoystick */
if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) {
@@ -771,7 +773,7 @@ SDL_SYS_JoystickInit(void)
("Joystick: Failed to get HID CFMutableDictionaryRef via IOServiceMatching.");
}
- /*/ Now search I/O Registry for matching devices. */
+ /* Now search I/O Registry for matching devices. */
result =
IOServiceGetMatchingServices(masterPort, hidMatchDictionary,
&hidObjectIterator);
diff --git a/src/joystick/iphoneos/SDL_sysjoystick.m b/src/joystick/iphoneos/SDL_sysjoystick.m
index 231c851..6082389 100644
--- a/src/joystick/iphoneos/SDL_sysjoystick.m
+++ b/src/joystick/iphoneos/SDL_sysjoystick.m
@@ -106,7 +106,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
[[SDLUIAccelerationDelegate sharedDelegate] setHasNewData: NO];
SDL_PrivateJoystickAxis(joystick, 0, orientation[0]);
- SDL_PrivateJoystickAxis(joystick, 1, orientation[1]);
+ SDL_PrivateJoystickAxis(joystick, 1, -orientation[1]);
SDL_PrivateJoystickAxis(joystick, 2, orientation[2]);
}
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index 8582838..72fa52c 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -52,124 +52,13 @@
#define SYN_DROPPED 3
#endif
-/*
- * !!! FIXME: move all the udev stuff to src/core/linux, so I can reuse it
- * !!! FIXME: for audio hardware disconnects.
- */
-#ifdef HAVE_LIBUDEV_H
-#define SDL_USE_LIBUDEV 1
-#include "SDL_loadso.h"
-#include <libudev.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
-/* we never link directly to libudev. */
-/* !!! FIXME: can we generalize this? ALSA, etc, do the same things. */
-static const char *udev_library = "libudev.so.0";
-static void *udev_handle = NULL;
-
-/* !!! FIXME: this is kinda ugly. */
-static SDL_bool
-load_udev_sym(const char *fn, void **addr)
-{
- *addr = SDL_LoadFunction(udev_handle, fn);
- if (*addr == NULL) {
- /* Don't call SDL_SetError(): SDL_LoadFunction already did. */
- return SDL_FALSE;
- }
-
- return SDL_TRUE;
-}
-
-/* libudev entry points... */
-static const char *(*UDEV_udev_device_get_action)(struct udev_device *) = NULL;
-static const char *(*UDEV_udev_device_get_devnode)(struct udev_device *) = NULL;
-static const char *(*UDEV_udev_device_get_property_value)(struct udev_device *, const char *) = NULL;
-static struct udev_device *(*UDEV_udev_device_new_from_syspath)(struct udev *, const char *) = NULL;
-static void (*UDEV_udev_device_unref)(struct udev_device *) = NULL;
-static int (*UDEV_udev_enumerate_add_match_property)(struct udev_enumerate *, const char *, const char *) = NULL;
-static int (*UDEV_udev_enumerate_add_match_subsystem)(struct udev_enumerate *, const char *) = NULL;
-static struct udev_list_entry *(*UDEV_udev_enumerate_get_list_entry)(struct udev_enumerate *) = NULL;
-static struct udev_enumerate *(*UDEV_udev_enumerate_new)(struct udev *) = NULL;
-static int (*UDEV_udev_enumerate_scan_devices)(struct udev_enumerate *) = NULL;
-static void (*UDEV_udev_enumerate_unref)(struct udev_enumerate *) = NULL;
-static const char *(*UDEV_udev_list_entry_get_name)(struct udev_list_entry *) = NULL;
-static struct udev_list_entry *(*UDEV_udev_list_entry_get_next)(struct udev_list_entry *) = NULL;
-static int (*UDEV_udev_monitor_enable_receiving)(struct udev_monitor *) = NULL;
-static int (*UDEV_udev_monitor_filter_add_match_subsystem_devtype)(struct udev_monitor *, const char *, const char *) = NULL;
-static int (*UDEV_udev_monitor_get_fd)(struct udev_monitor *) = NULL;
-static struct udev_monitor *(*UDEV_udev_monitor_new_from_netlink)(struct udev *, const char *) = NULL;
-static struct udev_device *(*UDEV_udev_monitor_receive_device)(struct udev_monitor *) = NULL;
-static void (*UDEV_udev_monitor_unref)(struct udev_monitor *) = NULL;
-static struct udev *(*UDEV_udev_new)(void) = NULL;
-static void (*UDEV_udev_unref)(struct udev *) = NULL;
-
-static int
-load_udev_syms(void)
-{
- /* cast funcs to char* first, to please GCC's strict aliasing rules. */
- #define SDL_UDEV_SYM(x) \
- if (!load_udev_sym(#x, (void **) (char *) &UDEV_##x)) return -1
-
- SDL_UDEV_SYM(udev_device_get_action);
- SDL_UDEV_SYM(udev_device_get_devnode);
- SDL_UDEV_SYM(udev_device_get_property_value);
- SDL_UDEV_SYM(udev_device_new_from_syspath);
- SDL_UDEV_SYM(udev_device_unref);
- SDL_UDEV_SYM(udev_enumerate_add_match_property);
- SDL_UDEV_SYM(udev_enumerate_add_match_subsystem);
- SDL_UDEV_SYM(udev_enumerate_get_list_entry);
- SDL_UDEV_SYM(udev_enumerate_new);
- SDL_UDEV_SYM(udev_enumerate_scan_devices);
- SDL_UDEV_SYM(udev_enumerate_unref);
- SDL_UDEV_SYM(udev_list_entry_get_name);
- SDL_UDEV_SYM(udev_list_entry_get_next);
- SDL_UDEV_SYM(udev_monitor_enable_receiving);
- SDL_UDEV_SYM(udev_monitor_filter_add_match_subsystem_devtype);
- SDL_UDEV_SYM(udev_monitor_get_fd);
- SDL_UDEV_SYM(udev_monitor_new_from_netlink);
- SDL_UDEV_SYM(udev_monitor_receive_device);
- SDL_UDEV_SYM(udev_monitor_unref);
- SDL_UDEV_SYM(udev_new);
- SDL_UDEV_SYM(udev_unref);
-
- #undef SDL_UDEV_SYM
-
- return 0;
-}
-
-static void
-UnloadUDEVLibrary(void)
-{
- if (udev_handle != NULL) {
- SDL_UnloadObject(udev_handle);
- udev_handle = NULL;
- }
-}
+#include "../../core/linux/SDL_udev.h"
-static int
-LoadUDEVLibrary(void)
-{
- int retval = 0;
- if (udev_handle == NULL) {
- udev_handle = SDL_LoadObject(udev_library);
- if (udev_handle == NULL) {
- retval = -1;
- /* Don't call SDL_SetError(): SDL_LoadObject already did. */
- } else {
- retval = load_udev_syms();
- if (retval < 0) {
- UnloadUDEVLibrary();
- }
- }
- }
-
- return retval;
-}
-
-static struct udev *udev = NULL;
-static struct udev_monitor *udev_mon = NULL;
-#endif
+static int MaybeAddDevice(const char *path);
+#if SDL_USE_LIBUDEV
+static int MaybeRemoveDevice(const char *path);
+void joystick_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
+#endif /* SDL_USE_LIBUDEV */
/* A linked list of available joysticks */
@@ -246,6 +135,30 @@ IsJoystick(int fd, char *namebuf, const size_t namebuflen, SDL_JoystickGUID *gui
return 1;
}
+#if SDL_USE_LIBUDEV
+void joystick_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath)
+{
+ if (devpath == NULL || !(udev_class & SDL_UDEV_DEVICE_JOYSTICK)) {
+ return;
+ }
+
+ switch( udev_type )
+ {
+ case SDL_UDEV_DEVICEADDED:
+ MaybeAddDevice(devpath);
+ break;
+
+ case SDL_UDEV_DEVICEREMOVED:
+ MaybeRemoveDevice(devpath);
+ break;
+
+ default:
+ break;
+ }
+
+}
+#endif /* SDL_USE_LIBUDEV */
+
/* !!! FIXME: I would love to dump this code and use libudev instead. */
static int
@@ -257,6 +170,9 @@ MaybeAddDevice(const char *path)
char namebuf[128];
SDL_JoystickGUID guid;
SDL_joylist_item *item;
+#if !SDL_EVENTS_DISABLED
+ SDL_Event event;
+#endif
if (path == NULL) {
return -1;
@@ -314,6 +230,19 @@ MaybeAddDevice(const char *path)
SDL_joylist_tail = item;
}
+ /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceAdded() function? */
+#if !SDL_EVENTS_DISABLED
+ event.type = SDL_JOYDEVICEADDED;
+
+ if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+ event.jdevice.which = numjoysticks;
+ if ( (SDL_EventOK == NULL) ||
+ (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
+ SDL_PushEvent(&event);
+ }
+ }
+#endif /* !SDL_EVENTS_DISABLED */
+
return numjoysticks++;
}
@@ -324,6 +253,9 @@ MaybeRemoveDevice(const char *path)
{
SDL_joylist_item *item;
SDL_joylist_item *prev = NULL;
+#if !SDL_EVENTS_DISABLED
+ SDL_Event event;
+#endif
if (path == NULL) {
return -1;
@@ -345,6 +277,20 @@ MaybeRemoveDevice(const char *path)
if (item == SDL_joylist_tail) {
SDL_joylist_tail = prev;
}
+
+ /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceRemoved() function? */
+#if !SDL_EVENTS_DISABLED
+ event.type = SDL_JOYDEVICEREMOVED;
+
+ if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+ event.jdevice.which = item->device_instance;
+ if ( (SDL_EventOK == NULL) ||
+ (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
+ SDL_PushEvent(&event);
+ }
+ }
+#endif /* !SDL_EVENTS_DISABLED */
+
SDL_free(item->path);
SDL_free(item->name);
SDL_free(item);
@@ -380,40 +326,19 @@ JoystickInitWithoutUdev(void)
static int
JoystickInitWithUdev(void)
{
- struct udev_enumerate *enumerate = NULL;
- struct udev_list_entry *devs = NULL;
- struct udev_list_entry *item = NULL;
-
- SDL_assert(udev == NULL);
- udev = UDEV_udev_new();
- if (udev == NULL) {
- return SDL_SetError("udev_new() failed");
- }
- udev_mon = UDEV_udev_monitor_new_from_netlink(udev, "udev");
- if (udev_mon != NULL) { /* okay if it's NULL, we just lose hotplugging. */
- UDEV_udev_monitor_filter_add_match_subsystem_devtype(udev_mon,
- "input", NULL);
- UDEV_udev_monitor_enable_receiving(udev_mon);
+ if (SDL_UDEV_Init() < 0) {
+ return SDL_SetError("Could not initialize UDEV");
}
- enumerate = UDEV_udev_enumerate_new(udev);
- if (enumerate == NULL) {
- return SDL_SetError("udev_enumerate_new() failed");
+ /* Set up the udev callback */
+ if ( SDL_UDEV_AddCallback(joystick_udev_callback) < 0) {
+ SDL_UDEV_Quit();
+ return SDL_SetError("Could not set up joystick <-> udev callback");
}
-
- UDEV_udev_enumerate_add_match_subsystem(enumerate, "input");
- UDEV_udev_enumerate_add_match_property(enumerate, "ID_INPUT_JOYSTICK", "1");
- UDEV_udev_enumerate_scan_devices(enumerate);
- devs = UDEV_udev_enumerate_get_list_entry(enumerate);
- for (item = devs; item; item = UDEV_udev_list_entry_get_next(item)) {
- const char *path = UDEV_udev_list_entry_get_name(item);
- struct udev_device *dev = UDEV_udev_device_new_from_syspath(udev, path);
- MaybeAddDevice(UDEV_udev_device_get_devnode(dev));
- UDEV_udev_device_unref(dev);
- }
-
- UDEV_udev_enumerate_unref(enumerate);
+
+ /* Force a scan to build the initial device list */
+ SDL_UDEV_Scan();
return numjoysticks;
}
@@ -439,9 +364,7 @@ SDL_SYS_JoystickInit(void)
}
#if SDL_USE_LIBUDEV
- if (LoadUDEVLibrary() == 0) { /* okay if this fails, FOR NOW. */
- return JoystickInitWithUdev();
- }
+ return JoystickInitWithUdev();
#endif
return JoystickInitWithoutUdev();
@@ -452,99 +375,21 @@ int SDL_SYS_NumJoysticks()
return numjoysticks;
}
-static SDL_bool
-HotplugUpdateAvailable(void)
-{
-#if SDL_USE_LIBUDEV
- if (udev_mon != NULL) {
- const int fd = UDEV_udev_monitor_get_fd(udev_mon);
- fd_set fds;
- struct timeval tv;
-
- FD_ZERO(&fds);
- FD_SET(fd, &fds);
- tv.tv_sec = 0;
- tv.tv_usec = 0;
- if ((select(fd+1, &fds, NULL, NULL, &tv) > 0) && (FD_ISSET(fd, &fds))) {
- return SDL_TRUE;
- }
- }
-#endif
-
- return SDL_FALSE;
-}
-
void SDL_SYS_JoystickDetect()
{
#if SDL_USE_LIBUDEV
- struct udev_device *dev = NULL;
- const char *devnode = NULL;
- const char *action = NULL;
- const char *val = NULL;
-
- while (HotplugUpdateAvailable()) {
- dev = UDEV_udev_monitor_receive_device(udev_mon);
- if (dev == NULL) {
- break;
- }
- val = UDEV_udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");
- if ((!val) || (SDL_strcmp(val, "1") != 0)) {
- continue;
- }
-
- action = UDEV_udev_device_get_action(dev);
- devnode = UDEV_udev_device_get_devnode(dev);
-
- if (SDL_strcmp(action, "add") == 0) {
- const int device_index = MaybeAddDevice(devnode);
- if (device_index != -1) {
- /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceAdded() function? */
- #if !SDL_EVENTS_DISABLED
- SDL_Event event;
- event.type = SDL_JOYDEVICEADDED;
-
- if (SDL_GetEventState(event.type) == SDL_ENABLE) {
- event.jdevice.which = device_index;
- if ( (SDL_EventOK == NULL) ||
- (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
- SDL_PushEvent(&event);
- }
- }
- #endif /* !SDL_EVENTS_DISABLED */
- }
- } else if (SDL_strcmp(action, "remove") == 0) {
- const int inst = MaybeRemoveDevice(devnode);
- if (inst != -1) {
- /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceRemoved() function? */
- #if !SDL_EVENTS_DISABLED
- SDL_Event event;
- event.type = SDL_JOYDEVICEREMOVED;
-
- if (SDL_GetEventState(event.type) == SDL_ENABLE) {
- event.jdevice.which = inst;
- if ( (SDL_EventOK == NULL) ||
- (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
- SDL_PushEvent(&event);
- }
- }
- #endif /* !SDL_EVENTS_DISABLED */
- }
- }
- UDEV_udev_device_unref(dev);
- }
+ SDL_UDEV_Poll();
#endif
+
}
SDL_bool SDL_SYS_JoystickNeedsPolling()
{
- /*
- * This results in a select() call, so technically we're polling to
- * decide if we should poll, but I think this function is here because
- * Windows has to do an enormous amount of work to detect new sticks,
- * whereas libudev just needs to see if there's more data available on
- * a socket...so this should be acceptable, I hope.
- */
- return HotplugUpdateAvailable();
+#if SDL_USE_LIBUDEV
+ return SDL_TRUE;
+#endif
+
+ return SDL_FALSE;
}
static SDL_joylist_item *
@@ -772,7 +617,7 @@ SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
return !joystick->closed && (joystick->hwdata->item != NULL);
}
-static __inline__ void
+static SDL_INLINE void
HandleHat(SDL_Joystick * stick, Uint8 hat, int axis, int value)
{
struct hwdata_hat *the_hat;
@@ -798,14 +643,14 @@ HandleHat(SDL_Joystick * stick, Uint8 hat, int axis, int value)
}
}
-static __inline__ void
+static SDL_INLINE void
HandleBall(SDL_Joystick * stick, Uint8 ball, int axis, int value)
{
stick->hwdata->balls[ball].axis[axis] += value;
}
-static __inline__ int
+static SDL_INLINE int
AxisCorrect(SDL_Joystick * joystick, int which, int value)
{
struct axis_correct *correct;
@@ -834,7 +679,7 @@ AxisCorrect(SDL_Joystick * joystick, int which, int value)
return value;
}
-static __inline__ void
+static SDL_INLINE void
PollAllValues(SDL_Joystick * joystick)
{
struct input_absinfo absinfo;
@@ -872,7 +717,7 @@ PollAllValues(SDL_Joystick * joystick)
}
}
-static __inline__ void
+static SDL_INLINE void
HandleInputEvents(SDL_Joystick * joystick)
{
struct input_event events[32];
@@ -1011,15 +856,8 @@ SDL_SYS_JoystickQuit(void)
instance_counter = 0;
#if SDL_USE_LIBUDEV
- if (udev_mon != NULL) {
- UDEV_udev_monitor_unref(udev_mon);
- udev_mon = NULL;
- }
- if (udev != NULL) {
- UDEV_udev_unref(udev);
- udev = NULL;
- }
- UnloadUDEVLibrary();
+ SDL_UDEV_DelCallback(joystick_udev_callback);
+ SDL_UDEV_Quit();
#endif
}
diff --git a/src/joystick/psp/SDL_sysjoystick.c b/src/joystick/psp/SDL_sysjoystick.c
index d6ca698..b953372 100644
--- a/src/joystick/psp/SDL_sysjoystick.c
+++ b/src/joystick/psp/SDL_sysjoystick.c
@@ -60,7 +60,7 @@ static point c = { 78, 32767 };
static point d = { 128, 32767 };
/* simple linear interpolation between two points */
-static __inline__ void lerp (point *dest, point *a, point *b, float t)
+static SDL_INLINE void lerp (point *dest, point *a, point *b, float t)
{
dest->x = a->x + (b->x - a->x)*t;
dest->y = a->y + (b->y - a->y)*t;
diff --git a/src/joystick/windows/SDL_dxjoystick.c b/src/joystick/windows/SDL_dxjoystick.c
index 5a832ab..d8149a3 100644
--- a/src/joystick/windows/SDL_dxjoystick.c
+++ b/src/joystick/windows/SDL_dxjoystick.c
@@ -46,40 +46,17 @@
#include "../../events/SDL_events_c.h"
#endif
-/* The latest version of mingw-w64 defines IID_IWbemLocator in wbemcli.h
- instead of declaring it like Visual Studio and other mingw32 compilers.
- So, we need to take care of this here before we define INITGUID.
-*/
-#ifdef __MINGW32__
-#define __IWbemLocator_INTERFACE_DEFINED__
-#endif /* __MINGW32__ */
-
#define INITGUID /* Only set here, if set twice will cause mingw32 to break. */
#include "SDL_dxjoystick_c.h"
-#ifdef __MINGW32__
-/* And now that we've included wbemcli.h we need to declare these interfaces */
-typedef struct IWbemLocatorVtbl {
- BEGIN_INTERFACE
- HRESULT (WINAPI *QueryInterface)(IWbemLocator *This,REFIID riid,void **ppvObject);
- ULONG (WINAPI *AddRef)(IWbemLocator *This);
- ULONG (WINAPI *Release)(IWbemLocator *This);
- HRESULT (WINAPI *ConnectServer)(IWbemLocator *This,const BSTR strNetworkResource,const BSTR strUser,const BSTR strPassword,const BSTR strLocale,LONG lSecurityFlags,const BSTR strAuthority,IWbemContext *pCtx,IWbemServices **ppNamespace);
- END_INTERFACE
-} IWbemLocatorVtbl;
-struct IWbemLocator {
- CONST_VTBL struct IWbemLocatorVtbl *lpVtbl;
-};
-#define IWbemLocator_ConnectServer(This,strNetworkResource,strUser,strPassword,strLocale,lSecurityFlags,strAuthority,pCtx,ppNamespace) (This)->lpVtbl->ConnectServer(This,strNetworkResource,strUser,strPassword,strLocale,lSecurityFlags,strAuthority,pCtx,ppNamespace)
-#endif /* __MINGW32__ */
-
#ifndef DIDFT_OPTIONAL
#define DIDFT_OPTIONAL 0x80000000
#endif
+DEFINE_GUID(GUID_DEVINTERFACE_HID, 0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30);
+
#define INPUT_QSIZE 32 /* Buffer up to 32 input messages */
-#define MAX_JOYSTICKS 8
#define AXIS_MIN -32768 /* minimum value for axis coordinate */
#define AXIS_MAX 32767 /* maximum value for axis coordinate */
#define JOY_AXIS_THRESHOLD (((AXIS_MAX)-(AXIS_MIN))/100) /* 1% motion */
@@ -94,7 +71,6 @@ static LPDIRECTINPUT8 dinput = NULL;
static SDL_bool s_bDeviceAdded = SDL_FALSE;
static SDL_bool s_bDeviceRemoved = SDL_FALSE;
static SDL_JoystickID s_nInstanceID = -1;
-static GUID *s_pKnownJoystickGUIDs = NULL;
static SDL_cond *s_condJoystickThread = NULL;
static SDL_mutex *s_mutexJoyStickEnum = NULL;
static SDL_Thread *s_threadJoystick = NULL;
@@ -396,156 +372,74 @@ SetDIerror(const char *function, HRESULT code)
} \
}
-DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3a,0x11d0,0x89,0x1F,0x00,0xaa,0x00,0x4b,0x2e,0x24);
-DEFINE_GUID(IID_IWbemLocator, 0xdc12a687,0x737f,0x11cf,0x88,0x4d,0x00,0xaa,0x00,0x4b,0x2e,0x24);
-
DEFINE_GUID(IID_ValveStreamingGamepad, MAKELONG( 0x28DE, 0x11FF ),0x0000,0x0000,0x00,0x00,0x50,0x49,0x44,0x56,0x49,0x44);
+DEFINE_GUID(IID_X360WiredGamepad, MAKELONG( 0x045E, 0x02A1 ),0x0000,0x0000,0x00,0x00,0x50,0x49,0x44,0x56,0x49,0x44);
+DEFINE_GUID(IID_X360WirelessGamepad, MAKELONG( 0x045E, 0x028E ),0x0000,0x0000,0x00,0x00,0x50,0x49,0x44,0x56,0x49,0x44);
-/*-----------------------------------------------------------------------------
- *
- * code from MSDN: http://msdn.microsoft.com/en-us/library/windows/desktop/ee417014(v=vs.85).aspx
- *
- * Enum each PNP device using WMI and check each device ID to see if it contains
- * "IG_" (ex. "VID_045E&PID_028E&IG_00"). If it does, then it's an XInput device
- * Unfortunately this information can not be found by just using DirectInput
- *-----------------------------------------------------------------------------*/
-BOOL IsXInputDevice( const GUID* pGuidProductFromDirectInput )
+static PRAWINPUTDEVICELIST SDL_RawDevList = NULL;
+static UINT SDL_RawDevListCount = 0;
+
+static SDL_bool
+SDL_IsXInputDevice( const GUID* pGuidProductFromDirectInput )
{
static const GUID *s_XInputProductGUID[] = {
- &IID_ValveStreamingGamepad
+ &IID_ValveStreamingGamepad,
+ &IID_X360WiredGamepad, /* Microsoft's wired X360 controller for Windows. */
+ &IID_X360WirelessGamepad /* Microsoft's wireless X360 controller for Windows. */
};
- IWbemLocator* pIWbemLocator = NULL;
- IEnumWbemClassObject* pEnumDevices = NULL;
- IWbemClassObject* pDevices[20];
- IWbemServices* pIWbemServices = NULL;
- DWORD uReturned = 0;
- BSTR bstrNamespace = NULL;
- BSTR bstrDeviceID = NULL;
- BSTR bstrClassName = NULL;
- SDL_bool bIsXinputDevice= SDL_FALSE;
- UINT iDevice = 0;
- VARIANT var;
- HRESULT hr;
- DWORD bCleanupCOM;
-
- if (!s_bXInputEnabled)
- {
+
+ size_t iDevice;
+ UINT i;
+
+ if (!s_bXInputEnabled) {
return SDL_FALSE;
}
- // Check for well known XInput device GUIDs
- // We need to do this for the Valve Streaming Gamepad because it's virtualized and doesn't show up in the device list.
+ /* Check for well known XInput device GUIDs */
+ /* This lets us skip RAWINPUT for popular devices. Also, we need to do this for the Valve Streaming Gamepad because it's virtualized and doesn't show up in the device list. */
for ( iDevice = 0; iDevice < SDL_arraysize(s_XInputProductGUID); ++iDevice ) {
if (SDL_memcmp(pGuidProductFromDirectInput, s_XInputProductGUID[iDevice], sizeof(GUID)) == 0) {
return SDL_TRUE;
}
}
- SDL_memset( pDevices, 0x0, sizeof(pDevices) );
-
- /* CoInit if needed */
- hr = CoInitialize(NULL);
- bCleanupCOM = SUCCEEDED(hr);
-
- /* Create WMI */
- hr = CoCreateInstance( &CLSID_WbemLocator,
- NULL,
- CLSCTX_INPROC_SERVER,
- &IID_IWbemLocator,
- (LPVOID*) &pIWbemLocator);
- if( FAILED(hr) || pIWbemLocator == NULL )
- goto LCleanup;
-
- bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup;
- bstrClassName = SysAllocString( L"Win32_PNPEntity" ); if( bstrClassName == NULL ) goto LCleanup;
- bstrDeviceID = SysAllocString( L"DeviceID" ); if( bstrDeviceID == NULL ) goto LCleanup;
-
- /* Connect to WMI */
- hr = IWbemLocator_ConnectServer( pIWbemLocator, bstrNamespace, NULL, NULL, 0L,
- 0L, NULL, NULL, &pIWbemServices );
- if( FAILED(hr) || pIWbemServices == NULL )
- goto LCleanup;
-
- /* Switch security level to IMPERSONATE. */
- CoSetProxyBlanket( (IUnknown *)pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL,
- RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );
-
- hr = IWbemServices_CreateInstanceEnum( pIWbemServices, bstrClassName, 0, NULL, &pEnumDevices );
- if( FAILED(hr) || pEnumDevices == NULL )
- goto LCleanup;
-
- /* Loop over all devices */
- for( ;; )
- {
- /* Get 20 at a time */
- hr = IEnumWbemClassObject_Next( pEnumDevices, 10000, 20, pDevices, &uReturned );
- if( FAILED(hr) )
- goto LCleanup;
- if( uReturned == 0 )
- break;
-
- for( iDevice=0; iDevice<uReturned; iDevice++ )
- {
- /* For each device, get its device ID */
- hr = IWbemClassObject_Get( pDevices[iDevice], bstrDeviceID, 0L, &var, NULL, NULL );
- if( SUCCEEDED( hr ) && var.vt == VT_BSTR && var.bstrVal != NULL )
- {
- /* Check if the device ID contains "IG_". If it does, then it's an XInput device */
- /* This information can not be found from DirectInput */
- char *pDeviceString = WIN_StringToUTF8( var.bstrVal );
- if( SDL_strstr( pDeviceString, "IG_" ) )
- {
- /* If it does, then get the VID/PID from var.bstrVal */
- long dwPid = 0, dwVid = 0;
- char * strPid = NULL;
- DWORD dwVidPid = 0;
- char * strVid = SDL_strstr( pDeviceString, "VID_" );
- if( strVid )
- {
- dwVid = SDL_strtol( strVid + 4, NULL, 16 );
- }
- strPid = SDL_strstr( pDeviceString, "PID_" );
- if( strPid )
- {
- dwPid = SDL_strtol( strPid + 4, NULL, 16 );
- }
+ /* Go through RAWINPUT (WinXP and later) to find HID devices. */
+ /* Cache this if we end up using it. */
+ if (SDL_RawDevList == NULL) {
+ if ((GetRawInputDeviceList(NULL, &SDL_RawDevListCount, sizeof (RAWINPUTDEVICELIST)) == -1) || (!SDL_RawDevListCount)) {
+ return SDL_FALSE; /* oh well. */
+ }
- /* Compare the VID/PID to the DInput device */
- dwVidPid = MAKELONG( dwVid, dwPid );
- if( dwVidPid == pGuidProductFromDirectInput->Data1 )
- {
- bIsXinputDevice = SDL_TRUE;
- }
- }
- if ( pDeviceString )
- SDL_free( pDeviceString );
+ SDL_RawDevList = (PRAWINPUTDEVICELIST) SDL_malloc(sizeof (RAWINPUTDEVICELIST) * SDL_RawDevListCount);
+ if (SDL_RawDevList == NULL) {
+ SDL_OutOfMemory();
+ return SDL_FALSE;
+ }
- if ( bIsXinputDevice )
- break;
- }
- SAFE_RELEASE( pDevices[iDevice] );
+ if (GetRawInputDeviceList(SDL_RawDevList, &SDL_RawDevListCount, sizeof (RAWINPUTDEVICELIST)) == -1) {
+ SDL_free(SDL_RawDevList);
+ SDL_RawDevList = NULL;
+ return SDL_FALSE; /* oh well. */
}
}
-LCleanup:
-
- for( iDevice=0; iDevice<20; iDevice++ )
- SAFE_RELEASE( pDevices[iDevice] );
- SAFE_RELEASE( pEnumDevices );
- SAFE_RELEASE( pIWbemLocator );
- SAFE_RELEASE( pIWbemServices );
-
- if ( bstrNamespace )
- SysFreeString( bstrNamespace );
- if ( bstrClassName )
- SysFreeString( bstrClassName );
- if ( bstrDeviceID )
- SysFreeString( bstrDeviceID );
-
- if( bCleanupCOM )
- CoUninitialize();
+ for (i = 0; i < SDL_RawDevListCount; i++) {
+ RID_DEVICE_INFO rdi;
+ char devName[128];
+ UINT rdiSize = sizeof (rdi);
+ UINT nameSize = SDL_arraysize(devName);
+
+ rdi.cbSize = sizeof (rdi);
+ if ( (SDL_RawDevList[i].dwType == RIM_TYPEHID) &&
+ (GetRawInputDeviceInfoA(SDL_RawDevList[i].hDevice, RIDI_DEVICEINFO, &rdi, &rdiSize) != ((UINT)-1)) &&
+ (MAKELONG(rdi.hid.dwVendorId, rdi.hid.dwProductId) == ((LONG)pGuidProductFromDirectInput->Data1)) &&
+ (GetRawInputDeviceInfoA(SDL_RawDevList[i].hDevice, RIDI_DEVICENAME, devName, &nameSize) != ((UINT)-1)) &&
+ (SDL_strstr(devName, "IG_") != NULL) ) {
+ return SDL_TRUE;
+ }
+ }
- return bIsXinputDevice;
+ return SDL_FALSE;
}
@@ -586,10 +480,10 @@ SDL_JoystickThread(void *_data)
HWND messageWindow = 0;
HDEVNOTIFY hNotify = 0;
DEV_BROADCAST_DEVICEINTERFACE dbh;
- SDL_bool bOpenedXInputDevices[4];
+ SDL_bool bOpenedXInputDevices[SDL_XINPUT_MAX_DEVICES];
WNDCLASSEX wincl;
- SDL_memset( bOpenedXInputDevices, 0x0, sizeof(bOpenedXInputDevices) );
+ SDL_zero(bOpenedXInputDevices);
WIN_CoInitialize();
@@ -610,11 +504,11 @@ SDL_JoystickThread(void *_data)
return SDL_SetError("Failed to create message window for joystick autodetect.", GetLastError());
}
- SDL_memset(&dbh, 0x0, sizeof(dbh));
+ SDL_zero(dbh);
dbh.dbcc_size = sizeof(dbh);
dbh.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
- dbh.dbcc_classguid = GUID_DEVINTERFACE_USB_DEVICE;
+ dbh.dbcc_classguid = GUID_DEVINTERFACE_HID;
hNotify = RegisterDeviceNotification( messageWindow, &dbh, DEVICE_NOTIFY_WINDOW_HANDLE );
if ( !hNotify )
@@ -626,9 +520,8 @@ SDL_JoystickThread(void *_data)
while ( s_bJoystickThreadQuit == SDL_FALSE )
{
MSG messages;
- Uint8 userId;
- int nCurrentOpenedXInputDevices = 0;
- int nNewOpenedXInputDevices = 0;
+ SDL_bool bXInputChanged = SDL_FALSE;
+
SDL_CondWaitTimeout( s_condJoystickThread, s_mutexJoyStickEnum, 300 );
while ( s_bJoystickThreadQuit == SDL_FALSE && PeekMessage(&messages, messageWindow, 0, 0, PM_NOREMOVE) )
@@ -639,33 +532,24 @@ SDL_JoystickThread(void *_data)
}
}
- if ( s_bXInputEnabled && XINPUTGETCAPABILITIES )
- {
+ if ( s_bXInputEnabled && XINPUTGETCAPABILITIES ) {
/* scan for any change in XInput devices */
- for ( userId = 0; userId < 4; userId++ )
- {
+ Uint8 userId;
+ for (userId = 0; userId < SDL_XINPUT_MAX_DEVICES; userId++) {
XINPUT_CAPABILITIES capabilities;
- DWORD result;
-
- if ( bOpenedXInputDevices[userId] == SDL_TRUE )
- nCurrentOpenedXInputDevices++;
-
- result = XINPUTGETCAPABILITIES( userId, XINPUT_FLAG_GAMEPAD, &capabilities );
- if ( result == ERROR_SUCCESS )
- {
- bOpenedXInputDevices[userId] = SDL_TRUE;
- nNewOpenedXInputDevices++;
- }
- else
- {
- bOpenedXInputDevices[userId] = SDL_FALSE;
+ const DWORD result = XINPUTGETCAPABILITIES( userId, XINPUT_FLAG_GAMEPAD, &capabilities );
+ const SDL_bool available = (result == ERROR_SUCCESS);
+ if (bOpenedXInputDevices[userId] != available) {
+ bXInputChanged = SDL_TRUE;
+ bOpenedXInputDevices[userId] = available;
}
}
}
- if ( s_pKnownJoystickGUIDs && ( s_bWindowsDeviceChanged || nNewOpenedXInputDevices != nCurrentOpenedXInputDevices ) )
- {
+ if (s_bWindowsDeviceChanged || bXInputChanged) {
+ SDL_UnlockMutex( s_mutexJoyStickEnum ); /* let main thread go while we SDL_Delay(). */
SDL_Delay( 300 ); /* wait for direct input to find out about this device */
+ SDL_LockMutex( s_mutexJoyStickEnum );
s_bDeviceRemoved = SDL_TRUE;
s_bDeviceAdded = SDL_TRUE;
@@ -730,14 +614,15 @@ SDL_SYS_JoystickInit(void)
return SetDIerror("IDirectInput::Initialize", result);
}
+ if ((s_bXInputEnabled) && (WIN_LoadXInputDLL() == -1)) {
+ s_bXInputEnabled = SDL_FALSE; /* oh well. */
+ }
+
s_mutexJoyStickEnum = SDL_CreateMutex();
s_condJoystickThread = SDL_CreateCond();
s_bDeviceAdded = SDL_TRUE; /* force a scan of the system for joysticks this first time */
- SDL_SYS_JoystickDetect();
- if ((s_bXInputEnabled) && (WIN_LoadXInputDLL() == -1)) {
- s_bXInputEnabled = SDL_FALSE; /* oh well. */
- }
+ SDL_SYS_JoystickDetect();
if ( !s_threadJoystick )
{
@@ -767,15 +652,17 @@ int SDL_SYS_NumJoysticks()
return nJoysticks;
}
-static int s_iNewGUID = 0;
-
/* helper function for direct input, gets called for each connected joystick */
static BOOL CALLBACK
EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
{
JoyStick_DeviceData *pNewJoystick;
JoyStick_DeviceData *pPrevJoystick = NULL;
- SDL_bool bXInputDevice;
+
+ if (SDL_IsXInputDevice( &pdidInstance->guidProduct )) {
+ return DIENUM_CONTINUE; /* ignore XInput devices here, keep going. */
+ }
+
pNewJoystick = *(JoyStick_DeviceData **)pContext;
while ( pNewJoystick )
{
@@ -794,58 +681,109 @@ static BOOL CALLBACK
pNewJoystick->pNext = SYS_Joystick;
SYS_Joystick = pNewJoystick;
- s_pKnownJoystickGUIDs[ s_iNewGUID ] = pdidInstance->guidInstance;
- s_iNewGUID++;
- if ( s_iNewGUID < MAX_JOYSTICKS )
- return DIENUM_CONTINUE; /* already have this joystick loaded, just keep going */
- else
- return DIENUM_STOP;
+ return DIENUM_CONTINUE; /* already have this joystick loaded, just keep going */
}
pPrevJoystick = pNewJoystick;
pNewJoystick = pNewJoystick->pNext;
}
- s_bDeviceAdded = SDL_TRUE;
-
- bXInputDevice = IsXInputDevice( &pdidInstance->guidProduct );
-
pNewJoystick = (JoyStick_DeviceData *)SDL_malloc( sizeof(JoyStick_DeviceData) );
-
- if ( bXInputDevice )
- {
- pNewJoystick->bXInputDevice = SDL_TRUE;
- pNewJoystick->XInputUserId = INVALID_XINPUT_USERID;
+ if (!pNewJoystick) {
+ return DIENUM_CONTINUE; /* better luck next time? */
}
- else
- {
- pNewJoystick->bXInputDevice = SDL_FALSE;
+
+ SDL_zerop(pNewJoystick);
+ pNewJoystick->joystickname = WIN_StringToUTF8(pdidInstance->tszProductName);
+ if (!pNewJoystick->joystickname) {
+ SDL_free(pNewJoystick);
+ return DIENUM_CONTINUE; /* better luck next time? */
}
SDL_memcpy(&(pNewJoystick->dxdevice), pdidInstance,
sizeof(DIDEVICEINSTANCE));
- pNewJoystick->joystickname = WIN_StringToUTF8(pdidInstance->tszProductName);
+ pNewJoystick->XInputUserId = INVALID_XINPUT_USERID;
pNewJoystick->send_add_event = 1;
pNewJoystick->nInstanceID = ++s_nInstanceID;
SDL_memcpy( &pNewJoystick->guid, &pdidInstance->guidProduct, sizeof(pNewJoystick->guid) );
- pNewJoystick->pNext = NULL;
+ pNewJoystick->pNext = SYS_Joystick;
+ SYS_Joystick = pNewJoystick;
- if ( SYS_Joystick )
- {
- pNewJoystick->pNext = SYS_Joystick;
+ s_bDeviceAdded = SDL_TRUE;
+
+ return DIENUM_CONTINUE; /* get next device, please */
+}
+
+static void
+AddXInputDevice(const Uint8 userid, JoyStick_DeviceData **pContext)
+{
+ char name[32];
+ JoyStick_DeviceData *pPrevJoystick = NULL;
+ JoyStick_DeviceData *pNewJoystick = *pContext;
+
+ while (pNewJoystick) {
+ if ((pNewJoystick->bXInputDevice) && (pNewJoystick->XInputUserId == userid)) {
+ /* if we are replacing the front of the list then update it */
+ if (pNewJoystick == *pContext) {
+ *pContext = pNewJoystick->pNext;
+ } else if (pPrevJoystick) {
+ pPrevJoystick->pNext = pNewJoystick->pNext;
+ }
+
+ pNewJoystick->pNext = SYS_Joystick;
+ SYS_Joystick = pNewJoystick;
+ return; /* already in the list. */
+ }
+
+ pPrevJoystick = pNewJoystick;
+ pNewJoystick = pNewJoystick->pNext;
}
+
+ pNewJoystick = (JoyStick_DeviceData *) SDL_malloc(sizeof (JoyStick_DeviceData));
+ if (!pNewJoystick) {
+ return; /* better luck next time? */
+ }
+ SDL_zerop(pNewJoystick);
+
+ SDL_snprintf(name, sizeof (name), "XInput Controller #%u", ((unsigned int) userid) + 1);
+ pNewJoystick->joystickname = SDL_strdup(name);
+ if (!pNewJoystick->joystickname) {
+ SDL_free(pNewJoystick);
+ return; /* better luck next time? */
+ }
+
+ pNewJoystick->bXInputDevice = SDL_TRUE;
+ pNewJoystick->XInputUserId = userid;
+ pNewJoystick->send_add_event = 1;
+ pNewJoystick->nInstanceID = ++s_nInstanceID;
+ pNewJoystick->pNext = SYS_Joystick;
SYS_Joystick = pNewJoystick;
- s_pKnownJoystickGUIDs[ s_iNewGUID ] = pdidInstance->guidInstance;
- s_iNewGUID++;
+ s_bDeviceAdded = SDL_TRUE;
+}
- if ( s_iNewGUID < MAX_JOYSTICKS )
- return DIENUM_CONTINUE; /* already have this joystick loaded, just keep going */
- else
- return DIENUM_STOP;
+static void
+EnumXInputDevices(JoyStick_DeviceData **pContext)
+{
+ if (s_bXInputEnabled) {
+ int iuserid;
+ /* iterate in reverse, so these are in the final list in ascending numeric order. */
+ for (iuserid = SDL_XINPUT_MAX_DEVICES-1; iuserid >= 0; iuserid--) {
+ const Uint8 userid = (Uint8) iuserid;
+ XINPUT_CAPABILITIES capabilities;
+ if (XINPUTGETCAPABILITIES(userid, XINPUT_FLAG_GAMEPAD, &capabilities) == ERROR_SUCCESS) {
+ /* Current version of XInput mistakenly returns 0 as the Type. Ignore it and ensure the subtype is a gamepad. */
+ /* !!! FIXME: we might want to support steering wheels or guitars or whatever laster. */
+ if (capabilities.SubType == XINPUT_DEVSUBTYPE_GAMEPAD) {
+ AddXInputDevice(userid, pContext);
+ }
+ }
+ }
+ }
}
+
/* detect any new joysticks being inserted into the system */
void SDL_SYS_JoystickDetect()
{
@@ -853,25 +791,27 @@ void SDL_SYS_JoystickDetect()
/* only enum the devices if the joystick thread told us something changed */
if ( s_bDeviceAdded || s_bDeviceRemoved )
{
+ SDL_LockMutex( s_mutexJoyStickEnum );
+
s_bDeviceAdded = SDL_FALSE;
s_bDeviceRemoved = SDL_FALSE;
pCurList = SYS_Joystick;
SYS_Joystick = NULL;
- s_iNewGUID = 0;
- SDL_LockMutex( s_mutexJoyStickEnum );
-
- if ( !s_pKnownJoystickGUIDs )
- s_pKnownJoystickGUIDs = SDL_malloc( sizeof(GUID)*MAX_JOYSTICKS );
-
- SDL_memset( s_pKnownJoystickGUIDs, 0x0, sizeof(GUID)*MAX_JOYSTICKS );
- /* Look for joysticks, wheels, head trackers, gamepads, etc.. */
+ /* Look for DirectInput joysticks, wheels, head trackers, gamepads, etc.. */
IDirectInput8_EnumDevices(dinput,
DI8DEVCLASS_GAMECTRL,
EnumJoysticksCallback,
&pCurList, DIEDFL_ATTACHEDONLY);
+ SDL_free(SDL_RawDevList); /* in case we used this in DirectInput enumerator. */
+ SDL_RawDevList = NULL;
+ SDL_RawDevListCount = 0;
+
+ /* Look for XInput devices. Do this last, so they're first in the final list. */
+ EnumXInputDevices(&pCurList);
+
SDL_UnlockMutex( s_mutexJoyStickEnum );
}
@@ -895,7 +835,7 @@ void SDL_SYS_JoystickDetect()
pListNext = pCurList->pNext;
SDL_free(pCurList->joystickname);
- SDL_free( pCurList );
+ SDL_free(pCurList);
pCurList = pListNext;
}
@@ -974,17 +914,11 @@ int
SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
{
HRESULT result;
- LPDIRECTINPUTDEVICE8 device;
- DIPROPDWORD dipdw;
JoyStick_DeviceData *joystickdevice = SYS_Joystick;
for (; device_index > 0; device_index--)
joystickdevice = joystickdevice->pNext;
- SDL_memset(&dipdw, 0, sizeof(DIPROPDWORD));
- dipdw.diph.dwSize = sizeof(DIPROPDWORD);
- dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-
/* allocate memory for system specific hardware data */
joystick->instance_id = joystickdevice->nInstanceID;
joystick->closed = 0;
@@ -993,71 +927,50 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
if (joystick->hwdata == NULL) {
return SDL_OutOfMemory();
}
- SDL_memset(joystick->hwdata, 0, sizeof(struct joystick_hwdata));
- joystick->hwdata->buffered = 1;
- joystick->hwdata->removed = 0;
- joystick->hwdata->Capabilities.dwSize = sizeof(DIDEVCAPS);
- joystick->hwdata->guid = joystickdevice->guid;
+ SDL_zerop(joystick->hwdata);
- if ( joystickdevice->bXInputDevice )
- {
+ if (joystickdevice->bXInputDevice) {
+ const SDL_bool bIs14OrLater = (SDL_XInputVersion >= ((1<<16)|4));
+ const Uint8 userId = joystickdevice->XInputUserId;
XINPUT_CAPABILITIES capabilities;
- Uint8 userId = 0;
- DWORD result;
- JoyStick_DeviceData *joysticklist = SYS_Joystick;
- /* scan the opened joysticks and pick the next free xinput userid for this one */
- for( ; joysticklist; joysticklist = joysticklist->pNext)
- {
- if ( joysticklist->bXInputDevice && joysticklist->XInputUserId == userId )
- userId++;
- }
-
- if ( s_bXInputEnabled && XINPUTGETCAPABILITIES )
- {
- result = XINPUTGETCAPABILITIES( userId, XINPUT_FLAG_GAMEPAD, &capabilities );
- if ( result == ERROR_SUCCESS )
- {
- const SDL_bool bIs14OrLater = (SDL_XInputVersion >= ((1<<16)|4));
- SDL_bool bIsSupported = SDL_FALSE;
- /* Current version of XInput mistakenly returns 0 as the Type. Ignore it and ensure the subtype is a gamepad. */
- bIsSupported = ( capabilities.SubType == XINPUT_DEVSUBTYPE_GAMEPAD );
- if ( !bIsSupported )
- {
- joystickdevice->bXInputDevice = SDL_FALSE;
- }
- else
- {
- /* valid */
- joystick->hwdata->bXInputDevice = SDL_TRUE;
- if ((!bIs14OrLater) || (capabilities.Flags & XINPUT_CAPS_FFB_SUPPORTED)) {
- joystick->hwdata->bXInputHaptic = SDL_TRUE;
- }
- SDL_memset( joystick->hwdata->XInputState, 0x0, sizeof(joystick->hwdata->XInputState) );
- joystickdevice->XInputUserId = userId;
- joystick->hwdata->userid = userId;
- joystick->hwdata->currentXInputSlot = 0;
- /* The XInput API has a hard coded button/axis mapping, so we just match it */
- joystick->naxes = 6;
- joystick->nbuttons = 15;
- joystick->nballs = 0;
- joystick->nhats = 0;
- }
- }
- else
- {
- joystickdevice->bXInputDevice = SDL_FALSE;
+ SDL_assert(s_bXInputEnabled);
+ SDL_assert(XINPUTGETCAPABILITIES);
+ SDL_assert(userId >= 0);
+ SDL_assert(userId < SDL_XINPUT_MAX_DEVICES);
+
+ joystick->hwdata->bXInputDevice = SDL_TRUE;
+
+ if (XINPUTGETCAPABILITIES(userId, XINPUT_FLAG_GAMEPAD, &capabilities) != ERROR_SUCCESS) {
+ SDL_free(joystick->hwdata);
+ joystick->hwdata = NULL;
+ return SDL_SetError("Failed to obtain XInput device capabilities. Device disconnected?");
+ } else {
+ /* Current version of XInput mistakenly returns 0 as the Type. Ignore it and ensure the subtype is a gamepad. */
+ SDL_assert(capabilities.SubType == XINPUT_DEVSUBTYPE_GAMEPAD);
+ if ((!bIs14OrLater) || (capabilities.Flags & XINPUT_CAPS_FFB_SUPPORTED)) {
+ joystick->hwdata->bXInputHaptic = SDL_TRUE;
}
- }
- else
- {
- joystickdevice->bXInputDevice = SDL_FALSE;
- }
- }
-
- if ( joystickdevice->bXInputDevice == SDL_FALSE )
- {
- joystick->hwdata->bXInputDevice = SDL_FALSE;
+ joystick->hwdata->userid = userId;
+
+ /* The XInput API has a hard coded button/axis mapping, so we just match it */
+ joystick->naxes = 6;
+ joystick->nbuttons = 15;
+ joystick->nballs = 0;
+ joystick->nhats = 0;
+ }
+ } else { /* use DirectInput, not XInput. */
+ LPDIRECTINPUTDEVICE8 device;
+ DIPROPDWORD dipdw;
+
+ joystick->hwdata->buffered = 1;
+ joystick->hwdata->removed = 0;
+ joystick->hwdata->Capabilities.dwSize = sizeof(DIDEVCAPS);
+ joystick->hwdata->guid = joystickdevice->guid;
+
+ SDL_zero(dipdw);
+ dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+ dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
result =
IDirectInput8_CreateDevice(dinput,
@@ -1642,29 +1555,13 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
void
SDL_SYS_JoystickClose(SDL_Joystick * joystick)
{
- if ( joystick->hwdata->bXInputDevice )
- {
- JoyStick_DeviceData *joysticklist = SYS_Joystick;
- /* scan the opened joysticks and clear the userid for this instance */
- for( ; joysticklist; joysticklist = joysticklist->pNext)
- {
- if ( joysticklist->bXInputDevice && joysticklist->nInstanceID == joystick->instance_id )
- {
- joysticklist->XInputUserId = INVALID_XINPUT_USERID;
- }
- }
-
- }
- else
- {
+ if (!joystick->hwdata->bXInputDevice) {
IDirectInputDevice8_Unacquire(joystick->hwdata->InputDevice);
IDirectInputDevice8_Release(joystick->hwdata->InputDevice);
}
- if (joystick->hwdata != NULL) {
- /* free system specific hardware data */
- SDL_free(joystick->hwdata);
- }
+ /* free system specific hardware data */
+ SDL_free(joystick->hwdata);
joystick->closed = 1;
}
@@ -1709,18 +1606,11 @@ SDL_SYS_JoystickQuit(void)
coinitialized = SDL_FALSE;
}
- if ( s_pKnownJoystickGUIDs )
- {
- SDL_free( s_pKnownJoystickGUIDs );
- s_pKnownJoystickGUIDs = NULL;
- }
-
if (s_bXInputEnabled) {
WIN_UnloadXInputDLL();
}
}
-
/* return the stable device guid for this device index */
SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
{
@@ -1750,6 +1640,12 @@ SDL_bool SDL_SYS_IsXInputDeviceIndex(int device_index)
return device->bXInputDevice;
}
+/* return SDL_TRUE if this device was opened with XInput */
+SDL_bool SDL_SYS_IsXInputJoystick(SDL_Joystick * joystick)
+{
+ return joystick->hwdata->bXInputDevice;
+}
+
#endif /* SDL_JOYSTICK_DINPUT */
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_dxjoystick_c.h b/src/joystick/windows/SDL_dxjoystick_c.h
index 01cfca9..1a4703e 100644
--- a/src/joystick/windows/SDL_dxjoystick_c.h
+++ b/src/joystick/windows/SDL_dxjoystick_c.h
@@ -42,7 +42,18 @@
#include <xinput.h>
#include <devguid.h>
#include <dbt.h>
-#include <xinput.h>
+
+
+#ifndef XUSER_MAX_COUNT
+#define XUSER_MAX_COUNT 4
+#endif
+#ifndef XUSER_INDEX_ANY
+#define XUSER_INDEX_ANY 0x000000FF
+#endif
+#ifndef XINPUT_CAPS_FFB_SUPPORTED
+#define XINPUT_CAPS_FFB_SUPPORTED 0x0001
+#endif
+
/* typedef's for XInput structs we use */
typedef struct
@@ -94,13 +105,8 @@ extern DWORD SDL_XInputVersion; /* ((major << 16) & 0xFF00) | (minor & 0xFF) */
#define XINPUTGETSTATE SDL_XInputGetState
#define XINPUTSETSTATE SDL_XInputSetState
#define XINPUTGETCAPABILITIES SDL_XInputGetCapabilities
-#define INVALID_XINPUT_USERID 255
-#define SDL_XINPUT_MAX_DEVICES 4
-
-#ifndef XINPUT_CAPS_FFB_SUPPORTED
-#define XINPUT_CAPS_FFB_SUPPORTED 0x0001
-#endif
-
+#define INVALID_XINPUT_USERID XUSER_INDEX_ANY
+#define SDL_XINPUT_MAX_DEVICES XUSER_MAX_COUNT
#define MAX_INPUTS 256 /* each joystick can have up to 256 inputs */
diff --git a/src/joystick/windows/SDL_mmjoystick.c b/src/joystick/windows/SDL_mmjoystick.c
index 413053f..e012d44 100644
--- a/src/joystick/windows/SDL_mmjoystick.c
+++ b/src/joystick/windows/SDL_mmjoystick.c
@@ -33,6 +33,11 @@
#include "../SDL_sysjoystick.h"
#include "../SDL_joystick_c.h"
+#ifdef REGSTR_VAL_JOYOEMNAME
+#undef REGSTR_VAL_JOYOEMNAME
+#endif
+#define REGSTR_VAL_JOYOEMNAME "OEMName"
+
#define MAX_JOYSTICKS 16
#define MAX_AXES 6 /* each joystick can have up to 6 axes */
#define MAX_BUTTONS 32 /* and 32 buttons */
@@ -45,7 +50,7 @@
/* array to hold joystick ID values */
static UINT SYS_JoystickID[MAX_JOYSTICKS];
-static JOYCAPS SYS_Joystick[MAX_JOYSTICKS];
+static JOYCAPSA SYS_Joystick[MAX_JOYSTICKS];
static char *SYS_JoystickName[MAX_JOYSTICKS];
/* The private structure used to keep track of a joystick */
@@ -148,7 +153,7 @@ SDL_SYS_JoystickInit(void)
int i;
int maxdevs;
JOYINFOEX joyinfo;
- JOYCAPS joycaps;
+ JOYCAPSA joycaps;
MMRESULT result;
/* Reset the joystick ID & name mapping tables */
@@ -166,7 +171,7 @@ SDL_SYS_JoystickInit(void)
joyinfo.dwFlags = JOY_RETURNALL;
result = joyGetPosEx(i, &joyinfo);
if (result == JOYERR_NOERROR) {
- result = joyGetDevCaps(i, &joycaps, sizeof(joycaps));
+ result = joyGetDevCapsA(i, &joycaps, sizeof(joycaps));
if (result == JOYERR_NOERROR) {
SYS_JoystickID[SDL_SYS_numjoysticks] = i;
SYS_Joystick[SDL_SYS_numjoysticks] = joycaps;
@@ -384,11 +389,9 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
void
SDL_SYS_JoystickClose(SDL_Joystick * joystick)
{
- if (joystick->hwdata != NULL) {
- /* free system specific hardware data */
- SDL_free(joystick->hwdata);
- joystick->hwdata = NULL;
- }
+ /* free system specific hardware data */
+ SDL_free(joystick->hwdata);
+ joystick->hwdata = NULL;
}
/* Function to perform any system-specific joystick related cleanup */
@@ -397,10 +400,8 @@ SDL_SYS_JoystickQuit(void)
{
int i;
for (i = 0; i < MAX_JOYSTICKS; i++) {
- if (SYS_JoystickName[i] != NULL) {
- SDL_free(SYS_JoystickName[i]);
- SYS_JoystickName[i] = NULL;
- }
+ SDL_free(SYS_JoystickName[i]);
+ SYS_JoystickName[i] = NULL;
}
}
diff --git a/src/libm/e_atan2.c b/src/libm/e_atan2.c
index 3f1ee57..f7b91a3 100644
--- a/src/libm/e_atan2.c
+++ b/src/libm/e_atan2.c
@@ -81,8 +81,8 @@ double attribute_hidden __ieee754_atan2(double y, double x)
switch(m) {
case 0: return pi_o_4+tiny;/* atan(+INF,+INF) */
case 1: return -pi_o_4-tiny;/* atan(-INF,+INF) */
- case 2: return 3.0*pi_o_4+tiny;/*atan(+INF,-INF)*/
- case 3: return -3.0*pi_o_4-tiny;/*atan(-INF,-INF)*/
+ case 2: return 3.0*pi_o_4+tiny;/* atan(+INF,-INF) */
+ case 3: return -3.0*pi_o_4-tiny;/* atan(-INF,-INF) */
}
} else {
switch(m) {
diff --git a/src/libm/e_pow.c b/src/libm/e_pow.c
index 9145c4b..686da2e 100644
--- a/src/libm/e_pow.c
+++ b/src/libm/e_pow.c
@@ -178,7 +178,7 @@ libm_hidden_proto(scalbn)
/* special value of x */
if (lx == 0) {
if (ix == 0x7ff00000 || ix == 0 || ix == 0x3ff00000) {
- z = ax; /*x is +-0,+-inf,+-1 */
+ z = ax; /* x is +-0,+-inf,+-1 */
if (hy < 0)
z = one / z; /* z = (1/|x|) */
if (hx < 0) {
diff --git a/src/libm/math_private.h b/src/libm/math_private.h
index c5ab63d..6ab0f35 100644
--- a/src/libm/math_private.h
+++ b/src/libm/math_private.h
@@ -17,9 +17,9 @@
#ifndef _MATH_PRIVATE_H_
#define _MATH_PRIVATE_H_
-/*#include <endian.h>*/
+/* #include <endian.h> */
#include "SDL_endian.h"
-/*#include <sys/types.h>*/
+/* #include <sys/types.h> */
#define attribute_hidden
#define libm_hidden_proto(x)
diff --git a/src/libm/s_scalbn.c b/src/libm/s_scalbn.c
index 74b9794..f824e92 100644
--- a/src/libm/s_scalbn.c
+++ b/src/libm/s_scalbn.c
@@ -54,7 +54,7 @@ libm_hidden_proto(scalbn)
GET_HIGH_WORD(hx, x);
k = ((hx & 0x7ff00000) >> 20) - 54;
if (n < -50000)
- return tiny * x; /*underflow */
+ return tiny * x; /* underflow */
}
if (k == 0x7ff)
return x + x; /* NaN or Inf */
@@ -67,9 +67,9 @@ libm_hidden_proto(scalbn)
}
if (k <= -54) {
if (n > 50000) /* in case integer overflow in n+k */
- return huge_val * copysign(huge_val, x); /*overflow */
+ return huge_val * copysign(huge_val, x); /* overflow */
else
- return tiny * copysign(tiny, x); /*underflow */
+ return tiny * copysign(tiny, x); /* underflow */
}
k += 54; /* subnormal result */
SET_HIGH_WORD(x, (hx & 0x800fffff) | (k << 20));
diff --git a/src/main/android/SDL_android_main.c b/src/main/android/SDL_android_main.c
index 0622a12..8f00f39 100644
--- a/src/main/android/SDL_android_main.c
+++ b/src/main/android/SDL_android_main.c
@@ -11,10 +11,10 @@
*******************************************************************************/
#include <jni.h>
-// Called before SDL_main() to initialize JNI bindings in SDL library
+/* Called before SDL_main() to initialize JNI bindings in SDL library */
extern void SDL_Android_Init(JNIEnv* env, jclass cls);
-// Start up the SDL app
+/* Start up the SDL app */
void Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject obj)
{
/* This interface could expand with ABI negotiation, calbacks, etc. */
@@ -30,7 +30,7 @@ void Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject
status = SDL_main(1, argv);
/* Do not issue an exit or the whole application will terminate instead of just the SDL thread */
- //exit(status);
+ /* exit(status); */
}
#endif /* __ANDROID__ */
diff --git a/src/main/beos/SDL_BApp.h b/src/main/beos/SDL_BApp.h
index 2a64455..9b731e3 100644
--- a/src/main/beos/SDL_BApp.h
+++ b/src/main/beos/SDL_BApp.h
@@ -371,7 +371,7 @@ private:
/* Members */
- vector<SDL_Window*> _window_map; /* Keeps track of SDL_Windows by index-id*/
+ std::vector<SDL_Window*> _window_map; /* Keeps track of SDL_Windows by index-id */
display_mode *_saved_mode;
BGLView *_current_context;
diff --git a/src/main/windows/SDL_windows_main.c b/src/main/windows/SDL_windows_main.c
index 519ce14..4e8e3f2 100644
--- a/src/main/windows/SDL_windows_main.c
+++ b/src/main/windows/SDL_windows_main.c
@@ -7,12 +7,12 @@
#ifdef __WIN32__
+/* Include this so we define UNICODE properly */
+#include "../../core/windows/SDL_windows.h"
+
#include <stdio.h>
#include <stdlib.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
/* Include the SDL main definition header */
#include "SDL.h"
#include "SDL_main.h"
diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc
index 129a1f5..b096a91 100644
--- a/src/main/windows/version.rc
+++ b/src/main/windows/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,0,1,0
+ PRODUCTVERSION 2,0,1,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "2, 0, 0, 0\0"
+ VALUE "FileVersion", "2, 0, 1, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright © 2013 Sam Lantinga\0"
- VALUE "OriginalFilename", "SDL.dll\0"
+ VALUE "OriginalFilename", "SDL2.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 0, 0, 0\0"
+ VALUE "ProductVersion", "2, 0, 1, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/power/uikit/SDL_syspower.m b/src/power/uikit/SDL_syspower.m
index 3364da5..f870ea2 100644
--- a/src/power/uikit/SDL_syspower.m
+++ b/src/power/uikit/SDL_syspower.m
@@ -38,11 +38,7 @@ void
SDL_UIKit_UpdateBatteryMonitoring(void)
{
if (SDL_UIKitLastPowerInfoQuery) {
- const Uint32 prev = SDL_UIKitLastPowerInfoQuery;
- const UInt32 now = SDL_GetTicks();
- const UInt32 ticks = now - prev;
- /* if timer wrapped (now < prev), shut down, too. */
- if ((now < prev) || (ticks >= BATTERY_MONITORING_TIMEOUT)) {
+ if (SDL_TICKS_PASSED(SDL_GetTicks(), SDL_UIKitLastPowerInfoQuery + BATTERY_MONITORING_TIMEOUT)) {
UIDevice *uidev = [UIDevice currentDevice];
SDL_assert([uidev isBatteryMonitoringEnabled] == YES);
[uidev setBatteryMonitoringEnabled:NO];
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index 5827a55..e2ca09b 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -22,6 +22,7 @@
/* The SDL 2D rendering system */
+#include "SDL_assert.h"
#include "SDL_hints.h"
#include "SDL_log.h"
#include "SDL_render.h"
@@ -120,7 +121,12 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
/* Window was resized, reset viewport */
int w, h;
- SDL_GetWindowSize(window, &w, &h);
+ if (renderer->GetOutputSize) {
+ renderer->GetOutputSize(renderer, &w, &h);
+ } else {
+ SDL_GetWindowSize(renderer->window, &w, &h);
+ }
+
if (renderer->target) {
renderer->viewport_backup.x = 0;
renderer->viewport_backup.y = 0;
@@ -338,11 +344,11 @@ SDL_GetRendererOutputSize(SDL_Renderer * renderer, int *w, int *h)
if (renderer->target) {
return SDL_QueryTexture(renderer->target, NULL, NULL, w, h);
+ } else if (renderer->GetOutputSize) {
+ return renderer->GetOutputSize(renderer, w, h);
} else if (renderer->window) {
SDL_GetWindowSize(renderer->window, w, h);
return 0;
- } else if (renderer->GetOutputSize) {
- return renderer->GetOutputSize(renderer, w, h);
} else {
/* This should never happen */
SDL_SetError("Renderer doesn't support querying output size");
@@ -407,6 +413,11 @@ SDL_CreateTexture(SDL_Renderer * renderer, Uint32 format, int access, int w, int
SDL_SetError("Texture dimensions can't be 0");
return NULL;
}
+ if ((renderer->info.max_texture_width && w > renderer->info.max_texture_width) ||
+ (renderer->info.max_texture_height && h > renderer->info.max_texture_height)) {
+ SDL_SetError("Texture dimensions are limited to %dx%d", renderer->info.max_texture_width, renderer->info.max_texture_height);
+ return NULL;
+ }
texture = (SDL_Texture *) SDL_calloc(1, sizeof(*texture));
if (!texture) {
SDL_OutOfMemory();
@@ -803,6 +814,110 @@ SDL_UpdateTexture(SDL_Texture * texture, const SDL_Rect * rect,
}
static int
+SDL_UpdateTextureYUVPlanar(SDL_Texture * texture, const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch)
+{
+ SDL_Texture *native = texture->native;
+ SDL_Rect full_rect;
+
+ if (SDL_SW_UpdateYUVTexturePlanar(texture->yuv, rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch) < 0) {
+ return -1;
+ }
+
+ full_rect.x = 0;
+ full_rect.y = 0;
+ full_rect.w = texture->w;
+ full_rect.h = texture->h;
+ rect = &full_rect;
+
+ if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+ /* We can lock the texture and copy to it */
+ void *native_pixels;
+ int native_pitch;
+
+ if (SDL_LockTexture(native, rect, &native_pixels, &native_pitch) < 0) {
+ return -1;
+ }
+ SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
+ rect->w, rect->h, native_pixels, native_pitch);
+ SDL_UnlockTexture(native);
+ } else {
+ /* Use a temporary buffer for updating */
+ void *temp_pixels;
+ int temp_pitch;
+
+ temp_pitch = (((rect->w * SDL_BYTESPERPIXEL(native->format)) + 3) & ~3);
+ temp_pixels = SDL_malloc(rect->h * temp_pitch);
+ if (!temp_pixels) {
+ return SDL_OutOfMemory();
+ }
+ SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
+ rect->w, rect->h, temp_pixels, temp_pitch);
+ SDL_UpdateTexture(native, rect, temp_pixels, temp_pitch);
+ SDL_free(temp_pixels);
+ }
+ return 0;
+}
+
+int SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch)
+{
+ SDL_Renderer *renderer;
+ SDL_Rect full_rect;
+
+ CHECK_TEXTURE_MAGIC(texture, -1);
+
+ if (!Yplane) {
+ return SDL_InvalidParamError("Yplane");
+ }
+ if (!Ypitch) {
+ return SDL_InvalidParamError("Ypitch");
+ }
+ if (!Uplane) {
+ return SDL_InvalidParamError("Uplane");
+ }
+ if (!Upitch) {
+ return SDL_InvalidParamError("Upitch");
+ }
+ if (!Vplane) {
+ return SDL_InvalidParamError("Vplane");
+ }
+ if (!Vpitch) {
+ return SDL_InvalidParamError("Vpitch");
+ }
+
+ if (texture->format != SDL_PIXELFORMAT_YV12 &&
+ texture->format != SDL_PIXELFORMAT_IYUV) {
+ return SDL_SetError("Texture format must by YV12 or IYUV");
+ }
+
+ if (!rect) {
+ full_rect.x = 0;
+ full_rect.y = 0;
+ full_rect.w = texture->w;
+ full_rect.h = texture->h;
+ rect = &full_rect;
+ }
+
+ if (texture->yuv) {
+ return SDL_UpdateTextureYUVPlanar(texture, rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch);
+ } else {
+ SDL_assert(!texture->native);
+ renderer = texture->renderer;
+ SDL_assert(renderer->UpdateTextureYUV);
+ if (renderer->UpdateTextureYUV) {
+ return renderer->UpdateTextureYUV(renderer, texture, rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch);
+ } else {
+ return SDL_Unsupported();
+ }
+ }
+}
+
+static int
SDL_LockTextureYUV(SDL_Texture * texture, const SDL_Rect * rect,
void **pixels, int *pitch)
{
@@ -1715,9 +1830,7 @@ SDL_DestroyTexture(SDL_Texture * texture)
if (texture->yuv) {
SDL_SW_DestroyYUVTexture(texture->yuv);
}
- if (texture->pixels) {
- SDL_free(texture->pixels);
- }
+ SDL_free(texture->pixels);
renderer->DestroyTexture(renderer, texture);
SDL_free(texture);
diff --git a/src/render/SDL_sysrender.h b/src/render/SDL_sysrender.h
index 1050465..b1b6915 100644
--- a/src/render/SDL_sysrender.h
+++ b/src/render/SDL_sysrender.h
@@ -89,6 +89,11 @@ struct SDL_Renderer
int (*UpdateTexture) (SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, const void *pixels,
int pitch);
+ int (*UpdateTextureYUV) (SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch);
int (*LockTexture) (SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, void **pixels, int *pitch);
void (*UnlockTexture) (SDL_Renderer * renderer, SDL_Texture * texture);
diff --git a/src/render/SDL_yuv_sw.c b/src/render/SDL_yuv_sw.c
index bb235b0..14b825d 100644
--- a/src/render/SDL_yuv_sw.c
+++ b/src/render/SDL_yuv_sw.c
@@ -958,10 +958,10 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
if (SDL_HasMMX() && (Rmask == 0xF800) &&
(Gmask == 0x07E0) && (Bmask == 0x001F)
&& (swdata->w & 15) == 0) {
-/*printf("Using MMX 16-bit 565 dither\n");*/
+/* printf("Using MMX 16-bit 565 dither\n"); */
swdata->Display1X = Color565DitherYV12MMX1X;
} else {
-/*printf("Using C 16-bit dither\n");*/
+/* printf("Using C 16-bit dither\n"); */
swdata->Display1X = Color16DitherYV12Mod1X;
}
#else
@@ -979,10 +979,10 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
if (SDL_HasMMX() && (Rmask == 0x00FF0000) &&
(Gmask == 0x0000FF00) &&
(Bmask == 0x000000FF) && (swdata->w & 15) == 0) {
-/*printf("Using MMX 32-bit dither\n");*/
+/* printf("Using MMX 32-bit dither\n"); */
swdata->Display1X = ColorRGBDitherYV12MMX1X;
} else {
-/*printf("Using C 32-bit dither\n");*/
+/* printf("Using C 32-bit dither\n"); */
swdata->Display1X = Color32DitherYV12Mod1X;
}
#else
@@ -1012,10 +1012,8 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
break;
}
- if (swdata->display) {
- SDL_FreeSurface(swdata->display);
- swdata->display = NULL;
- }
+ SDL_FreeSurface(swdata->display);
+ swdata->display = NULL;
return 0;
}
@@ -1187,6 +1185,61 @@ SDL_SW_UpdateYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
}
int
+SDL_SW_UpdateYUVTexturePlanar(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch)
+{
+ const Uint8 *src;
+ Uint8 *dst;
+ int row;
+ size_t length;
+
+ /* Copy the Y plane */
+ src = Yplane;
+ dst = swdata->pixels + rect->y * swdata->w + rect->x;
+ length = rect->w;
+ for (row = 0; row < rect->h; ++row) {
+ SDL_memcpy(dst, src, length);
+ src += Ypitch;
+ dst += swdata->w;
+ }
+
+ /* Copy the U plane */
+ src = Uplane;
+ if (swdata->format == SDL_PIXELFORMAT_IYUV) {
+ dst = swdata->pixels + swdata->h * swdata->w;
+ } else {
+ dst = swdata->pixels + swdata->h * swdata->w +
+ (swdata->h * swdata->w) / 4;
+ }
+ dst += rect->y/2 * swdata->w/2 + rect->x/2;
+ length = rect->w / 2;
+ for (row = 0; row < rect->h/2; ++row) {
+ SDL_memcpy(dst, src, length);
+ src += Upitch;
+ dst += swdata->w/2;
+ }
+
+ /* Copy the V plane */
+ src = Vplane;
+ if (swdata->format == SDL_PIXELFORMAT_YV12) {
+ dst = swdata->pixels + swdata->h * swdata->w;
+ } else {
+ dst = swdata->pixels + swdata->h * swdata->w +
+ (swdata->h * swdata->w) / 4;
+ }
+ dst += rect->y/2 * swdata->w/2 + rect->x/2;
+ length = rect->w / 2;
+ for (row = 0; row < rect->h/2; ++row) {
+ SDL_memcpy(dst, src, length);
+ src += Vpitch;
+ dst += swdata->w/2;
+ }
+ return 0;
+}
+
+int
SDL_SW_LockYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
void **pixels, int *pitch)
{
@@ -1335,21 +1388,11 @@ void
SDL_SW_DestroyYUVTexture(SDL_SW_YUVTexture * swdata)
{
if (swdata) {
- if (swdata->pixels) {
- SDL_free(swdata->pixels);
- }
- if (swdata->colortab) {
- SDL_free(swdata->colortab);
- }
- if (swdata->rgb_2_pix) {
- SDL_free(swdata->rgb_2_pix);
- }
- if (swdata->stretch) {
- SDL_FreeSurface(swdata->stretch);
- }
- if (swdata->display) {
- SDL_FreeSurface(swdata->display);
- }
+ SDL_free(swdata->pixels);
+ SDL_free(swdata->colortab);
+ SDL_free(swdata->rgb_2_pix);
+ SDL_FreeSurface(swdata->stretch);
+ SDL_FreeSurface(swdata->display);
SDL_free(swdata);
}
}
diff --git a/src/render/SDL_yuv_sw_c.h b/src/render/SDL_yuv_sw_c.h
index 9debacb..f128041 100644
--- a/src/render/SDL_yuv_sw_c.h
+++ b/src/render/SDL_yuv_sw_c.h
@@ -57,6 +57,10 @@ int SDL_SW_QueryYUVTexturePixels(SDL_SW_YUVTexture * swdata, void **pixels,
int *pitch);
int SDL_SW_UpdateYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
const void *pixels, int pitch);
+int SDL_SW_UpdateYUVTexturePlanar(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch);
int SDL_SW_LockYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
void **pixels, int *pitch);
void SDL_SW_UnlockYUVTexture(SDL_SW_YUVTexture * swdata);
diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
index e9fc0ce..a4c6027 100644
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -22,14 +22,14 @@
#if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED
-
#include "../../core/windows/SDL_windows.h"
#include "SDL_hints.h"
#include "SDL_loadso.h"
#include "SDL_syswm.h"
+#include "SDL_system.h"
#include "../SDL_sysrender.h"
-#include <stdio.h>
+#include "../../video/windows/SDL_windowsvideo.h"
#if SDL_VIDEO_RENDER_D3D
#define D3D_DEBUG_INFO
@@ -207,6 +207,11 @@ static int D3D_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
static int D3D_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, const void *pixels,
int pitch);
+static int D3D_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch);
static int D3D_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, void **pixels, int *pitch);
static void D3D_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
@@ -395,6 +400,73 @@ D3DFMTToPixelFormat(D3DFORMAT format)
}
}
+static void
+D3D_InitRenderState(D3D_RenderData *data)
+{
+ D3DMATRIX matrix;
+
+ IDirect3DDevice9 *device = data->device;
+
+ IDirect3DDevice9_SetVertexShader(device, NULL);
+ IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1);
+ IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE);
+ IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE);
+ IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE);
+
+ /* Enable color modulation by diffuse color */
+ IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP,
+ D3DTOP_MODULATE);
+ IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1,
+ D3DTA_TEXTURE);
+ IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG2,
+ D3DTA_DIFFUSE);
+
+ /* Enable alpha modulation by diffuse alpha */
+ IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP,
+ D3DTOP_MODULATE);
+ IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1,
+ D3DTA_TEXTURE);
+ IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG2,
+ D3DTA_DIFFUSE);
+
+ /* Enable separate alpha blend function, if possible */
+ if (data->enableSeparateAlphaBlend) {
+ IDirect3DDevice9_SetRenderState(device, D3DRS_SEPARATEALPHABLENDENABLE, TRUE);
+ }
+
+ /* Disable second texture stage, since we're done */
+ IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP,
+ D3DTOP_DISABLE);
+ IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_ALPHAOP,
+ D3DTOP_DISABLE);
+
+ /* Set an identity world and view matrix */
+ matrix.m[0][0] = 1.0f;
+ matrix.m[0][1] = 0.0f;
+ matrix.m[0][2] = 0.0f;
+ matrix.m[0][3] = 0.0f;
+ matrix.m[1][0] = 0.0f;
+ matrix.m[1][1] = 1.0f;
+ matrix.m[1][2] = 0.0f;
+ matrix.m[1][3] = 0.0f;
+ matrix.m[2][0] = 0.0f;
+ matrix.m[2][1] = 0.0f;
+ matrix.m[2][2] = 1.0f;
+ matrix.m[2][3] = 0.0f;
+ matrix.m[3][0] = 0.0f;
+ matrix.m[3][1] = 0.0f;
+ matrix.m[3][2] = 0.0f;
+ matrix.m[3][3] = 1.0f;
+ IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &matrix);
+ IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &matrix);
+
+ /* Reset our current scale mode */
+ SDL_memset(data->scaleMode, 0xFF, sizeof(data->scaleMode));
+
+ /* Start the render with beginScene */
+ data->beginScene = SDL_TRUE;
+}
+
static int
D3D_Reset(SDL_Renderer * renderer)
{
@@ -416,14 +488,9 @@ D3D_Reset(SDL_Renderer * renderer)
return D3D_SetError("Reset()", result);
}
}
- IDirect3DDevice9_SetVertexShader(data->device, NULL);
- IDirect3DDevice9_SetFVF(data->device,
- D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1);
- IDirect3DDevice9_SetRenderState(data->device, D3DRS_CULLMODE,
- D3DCULL_NONE);
- IDirect3DDevice9_SetRenderState(data->device, D3DRS_LIGHTING, FALSE);
+
IDirect3DDevice9_GetRenderTarget(data->device, 0, &data->defaultRenderTarget);
- SDL_memset(data->scaleMode, 0xFF, sizeof(data->scaleMode));
+ D3D_InitRenderState(data);
D3D_UpdateViewport(renderer);
return 0;
}
@@ -476,15 +543,17 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
D3D_RenderData *data;
SDL_SysWMinfo windowinfo;
HRESULT result;
+ const char *hint;
D3DPRESENT_PARAMETERS pparams;
IDirect3DSwapChain9 *chain;
D3DCAPS9 caps;
+ DWORD device_flags;
Uint32 window_flags;
int w, h;
SDL_DisplayMode fullscreen_mode;
- D3DMATRIX matrix;
int d3dxVersion;
char d3dxDLLFile[50];
+ int displayIndex;
renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
if (!renderer) {
@@ -499,21 +568,7 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
return NULL;
}
- data->d3dDLL = SDL_LoadObject("D3D9.DLL");
- if (data->d3dDLL) {
- IDirect3D9 *(WINAPI * D3DCreate) (UINT SDKVersion);
-
- D3DCreate =
- (IDirect3D9 * (WINAPI *) (UINT)) SDL_LoadFunction(data->d3dDLL,
- "Direct3DCreate9");
- if (D3DCreate) {
- data->d3d = D3DCreate(D3D_SDK_VERSION);
- }
- if (!data->d3d) {
- SDL_UnloadObject(data->d3dDLL);
- data->d3dDLL = NULL;
- }
-
+ if( D3D_LoadDLL( &data->d3dDLL, &data->d3d ) ) {
for (d3dxVersion=50;d3dxVersion>0;d3dxVersion--) {
LPTSTR dllName;
SDL_snprintf(d3dxDLLFile, sizeof(d3dxDLLFile), "D3DX9_%02d.dll", d3dxVersion);
@@ -535,8 +590,6 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
}
}
-
-
if (!data->d3d || !data->matrixStack) {
SDL_free(renderer);
SDL_free(data);
@@ -547,6 +600,7 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->WindowEvent = D3D_WindowEvent;
renderer->CreateTexture = D3D_CreateTexture;
renderer->UpdateTexture = D3D_UpdateTexture;
+ renderer->UpdateTextureYUV = D3D_UpdateTextureYUV;
renderer->LockTexture = D3D_LockTexture;
renderer->UnlockTexture = D3D_UnlockTexture;
renderer->SetRenderTarget = D3D_SetRenderTarget;
@@ -606,26 +660,34 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
pparams.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
}
- /* FIXME: Which adapter? */
- data->adapter = D3DADAPTER_DEFAULT;
+ /* Get the adapter for the display that the window is on */
+ displayIndex = SDL_GetWindowDisplayIndex( window );
+ data->adapter = SDL_Direct3D9GetAdapterIndex( displayIndex );
+
IDirect3D9_GetDeviceCaps(data->d3d, data->adapter, D3DDEVTYPE_HAL, &caps);
+ device_flags = D3DCREATE_FPU_PRESERVE;
+ if (caps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) {
+ device_flags |= D3DCREATE_HARDWARE_VERTEXPROCESSING;
+ } else {
+ device_flags |= D3DCREATE_SOFTWARE_VERTEXPROCESSING;
+ }
+
+ hint = SDL_GetHint(SDL_HINT_RENDER_DIRECT3D_THREADSAFE);
+ if (hint && SDL_atoi(hint)) {
+ device_flags |= D3DCREATE_MULTITHREADED;
+ }
+
result = IDirect3D9_CreateDevice(data->d3d, data->adapter,
D3DDEVTYPE_HAL,
pparams.hDeviceWindow,
- D3DCREATE_FPU_PRESERVE | ((caps.
- DevCaps &
- D3DDEVCAPS_HWTRANSFORMANDLIGHT) ?
- D3DCREATE_HARDWARE_VERTEXPROCESSING :
- D3DCREATE_SOFTWARE_VERTEXPROCESSING),
+ device_flags,
&pparams, &data->device);
if (FAILED(result)) {
D3D_DestroyRenderer(renderer);
D3D_SetError("CreateDevice()", result);
return NULL;
}
- data->beginScene = SDL_TRUE;
- SDL_memset(data->scaleMode, 0xFF, sizeof(data->scaleMode));
/* Get presentation parameters to fill info */
result = IDirect3DDevice9_GetSwapChain(data->device, 0, &chain);
@@ -658,61 +720,12 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
data->enableSeparateAlphaBlend = SDL_TRUE;
}
- /* Set up parameters for rendering */
- IDirect3DDevice9_SetVertexShader(data->device, NULL);
- IDirect3DDevice9_SetFVF(data->device,
- D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1);
- IDirect3DDevice9_SetRenderState(data->device, D3DRS_ZENABLE, D3DZB_FALSE);
- IDirect3DDevice9_SetRenderState(data->device, D3DRS_CULLMODE,
- D3DCULL_NONE);
- IDirect3DDevice9_SetRenderState(data->device, D3DRS_LIGHTING, FALSE);
- /* Enable color modulation by diffuse color */
- IDirect3DDevice9_SetTextureStageState(data->device, 0, D3DTSS_COLOROP,
- D3DTOP_MODULATE);
- IDirect3DDevice9_SetTextureStageState(data->device, 0, D3DTSS_COLORARG1,
- D3DTA_TEXTURE);
- IDirect3DDevice9_SetTextureStageState(data->device, 0, D3DTSS_COLORARG2,
- D3DTA_DIFFUSE);
- /* Enable alpha modulation by diffuse alpha */
- IDirect3DDevice9_SetTextureStageState(data->device, 0, D3DTSS_ALPHAOP,
- D3DTOP_MODULATE);
- IDirect3DDevice9_SetTextureStageState(data->device, 0, D3DTSS_ALPHAARG1,
- D3DTA_TEXTURE);
- IDirect3DDevice9_SetTextureStageState(data->device, 0, D3DTSS_ALPHAARG2,
- D3DTA_DIFFUSE);
- /* Enable separate alpha blend function, if possible */
- if (data->enableSeparateAlphaBlend) {
- IDirect3DDevice9_SetRenderState(data->device, D3DRS_SEPARATEALPHABLENDENABLE, TRUE);
- }
- /* Disable second texture stage, since we're done */
- IDirect3DDevice9_SetTextureStageState(data->device, 1, D3DTSS_COLOROP,
- D3DTOP_DISABLE);
- IDirect3DDevice9_SetTextureStageState(data->device, 1, D3DTSS_ALPHAOP,
- D3DTOP_DISABLE);
-
/* Store the default render target */
IDirect3DDevice9_GetRenderTarget(data->device, 0, &data->defaultRenderTarget );
data->currentRenderTarget = NULL;
- /* Set an identity world and view matrix */
- matrix.m[0][0] = 1.0f;
- matrix.m[0][1] = 0.0f;
- matrix.m[0][2] = 0.0f;
- matrix.m[0][3] = 0.0f;
- matrix.m[1][0] = 0.0f;
- matrix.m[1][1] = 1.0f;
- matrix.m[1][2] = 0.0f;
- matrix.m[1][3] = 0.0f;
- matrix.m[2][0] = 0.0f;
- matrix.m[2][1] = 0.0f;
- matrix.m[2][2] = 1.0f;
- matrix.m[2][3] = 0.0f;
- matrix.m[3][0] = 0.0f;
- matrix.m[3][1] = 0.0f;
- matrix.m[3][2] = 0.0f;
- matrix.m[3][3] = 1.0f;
- IDirect3DDevice9_SetTransform(data->device, D3DTS_WORLD, &matrix);
- IDirect3DDevice9_SetTransform(data->device, D3DTS_VIEW, &matrix);
+ /* Set up parameters for rendering */
+ D3D_InitRenderState(data);
if (caps.MaxSimultaneousTextures >= 3)
{
@@ -864,7 +877,7 @@ GetScaleQuality(void)
if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
return D3DTEXF_POINT;
- } else /*if (*hint == '1' || SDL_strcasecmp(hint, "linear") == 0)*/ {
+ } else /* if (*hint == '1' || SDL_strcasecmp(hint, "linear") == 0) */ {
return D3DTEXF_LINEAR;
}
}
@@ -1014,6 +1027,36 @@ D3D_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
}
static int
+D3D_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch)
+{
+ D3D_TextureData *data = (D3D_TextureData *) texture->driverdata;
+ SDL_bool full_texture = SDL_FALSE;
+
+#ifdef USE_DYNAMIC_TEXTURE
+ if (texture->access == SDL_TEXTUREACCESS_STREAMING &&
+ rect->x == 0 && rect->y == 0 &&
+ rect->w == texture->w && rect->h == texture->h) {
+ full_texture = SDL_TRUE;
+ }
+#endif
+
+ if (D3D_UpdateTextureInternal(data->texture, texture->format, full_texture, rect->x, rect->y, rect->w, rect->h, Yplane, Ypitch) < 0) {
+ return -1;
+ }
+ if (D3D_UpdateTextureInternal(data->utexture, texture->format, full_texture, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, Uplane, Upitch) < 0) {
+ return -1;
+ }
+ if (D3D_UpdateTextureInternal(data->vtexture, texture->format, full_texture, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, Vplane, Vpitch) < 0) {
+ return -1;
+ }
+ return 0;
+}
+
+static int
D3D_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, void **pixels, int *pitch)
{
@@ -1023,7 +1066,7 @@ D3D_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
HRESULT result;
if (data->yuv) {
- // It's more efficient to upload directly...
+ /* It's more efficient to upload directly... */
if (!data->pixels) {
data->pitch = texture->w;
data->pixels = (Uint8 *)SDL_malloc((texture->h * data->pitch * 3) / 2);
@@ -1173,6 +1216,7 @@ D3D_RenderClear(SDL_Renderer * renderer)
D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
DWORD color;
HRESULT result;
+ int BackBufferWidth, BackBufferHeight;
if (D3D_ActivateRenderer(renderer) < 0) {
return -1;
@@ -1180,10 +1224,18 @@ D3D_RenderClear(SDL_Renderer * renderer)
color = D3DCOLOR_ARGB(renderer->a, renderer->r, renderer->g, renderer->b);
+ if (renderer->target) {
+ BackBufferWidth = renderer->target->w;
+ BackBufferHeight = renderer->target->h;
+ } else {
+ BackBufferWidth = data->pparams.BackBufferWidth;
+ BackBufferHeight = data->pparams.BackBufferHeight;
+ }
+
/* Don't reset the viewport if we don't have to! */
if (!renderer->viewport.x && !renderer->viewport.y &&
- renderer->viewport.w == data->pparams.BackBufferWidth &&
- renderer->viewport.h == data->pparams.BackBufferHeight) {
+ renderer->viewport.w == BackBufferWidth &&
+ renderer->viewport.h == BackBufferHeight) {
result = IDirect3DDevice9_Clear(data->device, 0, NULL, D3DCLEAR_TARGET, color, 0.0f, 0);
} else {
D3DVIEWPORT9 viewport;
@@ -1191,8 +1243,8 @@ D3D_RenderClear(SDL_Renderer * renderer)
/* Clear is defined to clear the entire render target */
viewport.X = 0;
viewport.Y = 0;
- viewport.Width = data->pparams.BackBufferWidth;
- viewport.Height = data->pparams.BackBufferHeight;
+ viewport.Width = BackBufferWidth;
+ viewport.Height = BackBufferHeight;
viewport.MinZ = 0.0f;
viewport.MaxZ = 1.0f;
IDirect3DDevice9_SetViewport(data->device, &viewport);
@@ -1803,9 +1855,7 @@ D3D_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
if (data->vtexture) {
IDirect3DTexture9_Release(data->vtexture);
}
- if (data->pixels) {
- SDL_free(data->pixels);
- }
+ SDL_free(data->pixels);
SDL_free(data);
texture->driverdata = NULL;
}
@@ -1825,7 +1875,9 @@ D3D_DestroyRenderer(SDL_Renderer * renderer)
IDirect3DSurface9_Release(data->currentRenderTarget);
data->currentRenderTarget = NULL;
}
-
+ if (data->ps_yuv) {
+ IDirect3DPixelShader9_Release(data->ps_yuv);
+ }
if (data->device) {
IDirect3DDevice9_Release(data->device);
}
@@ -1839,6 +1891,25 @@ D3D_DestroyRenderer(SDL_Renderer * renderer)
SDL_free(renderer);
}
+IDirect3DDevice9 *
+SDL_RenderGetD3D9Device(SDL_Renderer * renderer)
+{
+ D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+ IDirect3DDevice9 *device;
+
+ // Make sure that this is a D3D renderer
+ if (renderer->DestroyRenderer != D3D_DestroyRenderer) {
+ SDL_SetError("Renderer is not a D3D renderer");
+ return NULL;
+ }
+
+ device = data->device;
+ if (device) {
+ IDirect3DDevice9_AddRef( device );
+ }
+ return device;
+}
+
#endif /* SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED */
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengl/SDL_glfuncs.h b/src/render/opengl/SDL_glfuncs.h
index 7544929..4915c64 100644
--- a/src/render/opengl/SDL_glfuncs.h
+++ b/src/render/opengl/SDL_glfuncs.h
@@ -89,8 +89,8 @@ SDL_PROC_UNUSED(void, glDepthFunc, (GLenum func))
SDL_PROC_UNUSED(void, glDepthMask, (GLboolean flag))
SDL_PROC_UNUSED(void, glDepthRange, (GLclampd zNear, GLclampd zFar))
SDL_PROC(void, glDisable, (GLenum cap))
-SDL_PROC_UNUSED(void, glDisableClientState, (GLenum array))
-SDL_PROC_UNUSED(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
+SDL_PROC(void, glDisableClientState, (GLenum array))
+SDL_PROC(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
SDL_PROC_UNUSED(void, glDrawBuffer, (GLenum mode))
SDL_PROC_UNUSED(void, glDrawElements,
(GLenum mode, GLsizei count, GLenum type,
@@ -103,7 +103,7 @@ SDL_PROC_UNUSED(void, glEdgeFlagPointer,
(GLsizei stride, const GLvoid * pointer))
SDL_PROC_UNUSED(void, glEdgeFlagv, (const GLboolean * flag))
SDL_PROC(void, glEnable, (GLenum cap))
-SDL_PROC_UNUSED(void, glEnableClientState, (GLenum array))
+SDL_PROC(void, glEnableClientState, (GLenum array))
SDL_PROC(void, glEnd, (void))
SDL_PROC_UNUSED(void, glEndList, (void))
SDL_PROC_UNUSED(void, glEvalCoord1d, (GLdouble u))
@@ -448,7 +448,7 @@ SDL_PROC_UNUSED(void, glVertex4iv, (const GLint * v))
SDL_PROC_UNUSED(void, glVertex4s,
(GLshort x, GLshort y, GLshort z, GLshort w))
SDL_PROC_UNUSED(void, glVertex4sv, (const GLshort * v))
-SDL_PROC_UNUSED(void, glVertexPointer,
+SDL_PROC(void, glVertexPointer,
(GLint size, GLenum type, GLsizei stride,
const GLvoid * pointer))
SDL_PROC(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index 697a974..51fc9ad 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -47,10 +47,16 @@ static const float inv255f = 1.0f / 255.0f;
static SDL_Renderer *GL_CreateRenderer(SDL_Window * window, Uint32 flags);
static void GL_WindowEvent(SDL_Renderer * renderer,
const SDL_WindowEvent *event);
+static int GL_GetOutputSize(SDL_Renderer * renderer, int *w, int *h);
static int GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
static int GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, const void *pixels,
int pitch);
+static int GL_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch);
static int GL_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, void **pixels, int *pitch);
static void GL_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
@@ -310,7 +316,7 @@ GL_ResetState(SDL_Renderer *renderer)
data->glDisable(GL_DEPTH_TEST);
data->glDisable(GL_CULL_FACE);
/* This ended up causing video discrepancies between OpenGL and Direct3D */
- /*data->glEnable(GL_LINE_SMOOTH);*/
+ /* data->glEnable(GL_LINE_SMOOTH); */
data->glMatrixMode(GL_MODELVIEW);
data->glLoadIdentity();
@@ -399,8 +405,10 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
}
renderer->WindowEvent = GL_WindowEvent;
+ renderer->GetOutputSize = GL_GetOutputSize;
renderer->CreateTexture = GL_CreateTexture;
renderer->UpdateTexture = GL_UpdateTexture;
+ renderer->UpdateTextureYUV = GL_UpdateTextureYUV;
renderer->LockTexture = GL_LockTexture;
renderer->UnlockTexture = GL_UnlockTexture;
renderer->SetRenderTarget = GL_SetRenderTarget;
@@ -506,6 +514,10 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_IYUV;
}
+#ifdef __MACOSX__
+ renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_UYVY;
+#endif
+
if (SDL_GL_ExtensionSupported("GL_EXT_framebuffer_object")) {
data->GL_EXT_framebuffer_object_supported = SDL_TRUE;
data->glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)
@@ -539,6 +551,14 @@ GL_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
}
}
+static int
+GL_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
+{
+ SDL_GL_GetDrawableSize(renderer->window, w, h);
+
+ return 0;
+}
+
SDL_FORCE_INLINE int
power_of_2(int input)
{
@@ -566,6 +586,13 @@ convert_format(GL_RenderData *renderdata, Uint32 pixel_format,
*format = GL_LUMINANCE;
*type = GL_UNSIGNED_BYTE;
break;
+#ifdef __MACOSX__
+ case SDL_PIXELFORMAT_UYVY:
+ *internalFormat = GL_RGB8;
+ *format = GL_YCBCR_422_APPLE;
+ *type = GL_UNSIGNED_SHORT_8_8_APPLE;
+ break;
+#endif
default:
return SDL_FALSE;
}
@@ -623,8 +650,6 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
}
}
- texture->driverdata = data;
-
if (texture->access == SDL_TEXTUREACCESS_TARGET) {
data->fbo = GL_GetFBO(renderdata, texture->w, texture->h);
} else {
@@ -637,8 +662,10 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
SDL_free(data);
return -1;
}
+ texture->driverdata = data;
+
if ((renderdata->GL_ARB_texture_rectangle_supported)
- /*&& texture->access != SDL_TEXTUREACCESS_TARGET*/){
+ /* && texture->access != SDL_TEXTUREACCESS_TARGET */){
data->type = GL_TEXTURE_RECTANGLE_ARB;
texture_w = texture->w;
texture_h = texture->h;
@@ -788,6 +815,43 @@ GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
data->format, data->formattype, pixels);
}
renderdata->glDisable(data->type);
+
+ return GL_CheckError("glTexSubImage2D()", renderer);
+}
+
+static int
+GL_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+ const SDL_Rect * rect,
+ const Uint8 *Yplane, int Ypitch,
+ const Uint8 *Uplane, int Upitch,
+ const Uint8 *Vplane, int Vpitch)
+{
+ GL_RenderData *renderdata = (GL_RenderData *) renderer->driverdata;
+ GL_TextureData *data = (GL_TextureData *) texture->driverdata;
+
+ GL_ActivateRenderer(renderer);
+
+ renderdata->glEnable(data->type);
+ renderdata->glBindTexture(data->type, data->texture);
+ renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH, Ypitch);
+ renderdata->glTexSubImage2D(data->type, 0, rect->x, rect->y, rect->w,
+ rect->h, data->format, data->formattype,
+ Yplane);
+
+ renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH, Upitch);
+ renderdata->glBindTexture(data->type, data->utexture);
+ renderdata->glTexSubImage2D(data->type, 0, rect->x/2, rect->y/2,
+ rect->w/2, rect->h/2,
+ data->format, data->formattype, Uplane);
+
+ renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH, Vpitch);
+ renderdata->glBindTexture(data->type, data->vtexture);
+ renderdata->glTexSubImage2D(data->type, 0, rect->x/2, rect->y/2,
+ rect->w/2, rect->h/2,
+ data->format, data->formattype, Vplane);
+ renderdata->glDisable(data->type);
+
return GL_CheckError("glTexSubImage2D()", renderer);
}
@@ -984,15 +1048,17 @@ GL_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points,
int count)
{
GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
- int i;
GL_SetDrawingState(renderer);
- data->glBegin(GL_POINTS);
- for (i = 0; i < count; ++i) {
- data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
- }
- data->glEnd();
+ data->glTranslatef(0.5f, 0.5f, 0.0f);
+ data->glVertexPointer(2, GL_FLOAT, 0, points);
+ data->glEnableClientState(GL_VERTEX_ARRAY);
+
+ data->glDrawArrays(GL_POINTS, 0, count);
+
+ data->glDisableClientState(GL_VERTEX_ARRAY);
+ data->glTranslatef(-0.5f, -0.5f, 0.0f);
return 0;
}
@@ -1002,61 +1068,28 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_FPoint * points,
int count)
{
GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
- int i;
GL_SetDrawingState(renderer);
+ data->glTranslatef(0.5f, 0.5f, 0.0f);
+ data->glVertexPointer(2, GL_FLOAT, 0, points);
+ data->glEnableClientState(GL_VERTEX_ARRAY);
+
if (count > 2 &&
points[0].x == points[count-1].x && points[0].y == points[count-1].y) {
- data->glBegin(GL_LINE_LOOP);
/* GL_LINE_LOOP takes care of the final segment */
- --count;
- for (i = 0; i < count; ++i) {
- data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
- }
- data->glEnd();
+ data->glDrawArrays(GL_LINE_LOOP, 0, count-1);
} else {
-#if defined(__APPLE__) || defined(__WIN32__)
-#else
- int x1, y1, x2, y2;
-#endif
-
- data->glBegin(GL_LINE_STRIP);
- for (i = 0; i < count; ++i) {
- data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
- }
- data->glEnd();
-
- /* The line is half open, so we need one more point to complete it.
- * http://www.opengl.org/documentation/specs/version1.1/glspec1.1/node47.html
- * If we have to, we can use vertical line and horizontal line textures
- * for vertical and horizontal lines, and then create custom textures
- * for diagonal lines and software render those. It's terrible, but at
- * least it would be pixel perfect.
- */
- data->glBegin(GL_POINTS);
-#if defined(__APPLE__) || defined(__WIN32__)
- /* Mac OS X and Windows seem to always leave the second point open */
- data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y);
-#else
- /* Linux seems to leave the right-most or bottom-most point open */
- x1 = points[0].x;
- y1 = points[0].y;
- x2 = points[count-1].x;
- y2 = points[count-1].y;
-
- if (x1 > x2) {
- data->glVertex2f(0.5f + x1, 0.5f + y1);
- } else if (x2 > x1) {
- data->glVertex2f(0.5f + x2, 0.5f + y2);
- } else if (y1 > y2) {
- data->glVertex2f(0.5f + x1, 0.5f + y1);
- } else if (y2 > y1) {
- data->glVertex2f(0.5f + x2, 0.5f + y2);
- }
-#endif
- data->glEnd();
+ data->glDrawArrays(GL_LINE_STRIP, 0, count);
}
+ /* Make sure all the line endpoints are closed.
+ * http://www.opengl.org/documentation/specs/version1.1/glspec1.1/node47.html
+ * Which points need to be drawn varies by driver, so just draw all of them.
+ */
+ data->glDrawArrays(GL_POINTS, 0, count);
+ data->glDisableClientState(GL_VERTEX_ARRAY);
+ data->glTranslatef(-0.5f, -0.5f, 0.0f);
+
return GL_CheckError("", renderer);
}
@@ -1267,7 +1300,9 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
format, type, temp_pixels);
- GL_CheckError("", renderer);
+ if (GL_CheckError("glReadPixels()", renderer) < 0) {
+ return -1;
+ }
/* Flip the rows to be top-down */
length = rect->w * SDL_BYTESPERPIXEL(temp_format);
@@ -1318,9 +1353,7 @@ GL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
renderdata->glDeleteTextures(1, &data->utexture);
renderdata->glDeleteTextures(1, &data->vtexture);
}
- if (data->pixels) {
- SDL_free(data->pixels);
- }
+ SDL_free(data->pixels);
SDL_free(data);
texture->driverdata = NULL;
}
diff --git a/src/render/opengl/SDL_shaders_gl.c b/src/render/opengl/SDL_shaders_gl.c
index 1e62621..ebf641b 100644
--- a/src/render/opengl/SDL_shaders_gl.c
+++ b/src/render/opengl/SDL_shaders_gl.c
@@ -30,7 +30,7 @@
/* OpenGL shader implementation */
-/*#define DEBUG_SHADERS*/
+/* #define DEBUG_SHADERS */
typedef struct
{
diff --git a/src/render/opengles/SDL_glesfuncs.h b/src/render/opengles/SDL_glesfuncs.h
index 4a6384d..ff5ce76 100644
--- a/src/render/opengles/SDL_glesfuncs.h
+++ b/src/render/opengles/SDL_glesfuncs.h
@@ -1,6 +1,6 @@
SDL_PROC(void, glBindTexture, (GLenum, GLuint))
SDL_PROC(void, glBlendFunc, (GLenum, GLenum))
-SDL_PROC(void, glBlendFuncSeparateOES, (GLenum, GLenum, GLenum, GLenum))
+SDL_PROC_OES(void, glBlendFuncSeparateOES, (GLenum, GLenum, GLenum, GLenum))
SDL_PROC(void, glClear, (GLbitfield))
SDL_PROC(void, glClearColor, (GLclampf, GLclampf, GLclampf, GLclampf))
SDL_PROC(void, glColor4f, (GLfloat, GLfloat, GLfloat, GLfloat))
@@ -8,11 +8,11 @@ SDL_PROC(void, glDeleteTextures, (GLsizei, const GLuint *))
SDL_PROC(void, glDisable, (GLenum))
SDL_PROC(void, glDisableClientState, (GLenum array))
SDL_PROC(void, glDrawArrays, (GLenum, GLint, GLsizei))
-SDL_PROC(void, glDrawTexfOES, (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC_OES(void, glDrawTexfOES, (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat))
SDL_PROC(void, glEnable, (GLenum))
SDL_PROC(void, glEnableClientState, (GLenum))
SDL_PROC(void, glFinish, (void))
-SDL_PROC(void, glGenFramebuffersOES, (GLsizei, GLuint *))
+SDL_PROC_OES(void, glGenFramebuffersOES, (GLsizei, GLuint *))
SDL_PROC(void, glGenTextures, (GLsizei, GLuint *))
SDL_PROC(GLenum, glGetError, (void))
SDL_PROC(void, glGetIntegerv, (GLenum, GLint *))
@@ -30,13 +30,13 @@ SDL_PROC(void, glTexParameteriv, (GLenum, GLenum, const GLint *))
SDL_PROC(void, glTexSubImage2D, (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *))
SDL_PROC(void, glVertexPointer, (GLint, GLenum, GLsizei, const GLvoid *))
SDL_PROC(void, glViewport, (GLint, GLint, GLsizei, GLsizei))
-SDL_PROC(void, glBindFramebufferOES, (GLenum, GLuint))
-SDL_PROC(void, glFramebufferTexture2DOES, (GLenum, GLenum, GLenum, GLuint, GLint))
-SDL_PROC(GLenum, glCheckFramebufferStatusOES, (GLenum))
+SDL_PROC_OES(void, glBindFramebufferOES, (GLenum, GLuint))
+SDL_PROC_OES(void, glFramebufferTexture2DOES, (GLenum, GLenum, GLenum, GLuint, GLint))
+SDL_PROC_OES(GLenum, glCheckFramebufferStatusOES, (GLenum))
SDL_PROC(void, glPushMatrix, (void))
SDL_PROC(void, glTranslatef, (GLfloat, GLfloat, GLfloat))
SDL_PROC(void, glRotatef, (GLfloat, GLfloat, GLfloat, GLfloat))
SDL_PROC(void, glPopMatrix, (void))
-SDL_PROC(void, glDeleteFramebuffersOES, (GLsizei, const GLuint*))
+SDL_PROC_OES(void, glDeleteFramebuffersOES, (GLsizei, const GLuint*))
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c
index ab0f01d..3be1998 100644
--- a/src/render/opengles/SDL_render_gles.c
+++ b/src/render/opengles/SDL_render_gles.c
@@ -96,7 +96,7 @@ SDL_RenderDriver GLES_RenderDriver = {
GLES_CreateRenderer,
{
"opengles",
- (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE),
+ (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC ),
1,
{SDL_PIXELFORMAT_ABGR8888},
0,
@@ -113,8 +113,10 @@ typedef struct
} current;
#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
+#define SDL_PROC_OES SDL_PROC
#include "SDL_glesfuncs.h"
#undef SDL_PROC
+#undef SDL_PROC_OES
SDL_bool GL_OES_framebuffer_object_supported;
GLES_FBOList *framebuffers;
GLuint window_framebuffer;
@@ -183,6 +185,7 @@ static int GLES_LoadFunctions(GLES_RenderData * data)
#ifdef __SDL_NOGETPROCADDR__
#define SDL_PROC(ret,func,params) data->func=func;
+#define SDL_PROC_OES(ret,func,params) data->func=func;
#else
#define SDL_PROC(ret,func,params) \
do { \
@@ -191,10 +194,15 @@ static int GLES_LoadFunctions(GLES_RenderData * data)
return SDL_SetError("Couldn't load GLES function %s: %s\n", #func, SDL_GetError()); \
} \
} while ( 0 );
+#define SDL_PROC_OES(ret,func,params) \
+ do { \
+ data->func = SDL_GL_GetProcAddress(#func); \
+ } while ( 0 );
#endif /* _SDL_NOGETPROCADDR_ */
#include "SDL_glesfuncs.h"
#undef SDL_PROC
+#undef SDL_PROC_OES
return 0;
}
@@ -272,7 +280,7 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
GLint value;
Uint32 windowFlags;
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_EGL, 1);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
@@ -367,7 +375,8 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
renderer->info.max_texture_height = value;
- if (SDL_GL_ExtensionSupported("GL_OES_framebuffer_object")) {
+ /* Android does not report GL_OES_framebuffer_object but the functionality seems to be there anyway */
+ if (SDL_GL_ExtensionSupported("GL_OES_framebuffer_object") || data->glGenFramebuffersOES) {
data->GL_OES_framebuffer_object_supported = SDL_TRUE;
renderer->info.flags |= SDL_RENDERER_TARGETTEXTURE;
@@ -405,7 +414,7 @@ GLES_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
}
}
-static __inline__ int
+static SDL_INLINE int
power_of_2(int input)
{
int value = 1;
@@ -465,12 +474,17 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
}
}
- texture->driverdata = data;
+
if (texture->access == SDL_TEXTUREACCESS_TARGET) {
- data->fbo = GLES_GetFBO(renderer->driverdata, texture->w, texture->h);
+ if (!renderdata->GL_OES_framebuffer_object_supported) {
+ SDL_free(data);
+ return SDL_SetError("GL_OES_framebuffer_object not supported");
+ }
+ data->fbo = GLES_GetFBO(renderer->driverdata, texture->w, texture->h);
} else {
- data->fbo = NULL;
+ data->fbo = NULL;
}
+
renderdata->glGetError();
renderdata->glEnable(GL_TEXTURE_2D);
@@ -503,8 +517,11 @@ GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
result = renderdata->glGetError();
if (result != GL_NO_ERROR) {
+ SDL_free(data);
return GLES_SetError("glTexImage2D()", result);
}
+
+ texture->driverdata = data;
return 0;
}
@@ -556,9 +573,7 @@ GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
data->format,
data->formattype,
src);
- if (blob) {
- SDL_free(blob);
- }
+ SDL_free(blob);
if (renderdata->glGetError() != GL_NO_ERROR)
{
@@ -602,6 +617,10 @@ GLES_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
GLenum status;
GLES_ActivateRenderer(renderer);
+
+ if (!data->GL_OES_framebuffer_object_supported) {
+ return SDL_SetError("Can't enable render target support in this renderer");
+ }
if (texture == NULL) {
data->glBindFramebufferOES(GL_FRAMEBUFFER_OES, data->window_framebuffer);
@@ -843,6 +862,8 @@ GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata;
GLfloat minx, miny, maxx, maxy;
GLfloat minu, maxu, minv, maxv;
+ GLfloat vertices[8];
+ GLfloat texCoords[8];
GLES_ActivateRenderer(renderer);
@@ -903,9 +924,6 @@ GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
maxv *= texturedata->texh;
- GLfloat vertices[8];
- GLfloat texCoords[8];
-
vertices[0] = minx;
vertices[1] = miny;
vertices[2] = maxx;
@@ -944,6 +962,9 @@ GLES_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
GLfloat minx, miny, maxx, maxy;
GLfloat minu, maxu, minv, maxv;
GLfloat centerx, centery;
+ GLfloat vertices[8];
+ GLfloat texCoords[8];
+
GLES_ActivateRenderer(renderer);
@@ -994,9 +1015,6 @@ GLES_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
maxv *= texturedata->texh;
- GLfloat vertices[8];
- GLfloat texCoords[8];
-
vertices[0] = minx;
vertices[1] = miny;
vertices[2] = maxx;
@@ -1096,9 +1114,7 @@ GLES_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
if (data->texture) {
renderdata->glDeleteTextures(1, &data->texture);
}
- if (data->pixels) {
- SDL_free(data->pixels);
- }
+ SDL_free(data->pixels);
SDL_free(data);
texture->driverdata = NULL;
}
diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
index a0ab943..31a1598 100644
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -25,6 +25,7 @@
#include "SDL_hints.h"
#include "SDL_opengles2.h"
#include "../SDL_sysrender.h"
+#include "../../video/SDL_blit.h"
#include "SDL_shaders_gles2.h"
/* Used to re-create the window with OpenGL ES capability */
@@ -81,6 +82,7 @@ typedef struct GLES2_ShaderCacheEntry
GLES2_ShaderType type;
const GLES2_ShaderInstance *instance;
int references;
+ Uint8 modulation_r, modulation_g, modulation_b, modulation_a;
struct GLES2_ShaderCacheEntry *prev;
struct GLES2_ShaderCacheEntry *next;
} GLES2_ShaderCacheEntry;
@@ -98,6 +100,9 @@ typedef struct GLES2_ProgramCacheEntry
GLES2_ShaderCacheEntry *vertex_shader;
GLES2_ShaderCacheEntry *fragment_shader;
GLuint uniform_locations[16];
+ Uint8 color_r, color_g, color_b, color_a;
+ Uint8 modulation_r, modulation_g, modulation_b, modulation_a;
+ GLfloat projection[4][4];
struct GLES2_ProgramCacheEntry *prev;
struct GLES2_ProgramCacheEntry *next;
} GLES2_ProgramCacheEntry;
@@ -122,8 +127,7 @@ typedef enum
GLES2_UNIFORM_PROJECTION,
GLES2_UNIFORM_TEXTURE,
GLES2_UNIFORM_MODULATION,
- GLES2_UNIFORM_COLOR,
- GLES2_UNIFORM_COLORTABLE
+ GLES2_UNIFORM_COLOR
} GLES2_Uniform;
typedef enum
@@ -138,6 +142,9 @@ typedef enum
typedef struct GLES2_DriverContext
{
SDL_GLContext *context;
+
+ SDL_bool debug_enabled;
+
struct {
int blendMode;
SDL_bool tex_coords;
@@ -154,10 +161,77 @@ typedef struct GLES2_DriverContext
GLES2_ShaderCache shader_cache;
GLES2_ProgramCache program_cache;
GLES2_ProgramCacheEntry *current_program;
+ Uint8 clear_r, clear_g, clear_b, clear_a;
} GLES2_DriverContext;
#define GLES2_MAX_CACHED_PROGRAMS 8
+
+SDL_FORCE_INLINE const char*
+GL_TranslateError (GLenum error)
+{
+#define GL_ERROR_TRANSLATE(e) case e: return #e;
+ switch (error) {
+ GL_ERROR_TRANSLATE(GL_INVALID_ENUM)
+ GL_ERROR_TRANSLATE(GL_INVALID_VALUE)
+ GL_ERROR_TRANSLATE(GL_INVALID_OPERATION)
+ GL_ERROR_TRANSLATE(GL_OUT_OF_MEMORY)
+ GL_ERROR_TRANSLATE(GL_NO_ERROR)
+ default:
+ return "UNKNOWN";
+}
+#undef GL_ERROR_TRANSLATE
+}
+
+SDL_FORCE_INLINE void
+GL_ClearErrors(SDL_Renderer *renderer)
+{
+ GLES2_DriverContext *data = (GLES2_DriverContext *) renderer->driverdata;
+
+ if (!data->debug_enabled)
+ {
+ return;
+ }
+ while (data->glGetError() != GL_NO_ERROR) {
+ continue;
+ }
+}
+
+SDL_FORCE_INLINE int
+GL_CheckAllErrors (const char *prefix, SDL_Renderer *renderer, const char *file, int line, const char *function)
+{
+ GLES2_DriverContext *data = (GLES2_DriverContext *) renderer->driverdata;
+ int ret = 0;
+
+ if (!data->debug_enabled)
+ {
+ return 0;
+ }
+ /* check gl errors (can return multiple errors) */
+ for (;;) {
+ GLenum error = data->glGetError();
+ if (error != GL_NO_ERROR) {
+ if (prefix == NULL || prefix[0] == '\0') {
+ prefix = "generic";
+ }
+ SDL_SetError("%s: %s (%d): %s %s (0x%X)", prefix, file, line, function, GL_TranslateError(error), error);
+ ret = -1;
+ } else {
+ break;
+ }
+ }
+ return ret;
+}
+
+#if 0
+#define GL_CheckError(prefix, renderer)
+#elif defined(_MSC_VER)
+#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, __FILE__, __LINE__, __FUNCTION__)
+#else
+#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+#endif
+
+
/*************************************************************************************************
* Renderer state APIs *
*************************************************************************************************/
@@ -222,26 +296,29 @@ GLES2_GetFBO(GLES2_DriverContext *data, Uint32 w, Uint32 h)
static int
GLES2_ActivateRenderer(SDL_Renderer * renderer)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
- if (SDL_CurrentContext != rdata->context) {
+ if (SDL_CurrentContext != data->context) {
/* Null out the current program to ensure we set it again */
- rdata->current_program = NULL;
+ data->current_program = NULL;
- if (SDL_GL_MakeCurrent(renderer->window, rdata->context) < 0) {
+ if (SDL_GL_MakeCurrent(renderer->window, data->context) < 0) {
return -1;
}
- SDL_CurrentContext = rdata->context;
+ SDL_CurrentContext = data->context;
GLES2_UpdateViewport(renderer);
}
+
+ GL_ClearErrors(renderer);
+
return 0;
}
static void
GLES2_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED ||
event->event == SDL_WINDOWEVENT_SHOWN ||
@@ -252,45 +329,45 @@ GLES2_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
if (event->event == SDL_WINDOWEVENT_MINIMIZED) {
/* According to Apple documentation, we need to finish drawing NOW! */
- rdata->glFinish();
+ data->glFinish();
}
}
static int
GLES2_UpdateViewport(SDL_Renderer * renderer)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
- if (SDL_CurrentContext != rdata->context) {
+ if (SDL_CurrentContext != data->context) {
/* We'll update the viewport after we rebind the context */
return 0;
}
- rdata->glViewport(renderer->viewport.x, renderer->viewport.y,
+ data->glViewport(renderer->viewport.x, renderer->viewport.y,
renderer->viewport.w, renderer->viewport.h);
- if (rdata->current_program) {
+ if (data->current_program) {
GLES2_SetOrthographicProjection(renderer);
}
- return 0;
+ return GL_CheckError("", renderer);
}
static int
GLES2_UpdateClipRect(SDL_Renderer * renderer)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
const SDL_Rect *rect = &renderer->clip_rect;
- if (SDL_CurrentContext != rdata->context) {
+ if (SDL_CurrentContext != data->context) {
/* We'll update the clip rect after we rebind the context */
return 0;
}
if (!SDL_RectEmpty(rect)) {
- rdata->glEnable(GL_SCISSOR_TEST);
- rdata->glScissor(rect->x, renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
+ data->glEnable(GL_SCISSOR_TEST);
+ data->glScissor(rect->x, renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
} else {
- rdata->glDisable(GL_SCISSOR_TEST);
+ data->glDisable(GL_SCISSOR_TEST);
}
return 0;
}
@@ -298,19 +375,19 @@ GLES2_UpdateClipRect(SDL_Renderer * renderer)
static void
GLES2_DestroyRenderer(SDL_Renderer *renderer)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
/* Deallocate everything */
- if (rdata) {
+ if (data) {
GLES2_ActivateRenderer(renderer);
{
GLES2_ShaderCacheEntry *entry;
GLES2_ShaderCacheEntry *next;
- entry = rdata->shader_cache.head;
+ entry = data->shader_cache.head;
while (entry)
{
- rdata->glDeleteShader(entry->id);
+ data->glDeleteShader(entry->id);
next = entry->next;
SDL_free(entry);
entry = next;
@@ -319,27 +396,26 @@ GLES2_DestroyRenderer(SDL_Renderer *renderer)
{
GLES2_ProgramCacheEntry *entry;
GLES2_ProgramCacheEntry *next;
- entry = rdata->program_cache.head;
+ entry = data->program_cache.head;
while (entry) {
- rdata->glDeleteProgram(entry->id);
+ data->glDeleteProgram(entry->id);
next = entry->next;
SDL_free(entry);
entry = next;
}
}
- if (rdata->context) {
- while (rdata->framebuffers) {
- GLES2_FBOList *nextnode = rdata->framebuffers->next;
- rdata->glDeleteFramebuffers(1, &rdata->framebuffers->FBO);
- SDL_free(rdata->framebuffers);
- rdata->framebuffers = nextnode;
+ if (data->context) {
+ while (data->framebuffers) {
+ GLES2_FBOList *nextnode = data->framebuffers->next;
+ data->glDeleteFramebuffers(1, &data->framebuffers->FBO);
+ GL_CheckError("", renderer);
+ SDL_free(data->framebuffers);
+ data->framebuffers = nextnode;
}
- SDL_GL_DeleteContext(rdata->context);
+ SDL_GL_DeleteContext(data->context);
}
- if (rdata->shader_formats) {
- SDL_free(rdata->shader_formats);
- }
- SDL_free(rdata);
+ SDL_free(data->shader_formats);
+ SDL_free(data);
}
SDL_free(renderer);
}
@@ -349,13 +425,13 @@ GLES2_DestroyRenderer(SDL_Renderer *renderer)
*************************************************************************************************/
static int GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture);
-static void GLES2_DestroyTexture(SDL_Renderer *renderer, SDL_Texture *texture);
+static int GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
+ const void *pixels, int pitch);
static int GLES2_LockTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
void **pixels, int *pitch);
static void GLES2_UnlockTexture(SDL_Renderer *renderer, SDL_Texture *texture);
-static int GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
- const void *pixels, int pitch);
static int GLES2_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture);
+static void GLES2_DestroyTexture(SDL_Renderer *renderer, SDL_Texture *texture);
static GLenum
GetScaleQuality(void)
@@ -372,8 +448,8 @@ GetScaleQuality(void)
static int
GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
- GLES2_TextureData *tdata;
+ GLES2_DriverContext *renderdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_TextureData *data;
GLenum format;
GLenum type;
GLenum scaleMode;
@@ -395,108 +471,57 @@ GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture)
}
/* Allocate a texture struct */
- tdata = (GLES2_TextureData *)SDL_calloc(1, sizeof(GLES2_TextureData));
- if (!tdata) {
+ data = (GLES2_TextureData *)SDL_calloc(1, sizeof(GLES2_TextureData));
+ if (!data) {
return SDL_OutOfMemory();
}
- tdata->texture = 0;
- tdata->texture_type = GL_TEXTURE_2D;
- tdata->pixel_format = format;
- tdata->pixel_type = type;
+ data->texture = 0;
+ data->texture_type = GL_TEXTURE_2D;
+ data->pixel_format = format;
+ data->pixel_type = type;
scaleMode = GetScaleQuality();
- /* Allocate a blob for image data */
+ /* Allocate a blob for image renderdata */
if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
- tdata->pitch = texture->w * SDL_BYTESPERPIXEL(texture->format);
- tdata->pixel_data = SDL_calloc(1, tdata->pitch * texture->h);
- if (!tdata->pixel_data) {
- SDL_free(tdata);
+ data->pitch = texture->w * SDL_BYTESPERPIXEL(texture->format);
+ data->pixel_data = SDL_calloc(1, data->pitch * texture->h);
+ if (!data->pixel_data) {
+ SDL_free(data);
return SDL_OutOfMemory();
}
}
/* Allocate the texture */
- rdata->glGetError();
- rdata->glGenTextures(1, &tdata->texture);
- if (rdata->glGetError() != GL_NO_ERROR) {
- SDL_free(tdata);
- return SDL_SetError("Texture creation failed in glGenTextures()");
- }
- rdata->glActiveTexture(GL_TEXTURE0);
- rdata->glBindTexture(tdata->texture_type, tdata->texture);
- rdata->glTexParameteri(tdata->texture_type, GL_TEXTURE_MIN_FILTER, scaleMode);
- rdata->glTexParameteri(tdata->texture_type, GL_TEXTURE_MAG_FILTER, scaleMode);
- rdata->glTexParameteri(tdata->texture_type, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- rdata->glTexParameteri(tdata->texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- rdata->glTexImage2D(tdata->texture_type, 0, format, texture->w, texture->h, 0, format, type, NULL);
- if (rdata->glGetError() != GL_NO_ERROR) {
- rdata->glDeleteTextures(1, &tdata->texture);
- SDL_free(tdata);
- return SDL_SetError("Texture creation failed");
+ GL_CheckError("", renderer);
+ renderdata->glGenTextures(1, &data->texture);
+ if (GL_CheckError("glGenTexures()", renderer) < 0) {
+ return -1;
+ }
+ texture->driverdata = data;
+ renderdata->glBindTexture(data->texture_type, data->texture);
+ renderdata->glTexParameteri(data->texture_type, GL_TEXTURE_MIN_FILTER, scaleMode);
+ renderdata->glTexParameteri(data->texture_type, GL_TEXTURE_MAG_FILTER, scaleMode);
+ renderdata->glTexParameteri(data->texture_type, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ renderdata->glTexParameteri(data->texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ renderdata->glTexImage2D(data->texture_type, 0, format, texture->w, texture->h, 0, format, type, NULL);
+ if (GL_CheckError("glTexImage2D()", renderer) < 0) {
+ return -1;
}
- texture->driverdata = tdata;
if (texture->access == SDL_TEXTUREACCESS_TARGET) {
- tdata->fbo = GLES2_GetFBO(renderer->driverdata, texture->w, texture->h);
+ data->fbo = GLES2_GetFBO(renderer->driverdata, texture->w, texture->h);
} else {
- tdata->fbo = NULL;
+ data->fbo = NULL;
}
- return 0;
-}
-
-static void
-GLES2_DestroyTexture(SDL_Renderer *renderer, SDL_Texture *texture)
-{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
- GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
-
- GLES2_ActivateRenderer(renderer);
-
- /* Destroy the texture */
- if (tdata)
- {
- rdata->glDeleteTextures(1, &tdata->texture);
- SDL_free(tdata->pixel_data);
- SDL_free(tdata);
- texture->driverdata = NULL;
- }
-}
-
-static int
-GLES2_LockTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
- void **pixels, int *pitch)
-{
- GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
-
- /* Retrieve the buffer/pitch for the specified region */
- *pixels = (Uint8 *)tdata->pixel_data +
- (tdata->pitch * rect->y) +
- (rect->x * SDL_BYTESPERPIXEL(texture->format));
- *pitch = tdata->pitch;
-
- return 0;
-}
-
-static void
-GLES2_UnlockTexture(SDL_Renderer *renderer, SDL_Texture *texture)
-{
- GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
- SDL_Rect rect;
-
- /* We do whole texture updates, at least for now */
- rect.x = 0;
- rect.y = 0;
- rect.w = texture->w;
- rect.h = texture->h;
- GLES2_UpdateTexture(renderer, texture, &rect, tdata->pixel_data, tdata->pitch);
+ return GL_CheckError("", renderer);
}
static int
GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
const void *pixels, int pitch)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
Uint8 *blob = NULL;
Uint8 *src;
@@ -528,11 +553,8 @@ GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
}
/* Create a texture subimage with the supplied data */
- rdata->glGetError();
- rdata->glActiveTexture(GL_TEXTURE0);
- rdata->glBindTexture(tdata->texture_type, tdata->texture);
- rdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- rdata->glTexSubImage2D(tdata->texture_type,
+ data->glBindTexture(tdata->texture_type, tdata->texture);
+ data->glTexSubImage2D(tdata->texture_type,
0,
rect->x,
rect->y,
@@ -541,16 +563,40 @@ GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
tdata->pixel_format,
tdata->pixel_type,
src);
- if (blob) {
- SDL_free(blob);
- }
+ SDL_free(blob);
+
+ return GL_CheckError("glTexSubImage2D()", renderer);
+}
+
+static int
+GLES2_LockTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
+ void **pixels, int *pitch)
+{
+ GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+
+ /* Retrieve the buffer/pitch for the specified region */
+ *pixels = (Uint8 *)tdata->pixel_data +
+ (tdata->pitch * rect->y) +
+ (rect->x * SDL_BYTESPERPIXEL(texture->format));
+ *pitch = tdata->pitch;
- if (rdata->glGetError() != GL_NO_ERROR) {
- return SDL_SetError("Failed to update texture");
- }
return 0;
}
+static void
+GLES2_UnlockTexture(SDL_Renderer *renderer, SDL_Texture *texture)
+{
+ GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+ SDL_Rect rect;
+
+ /* We do whole texture updates, at least for now */
+ rect.x = 0;
+ rect.y = 0;
+ rect.w = texture->w;
+ rect.h = texture->h;
+ GLES2_UpdateTexture(renderer, texture, &rect, tdata->pixel_data, tdata->pitch);
+}
+
static int
GLES2_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
{
@@ -574,6 +620,24 @@ GLES2_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
return 0;
}
+static void
+GLES2_DestroyTexture(SDL_Renderer *renderer, SDL_Texture *texture)
+{
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+
+ GLES2_ActivateRenderer(renderer);
+
+ /* Destroy the texture */
+ if (tdata)
+ {
+ data->glDeleteTextures(1, &tdata->texture);
+ SDL_free(tdata->pixel_data);
+ SDL_free(tdata);
+ texture->driverdata = NULL;
+ }
+}
+
/*************************************************************************************************
* Shader management functions *
*************************************************************************************************/
@@ -592,13 +656,13 @@ static GLES2_ProgramCacheEntry *
GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex,
GLES2_ShaderCacheEntry *fragment, SDL_BlendMode blendMode)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLES2_ProgramCacheEntry *entry;
GLES2_ShaderCacheEntry *shaderEntry;
GLint linkSuccessful;
/* Check if we've already cached this program */
- entry = rdata->program_cache.head;
+ entry = data->program_cache.head;
while (entry)
{
if (entry->vertex_shader == vertex && entry->fragment_shader == fragment)
@@ -607,16 +671,16 @@ GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex,
}
if (entry)
{
- if (rdata->program_cache.head != entry)
+ if (data->program_cache.head != entry)
{
if (entry->next)
entry->next->prev = entry->prev;
if (entry->prev)
entry->prev->next = entry->next;
entry->prev = NULL;
- entry->next = rdata->program_cache.head;
- rdata->program_cache.head->prev = entry;
- rdata->program_cache.head = entry;
+ entry->next = data->program_cache.head;
+ data->program_cache.head->prev = entry;
+ data->program_cache.head = entry;
}
return entry;
}
@@ -633,19 +697,18 @@ GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex,
entry->blend_mode = blendMode;
/* Create the program and link it */
- rdata->glGetError();
- entry->id = rdata->glCreateProgram();
- rdata->glAttachShader(entry->id, vertex->id);
- rdata->glAttachShader(entry->id, fragment->id);
- rdata->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_POSITION, "a_position");
- rdata->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_TEXCOORD, "a_texCoord");
- rdata->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_ANGLE, "a_angle");
- rdata->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_CENTER, "a_center");
- rdata->glLinkProgram(entry->id);
- rdata->glGetProgramiv(entry->id, GL_LINK_STATUS, &linkSuccessful);
- if (rdata->glGetError() != GL_NO_ERROR || !linkSuccessful)
+ entry->id = data->glCreateProgram();
+ data->glAttachShader(entry->id, vertex->id);
+ data->glAttachShader(entry->id, fragment->id);
+ data->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_POSITION, "a_position");
+ data->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_TEXCOORD, "a_texCoord");
+ data->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_ANGLE, "a_angle");
+ data->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_CENTER, "a_center");
+ data->glLinkProgram(entry->id);
+ data->glGetProgramiv(entry->id, GL_LINK_STATUS, &linkSuccessful);
+ if (!linkSuccessful)
{
- rdata->glDeleteProgram(entry->id);
+ data->glDeleteProgram(entry->id);
SDL_free(entry);
SDL_SetError("Failed to link shader program");
return NULL;
@@ -653,47 +716,54 @@ GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex,
/* Predetermine locations of uniform variables */
entry->uniform_locations[GLES2_UNIFORM_PROJECTION] =
- rdata->glGetUniformLocation(entry->id, "u_projection");
+ data->glGetUniformLocation(entry->id, "u_projection");
entry->uniform_locations[GLES2_UNIFORM_TEXTURE] =
- rdata->glGetUniformLocation(entry->id, "u_texture");
+ data->glGetUniformLocation(entry->id, "u_texture");
entry->uniform_locations[GLES2_UNIFORM_MODULATION] =
- rdata->glGetUniformLocation(entry->id, "u_modulation");
+ data->glGetUniformLocation(entry->id, "u_modulation");
entry->uniform_locations[GLES2_UNIFORM_COLOR] =
- rdata->glGetUniformLocation(entry->id, "u_color");
- entry->uniform_locations[GLES2_UNIFORM_COLORTABLE] =
- rdata->glGetUniformLocation(entry->id, "u_colorTable");
+ data->glGetUniformLocation(entry->id, "u_color");
+
+ entry->modulation_r = entry->modulation_g = entry->modulation_b = entry->modulation_a = 1.0f;
+ entry->color_r = entry->color_g = entry->color_b = entry->color_a = 1.0f;
+
+ data->glUseProgram(entry->id);
+ data->glUniformMatrix4fv(entry->uniform_locations[GLES2_UNIFORM_PROJECTION], 1, GL_FALSE, (GLfloat *)entry->projection);
+ data->glUniform1i(entry->uniform_locations[GLES2_UNIFORM_TEXTURE], 0); /* always texture unit 0. */
+ data->glUniform4f(entry->uniform_locations[GLES2_UNIFORM_MODULATION], 1.0f, 1.0f, 1.0f, 1.0f);
+ data->glUniform4f(entry->uniform_locations[GLES2_UNIFORM_COLOR], 1.0f, 1.0f, 1.0f, 1.0f);
/* Cache the linked program */
- if (rdata->program_cache.head)
+ if (data->program_cache.head)
{
- entry->next = rdata->program_cache.head;
- rdata->program_cache.head->prev = entry;
+ entry->next = data->program_cache.head;
+ data->program_cache.head->prev = entry;
}
else
{
- rdata->program_cache.tail = entry;
+ data->program_cache.tail = entry;
}
- rdata->program_cache.head = entry;
- ++rdata->program_cache.count;
+ data->program_cache.head = entry;
+ ++data->program_cache.count;
/* Increment the refcount of the shaders we're using */
++vertex->references;
++fragment->references;
/* Evict the last entry from the cache if we exceed the limit */
- if (rdata->program_cache.count > GLES2_MAX_CACHED_PROGRAMS)
+ if (data->program_cache.count > GLES2_MAX_CACHED_PROGRAMS)
{
- shaderEntry = rdata->program_cache.tail->vertex_shader;
+ shaderEntry = data->program_cache.tail->vertex_shader;
if (--shaderEntry->references <= 0)
GLES2_EvictShader(renderer, shaderEntry);
- shaderEntry = rdata->program_cache.tail->fragment_shader;
+ shaderEntry = data->program_cache.tail->fragment_shader;
if (--shaderEntry->references <= 0)
GLES2_EvictShader(renderer, shaderEntry);
- rdata->glDeleteProgram(rdata->program_cache.tail->id);
- rdata->program_cache.tail = rdata->program_cache.tail->prev;
- SDL_free(rdata->program_cache.tail->next);
- rdata->program_cache.tail->next = NULL;
- --rdata->program_cache.count;
+ data->glDeleteProgram(data->program_cache.tail->id);
+ data->program_cache.tail = data->program_cache.tail->prev;
+ SDL_free(data->program_cache.tail->next);
+ data->program_cache.tail->next = NULL;
+ --data->program_cache.count;
}
return entry;
}
@@ -701,7 +771,7 @@ GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex,
static GLES2_ShaderCacheEntry *
GLES2_CacheShader(SDL_Renderer *renderer, GLES2_ShaderType type, SDL_BlendMode blendMode)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
const GLES2_Shader *shader;
const GLES2_ShaderInstance *instance = NULL;
GLES2_ShaderCacheEntry *entry = NULL;
@@ -719,13 +789,13 @@ GLES2_CacheShader(SDL_Renderer *renderer, GLES2_ShaderType type, SDL_BlendMode b
/* Find a matching shader instance that's supported on this hardware */
for (i = 0; i < shader->instance_count && !instance; ++i)
{
- for (j = 0; j < rdata->shader_format_count && !instance; ++j)
+ for (j = 0; j < data->shader_format_count && !instance; ++j)
{
if (!shader->instances)
continue;
if (!shader->instances[i])
continue;
- if (shader->instances[i]->format != rdata->shader_formats[j])
+ if (shader->instances[i]->format != data->shader_formats[j])
continue;
instance = shader->instances[i];
}
@@ -737,7 +807,7 @@ GLES2_CacheShader(SDL_Renderer *renderer, GLES2_ShaderType type, SDL_BlendMode b
}
/* Check if we've already cached this shader */
- entry = rdata->shader_cache.head;
+ entry = data->shader_cache.head;
while (entry)
{
if (entry->instance == instance)
@@ -758,29 +828,28 @@ GLES2_CacheShader(SDL_Renderer *renderer, GLES2_ShaderType type, SDL_BlendMode b
entry->instance = instance;
/* Compile or load the selected shader instance */
- rdata->glGetError();
- entry->id = rdata->glCreateShader(instance->type);
+ entry->id = data->glCreateShader(instance->type);
if (instance->format == (GLenum)-1)
{
- rdata->glShaderSource(entry->id, 1, (const char **)&instance->data, NULL);
- rdata->glCompileShader(entry->id);
- rdata->glGetShaderiv(entry->id, GL_COMPILE_STATUS, &compileSuccessful);
+ data->glShaderSource(entry->id, 1, (const char **)&instance->data, NULL);
+ data->glCompileShader(entry->id);
+ data->glGetShaderiv(entry->id, GL_COMPILE_STATUS, &compileSuccessful);
}
else
{
- rdata->glShaderBinary(1, &entry->id, instance->format, instance->data, instance->length);
+ data->glShaderBinary(1, &entry->id, instance->format, instance->data, instance->length);
compileSuccessful = GL_TRUE;
}
- if (rdata->glGetError() != GL_NO_ERROR || !compileSuccessful)
+ if (!compileSuccessful)
{
char *info = NULL;
int length = 0;
- rdata->glGetShaderiv(entry->id, GL_INFO_LOG_LENGTH, &length);
+ data->glGetShaderiv(entry->id, GL_INFO_LOG_LENGTH, &length);
if (length > 0) {
info = SDL_stack_alloc(char, length);
if (info) {
- rdata->glGetShaderInfoLog(entry->id, length, &length, info);
+ data->glGetShaderInfoLog(entry->id, length, &length, info);
}
}
if (info) {
@@ -789,45 +858,45 @@ GLES2_CacheShader(SDL_Renderer *renderer, GLES2_ShaderType type, SDL_BlendMode b
} else {
SDL_SetError("Failed to load the shader");
}
- rdata->glDeleteShader(entry->id);
+ data->glDeleteShader(entry->id);
SDL_free(entry);
return NULL;
}
/* Link the shader entry in at the front of the cache */
- if (rdata->shader_cache.head)
+ if (data->shader_cache.head)
{
- entry->next = rdata->shader_cache.head;
- rdata->shader_cache.head->prev = entry;
+ entry->next = data->shader_cache.head;
+ data->shader_cache.head->prev = entry;
}
- rdata->shader_cache.head = entry;
- ++rdata->shader_cache.count;
+ data->shader_cache.head = entry;
+ ++data->shader_cache.count;
return entry;
}
static void
GLES2_EvictShader(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *entry)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
/* Unlink the shader from the cache */
if (entry->next)
entry->next->prev = entry->prev;
if (entry->prev)
entry->prev->next = entry->next;
- if (rdata->shader_cache.head == entry)
- rdata->shader_cache.head = entry->next;
- --rdata->shader_cache.count;
+ if (data->shader_cache.head == entry)
+ data->shader_cache.head = entry->next;
+ --data->shader_cache.count;
/* Deallocate the shader */
- rdata->glDeleteShader(entry->id);
+ data->glDeleteShader(entry->id);
SDL_free(entry);
}
static int
GLES2_SelectProgram(SDL_Renderer *renderer, GLES2_ImageSource source, SDL_BlendMode blendMode)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLES2_ShaderCacheEntry *vertex = NULL;
GLES2_ShaderCacheEntry *fragment = NULL;
GLES2_ShaderType vtype, ftype;
@@ -865,9 +934,9 @@ GLES2_SelectProgram(SDL_Renderer *renderer, GLES2_ImageSource source, SDL_BlendM
goto fault;
/* Check if we need to change programs at all */
- if (rdata->current_program &&
- rdata->current_program->vertex_shader == vertex &&
- rdata->current_program->fragment_shader == fragment)
+ if (data->current_program &&
+ data->current_program->vertex_shader == vertex &&
+ data->current_program->fragment_shader == fragment)
return 0;
/* Generate a matching program */
@@ -876,16 +945,10 @@ GLES2_SelectProgram(SDL_Renderer *renderer, GLES2_ImageSource source, SDL_BlendM
goto fault;
/* Select that program in OpenGL */
- rdata->glGetError();
- rdata->glUseProgram(program->id);
- if (rdata->glGetError() != GL_NO_ERROR)
- {
- SDL_SetError("Failed to select program");
- goto fault;
- }
+ data->glUseProgram(program->id);
/* Set the current program */
- rdata->current_program = program;
+ data->current_program = program;
/* Activate an orthographic projection */
if (GLES2_SetOrthographicProjection(renderer) < 0)
@@ -898,16 +961,15 @@ fault:
GLES2_EvictShader(renderer, vertex);
if (fragment && fragment->references <= 0)
GLES2_EvictShader(renderer, fragment);
- rdata->current_program = NULL;
+ data->current_program = NULL;
return -1;
}
static int
GLES2_SetOrthographicProjection(SDL_Renderer *renderer)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLfloat projection[4][4];
- GLuint locProjection;
if (!renderer->viewport.w || !renderer->viewport.h) {
return 0;
@@ -940,12 +1002,12 @@ GLES2_SetOrthographicProjection(SDL_Renderer *renderer)
projection[3][3] = 1.0f;
/* Set the projection matrix */
- locProjection = rdata->current_program->uniform_locations[GLES2_UNIFORM_PROJECTION];
- rdata->glGetError();
- rdata->glUniformMatrix4fv(locProjection, 1, GL_FALSE, (GLfloat *)projection);
- if (rdata->glGetError() != GL_NO_ERROR) {
- return SDL_SetError("Failed to set orthographic projection");
+ if (SDL_memcmp(data->current_program->projection, projection, sizeof (projection)) != 0) {
+ const GLuint locProjection = data->current_program->uniform_locations[GLES2_UNIFORM_PROJECTION];
+ data->glUniformMatrix4fv(locProjection, 1, GL_FALSE, (GLfloat *)projection);
+ SDL_memcpy(data->current_program->projection, projection, sizeof (projection));
}
+
return 0;
}
@@ -968,106 +1030,129 @@ static int GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect
Uint32 pixel_format, void * pixels, int pitch);
static void GLES2_RenderPresent(SDL_Renderer *renderer);
+static SDL_bool
+CompareColors(Uint8 r1, Uint8 g1, Uint8 b1, Uint8 a1,
+ Uint8 r2, Uint8 g2, Uint8 b2, Uint8 a2)
+{
+ Uint32 Pixel1, Pixel2;
+ RGBA8888_FROM_RGBA(Pixel1, r1, g1, b1, a1);
+ RGBA8888_FROM_RGBA(Pixel2, r2, g2, b2, a2);
+ return (Pixel1 == Pixel2);
+}
static int
GLES2_RenderClear(SDL_Renderer * renderer)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLES2_ActivateRenderer(renderer);
- rdata->glClearColor((GLfloat) renderer->r * inv255f,
- (GLfloat) renderer->g * inv255f,
- (GLfloat) renderer->b * inv255f,
- (GLfloat) renderer->a * inv255f);
+ if (!CompareColors(data->clear_r, data->clear_g, data->clear_b, data->clear_a,
+ renderer->r, renderer->g, renderer->b, renderer->a)) {
+ data->glClearColor((GLfloat) renderer->r * inv255f,
+ (GLfloat) renderer->g * inv255f,
+ (GLfloat) renderer->b * inv255f,
+ (GLfloat) renderer->a * inv255f);
+ data->clear_r = renderer->r;
+ data->clear_g = renderer->g;
+ data->clear_b = renderer->b;
+ data->clear_a = renderer->a;
+ }
- rdata->glClear(GL_COLOR_BUFFER_BIT);
+ data->glClear(GL_COLOR_BUFFER_BIT);
return 0;
}
static void
-GLES2_SetBlendMode(GLES2_DriverContext *rdata, int blendMode)
+GLES2_SetBlendMode(GLES2_DriverContext *data, int blendMode)
{
- if (blendMode != rdata->current.blendMode) {
+ if (blendMode != data->current.blendMode) {
switch (blendMode) {
default:
case SDL_BLENDMODE_NONE:
- rdata->glDisable(GL_BLEND);
+ data->glDisable(GL_BLEND);
break;
case SDL_BLENDMODE_BLEND:
- rdata->glEnable(GL_BLEND);
- rdata->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+ data->glEnable(GL_BLEND);
+ data->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
break;
case SDL_BLENDMODE_ADD:
- rdata->glEnable(GL_BLEND);
- rdata->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE);
+ data->glEnable(GL_BLEND);
+ data->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE);
break;
case SDL_BLENDMODE_MOD:
- rdata->glEnable(GL_BLEND);
- rdata->glBlendFuncSeparate(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE);
+ data->glEnable(GL_BLEND);
+ data->glBlendFuncSeparate(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE);
break;
}
- rdata->current.blendMode = blendMode;
+ data->current.blendMode = blendMode;
}
}
static void
-GLES2_SetTexCoords(GLES2_DriverContext * rdata, SDL_bool enabled)
+GLES2_SetTexCoords(GLES2_DriverContext * data, SDL_bool enabled)
{
- if (enabled != rdata->current.tex_coords) {
+ if (enabled != data->current.tex_coords) {
if (enabled) {
- rdata->glEnableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
+ data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
} else {
- rdata->glDisableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
+ data->glDisableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
}
- rdata->current.tex_coords = enabled;
+ data->current.tex_coords = enabled;
}
}
static int
GLES2_SetDrawingState(SDL_Renderer * renderer)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
- int blendMode = renderer->blendMode;
- GLuint locColor;
-
- rdata->glGetError();
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+ const int blendMode = renderer->blendMode;
+ GLES2_ProgramCacheEntry *program;
+ Uint8 r, g, b, a;
GLES2_ActivateRenderer(renderer);
- GLES2_SetBlendMode(rdata, blendMode);
+ GLES2_SetBlendMode(data, blendMode);
- GLES2_SetTexCoords(rdata, SDL_FALSE);
+ GLES2_SetTexCoords(data, SDL_FALSE);
/* Activate an appropriate shader and set the projection matrix */
- if (GLES2_SelectProgram(renderer, GLES2_IMAGESOURCE_SOLID, blendMode) < 0)
+ if (GLES2_SelectProgram(renderer, GLES2_IMAGESOURCE_SOLID, blendMode) < 0) {
return -1;
+ }
/* Select the color to draw with */
- locColor = rdata->current_program->uniform_locations[GLES2_UNIFORM_COLOR];
+ g = renderer->g;
+ a = renderer->a;
+
if (renderer->target &&
- (renderer->target->format == SDL_PIXELFORMAT_ARGB8888 ||
+ (renderer->target->format == SDL_PIXELFORMAT_ARGB8888 ||
renderer->target->format == SDL_PIXELFORMAT_RGB888)) {
- rdata->glUniform4f(locColor,
- renderer->b * inv255f,
- renderer->g * inv255f,
- renderer->r * inv255f,
- renderer->a * inv255f);
- } else {
- rdata->glUniform4f(locColor,
- renderer->r * inv255f,
- renderer->g * inv255f,
- renderer->b * inv255f,
- renderer->a * inv255f);
+ r = renderer->b;
+ b = renderer->r;
+ } else {
+ r = renderer->r;
+ b = renderer->b;
+ }
+
+ program = data->current_program;
+ if (!CompareColors(program->color_r, program->color_g, program->color_b, program->color_a, r, g, b, a)) {
+ /* Select the color to draw with */
+ data->glUniform4f(program->uniform_locations[GLES2_UNIFORM_COLOR], r * inv255f, g * inv255f, b * inv255f, a * inv255f);
+ program->color_r = r;
+ program->color_g = g;
+ program->color_b = b;
+ program->color_a = a;
}
+
return 0;
}
static int
GLES2_RenderDrawPoints(SDL_Renderer *renderer, const SDL_FPoint *points, int count)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLfloat *vertices;
int idx;
@@ -1084,20 +1169,16 @@ GLES2_RenderDrawPoints(SDL_Renderer *renderer, const SDL_FPoint *points, int cou
vertices[idx * 2] = x;
vertices[(idx * 2) + 1] = y;
}
- rdata->glGetError();
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
- rdata->glDrawArrays(GL_POINTS, 0, count);
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+ data->glDrawArrays(GL_POINTS, 0, count);
SDL_stack_free(vertices);
- if (rdata->glGetError() != GL_NO_ERROR) {
- return SDL_SetError("Failed to render points");
- }
return 0;
}
static int
GLES2_RenderDrawLines(SDL_Renderer *renderer, const SDL_FPoint *points, int count)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLfloat *vertices;
int idx;
@@ -1114,26 +1195,23 @@ GLES2_RenderDrawLines(SDL_Renderer *renderer, const SDL_FPoint *points, int coun
vertices[idx * 2] = x;
vertices[(idx * 2) + 1] = y;
}
- rdata->glGetError();
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
- rdata->glDrawArrays(GL_LINE_STRIP, 0, count);
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+ data->glDrawArrays(GL_LINE_STRIP, 0, count);
/* We need to close the endpoint of the line */
if (count == 2 ||
points[0].x != points[count-1].x || points[0].y != points[count-1].y) {
- rdata->glDrawArrays(GL_POINTS, count-1, 1);
+ data->glDrawArrays(GL_POINTS, count-1, 1);
}
SDL_stack_free(vertices);
- if (rdata->glGetError() != GL_NO_ERROR) {
- return SDL_SetError("Failed to render lines");
- }
- return 0;
+
+ return GL_CheckError("", renderer);
}
static int
GLES2_RenderFillRects(SDL_Renderer *renderer, const SDL_FRect *rects, int count)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLfloat vertices[8];
int idx;
@@ -1142,7 +1220,6 @@ GLES2_RenderFillRects(SDL_Renderer *renderer, const SDL_FRect *rects, int count)
}
/* Emit a line loop for each rectangle */
- rdata->glGetError();
for (idx = 0; idx < count; ++idx) {
const SDL_FRect *rect = &rects[idx];
@@ -1159,27 +1236,24 @@ GLES2_RenderFillRects(SDL_Renderer *renderer, const SDL_FRect *rects, int count)
vertices[5] = yMax;
vertices[6] = xMax;
vertices[7] = yMax;
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
- rdata->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+ data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
}
- if (rdata->glGetError() != GL_NO_ERROR) {
- return SDL_SetError("Failed to render filled rects");
- }
- return 0;
+ return GL_CheckError("", renderer);
}
static int
GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *srcrect,
const SDL_FRect *dstrect)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
- GLES2_ImageSource sourceType;
+ GLES2_ImageSource sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
SDL_BlendMode blendMode;
GLfloat vertices[8];
GLfloat texCoords[8];
- GLuint locTexture;
- GLuint locModulation;
+ GLES2_ProgramCacheEntry *program;
+ Uint8 r, g, b, a;
GLES2_ActivateRenderer(renderer);
@@ -1265,38 +1339,42 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s
return -1;
}
}
- if (GLES2_SelectProgram(renderer, sourceType, blendMode) < 0)
+
+ if (GLES2_SelectProgram(renderer, sourceType, blendMode) < 0) {
return -1;
+ }
/* Select the target texture */
- locTexture = rdata->current_program->uniform_locations[GLES2_UNIFORM_TEXTURE];
- rdata->glGetError();
- rdata->glActiveTexture(GL_TEXTURE0);
- rdata->glBindTexture(tdata->texture_type, tdata->texture);
- rdata->glUniform1i(locTexture, 0);
+ data->glBindTexture(tdata->texture_type, tdata->texture);
/* Configure color modulation */
- locModulation = rdata->current_program->uniform_locations[GLES2_UNIFORM_MODULATION];
+ g = texture->g;
+ a = texture->a;
+
if (renderer->target &&
(renderer->target->format == SDL_PIXELFORMAT_ARGB8888 ||
renderer->target->format == SDL_PIXELFORMAT_RGB888)) {
- rdata->glUniform4f(locModulation,
- texture->b * inv255f,
- texture->g * inv255f,
- texture->r * inv255f,
- texture->a * inv255f);
+ r = texture->b;
+ b = texture->r;
} else {
- rdata->glUniform4f(locModulation,
- texture->r * inv255f,
- texture->g * inv255f,
- texture->b * inv255f,
- texture->a * inv255f);
+ r = texture->r;
+ b = texture->b;
+ }
+
+ program = data->current_program;
+
+ if (!CompareColors(program->modulation_r, program->modulation_g, program->modulation_b, program->modulation_a, r, g, b, a)) {
+ data->glUniform4f(program->uniform_locations[GLES2_UNIFORM_MODULATION], r * inv255f, g * inv255f, b * inv255f, a * inv255f);
+ program->modulation_r = r;
+ program->modulation_g = g;
+ program->modulation_b = b;
+ program->modulation_a = a;
}
/* Configure texture blending */
- GLES2_SetBlendMode(rdata, blendMode);
+ GLES2_SetBlendMode(data, blendMode);
- GLES2_SetTexCoords(rdata, SDL_TRUE);
+ GLES2_SetTexCoords(data, SDL_TRUE);
/* Emit the textured quad */
vertices[0] = dstrect->x;
@@ -1307,7 +1385,7 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s
vertices[5] = (dstrect->y + dstrect->h);
vertices[6] = (dstrect->x + dstrect->w);
vertices[7] = (dstrect->y + dstrect->h);
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
texCoords[0] = srcrect->x / (GLfloat)texture->w;
texCoords[1] = srcrect->y / (GLfloat)texture->h;
texCoords[2] = (srcrect->x + srcrect->w) / (GLfloat)texture->w;
@@ -1316,34 +1394,32 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s
texCoords[5] = (srcrect->y + srcrect->h) / (GLfloat)texture->h;
texCoords[6] = (srcrect->x + srcrect->w) / (GLfloat)texture->w;
texCoords[7] = (srcrect->y + srcrect->h) / (GLfloat)texture->h;
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, texCoords);
- rdata->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- if (rdata->glGetError() != GL_NO_ERROR) {
- return SDL_SetError("Failed to render texture");
- }
- return 0;
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, texCoords);
+ data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+ return GL_CheckError("", renderer);
}
static int
GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *srcrect,
const SDL_FRect *dstrect, const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
- GLES2_ImageSource sourceType;
+ GLES2_ImageSource sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+ GLES2_ProgramCacheEntry *program;
+ Uint8 r, g, b, a;
SDL_BlendMode blendMode;
GLfloat vertices[8];
GLfloat texCoords[8];
- GLuint locTexture;
- GLuint locModulation;
GLfloat translate[8];
GLfloat fAngle[4];
GLfloat tmp;
GLES2_ActivateRenderer(renderer);
- rdata->glEnableVertexAttribArray(GLES2_ATTRIBUTE_CENTER);
- rdata->glEnableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE);
+ data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_CENTER);
+ data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE);
fAngle[0] = fAngle[1] = fAngle[2] = fAngle[3] = (GLfloat)(360.0f - angle);
/* Calculate the center of rotation */
translate[0] = translate[2] = translate[4] = translate[6] = (center->x + dstrect->x);
@@ -1435,34 +1511,37 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
return -1;
/* Select the target texture */
- locTexture = rdata->current_program->uniform_locations[GLES2_UNIFORM_TEXTURE];
- rdata->glGetError();
- rdata->glActiveTexture(GL_TEXTURE0);
- rdata->glBindTexture(tdata->texture_type, tdata->texture);
- rdata->glUniform1i(locTexture, 0);
+ data->glBindTexture(tdata->texture_type, tdata->texture);
/* Configure color modulation */
- locModulation = rdata->current_program->uniform_locations[GLES2_UNIFORM_MODULATION];
+ /* !!! FIXME: grep for glUniform4f(), move that stuff to a subroutine, it's a lot of copy/paste. */
+ g = texture->g;
+ a = texture->a;
+
if (renderer->target &&
(renderer->target->format == SDL_PIXELFORMAT_ARGB8888 ||
renderer->target->format == SDL_PIXELFORMAT_RGB888)) {
- rdata->glUniform4f(locModulation,
- texture->b * inv255f,
- texture->g * inv255f,
- texture->r * inv255f,
- texture->a * inv255f);
+ r = texture->b;
+ b = texture->r;
} else {
- rdata->glUniform4f(locModulation,
- texture->r * inv255f,
- texture->g * inv255f,
- texture->b * inv255f,
- texture->a * inv255f);
+ r = texture->r;
+ b = texture->b;
+ }
+
+ program = data->current_program;
+
+ if (!CompareColors(program->modulation_r, program->modulation_g, program->modulation_b, program->modulation_a, r, g, b, a)) {
+ data->glUniform4f(program->uniform_locations[GLES2_UNIFORM_MODULATION], r * inv255f, g * inv255f, b * inv255f, a * inv255f);
+ program->modulation_r = r;
+ program->modulation_g = g;
+ program->modulation_b = b;
+ program->modulation_a = a;
}
/* Configure texture blending */
- GLES2_SetBlendMode(rdata, blendMode);
+ GLES2_SetBlendMode(data, blendMode);
- GLES2_SetTexCoords(rdata, SDL_TRUE);
+ GLES2_SetTexCoords(data, SDL_TRUE);
/* Emit the textured quad */
vertices[0] = dstrect->x;
@@ -1484,9 +1563,9 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
vertices[5] = vertices[7] = tmp;
}
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_ANGLE, 1, GL_FLOAT, GL_FALSE, 0, &fAngle);
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_CENTER, 2, GL_FLOAT, GL_FALSE, 0, translate);
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_ANGLE, 1, GL_FLOAT, GL_FALSE, 0, &fAngle);
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_CENTER, 2, GL_FLOAT, GL_FALSE, 0, translate);
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
texCoords[0] = srcrect->x / (GLfloat)texture->w;
texCoords[1] = srcrect->y / (GLfloat)texture->h;
@@ -1496,21 +1575,19 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
texCoords[5] = (srcrect->y + srcrect->h) / (GLfloat)texture->h;
texCoords[6] = (srcrect->x + srcrect->w) / (GLfloat)texture->w;
texCoords[7] = (srcrect->y + srcrect->h) / (GLfloat)texture->h;
- rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, texCoords);
- rdata->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- rdata->glDisableVertexAttribArray(GLES2_ATTRIBUTE_CENTER);
- rdata->glDisableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE);
- if (rdata->glGetError() != GL_NO_ERROR) {
- return SDL_SetError("Failed to render texture");
- }
- return 0;
+ data->glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, texCoords);
+ data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+ data->glDisableVertexAttribArray(GLES2_ATTRIBUTE_CENTER);
+ data->glDisableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE);
+
+ return GL_CheckError("", renderer);
}
static int
GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
Uint32 pixel_format, void * pixels, int pitch)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
Uint32 temp_format = SDL_PIXELFORMAT_ABGR8888;
void *temp_pixels;
int temp_pitch;
@@ -1528,10 +1605,11 @@ GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
SDL_GetRendererOutputSize(renderer, &w, &h);
- rdata->glPixelStorei(GL_PACK_ALIGNMENT, 1);
-
- rdata->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
+ data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
GL_RGBA, GL_UNSIGNED_BYTE, temp_pixels);
+ if (GL_CheckError("glReadPixels()", renderer) < 0) {
+ return -1;
+ }
/* Flip the rows to be top-down */
length = rect->w * SDL_BYTESPERPIXEL(temp_format);
@@ -1572,7 +1650,8 @@ GLES2_RenderPresent(SDL_Renderer *renderer)
static int GLES2_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh);
static int GLES2_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture);
-static int GLES2_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh) {
+static int GLES2_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh)
+{
GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLES2_TextureData *texturedata = (GLES2_TextureData *)texture->driverdata;
GLES2_ActivateRenderer(renderer);
@@ -1585,7 +1664,8 @@ static int GLES2_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, flo
return 0;
}
-static int GLES2_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture) {
+static int GLES2_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture)
+{
GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
GLES2_TextureData *texturedata = (GLES2_TextureData *)texture->driverdata;
GLES2_ActivateRenderer(renderer);
@@ -1605,34 +1685,46 @@ static int GLES2_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture) {
static void
GLES2_ResetState(SDL_Renderer *renderer)
{
- GLES2_DriverContext *rdata = (GLES2_DriverContext *) renderer->driverdata;
+ GLES2_DriverContext *data = (GLES2_DriverContext *) renderer->driverdata;
- if (SDL_CurrentContext == rdata->context) {
+ if (SDL_CurrentContext == data->context) {
GLES2_UpdateViewport(renderer);
} else {
GLES2_ActivateRenderer(renderer);
}
- rdata->current.blendMode = -1;
- rdata->current.tex_coords = SDL_FALSE;
+ data->current.blendMode = -1;
+ data->current.tex_coords = SDL_FALSE;
+
+ data->glActiveTexture(GL_TEXTURE0);
+ data->glPixelStorei(GL_PACK_ALIGNMENT, 1);
+ data->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- rdata->glEnableVertexAttribArray(GLES2_ATTRIBUTE_POSITION);
- rdata->glDisableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
+ data->glClearColor((GLfloat) data->clear_r * inv255f,
+ (GLfloat) data->clear_g * inv255f,
+ (GLfloat) data->clear_b * inv255f,
+ (GLfloat) data->clear_a * inv255f);
+
+ data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_POSITION);
+ data->glDisableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
+
+ GL_CheckError("", renderer);
}
static SDL_Renderer *
GLES2_CreateRenderer(SDL_Window *window, Uint32 flags)
{
SDL_Renderer *renderer;
- GLES2_DriverContext *rdata;
+ GLES2_DriverContext *data;
GLint nFormats;
#ifndef ZUNE_HD
GLboolean hasCompiler;
#endif
Uint32 windowFlags;
GLint window_framebuffer;
+ GLint value;
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_EGL, 1);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
@@ -1652,30 +1744,30 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags)
return NULL;
}
- rdata = (GLES2_DriverContext *)SDL_calloc(1, sizeof(GLES2_DriverContext));
- if (!rdata) {
+ data = (GLES2_DriverContext *)SDL_calloc(1, sizeof(GLES2_DriverContext));
+ if (!data) {
GLES2_DestroyRenderer(renderer);
SDL_OutOfMemory();
return NULL;
}
renderer->info = GLES2_RenderDriver.info;
renderer->info.flags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE;
- renderer->driverdata = rdata;
+ renderer->driverdata = data;
renderer->window = window;
/* Create an OpenGL ES 2.0 context */
- rdata->context = SDL_GL_CreateContext(window);
- if (!rdata->context)
+ data->context = SDL_GL_CreateContext(window);
+ if (!data->context)
{
GLES2_DestroyRenderer(renderer);
return NULL;
}
- if (SDL_GL_MakeCurrent(window, rdata->context) < 0) {
+ if (SDL_GL_MakeCurrent(window, data->context) < 0) {
GLES2_DestroyRenderer(renderer);
return NULL;
}
- if (GLES2_LoadFunctions(rdata) < 0) {
+ if (GLES2_LoadFunctions(data) < 0) {
GLES2_DestroyRenderer(renderer);
return NULL;
}
@@ -1689,42 +1781,48 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags)
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
}
+ /* Check for debug output support */
+ if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_FLAGS, &value) == 0 &&
+ (value & SDL_GL_CONTEXT_DEBUG_FLAG)) {
+ data->debug_enabled = SDL_TRUE;
+ }
+
+ value = 0;
+ data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+ renderer->info.max_texture_width = value;
+ value = 0;
+ data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+ renderer->info.max_texture_height = value;
+
/* Determine supported shader formats */
/* HACK: glGetInteger is broken on the Zune HD's compositor, so we just hardcode this */
- rdata->glGetError();
#ifdef ZUNE_HD
nFormats = 1;
#else /* !ZUNE_HD */
- rdata->glGetIntegerv(GL_NUM_SHADER_BINARY_FORMATS, &nFormats);
- rdata->glGetBooleanv(GL_SHADER_COMPILER, &hasCompiler);
+ data->glGetIntegerv(GL_NUM_SHADER_BINARY_FORMATS, &nFormats);
+ data->glGetBooleanv(GL_SHADER_COMPILER, &hasCompiler);
if (hasCompiler)
++nFormats;
#endif /* ZUNE_HD */
- rdata->shader_formats = (GLenum *)SDL_calloc(nFormats, sizeof(GLenum));
- if (!rdata->shader_formats)
+ data->shader_formats = (GLenum *)SDL_calloc(nFormats, sizeof(GLenum));
+ if (!data->shader_formats)
{
GLES2_DestroyRenderer(renderer);
SDL_OutOfMemory();
return NULL;
}
- rdata->shader_format_count = nFormats;
+ data->shader_format_count = nFormats;
#ifdef ZUNE_HD
- rdata->shader_formats[0] = GL_NVIDIA_PLATFORM_BINARY_NV;
+ data->shader_formats[0] = GL_NVIDIA_PLATFORM_BINARY_NV;
#else /* !ZUNE_HD */
- rdata->glGetIntegerv(GL_SHADER_BINARY_FORMATS, (GLint *)rdata->shader_formats);
- if (rdata->glGetError() != GL_NO_ERROR)
- {
- GLES2_DestroyRenderer(renderer);
- SDL_SetError("Failed to query supported shader formats");
- return NULL;
- }
+ data->glGetIntegerv(GL_SHADER_BINARY_FORMATS, (GLint *)data->shader_formats);
if (hasCompiler)
- rdata->shader_formats[nFormats - 1] = (GLenum)-1;
+ data->shader_formats[nFormats - 1] = (GLenum)-1;
#endif /* ZUNE_HD */
- rdata->framebuffers = NULL;
- rdata->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &window_framebuffer);
- rdata->window_framebuffer = (GLuint)window_framebuffer;
+ data->framebuffers = NULL;
+ data->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &window_framebuffer);
+ data->window_framebuffer = (GLuint)window_framebuffer;
/* Populate the function pointers for the module */
renderer->WindowEvent = &GLES2_WindowEvent;
diff --git a/src/render/psp/SDL_render_psp.c b/src/render/psp/SDL_render_psp.c
index 7ea536d..b8cd265 100644
--- a/src/render/psp/SDL_render_psp.c
+++ b/src/render/psp/SDL_render_psp.c
@@ -458,7 +458,7 @@ PSP_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
static int
PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
{
-// PSP_RenderData *renderdata = (PSP_RenderData *) renderer->driverdata;
+/* PSP_RenderData *renderdata = (PSP_RenderData *) renderer->driverdata; */
PSP_TextureData* psp_texture = (PSP_TextureData*) SDL_calloc(1, sizeof(*psp_texture));;
if(!psp_texture)
@@ -528,7 +528,7 @@ static int
PSP_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, const void *pixels, int pitch)
{
-// PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata;
+/* PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata; */
const Uint8 *src;
Uint8 *dst;
int row, length,dpitch;
@@ -895,8 +895,8 @@ PSP_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
sceGuColor(0xFFFFFFFF);
}
-// x += width * 0.5f;
-// y += height * 0.5f;
+/* x += width * 0.5f; */
+/* y += height * 0.5f; */
x += centerx;
y += centery;
@@ -904,8 +904,8 @@ PSP_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
MathSincos(degToRad(angle), &s, &c);
-// width *= 0.5f;
-// height *= 0.5f;
+/* width *= 0.5f; */
+/* height *= 0.5f; */
width -= centerx;
height -= centery;
@@ -968,7 +968,7 @@ PSP_RenderPresent(SDL_Renderer * renderer)
sceGuFinish();
sceGuSync(0,0);
-// if(data->vsync)
+/* if(data->vsync) */
sceDisplayWaitVblankStart();
data->backbuffer = data->frontbuffer;
@@ -988,10 +988,7 @@ PSP_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
if(psp_texture == 0)
return;
- if(psp_texture->data != 0)
- {
- SDL_free(psp_texture->data);
- }
+ SDL_free(psp_texture->data);
SDL_free(psp_texture);
texture->driverdata = NULL;
}
@@ -1007,8 +1004,8 @@ PSP_DestroyRenderer(SDL_Renderer * renderer)
StartDrawing(renderer);
sceGuTerm();
-// vfree(data->backbuffer);
-// vfree(data->frontbuffer);
+/* vfree(data->backbuffer); */
+/* vfree(data->frontbuffer); */
data->initialized = SDL_FALSE;
data->displayListAvail = SDL_FALSE;
diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index 78f6ca1..29aab8c 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -609,8 +609,8 @@ SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
retval = SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect);
if (!retval) {
- _rotozoomSurfaceSizeTrig(tmp_rect.w, tmp_rect.h, -angle, &dstwidth, &dstheight, &cangle, &sangle);
- surface_rotated = _rotateSurface(surface_scaled, -angle, dstwidth/2, dstheight/2, GetScaleQuality(), flip & SDL_FLIP_HORIZONTAL, flip & SDL_FLIP_VERTICAL, dstwidth, dstheight, cangle, sangle);
+ SDLgfx_rotozoomSurfaceSizeTrig(tmp_rect.w, tmp_rect.h, -angle, &dstwidth, &dstheight, &cangle, &sangle);
+ surface_rotated = SDLgfx_rotateSurface(surface_scaled, -angle, dstwidth/2, dstheight/2, GetScaleQuality(), flip & SDL_FLIP_HORIZONTAL, flip & SDL_FLIP_VERTICAL, dstwidth, dstheight, cangle, sangle);
if(surface_rotated) {
/* Find out where the new origin is by rotating the four final_rect points around the center and then taking the extremes */
abscenterx = final_rect.x + (int)center->x;
@@ -718,9 +718,7 @@ SW_DestroyRenderer(SDL_Renderer * renderer)
{
SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
- if (data) {
- SDL_free(data);
- }
+ SDL_free(data);
SDL_free(renderer);
}
diff --git a/src/render/software/SDL_rotate.c b/src/render/software/SDL_rotate.c
index b315535..3006eda 100644
--- a/src/render/software/SDL_rotate.c
+++ b/src/render/software/SDL_rotate.c
@@ -30,8 +30,8 @@ Andreas Schiffler -- aschiffler at ferzkopp dot net
*/
#include "SDL_config.h"
-#ifdef WIN32
-#include <windows.h>
+#if defined(__WIN32__)
+#include "../../core/windows/SDL_windows.h"
#endif
#include <stdlib.h>
@@ -42,7 +42,7 @@ Andreas Schiffler -- aschiffler at ferzkopp dot net
/* ---- Internally used structures */
-/*!
+/* !
\brief A 32 bit RGBA pixel.
*/
typedef struct tColorRGBA {
@@ -52,19 +52,19 @@ typedef struct tColorRGBA {
Uint8 a;
} tColorRGBA;
-/*!
+/* !
\brief A 8bit Y/palette pixel.
*/
typedef struct tColorY {
Uint8 y;
} tColorY;
-/*!
+/* !
\brief Returns maximum of two numbers a and b.
*/
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
-/*!
+/* !
\brief Number of guard rows added to destination surfaces.
This is a simple but effective workaround for observed issues.
@@ -76,15 +76,16 @@ to a situation where the program can segfault.
*/
#define GUARD_ROWS (2)
-/*!
+/* !
\brief Lower limit of absolute zoom factor or rotation degrees.
*/
#define VALUE_LIMIT 0.001
-/*!
+/* !
\brief Returns colorkey info for a surface
*/
-Uint32 _colorkey(SDL_Surface *src)
+static Uint32
+_colorkey(SDL_Surface *src)
{
Uint32 key = 0;
SDL_GetColorKey(src, &key);
@@ -92,7 +93,7 @@ Uint32 _colorkey(SDL_Surface *src)
}
-/*!
+/* !
\brief Internal target surface sizing function for rotations with trig result return.
\param width The source surface width.
@@ -104,9 +105,10 @@ Uint32 _colorkey(SDL_Surface *src)
\param sangle The cosine of the angle
*/
-void _rotozoomSurfaceSizeTrig(int width, int height, double angle,
- int *dstwidth, int *dstheight,
- double *cangle, double *sangle)
+void
+SDLgfx_rotozoomSurfaceSizeTrig(int width, int height, double angle,
+ int *dstwidth, int *dstheight,
+ double *cangle, double *sangle)
{
double x, y, cx, cy, sx, sy;
double radangle;
@@ -134,7 +136,7 @@ void _rotozoomSurfaceSizeTrig(int width, int height, double angle,
}
-/*!
+/* !
\brief Internal 32 bit rotozoomer with optional anti-aliasing.
Rotates and zooms 32 bit RGBA/ABGR 'src' surface to 'dst' surface based on the control
@@ -153,7 +155,8 @@ Assumes dst surface was allocated with the correct dimensions.
\param flipy Flag indicating vertical mirroring should be applied.
\param smooth Flag indicating anti-aliasing should be used.
*/
-void _transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy, int smooth)
+static void
+_transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy, int smooth)
{
int x, y, t1, t2, dx, dy, xd, yd, sdx, sdy, ax, ay, ex, ey, sw, sh;
tColorRGBA c00, c01, c10, c11, cswap;
@@ -252,7 +255,7 @@ void _transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int cx, int cy,
}
}
-/*!
+/* !
\brief Rotates and zooms 8 bit palette/Y 'src' surface to 'dst' surface without smoothing.
@@ -270,7 +273,8 @@ Assumes dst surface was allocated with the correct dimensions.
\param flipx Flag indicating horizontal mirroring should be applied.
\param flipy Flag indicating vertical mirroring should be applied.
*/
-void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy)
+static void
+transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy)
{
int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay;
tColorY *pc, *sp;
@@ -315,9 +319,7 @@ void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int
}
-
-
-/*!
+/* !
\brief Rotates and zooms a surface with different horizontal and vertival scaling factors and optional anti-aliasing.
Rotates a 32bit or 8bit 'src' surface to newly created 'dst' surface.
@@ -340,7 +342,8 @@ or 32bit RGBA/ABGR it will be converted into a 32bit RGBA format on the fly.
*/
-SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle)
+SDL_Surface *
+SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle)
{
SDL_Surface *rz_src;
SDL_Surface *rz_dst;
@@ -357,7 +360,7 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
if (src == NULL)
return (NULL);
- if (src->flags & SDL_TRUE/*SDL_SRCCOLORKEY*/)
+ if (src->flags & SDL_TRUE/* SDL_SRCCOLORKEY */)
{
colorkey = _colorkey(src);
SDL_GetRGB(colorkey, src->format, &r, &g, &b);
@@ -391,14 +394,14 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
SDL_BlitSurface(src, NULL, rz_src, NULL);
if(colorKeyAvailable)
- SDL_SetColorKey(src, SDL_TRUE /*SDL_SRCCOLORKEY*/, colorkey);
+ SDL_SetColorKey(src, SDL_TRUE /* SDL_SRCCOLORKEY */, colorkey);
src_converted = 1;
is32bit = 1;
}
/* Determine target size */
- /*_rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); */
+ /* _rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); */
/*
* Calculate target factors from sin/cos and zoom
@@ -459,8 +462,8 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
/*
* Turn on source-alpha support
*/
- /*SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255);*/
- SDL_SetColorKey(rz_dst, /*SDL_SRCCOLORKEY*/ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
+ /* SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255); */
+ SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
} else {
/*
* Copy palette and colorkey info
@@ -475,7 +478,7 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
transformSurfaceY(rz_src, rz_dst, centerx, centery,
(int) (sangleinv), (int) (cangleinv),
flipx, flipy);
- SDL_SetColorKey(rz_dst, /*SDL_SRCCOLORKEY*/ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
+ SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
}
/*
* Unlock source surface
@@ -496,4 +499,3 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
*/
return (rz_dst);
}
-
diff --git a/src/render/software/SDL_rotate.h b/src/render/software/SDL_rotate.h
index 26bb8ad..31d12a4 100644
--- a/src/render/software/SDL_rotate.h
+++ b/src/render/software/SDL_rotate.h
@@ -2,6 +2,6 @@
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
-extern SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle);
-extern void _rotozoomSurfaceSizeTrig(int width, int height, double angle, int *dstwidth, int *dstheight, double *cangle, double *sangle);
+extern SDL_Surface *SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle);
+extern void SDLgfx_rotozoomSurfaceSizeTrig(int width, int height, double angle, int *dstwidth, int *dstheight, double *cangle, double *sangle);
diff --git a/src/stdlib/SDL_getenv.c b/src/stdlib/SDL_getenv.c
index 0cd4405..10fa7c5 100644
--- a/src/stdlib/SDL_getenv.c
+++ b/src/stdlib/SDL_getenv.c
@@ -20,10 +20,13 @@
*/
#include "SDL_config.h"
+#if defined(__WIN32__)
+#include "../core/windows/SDL_windows.h"
+#endif
+
#include "SDL_stdinc.h"
#if !defined(SDL_setenv) && defined(__WIN32__)
-#include "../core/windows/SDL_windows.h"
/* Note this isn't thread-safe! */
static char *SDL_envmem = NULL; /* Ugh, memory leak */
static size_t SDL_envmemlen = 0;
diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c
index 109e03e..4de2ebe 100644
--- a/src/stdlib/SDL_iconv.c
+++ b/src/stdlib/SDL_iconv.c
@@ -843,7 +843,7 @@ SDL_iconv(SDL_iconv_t cd,
int
SDL_iconv_close(SDL_iconv_t cd)
{
- if (cd && cd != (SDL_iconv_t) - 1) {
+ if (cd != (SDL_iconv_t)-1) {
SDL_free(cd);
}
return 0;
diff --git a/src/stdlib/SDL_string.c b/src/stdlib/SDL_string.c
index 89f5f35..980f025 100644
--- a/src/stdlib/SDL_string.c
+++ b/src/stdlib/SDL_string.c
@@ -1293,13 +1293,20 @@ int SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap)
}
#else
/* FIXME: implement more of the format specifiers */
+typedef enum
+{
+ SDL_CASE_NOCHANGE,
+ SDL_CASE_LOWER,
+ SDL_CASE_UPPER
+} SDL_letter_case;
+
typedef struct
{
SDL_bool left_justify;
SDL_bool force_sign;
SDL_bool force_type;
SDL_bool pad_zeroes;
- SDL_bool do_lowercase;
+ SDL_letter_case force_case;
int width;
int radix;
int precision;
@@ -1322,8 +1329,12 @@ SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *str
length += SDL_strlcpy(text, string, maxlen);
- if (info && info->do_lowercase) {
- SDL_strlwr(text);
+ if (info) {
+ if (info->force_case == SDL_CASE_LOWER) {
+ SDL_strlwr(text);
+ } else if (info->force_case == SDL_CASE_UPPER) {
+ SDL_strupr(text);
+ }
}
return length;
}
@@ -1573,9 +1584,12 @@ SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap)
break;
case 'p':
case 'x':
- info.do_lowercase = SDL_TRUE;
+ info.force_case = SDL_CASE_LOWER;
/* Fall through to 'X' handling */
case 'X':
+ if (info.force_case == SDL_CASE_NOCHANGE) {
+ info.force_case = SDL_CASE_UPPER;
+ }
if (info.radix == 10) {
info.radix = 16;
}
diff --git a/src/test/SDL_test_assert.c b/src/test/SDL_test_assert.c
index 41a3df6..6f08d1f 100644
--- a/src/test/SDL_test_assert.c
+++ b/src/test/SDL_test_assert.c
@@ -35,10 +35,10 @@ const char *SDLTest_AssertCheckFormat = "Assert '%s': %s";
/* Assert summary message format */
const char *SDLTest_AssertSummaryFormat = "Assert Summary: Total=%d Passed=%d Failed=%d";
-/*! \brief counts the failed asserts */
+/* ! \brief counts the failed asserts */
static Uint32 SDLTest_AssertsFailed = 0;
-/*! \brief counts the passed asserts */
+/* ! \brief counts the passed asserts */
static Uint32 SDLTest_AssertsPassed = 0;
/*
diff --git a/src/test/SDL_test_common.c b/src/test/SDL_test_common.c
index 14add55..c117a93 100644
--- a/src/test/SDL_test_common.c
+++ b/src/test/SDL_test_common.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#define VIDEO_USAGE \
-"[--video driver] [--renderer driver] [--gldebug] [--info all|video|modes|render|event] [--log all|error|system|audio|video|render|input] [--display N] [--fullscreen | --fullscreen-desktop | --windows N] [--title title] [--icon icon.bmp] [--center | --position X,Y] [--geometry WxH] [--min-geometry WxH] [--max-geometry WxH] [--logical WxH] [--scale N] [--depth N] [--refresh R] [--vsync] [--noframe] [--resize] [--minimize] [--maximize] [--grab]"
+"[--video driver] [--renderer driver] [--gldebug] [--info all|video|modes|render|event] [--log all|error|system|audio|video|render|input] [--display N] [--fullscreen | --fullscreen-desktop | --windows N] [--title title] [--icon icon.bmp] [--center | --position X,Y] [--geometry WxH] [--min-geometry WxH] [--max-geometry WxH] [--logical WxH] [--scale N] [--depth N] [--refresh R] [--vsync] [--noframe] [--resize] [--minimize] [--maximize] [--grab] [--allow-hidpi]"
#define AUDIO_USAGE \
"[--rate N] [--format U8|S8|U16|U16LE|U16BE|S16|S16LE|S16BE] [--channels N] [--samples N]"
@@ -194,6 +194,10 @@ SDLTest_CommonArg(SDLTest_CommonState * state, int index)
state->num_windows = 1;
return 1;
}
+ if (SDL_strcasecmp(argv[index], "--allow-highdpi") == 0) {
+ state->window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+ return 1;
+ }
if (SDL_strcasecmp(argv[index], "--windows") == 0) {
++index;
if (!argv[index] || !SDL_isdigit(*argv[index])) {
@@ -691,13 +695,18 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
if (state->gl_debug) {
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
}
+ if (state->gl_profile_mask) {
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, state->gl_profile_mask);
+ }
if (state->verbose & VERBOSE_MODES) {
SDL_Rect bounds;
SDL_DisplayMode mode;
int bpp;
Uint32 Rmask, Gmask, Bmask, Amask;
-
+#if SDL_VIDEO_DRIVER_WINDOWS
+ int adapterIndex = 0;
+#endif
n = SDL_GetNumVideoDisplays();
fprintf(stderr, "Number of displays: %d\n", n);
for (i = 0; i < n; ++i) {
@@ -750,6 +759,12 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
}
}
}
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+ /* Print the adapter index */
+ adapterIndex = SDL_Direct3D9GetAdapterIndex( i );
+ fprintf( stderr, "Adapter Index: %d", adapterIndex );
+#endif
}
}
@@ -1092,10 +1107,10 @@ SDLTest_PrintEvent(SDL_Event * event)
case SDL_FINGERDOWN:
case SDL_FINGERUP:
- fprintf(stderr, "Finger: %s touch=%lld, finger=%lld, x=%f, y=%f, dx=%f, dy=%f, pressure=%f",
+ fprintf(stderr, "Finger: %s touch=%ld, finger=%ld, x=%f, y=%f, dx=%f, dy=%f, pressure=%f",
(event->type == SDL_FINGERDOWN) ? "down" : "up",
- (long long) event->tfinger.touchId,
- (long long) event->tfinger.fingerId,
+ (long) event->tfinger.touchId,
+ (long) event->tfinger.fingerId,
event->tfinger.x, event->tfinger.y,
event->tfinger.dx, event->tfinger.dy, event->tfinger.pressure);
break;
@@ -1139,11 +1154,13 @@ SDLTest_ScreenShot(SDL_Renderer *renderer)
if (SDL_RenderReadPixels(renderer, NULL, surface->format->format,
surface->pixels, surface->pitch) < 0) {
fprintf(stderr, "Couldn't read screen: %s\n", SDL_GetError());
+ SDL_free(surface);
return;
}
if (SDL_SaveBMP(surface, "screenshot.bmp") < 0) {
fprintf(stderr, "Couldn't save screenshot.bmp: %s\n", SDL_GetError());
+ SDL_free(surface);
return;
}
}
@@ -1188,6 +1205,12 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
SDL_Window *window = SDL_GetWindowFromID(event->window.windowID);
if (window) {
SDL_DestroyWindow(window);
+ for (i = 0; i < state->num_windows; ++i) {
+ if (window == state->windows[i]) {
+ state->windows[i] = NULL;
+ break;
+ }
+ }
}
}
break;
@@ -1388,9 +1411,7 @@ SDLTest_CommonQuit(SDLTest_CommonState * state)
{
int i;
- if (state->windows) {
- SDL_free(state->windows);
- }
+ SDL_free(state->windows);
if (state->renderers) {
for (i = 0; i < state->num_windows; ++i) {
if (state->renderers[i]) {
diff --git a/src/test/SDL_test_font.c b/src/test/SDL_test_font.c
index 144bcad..b7d2caa 100644
--- a/src/test/SDL_test_font.c
+++ b/src/test/SDL_test_font.c
@@ -1569,7 +1569,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 128 0x80 '€'
+ * 128 0x80 '�'
*/
0x7c, /* 01111100 */
0xc6, /* 11000110 */
@@ -1581,7 +1581,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x78, /* 01111000 */
/*
- * 129 0x81 ''
+ * 129 0x81 '�'
*/
0xcc, /* 11001100 */
0x00, /* 00000000 */
@@ -1593,7 +1593,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 130 0x82 '‚'
+ * 130 0x82 '�'
*/
0x0c, /* 00001100 */
0x18, /* 00011000 */
@@ -1605,7 +1605,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 131 0x83 'ƒ'
+ * 131 0x83 '�'
*/
0x7c, /* 01111100 */
0x82, /* 10000010 */
@@ -1617,7 +1617,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 132 0x84 '„'
+ * 132 0x84 '�'
*/
0xc6, /* 11000110 */
0x00, /* 00000000 */
@@ -1629,7 +1629,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 133 0x85 '…'
+ * 133 0x85 '�'
*/
0x30, /* 00110000 */
0x18, /* 00011000 */
@@ -1641,7 +1641,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 134 0x86 '†'
+ * 134 0x86 '�'
*/
0x30, /* 00110000 */
0x30, /* 00110000 */
@@ -1653,7 +1653,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 135 0x87 '‡'
+ * 135 0x87 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -1665,7 +1665,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x38, /* 00111000 */
/*
- * 136 0x88 'ˆ'
+ * 136 0x88 '�'
*/
0x7c, /* 01111100 */
0x82, /* 10000010 */
@@ -1677,7 +1677,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 137 0x89 '‰'
+ * 137 0x89 '�'
*/
0xc6, /* 11000110 */
0x00, /* 00000000 */
@@ -1689,7 +1689,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 138 0x8a 'Š'
+ * 138 0x8a '�'
*/
0x30, /* 00110000 */
0x18, /* 00011000 */
@@ -1701,7 +1701,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 139 0x8b '‹'
+ * 139 0x8b '�'
*/
0x66, /* 01100110 */
0x00, /* 00000000 */
@@ -1713,7 +1713,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 140 0x8c 'Œ'
+ * 140 0x8c '�'
*/
0x7c, /* 01111100 */
0x82, /* 10000010 */
@@ -1725,7 +1725,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 141 0x8d ''
+ * 141 0x8d '�'
*/
0x30, /* 00110000 */
0x18, /* 00011000 */
@@ -1737,7 +1737,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 142 0x8e 'Ž'
+ * 142 0x8e '�'
*/
0xc6, /* 11000110 */
0x38, /* 00111000 */
@@ -1749,7 +1749,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 143 0x8f ''
+ * 143 0x8f '�'
*/
0x38, /* 00111000 */
0x6c, /* 01101100 */
@@ -1761,7 +1761,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 144 0x90 ''
+ * 144 0x90 '�'
*/
0x18, /* 00011000 */
0x30, /* 00110000 */
@@ -1773,7 +1773,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 145 0x91 '‘'
+ * 145 0x91 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -1785,7 +1785,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 146 0x92 '’'
+ * 146 0x92 '�'
*/
0x3e, /* 00111110 */
0x6c, /* 01101100 */
@@ -1797,7 +1797,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 147 0x93 '“'
+ * 147 0x93 '�'
*/
0x7c, /* 01111100 */
0x82, /* 10000010 */
@@ -1809,7 +1809,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 148 0x94 '”'
+ * 148 0x94 '�'
*/
0xc6, /* 11000110 */
0x00, /* 00000000 */
@@ -1821,7 +1821,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 149 0x95 '•'
+ * 149 0x95 '�'
*/
0x30, /* 00110000 */
0x18, /* 00011000 */
@@ -1833,7 +1833,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 150 0x96 '–'
+ * 150 0x96 '�'
*/
0x78, /* 01111000 */
0x84, /* 10000100 */
@@ -1845,7 +1845,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 151 0x97 '—'
+ * 151 0x97 '�'
*/
0x60, /* 01100000 */
0x30, /* 00110000 */
@@ -1857,7 +1857,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 152 0x98 '˜'
+ * 152 0x98 '�'
*/
0xc6, /* 11000110 */
0x00, /* 00000000 */
@@ -1869,7 +1869,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xfc, /* 11111100 */
/*
- * 153 0x99 '™'
+ * 153 0x99 '�'
*/
0xc6, /* 11000110 */
0x38, /* 00111000 */
@@ -1881,7 +1881,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 154 0x9a 'š'
+ * 154 0x9a '�'
*/
0xc6, /* 11000110 */
0x00, /* 00000000 */
@@ -1893,7 +1893,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 155 0x9b '›'
+ * 155 0x9b '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -1905,7 +1905,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 156 0x9c 'œ'
+ * 156 0x9c '�'
*/
0x38, /* 00111000 */
0x6c, /* 01101100 */
@@ -1917,7 +1917,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 157 0x9d ''
+ * 157 0x9d '�'
*/
0x66, /* 01100110 */
0x66, /* 01100110 */
@@ -1929,7 +1929,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 158 0x9e 'ž'
+ * 158 0x9e '�'
*/
0xf8, /* 11111000 */
0xcc, /* 11001100 */
@@ -1941,7 +1941,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xc7, /* 11000111 */
/*
- * 159 0x9f 'Ÿ'
+ * 159 0x9f '�'
*/
0x0e, /* 00001110 */
0x1b, /* 00011011 */
@@ -1953,7 +1953,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 160 0xa0 ' '
+ * 160 0xa0 '�'
*/
0x18, /* 00011000 */
0x30, /* 00110000 */
@@ -1965,7 +1965,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 161 0xa1 '¡'
+ * 161 0xa1 '�'
*/
0x0c, /* 00001100 */
0x18, /* 00011000 */
@@ -1977,7 +1977,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 162 0xa2 '¢'
+ * 162 0xa2 '�'
*/
0x0c, /* 00001100 */
0x18, /* 00011000 */
@@ -1989,7 +1989,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 163 0xa3 '£'
+ * 163 0xa3 '�'
*/
0x18, /* 00011000 */
0x30, /* 00110000 */
@@ -2001,7 +2001,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 164 0xa4 '¤'
+ * 164 0xa4 '�'
*/
0x76, /* 01110110 */
0xdc, /* 11011100 */
@@ -2013,7 +2013,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 165 0xa5 '¥'
+ * 165 0xa5 '�'
*/
0x76, /* 01110110 */
0xdc, /* 11011100 */
@@ -2025,7 +2025,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 166 0xa6 '¦'
+ * 166 0xa6 '�'
*/
0x3c, /* 00111100 */
0x6c, /* 01101100 */
@@ -2037,7 +2037,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 167 0xa7 '§'
+ * 167 0xa7 '�'
*/
0x38, /* 00111000 */
0x6c, /* 01101100 */
@@ -2049,7 +2049,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 168 0xa8 '¨'
+ * 168 0xa8 '�'
*/
0x18, /* 00011000 */
0x00, /* 00000000 */
@@ -2061,7 +2061,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 169 0xa9 '©'
+ * 169 0xa9 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2073,7 +2073,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 170 0xaa 'ª'
+ * 170 0xaa '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2085,7 +2085,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 171 0xab '«'
+ * 171 0xab '�'
*/
0x63, /* 01100011 */
0xe6, /* 11100110 */
@@ -2097,7 +2097,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x0f, /* 00001111 */
/*
- * 172 0xac '¬'
+ * 172 0xac '�'
*/
0x63, /* 01100011 */
0xe6, /* 11100110 */
@@ -2109,7 +2109,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x06, /* 00000110 */
/*
- * 173 0xad ''
+ * 173 0xad '�'
*/
0x18, /* 00011000 */
0x00, /* 00000000 */
@@ -2121,7 +2121,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 174 0xae '®'
+ * 174 0xae '�'
*/
0x00, /* 00000000 */
0x33, /* 00110011 */
@@ -2133,7 +2133,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 175 0xaf '¯'
+ * 175 0xaf '�'
*/
0x00, /* 00000000 */
0xcc, /* 11001100 */
@@ -2145,7 +2145,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 176 0xb0 '°'
+ * 176 0xb0 '�'
*/
0x22, /* 00100010 */
0x88, /* 10001000 */
@@ -2157,7 +2157,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x88, /* 10001000 */
/*
- * 177 0xb1 '±'
+ * 177 0xb1 '�'
*/
0x55, /* 01010101 */
0xaa, /* 10101010 */
@@ -2169,7 +2169,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xaa, /* 10101010 */
/*
- * 178 0xb2 '²'
+ * 178 0xb2 '�'
*/
0x77, /* 01110111 */
0xdd, /* 11011101 */
@@ -2181,7 +2181,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xdd, /* 11011101 */
/*
- * 179 0xb3 '³'
+ * 179 0xb3 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2193,7 +2193,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 180 0xb4 '´'
+ * 180 0xb4 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2205,7 +2205,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 181 0xb5 'µ'
+ * 181 0xb5 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2217,7 +2217,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 182 0xb6 '¶'
+ * 182 0xb6 '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2229,7 +2229,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 183 0xb7 '·'
+ * 183 0xb7 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2241,7 +2241,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 184 0xb8 '¸'
+ * 184 0xb8 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2253,7 +2253,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 185 0xb9 '¹'
+ * 185 0xb9 '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2265,7 +2265,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 186 0xba 'º'
+ * 186 0xba '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2277,7 +2277,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 187 0xbb '»'
+ * 187 0xbb '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2289,7 +2289,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 188 0xbc '¼'
+ * 188 0xbc '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2301,7 +2301,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 189 0xbd '½'
+ * 189 0xbd '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2313,7 +2313,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 190 0xbe '¾'
+ * 190 0xbe '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2325,7 +2325,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 191 0xbf '¿'
+ * 191 0xbf '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2337,7 +2337,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 192 0xc0 'À'
+ * 192 0xc0 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2349,7 +2349,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 193 0xc1 'Á'
+ * 193 0xc1 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2361,7 +2361,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 194 0xc2 'Â'
+ * 194 0xc2 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2373,7 +2373,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 195 0xc3 'Ã'
+ * 195 0xc3 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2385,7 +2385,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 196 0xc4 'Ä'
+ * 196 0xc4 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2397,7 +2397,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 197 0xc5 'Å'
+ * 197 0xc5 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2409,7 +2409,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 198 0xc6 'Æ'
+ * 198 0xc6 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2421,7 +2421,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 199 0xc7 'Ç'
+ * 199 0xc7 '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2433,7 +2433,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 200 0xc8 'È'
+ * 200 0xc8 '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2445,7 +2445,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 201 0xc9 'É'
+ * 201 0xc9 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2457,7 +2457,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 202 0xca 'Ê'
+ * 202 0xca '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2469,7 +2469,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 203 0xcb 'Ë'
+ * 203 0xcb '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2481,7 +2481,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 204 0xcc 'Ì'
+ * 204 0xcc '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2493,7 +2493,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 205 0xcd 'Í'
+ * 205 0xcd '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2505,7 +2505,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 206 0xce 'Î'
+ * 206 0xce '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2517,7 +2517,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 207 0xcf 'Ï'
+ * 207 0xcf '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2529,7 +2529,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 208 0xd0 'Ð'
+ * 208 0xd0 '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2541,7 +2541,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 209 0xd1 'Ñ'
+ * 209 0xd1 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2553,7 +2553,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 210 0xd2 'Ò'
+ * 210 0xd2 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2565,7 +2565,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 211 0xd3 'Ó'
+ * 211 0xd3 '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2577,7 +2577,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 212 0xd4 'Ô'
+ * 212 0xd4 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2589,7 +2589,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 213 0xd5 'Õ'
+ * 213 0xd5 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2601,7 +2601,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 214 0xd6 'Ö'
+ * 214 0xd6 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2613,7 +2613,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 215 0xd7 '×'
+ * 215 0xd7 '�'
*/
0x36, /* 00110110 */
0x36, /* 00110110 */
@@ -2625,7 +2625,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x36, /* 00110110 */
/*
- * 216 0xd8 'Ø'
+ * 216 0xd8 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2637,7 +2637,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 217 0xd9 'Ù'
+ * 217 0xd9 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2649,7 +2649,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 218 0xda 'Ú'
+ * 218 0xda '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2661,7 +2661,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 219 0xdb 'Û'
+ * 219 0xdb '�'
*/
0xff, /* 11111111 */
0xff, /* 11111111 */
@@ -2673,7 +2673,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xff, /* 11111111 */
/*
- * 220 0xdc 'Ü'
+ * 220 0xdc '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2685,7 +2685,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xff, /* 11111111 */
/*
- * 221 0xdd 'Ý'
+ * 221 0xdd '�'
*/
0xf0, /* 11110000 */
0xf0, /* 11110000 */
@@ -2697,7 +2697,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xf0, /* 11110000 */
/*
- * 222 0xde 'Þ'
+ * 222 0xde '�'
*/
0x0f, /* 00001111 */
0x0f, /* 00001111 */
@@ -2709,7 +2709,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x0f, /* 00001111 */
/*
- * 223 0xdf 'ß'
+ * 223 0xdf '�'
*/
0xff, /* 11111111 */
0xff, /* 11111111 */
@@ -2721,7 +2721,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 224 0xe0 'à'
+ * 224 0xe0 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2733,7 +2733,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 225 0xe1 'á'
+ * 225 0xe1 '�'
*/
0x78, /* 01111000 */
0xcc, /* 11001100 */
@@ -2745,7 +2745,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 226 0xe2 'â'
+ * 226 0xe2 '�'
*/
0xfe, /* 11111110 */
0xc6, /* 11000110 */
@@ -2757,7 +2757,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 227 0xe3 'ã'
+ * 227 0xe3 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2769,7 +2769,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 228 0xe4 'ä'
+ * 228 0xe4 '�'
*/
0xfe, /* 11111110 */
0xc6, /* 11000110 */
@@ -2781,7 +2781,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 229 0xe5 'å'
+ * 229 0xe5 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2793,7 +2793,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 230 0xe6 'æ'
+ * 230 0xe6 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2805,7 +2805,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xc0, /* 11000000 */
/*
- * 231 0xe7 'ç'
+ * 231 0xe7 '�'
*/
0x00, /* 00000000 */
0x76, /* 01110110 */
@@ -2817,7 +2817,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 232 0xe8 'è'
+ * 232 0xe8 '�'
*/
0x7e, /* 01111110 */
0x18, /* 00011000 */
@@ -2829,7 +2829,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x7e, /* 01111110 */
/*
- * 233 0xe9 'é'
+ * 233 0xe9 '�'
*/
0x38, /* 00111000 */
0x6c, /* 01101100 */
@@ -2841,7 +2841,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 234 0xea 'ê'
+ * 234 0xea '�'
*/
0x38, /* 00111000 */
0x6c, /* 01101100 */
@@ -2853,7 +2853,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 235 0xeb 'ë'
+ * 235 0xeb '�'
*/
0x0e, /* 00001110 */
0x18, /* 00011000 */
@@ -2865,7 +2865,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 236 0xec 'ì'
+ * 236 0xec '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -2877,7 +2877,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 237 0xed 'í'
+ * 237 0xed '�'
*/
0x06, /* 00000110 */
0x0c, /* 00001100 */
@@ -2889,7 +2889,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0xc0, /* 11000000 */
/*
- * 238 0xee 'î'
+ * 238 0xee '�'
*/
0x1e, /* 00011110 */
0x30, /* 00110000 */
@@ -2901,7 +2901,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 239 0xef 'ï'
+ * 239 0xef '�'
*/
0x00, /* 00000000 */
0x7c, /* 01111100 */
@@ -2913,7 +2913,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 240 0xf0 'ð'
+ * 240 0xf0 '�'
*/
0x00, /* 00000000 */
0xfe, /* 11111110 */
@@ -2925,7 +2925,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 241 0xf1 'ñ'
+ * 241 0xf1 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2937,7 +2937,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 242 0xf2 'ò'
+ * 242 0xf2 '�'
*/
0x30, /* 00110000 */
0x18, /* 00011000 */
@@ -2949,7 +2949,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 243 0xf3 'ó'
+ * 243 0xf3 '�'
*/
0x0c, /* 00001100 */
0x18, /* 00011000 */
@@ -2961,7 +2961,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 244 0xf4 'ô'
+ * 244 0xf4 '�'
*/
0x0e, /* 00001110 */
0x1b, /* 00011011 */
@@ -2973,7 +2973,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x18, /* 00011000 */
/*
- * 245 0xf5 'õ'
+ * 245 0xf5 '�'
*/
0x18, /* 00011000 */
0x18, /* 00011000 */
@@ -2985,7 +2985,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x70, /* 01110000 */
/*
- * 246 0xf6 'ö'
+ * 246 0xf6 '�'
*/
0x00, /* 00000000 */
0x18, /* 00011000 */
@@ -2997,7 +2997,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 247 0xf7 '÷'
+ * 247 0xf7 '�'
*/
0x00, /* 00000000 */
0x76, /* 01110110 */
@@ -3009,7 +3009,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 248 0xf8 'ø'
+ * 248 0xf8 '�'
*/
0x38, /* 00111000 */
0x6c, /* 01101100 */
@@ -3021,7 +3021,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 249 0xf9 'ù'
+ * 249 0xf9 '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -3033,7 +3033,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 250 0xfa 'ú'
+ * 250 0xfa '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -3045,7 +3045,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 251 0xfb 'û'
+ * 251 0xfb '�'
*/
0x0f, /* 00001111 */
0x0c, /* 00001100 */
@@ -3057,7 +3057,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x1c, /* 00011100 */
/*
- * 252 0xfc 'ü'
+ * 252 0xfc '�'
*/
0x6c, /* 01101100 */
0x36, /* 00110110 */
@@ -3069,7 +3069,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 253 0xfd 'ý'
+ * 253 0xfd '�'
*/
0x78, /* 01111000 */
0x0c, /* 00001100 */
@@ -3081,7 +3081,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
0x00, /* 00000000 */
/*
- * 254 0xfe 'þ'
+ * 254 0xfe '�'
*/
0x00, /* 00000000 */
0x00, /* 00000000 */
@@ -3109,7 +3109,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
/* ---- Character */
-/*!
+/* !
\brief Global cache for 8x8 pixel font textures created at runtime.
*/
static SDL_Texture *SDLTest_CharTextureCache[256];
diff --git a/src/test/SDL_test_fuzzer.c b/src/test/SDL_test_fuzzer.c
index 8a27fd0..d090c15 100644
--- a/src/test/SDL_test_fuzzer.c
+++ b/src/test/SDL_test_fuzzer.c
@@ -173,7 +173,7 @@ SDLTest_RandomIntegerInRange(Sint32 pMin, Sint32 pMax)
return (Sint32)((number % ((max + 1) - min)) + min);
}
-/*!
+/* !
* Generates a unsigned boundary value between the given boundaries.
* Boundary values are inclusive. See the examples below.
* If boundary2 < boundary1, the values are swapped.
@@ -303,7 +303,7 @@ SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool v
validDomain);
}
-/*!
+/* !
* Generates a signed boundary value between the given boundaries.
* Boundary values are inclusive. See the examples below.
* If boundary2 < boundary1, the values are swapped.
diff --git a/src/test/SDL_test_harness.c b/src/test/SDL_test_harness.c
index 2918745..1bfe9c2 100644
--- a/src/test/SDL_test_harness.c
+++ b/src/test/SDL_test_harness.c
@@ -37,7 +37,7 @@ const char *SDLTest_LogSummaryFormat = "%s Summary: Total=%d Passed=%d Failed=%d
/* Final result message format */
const char *SDLTest_FinalResultFormat = ">>> %s '%s': %s\n";
-/*! \brief Timeout for single test case execution */
+/* ! \brief Timeout for single test case execution */
static Uint32 SDLTest_TestCaseTimeout = 3600;
/**
@@ -109,17 +109,17 @@ SDLTest_GenerateExecKey(char *runSeed, char *suiteName, char *testName, int iter
Uint32 entireStringLength;
char *buffer;
- if (runSeed == NULL || SDL_strlen(runSeed)==0) {
+ if (runSeed == NULL || runSeed[0] == '\0') {
SDLTest_LogError("Invalid runSeed string.");
return -1;
}
- if (suiteName == NULL || SDL_strlen(suiteName)==0) {
+ if (suiteName == NULL || suiteName[0] == '\0') {
SDLTest_LogError("Invalid suiteName string.");
return -1;
}
- if (testName == NULL || SDL_strlen(testName)==0) {
+ if (testName == NULL || testName[0] == '\0') {
SDLTest_LogError("Invalid testName string.");
return -1;
}
@@ -399,7 +399,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
}
/* Generate run see if we don't have one already */
- if (userRunSeed == NULL || SDL_strlen(userRunSeed) == 0) {
+ if (userRunSeed == NULL || userRunSeed[0] == '\0') {
runSeed = SDLTest_GenerateRunSeed(16);
if (runSeed == NULL) {
SDLTest_LogError("Generating a random seed failed");
@@ -422,7 +422,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
SDLTest_Log("::::: Test Run /w seed '%s' started\n", runSeed);
/* Initialize filtering */
- if (filter != NULL && SDL_strlen(filter) > 0) {
+ if (filter != NULL && filter[0] != '\0') {
/* Loop over all suites to check if we have a filter match */
suiteCounter = 0;
while (testSuites[suiteCounter] && suiteFilter == 0) {
@@ -521,7 +521,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
suiteCounter,
testCounter,
currentTestName);
- if (testCase->description != NULL && SDL_strlen(testCase->description)>0) {
+ if (testCase->description != NULL && testCase->description[0] != '\0') {
SDLTest_Log("Test Description: '%s'",
(testCase->description) ? testCase->description : SDLTest_InvalidNameFormat);
}
diff --git a/src/test/SDL_test_log.c b/src/test/SDL_test_log.c
index c854c0f..caf3ddd 100644
--- a/src/test/SDL_test_log.c
+++ b/src/test/SDL_test_log.c
@@ -39,7 +39,7 @@
#include "SDL_test.h"
-/*!
+/* !
* Converts unix timestamp to its ascii representation in localtime
*
* Note: Uses a static buffer internally, so the return value
diff --git a/src/thread/SDL_systhread.h b/src/thread/SDL_systhread.h
index 738ea27..36898f3 100644
--- a/src/thread/SDL_systhread.h
+++ b/src/thread/SDL_systhread.h
@@ -26,6 +26,7 @@
#define _SDL_systhread_h
#include "SDL_thread.h"
+#include "SDL_thread_c.h"
/* This function creates a thread, passing args to SDL_RunThread(),
saves a system-dependent thread id in thread->id, and returns 0
diff --git a/src/thread/SDL_thread.c b/src/thread/SDL_thread.c
index 5eaed0c..4b070da 100644
--- a/src/thread/SDL_thread.c
+++ b/src/thread/SDL_thread.c
@@ -125,6 +125,7 @@ SDL_Generic_GetTLSData()
SDL_TLSEntry *entry;
SDL_TLSData *storage = NULL;
+#if !SDL_THREADS_DISABLED
if (!SDL_generic_TLS_mutex) {
static SDL_SpinLock tls_lock;
SDL_AtomicLock(&tls_lock);
@@ -139,6 +140,7 @@ SDL_Generic_GetTLSData()
}
SDL_AtomicUnlock(&tls_lock);
}
+#endif /* SDL_THREADS_DISABLED */
SDL_MemoryBarrierAcquire();
SDL_LockMutex(SDL_generic_TLS_mutex);
@@ -148,7 +150,9 @@ SDL_Generic_GetTLSData()
break;
}
}
+#if !SDL_THREADS_DISABLED
SDL_UnlockMutex(SDL_generic_TLS_mutex);
+#endif
return storage;
}
diff --git a/src/thread/SDL_thread_c.h b/src/thread/SDL_thread_c.h
index 90d9b57..2a20b4d 100644
--- a/src/thread/SDL_thread_c.h
+++ b/src/thread/SDL_thread_c.h
@@ -23,6 +23,8 @@
#ifndef _SDL_thread_c_h
#define _SDL_thread_c_h
+#include "SDL_thread.h"
+
/* Need the definitions of SYS_ThreadHandle */
#if SDL_THREADS_DISABLED
#include "generic/SDL_systhread_c.h"
diff --git a/src/thread/pthread/SDL_syssem.c b/src/thread/pthread/SDL_syssem.c
index 4acd6bf..e1613fc 100644
--- a/src/thread/pthread/SDL_syssem.c
+++ b/src/thread/pthread/SDL_syssem.c
@@ -156,10 +156,10 @@ SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
#else
end = SDL_GetTicks() + timeout;
while ((retval = SDL_SemTryWait(sem)) == SDL_MUTEX_TIMEDOUT) {
- if ((SDL_GetTicks() - end) >= 0) {
+ if (SDL_TICKS_PASSED(SDL_GetTicks(), end)) {
break;
}
- SDL_Delay(0);
+ SDL_Delay(1);
}
#endif /* HAVE_SEM_TIMEDWAIT */
diff --git a/src/thread/windows/SDL_systhread.c b/src/thread/windows/SDL_systhread.c
index 6cf826e..06e23ab 100644
--- a/src/thread/windows/SDL_systhread.c
+++ b/src/thread/windows/SDL_systhread.c
@@ -116,8 +116,8 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
int
SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
{
- pfnSDL_CurrentBeginThread pfnBeginThread = _beginthreadex;
- pfnSDL_CurrentEndThread pfnEndThread = _endthreadex;
+ pfnSDL_CurrentBeginThread pfnBeginThread = (pfnSDL_CurrentBeginThread)_beginthreadex;
+ pfnSDL_CurrentEndThread pfnEndThread = (pfnSDL_CurrentEndThread)_endthreadex;
#endif /* SDL_PASSED_BEGINTHREAD_ENDTHREAD */
pThreadStartParms pThreadParms =
(pThreadStartParms) SDL_malloc(sizeof(tThreadStartParms));
@@ -145,7 +145,9 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
return 0;
}
+#if 0 /* !!! FIXME: revisit this later. See https://bugzilla.libsdl.org/show_bug.cgi?id=2089 */
#ifdef _MSC_VER
+#pragma warning(disable : 4733)
#pragma pack(push,8)
typedef struct tagTHREADNAME_INFO
{
@@ -155,28 +157,46 @@ typedef struct tagTHREADNAME_INFO
DWORD dwFlags; /* reserved for future use, must be zero */
} THREADNAME_INFO;
#pragma pack(pop)
+
+static EXCEPTION_DISPOSITION
+ignore_exception(void *a, void *b, void *c, void *d)
+{
+ return ExceptionContinueExecution;
+}
+#endif
#endif
void
SDL_SYS_SetupThread(const char *name)
{
if (name != NULL) {
- #if 0 /* !!! FIXME: __except needs C runtime, which we don't link against. */
- #ifdef _MSC_VER /* !!! FIXME: can we do SEH on other compilers yet? */
- /* This magic tells the debugger to name a thread if it's listening. */
+ #if 0 /* !!! FIXME: revisit this later. See https://bugzilla.libsdl.org/show_bug.cgi?id=2089 */
+ #if (defined(_MSC_VER) && defined(_M_IX86))
+ /* This magic tells the debugger to name a thread if it's listening.
+ The inline asm sets up SEH (__try/__except) without C runtime
+ support. See Microsoft Systems Journal, January 1997:
+ http://www.microsoft.com/msj/0197/exception/exception.aspx */
+ INT_PTR handler = (INT_PTR) ignore_exception;
THREADNAME_INFO inf;
+
inf.dwType = 0x1000;
inf.szName = name;
inf.dwThreadID = (DWORD) -1;
inf.dwFlags = 0;
- __try
- {
- RaiseException(0x406D1388, 0, sizeof(inf)/sizeof(DWORD), (DWORD*)&inf);
+ __asm { /* set up SEH */
+ push handler
+ push fs:[0]
+ mov fs:[0],esp
}
- __except(EXCEPTION_CONTINUE_EXECUTION)
- {
- /* The program itself should ignore this bogus exception. */
+
+ /* The program itself should ignore this bogus exception. */
+ RaiseException(0x406D1388, 0, sizeof(inf)/sizeof(DWORD), (DWORD*)&inf);
+
+ __asm { /* tear down SEH. */
+ mov eax,[esp]
+ mov fs:[0], eax
+ add esp, 8
}
#endif
#endif
diff --git a/src/thread/windows/SDL_systls.c b/src/thread/windows/SDL_systls.c
index 0ece77d..90941ee 100644
--- a/src/thread/windows/SDL_systls.c
+++ b/src/thread/windows/SDL_systls.c
@@ -20,13 +20,13 @@
*/
#include "SDL_config.h"
-#include "SDL_thread.h"
-#include "../SDL_thread_c.h"
#if SDL_THREAD_WINDOWS
#include "../../core/windows/SDL_windows.h"
+#include "SDL_thread.h"
+#include "../SDL_thread_c.h"
static DWORD thread_local_storage = TLS_OUT_OF_INDEXES;
static SDL_bool generic_local_storage = SDL_FALSE;
diff --git a/src/timer/SDL_timer.c b/src/timer/SDL_timer.c
index 5b6550c..2980f4d 100644
--- a/src/timer/SDL_timer.c
+++ b/src/timer/SDL_timer.c
@@ -26,8 +26,6 @@
#include "SDL_cpuinfo.h"
#include "SDL_thread.h"
-extern void SDL_StartTicks(void);
-
/* #define DEBUG_TIMERS */
typedef struct _SDL_Timer
@@ -72,17 +70,6 @@ typedef struct {
static SDL_TimerData SDL_timer_data;
-static Uint32 ticks_started = 0;
-
-void
-SDL_InitTicks(void)
-{
- if (!ticks_started) {
- SDL_StartTicks();
- ticks_started = 1;
- }
-}
-
/* The idea here is that any thread might add a timer, but a single
* thread manages the active timer queue, sorted by scheduling time.
*
diff --git a/src/timer/beos/SDL_systimer.c b/src/timer/beos/SDL_systimer.c
index edaf275..fd22e44 100644
--- a/src/timer/beos/SDL_systimer.c
+++ b/src/timer/beos/SDL_systimer.c
@@ -27,10 +27,16 @@
#include "SDL_timer.h"
static bigtime_t start;
+static SDL_bool ticks_started = SDL_FALSE;
void
-SDL_StartTicks(void)
+SDL_InitTicks(void)
{
+ if (ticks_started) {
+ return;
+ }
+ ticks_started = SDL_TRUE;
+
/* Set first ticks value */
start = system_time();
}
@@ -38,6 +44,10 @@ SDL_StartTicks(void)
Uint32
SDL_GetTicks(void)
{
+ if (!ticks_started) {
+ SDL_InitTicks();
+ }
+
return ((system_time() - start) / 1000);
}
diff --git a/src/timer/dummy/SDL_systimer.c b/src/timer/dummy/SDL_systimer.c
index 2b5a9f8..387675d 100644
--- a/src/timer/dummy/SDL_systimer.c
+++ b/src/timer/dummy/SDL_systimer.c
@@ -24,14 +24,24 @@
#include "SDL_timer.h"
+static SDL_bool ticks_started = SDL_FALSE;
+
void
-SDL_StartTicks(void)
+SDL_InitTicks(void)
{
+ if (ticks_started) {
+ return;
+ }
+ ticks_started = SDL_TRUE;
}
Uint32
SDL_GetTicks(void)
{
+ if (!ticks_started) {
+ SDL_InitTicks();
+ }
+
SDL_Unsupported();
return 0;
}
diff --git a/src/timer/psp/SDL_systimer.c b/src/timer/psp/SDL_systimer.c
index 59bb4df..61c4690 100644
--- a/src/timer/psp/SDL_systimer.c
+++ b/src/timer/psp/SDL_systimer.c
@@ -29,14 +29,24 @@
#include <pspthreadman.h>
static struct timeval start;
+static SDL_bool ticks_started = SDL_FALSE;
-void SDL_StartTicks(void)
+void SDL_InitTicks(void)
{
+ if (ticks_started) {
+ return;
+ }
+ ticks_started = SDL_TRUE;
+
gettimeofday(&start, NULL);
}
Uint32 SDL_GetTicks(void)
{
+ if (!ticks_started) {
+ SDL_InitTicks();
+ }
+
struct timeval now;
Uint32 ticks;
diff --git a/src/timer/unix/SDL_systimer.c b/src/timer/unix/SDL_systimer.c
index 596d749..88a40ba 100644
--- a/src/timer/unix/SDL_systimer.c
+++ b/src/timer/unix/SDL_systimer.c
@@ -56,10 +56,16 @@ mach_timebase_info_data_t mach_base_info;
#endif
static SDL_bool has_monotonic_time = SDL_FALSE;
static struct timeval start_tv;
+static SDL_bool ticks_started = SDL_FALSE;
void
-SDL_StartTicks(void)
+SDL_InitTicks(void)
{
+ if (ticks_started) {
+ return;
+ }
+ ticks_started = SDL_TRUE;
+
/* Set first ticks value */
#if HAVE_CLOCK_GETTIME
if (clock_gettime(CLOCK_MONOTONIC, &start_ts) == 0) {
@@ -81,6 +87,10 @@ Uint32
SDL_GetTicks(void)
{
Uint32 ticks;
+ if (!ticks_started) {
+ SDL_InitTicks();
+ }
+
if (has_monotonic_time) {
#if HAVE_CLOCK_GETTIME
struct timespec now;
@@ -106,6 +116,10 @@ Uint64
SDL_GetPerformanceCounter(void)
{
Uint64 ticks;
+ if (!ticks_started) {
+ SDL_InitTicks();
+ }
+
if (has_monotonic_time) {
#if HAVE_CLOCK_GETTIME
struct timespec now;
@@ -131,6 +145,10 @@ SDL_GetPerformanceCounter(void)
Uint64
SDL_GetPerformanceFrequency(void)
{
+ if (!ticks_started) {
+ SDL_InitTicks();
+ }
+
if (has_monotonic_time) {
#if HAVE_CLOCK_GETTIME
return 1000000000;
@@ -140,9 +158,9 @@ SDL_GetPerformanceFrequency(void)
freq /= mach_base_info.numer;
return freq;
#endif
- } else {
- return 1000000;
- }
+ }
+
+ return 1000000;
}
void
diff --git a/src/timer/windows/SDL_systimer.c b/src/timer/windows/SDL_systimer.c
index f71aecf..a305521 100644
--- a/src/timer/windows/SDL_systimer.c
+++ b/src/timer/windows/SDL_systimer.c
@@ -31,6 +31,7 @@
/* The first (low-resolution) ticks value of the application */
static DWORD start;
+static BOOL ticks_started = FALSE;
#ifndef USE_GETTICKCOUNT
/* Store if a high-resolution performance counter exists on the system */
@@ -78,8 +79,13 @@ SDL_TimerResolutionChanged(void *userdata, const char *name, const char *oldValu
#endif /* ifndef __WINRT__ */
void
-SDL_StartTicks(void)
+SDL_InitTicks(void)
{
+ if (ticks_started) {
+ return;
+ }
+ ticks_started = TRUE;
+
/* Set first ticks value */
#ifdef USE_GETTICKCOUNT
start = GetTickCount();
@@ -115,6 +121,10 @@ SDL_GetTicks(void)
LARGE_INTEGER hires_now;
#endif
+ if (!ticks_started) {
+ SDL_InitTicks();
+ }
+
#ifdef USE_GETTICKCOUNT
now = GetTickCount();
#else
diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c
index 25ecd45..6db43b0 100644
--- a/src/video/SDL_RLEaccel.c
+++ b/src/video/SDL_RLEaccel.c
@@ -1558,10 +1558,8 @@ SDL_UnRLESurface(SDL_Surface * surface, int recode)
surface->map->info.flags &=
~(SDL_COPY_RLE_COLORKEY | SDL_COPY_RLE_ALPHAKEY);
- if (surface->map->data) {
- SDL_free(surface->map->data);
- surface->map->data = NULL;
- }
+ SDL_free(surface->map->data);
+ surface->map->data = NULL;
}
}
diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index 3fb89c0..46d4613 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -334,18 +334,16 @@ BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info)
Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->dst_skip >> 2;
SDL_PixelFormat *sf = info->src_fmt;
- Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask;
Uint32 amask = sf->Amask;
Uint32 ashift = sf->Ashift;
- Uint64 multmask;
+ Uint64 multmask, multmask2;
- __m64 src1, dst1, mm_alpha, mm_zero, dmask;
+ __m64 src1, dst1, mm_alpha, mm_zero, mm_alpha2;
mm_zero = _mm_setzero_si64(); /* 0 -> mm_zero */
- multmask = 0xFFFF;
- multmask <<= (ashift * 2);
- multmask = ~multmask;
- dmask = *(__m64 *) & multmask; /* dst alpha mask -> dmask */
+ multmask = 0x00FF;
+ multmask <<= (ashift * 2);
+ multmask2 = 0x00FF00FF00FF00FF;
while (height--) {
/* *INDENT-OFF* */
@@ -354,27 +352,28 @@ BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info)
if (alpha == 0) {
/* do nothing */
} else if (alpha == amask) {
- /* opaque alpha -- copy RGB, keep dst alpha */
- *dstp = (*srcp & chanmask) | (*dstp & ~chanmask);
+ *dstp = *srcp;
} else {
- src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB)*/
+ src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB) */
src1 = _mm_unpacklo_pi8(src1, mm_zero); /* 0A0R0G0B -> src1 */
- dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB)*/
+ dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB) */
dst1 = _mm_unpacklo_pi8(dst1, mm_zero); /* 0A0R0G0B -> dst1 */
mm_alpha = _mm_cvtsi32_si64(alpha); /* alpha -> mm_alpha (0000000A) */
mm_alpha = _mm_srli_si64(mm_alpha, ashift); /* mm_alpha >> ashift -> mm_alpha(0000000A) */
mm_alpha = _mm_unpacklo_pi16(mm_alpha, mm_alpha); /* 00000A0A -> mm_alpha */
- mm_alpha = _mm_unpacklo_pi32(mm_alpha, mm_alpha); /* 0A0A0A0A -> mm_alpha */
- mm_alpha = _mm_and_si64(mm_alpha, dmask); /* 000A0A0A -> mm_alpha, preserve dst alpha on add */
+ mm_alpha2 = _mm_unpacklo_pi32(mm_alpha, mm_alpha); /* 0A0A0A0A -> mm_alpha2 */
+ mm_alpha = _mm_or_si64(mm_alpha2, *(__m64 *) & multmask); /* 0F0A0A0A -> mm_alpha */
+ mm_alpha2 = _mm_xor_si64(mm_alpha2, *(__m64 *) & multmask2); /* 255 - mm_alpha -> mm_alpha */
/* blend */
- src1 = _mm_sub_pi16(src1, dst1);/* src1 - dst1 -> src1 */
- src1 = _mm_mullo_pi16(src1, mm_alpha); /* (src1 - dst1) * alpha -> src1 */
- src1 = _mm_srli_pi16(src1, 8); /* src1 >> 8 -> src1(000R0G0B) */
- dst1 = _mm_add_pi8(src1, dst1); /* src1 + dst1 -> dst1(0A0R0G0B) */
- dst1 = _mm_packs_pu16(dst1, mm_zero); /* 0000ARGB -> dst1 */
+ src1 = _mm_mullo_pi16(src1, mm_alpha);
+ src1 = _mm_srli_pi16(src1, 8);
+ dst1 = _mm_mullo_pi16(dst1, mm_alpha2);
+ dst1 = _mm_srli_pi16(dst1, 8);
+ dst1 = _mm_add_pi16(src1, dst1);
+ dst1 = _mm_packs_pu16(dst1, mm_zero);
*dstp = _mm_cvtsi64_si32(dst1); /* dst1 -> pixel */
}
@@ -481,23 +480,24 @@ BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info)
compositioning used (>>8 instead of /255) doesn't handle
it correctly. Also special-case alpha=0 for speed?
Benchmark this! */
- if(alpha) {
- if(alpha == SDL_ALPHA_OPAQUE) {
- *dstp = (s & 0x00ffffff) | (*dstp & 0xff000000);
+ if (alpha) {
+ if (alpha == SDL_ALPHA_OPAQUE) {
+ *dstp = *srcp;
} else {
/*
* take out the middle component (green), and process
* the other two in parallel. One multiply less.
*/
d = *dstp;
- dalpha = d & 0xff000000;
+ dalpha = d >> 24;
s1 = s & 0xff00ff;
d1 = d & 0xff00ff;
d1 = (d1 + ((s1 - d1) * alpha >> 8)) & 0xff00ff;
s &= 0xff00;
d &= 0xff00;
d = (d + ((s - d) * alpha >> 8)) & 0xff00;
- *dstp = d1 | d | dalpha;
+ dalpha = alpha + (dalpha * (alpha ^ 0xFF) >> 8);
+ *dstp = d1 | d | (dalpha << 24);
}
}
++srcp;
@@ -521,18 +521,16 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
Uint32 *dstp = (Uint32 *) info->dst;
int dstskip = info->dst_skip >> 2;
SDL_PixelFormat *sf = info->src_fmt;
- Uint32 chanmask = sf->Rmask | sf->Gmask | sf->Bmask;
Uint32 amask = sf->Amask;
Uint32 ashift = sf->Ashift;
- Uint64 multmask;
+ Uint64 multmask, multmask2;
- __m64 src1, dst1, mm_alpha, mm_zero, dmask;
+ __m64 src1, dst1, mm_alpha, mm_zero, mm_alpha2;
mm_zero = _mm_setzero_si64(); /* 0 -> mm_zero */
- multmask = 0xFFFF;
+ multmask = 0x00FF;
multmask <<= (ashift * 2);
- multmask = ~multmask;
- dmask = *(__m64 *) & multmask; /* dst alpha mask -> dmask */
+ multmask2 = 0x00FF00FF00FF00FF;
while (height--) {
/* *INDENT-OFF* */
@@ -546,27 +544,29 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
if (alpha == 0) {
/* do nothing */
} else if (alpha == amask) {
- /* copy RGB, keep dst alpha */
- *dstp = (*srcp & chanmask) | (*dstp & ~chanmask);
+ *dstp = *srcp;
} else {
- src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB)*/
+ src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB) */
src1 = _mm_unpacklo_pi8(src1, mm_zero); /* 0A0R0G0B -> src1 */
- dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB)*/
+ dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB) */
dst1 = _mm_unpacklo_pi8(dst1, mm_zero); /* 0A0R0G0B -> dst1 */
mm_alpha = _mm_cvtsi32_si64(alpha); /* alpha -> mm_alpha (0000000A) */
mm_alpha = _mm_srli_si64(mm_alpha, ashift); /* mm_alpha >> ashift -> mm_alpha(0000000A) */
mm_alpha = _mm_unpacklo_pi16(mm_alpha, mm_alpha); /* 00000A0A -> mm_alpha */
- mm_alpha = _mm_unpacklo_pi32(mm_alpha, mm_alpha); /* 0A0A0A0A -> mm_alpha */
- mm_alpha = _mm_and_si64(mm_alpha, dmask); /* 000A0A0A -> mm_alpha, preserve dst alpha on add */
+ mm_alpha2 = _mm_unpacklo_pi32(mm_alpha, mm_alpha); /* 0A0A0A0A -> mm_alpha2 */
+ mm_alpha = _mm_or_si64(mm_alpha2, *(__m64 *) & multmask); /* 0F0A0A0A -> mm_alpha */
+ mm_alpha2 = _mm_xor_si64(mm_alpha2, *(__m64 *) & multmask2); /* 255 - mm_alpha -> mm_alpha */
+
/* blend */
- src1 = _mm_sub_pi16(src1, dst1);/* src - dst -> src1 */
- src1 = _mm_mullo_pi16(src1, mm_alpha); /* (src - dst) * alpha -> src1 */
- src1 = _mm_srli_pi16(src1, 8); /* src1 >> 8 -> src1(000R0G0B) */
- dst1 = _mm_add_pi8(src1, dst1); /* src1 + dst1(dst) -> dst1(0A0R0G0B) */
- dst1 = _mm_packs_pu16(dst1, mm_zero); /* 0000ARGB -> dst1 */
+ src1 = _mm_mullo_pi16(src1, mm_alpha);
+ src1 = _mm_srli_pi16(src1, 8);
+ dst1 = _mm_mullo_pi16(dst1, mm_alpha2);
+ dst1 = _mm_srli_pi16(dst1, 8);
+ dst1 = _mm_add_pi16(src1, dst1);
+ dst1 = _mm_packs_pu16(dst1, mm_zero);
*dstp = _mm_cvtsi64_si32(dst1); /* dst1 -> pixel */
}
diff --git a/src/video/SDL_blit_copy.c b/src/video/SDL_blit_copy.c
index 6d286c3..80519e0 100644
--- a/src/video/SDL_blit_copy.c
+++ b/src/video/SDL_blit_copy.c
@@ -27,7 +27,7 @@
#ifdef __SSE__
/* This assumes 16-byte aligned src and dst */
-static __inline__ void
+static SDL_INLINE void
SDL_memcpySSE(Uint8 * dst, const Uint8 * src, int len)
{
int i;
@@ -56,7 +56,7 @@ SDL_memcpySSE(Uint8 * dst, const Uint8 * src, int len)
#ifdef _MSC_VER
#pragma warning(disable:4799)
#endif
-static __inline__ void
+static SDL_INLINE void
SDL_memcpyMMX(Uint8 * dst, const Uint8 * src, int len)
{
const int remain = (len & 63);
diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
index df43ed0..9244b28 100644
--- a/src/video/SDL_bmp.c
+++ b/src/video/SDL_bmp.c
@@ -97,23 +97,23 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
/* The Win32 BMP file header (14 bytes) */
char magic[2];
- /*Uint32 bfSize = 0;*/
- /*Uint16 bfReserved1 = 0;*/
- /*Uint16 bfReserved2 = 0;*/
+ /* Uint32 bfSize = 0; */
+ /* Uint16 bfReserved1 = 0; */
+ /* Uint16 bfReserved2 = 0; */
Uint32 bfOffBits = 0;
/* The Win32 BITMAPINFOHEADER struct (40 bytes) */
Uint32 biSize = 0;
Sint32 biWidth = 0;
Sint32 biHeight = 0;
- /*Uint16 biPlanes = 0;*/
+ /* Uint16 biPlanes = 0; */
Uint16 biBitCount = 0;
Uint32 biCompression = 0;
- /*Uint32 biSizeImage = 0;*/
- /*Sint32 biXPelsPerMeter = 0;*/
- /*Sint32 biYPelsPerMeter = 0;*/
+ /* Uint32 biSizeImage = 0; */
+ /* Sint32 biXPelsPerMeter = 0; */
+ /* Sint32 biYPelsPerMeter = 0; */
Uint32 biClrUsed = 0;
- /*Uint32 biClrImportant = 0;*/
+ /* Uint32 biClrImportant = 0; */
/* Make sure we are passed a valid data source */
surface = NULL;
@@ -136,9 +136,9 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
was_error = SDL_TRUE;
goto done;
}
- /*bfSize =*/ SDL_ReadLE32(src);
- /*bfReserved1 =*/ SDL_ReadLE16(src);
- /*bfReserved2 =*/ SDL_ReadLE16(src);
+ /* bfSize = */ SDL_ReadLE32(src);
+ /* bfReserved1 = */ SDL_ReadLE16(src);
+ /* bfReserved2 = */ SDL_ReadLE16(src);
bfOffBits = SDL_ReadLE32(src);
/* Read the Win32 BITMAPINFOHEADER */
@@ -146,20 +146,20 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
if (biSize == 12) {
biWidth = (Uint32) SDL_ReadLE16(src);
biHeight = (Uint32) SDL_ReadLE16(src);
- /*biPlanes =*/ SDL_ReadLE16(src);
+ /* biPlanes = */ SDL_ReadLE16(src);
biBitCount = SDL_ReadLE16(src);
biCompression = BI_RGB;
} else {
biWidth = SDL_ReadLE32(src);
biHeight = SDL_ReadLE32(src);
- /*biPlanes =*/ SDL_ReadLE16(src);
+ /* biPlanes = */ SDL_ReadLE16(src);
biBitCount = SDL_ReadLE16(src);
biCompression = SDL_ReadLE32(src);
- /*biSizeImage =*/ SDL_ReadLE32(src);
- /*biXPelsPerMeter =*/ SDL_ReadLE32(src);
- /*biYPelsPerMeter =*/ SDL_ReadLE32(src);
+ /* biSizeImage = */ SDL_ReadLE32(src);
+ /* biXPelsPerMeter = */ SDL_ReadLE32(src);
+ /* biYPelsPerMeter = */ SDL_ReadLE32(src);
biClrUsed = SDL_ReadLE32(src);
- /*biClrImportant =*/ SDL_ReadLE32(src);
+ /* biClrImportant = */ SDL_ReadLE32(src);
}
if (biHeight < 0) {
topDown = SDL_TRUE;
@@ -398,9 +398,7 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
if (src) {
SDL_RWseek(src, fp_offset, RW_SEEK_SET);
}
- if (surface) {
- SDL_FreeSurface(surface);
- }
+ SDL_FreeSurface(surface);
surface = NULL;
}
if (freesrc && src) {
diff --git a/src/video/SDL_clipboard.c b/src/video/SDL_clipboard.c
index 83c2e34..8c0626e 100644
--- a/src/video/SDL_clipboard.c
+++ b/src/video/SDL_clipboard.c
@@ -35,9 +35,7 @@ SDL_SetClipboardText(const char *text)
if (_this->SetClipboardText) {
return _this->SetClipboardText(_this, text);
} else {
- if (_this->clipboard_text) {
- SDL_free(_this->clipboard_text);
- }
+ SDL_free(_this->clipboard_text);
_this->clipboard_text = SDL_strdup(text);
return 0;
}
@@ -67,7 +65,7 @@ SDL_HasClipboardText(void)
if (_this->HasClipboardText) {
return _this->HasClipboardText(_this);
} else {
- if ((_this->clipboard_text) && (SDL_strlen(_this->clipboard_text)>0)) {
+ if (_this->clipboard_text && _this->clipboard_text[0] != '\0') {
return SDL_TRUE;
} else {
return SDL_FALSE;
diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
new file mode 100644
index 0000000..ccfb92e
--- /dev/null
+++ b/src/video/SDL_egl.c
@@ -0,0 +1,431 @@
+/*
+ * Simple DirectMedia Layer
+ * Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_sysvideo.h"
+#include "SDL_egl.h"
+
+
+#if SDL_VIDEO_DRIVER_RPI
+/* Raspbian places the OpenGL ES/EGL binaries in a non standard path */
+#define DEFAULT_EGL "/opt/vc/lib/libEGL.so"
+#define DEFAULT_OGL_ES2 "/opt/vc/lib/libGLESv2.so"
+#define DEFAULT_OGL_ES_PVR "/opt/vc/lib/libGLES_CM.so"
+#define DEFAULT_OGL_ES "/opt/vc/lib/libGLESv1_CM.so"
+
+#elif SDL_VIDEO_DRIVER_ANDROID
+/* Android */
+#define DEFAULT_EGL "libEGL.so"
+#define DEFAULT_OGL_ES2 "libGLESv2.so"
+#define DEFAULT_OGL_ES_PVR "libGLES_CM.so"
+#define DEFAULT_OGL_ES "libGLESv1_CM.so"
+
+#else
+/* Desktop Linux */
+#define DEFAULT_EGL "libEGL.so.1"
+#define DEFAULT_OGL_ES2 "libGLESv2.so.2"
+#define DEFAULT_OGL_ES_PVR "libGLES_CM.so.1"
+#define DEFAULT_OGL_ES "libGLESv1_CM.so.1"
+#endif /* SDL_VIDEO_DRIVER_RPI */
+
+#define LOAD_FUNC(NAME) \
+*((void**)&_this->egl_data->NAME) = dlsym(dll_handle, #NAME); \
+if (!_this->egl_data->NAME) \
+{ \
+ return SDL_SetError("Could not retrieve EGL function " #NAME); \
+}
+
+/* EGL implementation of SDL OpenGL ES support */
+
+void *
+SDL_EGL_GetProcAddress(_THIS, const char *proc)
+{
+ static char procname[1024];
+ void *handle;
+ void *retval;
+
+ /* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */
+#if !defined(SDL_VIDEO_DRIVER_ANDROID)
+ handle = _this->egl_data->egl_dll_handle;
+ if (_this->egl_data->eglGetProcAddress) {
+ retval = _this->egl_data->eglGetProcAddress(proc);
+ if (retval) {
+ return retval;
+ }
+ }
+#endif
+
+ handle = _this->gl_config.dll_handle;
+ #if defined(__OpenBSD__) && !defined(__ELF__)
+ #undef dlsym(x,y);
+ #endif
+ retval = dlsym(handle, proc);
+ if (!retval && strlen(proc) <= 1022) {
+ procname[0] = '_';
+ strcpy(procname + 1, proc);
+ retval = dlsym(handle, procname);
+ }
+ return retval;
+}
+
+void
+SDL_EGL_UnloadLibrary(_THIS)
+{
+ if (_this->egl_data) {
+ if (_this->egl_data->egl_display) {
+ _this->egl_data->eglTerminate(_this->egl_data->egl_display);
+ _this->egl_data->egl_display = NULL;
+ }
+
+ if (_this->gl_config.dll_handle) {
+ dlclose(_this->gl_config.dll_handle);
+ _this->gl_config.dll_handle = NULL;
+ }
+ if (_this->egl_data->egl_dll_handle) {
+ dlclose(_this->egl_data->egl_dll_handle);
+ _this->egl_data->egl_dll_handle = NULL;
+ }
+
+ SDL_free(_this->egl_data);
+ _this->egl_data = NULL;
+ }
+}
+
+int
+SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_display)
+{
+ void *dll_handle, *egl_dll_handle; /* The naming is counter intuitive, but hey, I just work here -- Gabriel */
+ char *path;
+ int dlopen_flags;
+
+ if (_this->egl_data) {
+ return SDL_SetError("OpenGL ES context already created");
+ }
+
+ _this->egl_data = (struct SDL_EGL_VideoData *) SDL_calloc(1, sizeof(SDL_EGL_VideoData));
+ if (!_this->egl_data) {
+ return SDL_OutOfMemory();
+ }
+
+#ifdef RTLD_GLOBAL
+ dlopen_flags = RTLD_LAZY | RTLD_GLOBAL;
+#else
+ dlopen_flags = RTLD_LAZY;
+#endif
+
+ /* A funny thing, loading EGL.so first does not work on the Raspberry, so we load libGL* first */
+ path = getenv("SDL_VIDEO_GL_DRIVER");
+ egl_dll_handle = dlopen(path, dlopen_flags);
+ if ((path == NULL) | (egl_dll_handle == NULL)) {
+ if (_this->gl_config.major_version > 1) {
+ path = DEFAULT_OGL_ES2;
+ egl_dll_handle = dlopen(path, dlopen_flags);
+ } else {
+ path = DEFAULT_OGL_ES;
+ egl_dll_handle = dlopen(path, dlopen_flags);
+ if (egl_dll_handle == NULL) {
+ path = DEFAULT_OGL_ES_PVR;
+ egl_dll_handle = dlopen(path, dlopen_flags);
+ }
+ }
+ }
+ _this->egl_data->egl_dll_handle = egl_dll_handle;
+
+ if (egl_dll_handle == NULL) {
+ return SDL_SetError("Could not initialize OpenGL ES library: %s", dlerror());
+ }
+
+ /* Loading libGL* in the previous step took care of loading libEGL.so, but we future proof by double checking */
+ dll_handle = dlopen(egl_path, dlopen_flags);
+ /* Catch the case where the application isn't linked with EGL */
+ if ((dlsym(dll_handle, "eglChooseConfig") == NULL) && (egl_path == NULL)) {
+ dlclose(dll_handle);
+ path = getenv("SDL_VIDEO_EGL_DRIVER");
+ if (path == NULL) {
+ path = DEFAULT_EGL;
+ }
+ dll_handle = dlopen(path, dlopen_flags);
+ }
+ _this->gl_config.dll_handle = dll_handle;
+
+ if (dll_handle == NULL) {
+ return SDL_SetError("Could not load EGL library: %s", dlerror());
+ }
+
+ /* Load new function pointers */
+ LOAD_FUNC(eglGetDisplay);
+ LOAD_FUNC(eglInitialize);
+ LOAD_FUNC(eglTerminate);
+ LOAD_FUNC(eglGetProcAddress);
+ LOAD_FUNC(eglChooseConfig);
+ LOAD_FUNC(eglGetConfigAttrib);
+ LOAD_FUNC(eglCreateContext);
+ LOAD_FUNC(eglDestroyContext);
+ LOAD_FUNC(eglCreateWindowSurface);
+ LOAD_FUNC(eglDestroySurface);
+ LOAD_FUNC(eglMakeCurrent);
+ LOAD_FUNC(eglSwapBuffers);
+ LOAD_FUNC(eglSwapInterval);
+ LOAD_FUNC(eglWaitNative);
+ LOAD_FUNC(eglWaitGL);
+
+ _this->egl_data->egl_display = _this->egl_data->eglGetDisplay(native_display);
+ if (!_this->egl_data->egl_display) {
+ return SDL_SetError("Could not get EGL display");
+ }
+
+ if (_this->egl_data->eglInitialize(_this->egl_data->egl_display, NULL, NULL) != EGL_TRUE) {
+ return SDL_SetError("Could not initialize EGL");
+ }
+
+ _this->gl_config.dll_handle = dll_handle;
+ _this->egl_data->egl_dll_handle = egl_dll_handle;
+ _this->gl_config.driver_loaded = 1;
+
+ if (path) {
+ strncpy(_this->gl_config.driver_path, path, sizeof(_this->gl_config.driver_path) - 1);
+ } else {
+ strcpy(_this->gl_config.driver_path, "");
+ }
+
+ /* We need to select a config here to satisfy some video backends such as X11 */
+ SDL_EGL_ChooseConfig(_this);
+
+ return 0;
+}
+
+int
+SDL_EGL_ChooseConfig(_THIS)
+{
+ /* 64 seems nice. */
+ EGLint attribs[64];
+ EGLint found_configs = 0;
+ int i;
+
+ if (!_this->egl_data) {
+ /* The EGL library wasn't loaded, SDL_GetError() should have info */
+ return -1;
+ }
+
+ /* Get a valid EGL configuration */
+ i = 0;
+ attribs[i++] = EGL_RED_SIZE;
+ attribs[i++] = _this->gl_config.red_size;
+ attribs[i++] = EGL_GREEN_SIZE;
+ attribs[i++] = _this->gl_config.green_size;
+ attribs[i++] = EGL_BLUE_SIZE;
+ attribs[i++] = _this->gl_config.blue_size;
+
+ if (_this->gl_config.alpha_size) {
+ attribs[i++] = EGL_ALPHA_SIZE;
+ attribs[i++] = _this->gl_config.alpha_size;
+ }
+
+ if (_this->gl_config.buffer_size) {
+ attribs[i++] = EGL_BUFFER_SIZE;
+ attribs[i++] = _this->gl_config.buffer_size;
+ }
+
+ attribs[i++] = EGL_DEPTH_SIZE;
+ attribs[i++] = _this->gl_config.depth_size;
+
+ if (_this->gl_config.stencil_size) {
+ attribs[i++] = EGL_STENCIL_SIZE;
+ attribs[i++] = _this->gl_config.stencil_size;
+ }
+
+ if (_this->gl_config.multisamplebuffers) {
+ attribs[i++] = EGL_SAMPLE_BUFFERS;
+ attribs[i++] = _this->gl_config.multisamplebuffers;
+ }
+
+ if (_this->gl_config.multisamplesamples) {
+ attribs[i++] = EGL_SAMPLES;
+ attribs[i++] = _this->gl_config.multisamplesamples;
+ }
+
+ attribs[i++] = EGL_RENDERABLE_TYPE;
+ if (_this->gl_config.major_version == 2) {
+ attribs[i++] = EGL_OPENGL_ES2_BIT;
+ } else {
+ attribs[i++] = EGL_OPENGL_ES_BIT;
+ }
+
+ attribs[i++] = EGL_NONE;
+
+ if (_this->egl_data->eglChooseConfig(_this->egl_data->egl_display,
+ attribs,
+ &_this->egl_data->egl_config, 1,
+ &found_configs) == EGL_FALSE ||
+ found_configs == 0) {
+ return SDL_SetError("Couldn't find matching EGL config");
+ }
+
+ return 0;
+}
+
+SDL_GLContext
+SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface)
+{
+ EGLint context_attrib_list[] = {
+ EGL_CONTEXT_CLIENT_VERSION,
+ 1,
+ EGL_NONE
+ };
+
+ EGLContext egl_context;
+
+ if (!_this->egl_data) {
+ /* The EGL library wasn't loaded, SDL_GetError() should have info */
+ return NULL;
+ }
+
+ if (_this->gl_config.major_version) {
+ context_attrib_list[1] = _this->gl_config.major_version;
+ }
+
+ egl_context =
+ _this->egl_data->eglCreateContext(_this->egl_data->egl_display,
+ _this->egl_data->egl_config,
+ EGL_NO_CONTEXT, context_attrib_list);
+
+ if (egl_context == EGL_NO_CONTEXT) {
+ SDL_SetError("Could not create EGL context");
+ return NULL;
+ }
+
+ _this->egl_data->egl_swapinterval = 0;
+
+ if (SDL_EGL_MakeCurrent(_this, egl_surface, egl_context) < 0) {
+ SDL_EGL_DeleteContext(_this, egl_context);
+ SDL_SetError("Could not make EGL context current");
+ return NULL;
+ }
+
+ return (SDL_GLContext) egl_context;
+}
+
+int
+SDL_EGL_MakeCurrent(_THIS, EGLSurface egl_surface, SDL_GLContext context)
+{
+ EGLContext egl_context = (EGLContext) context;
+
+ if (!_this->egl_data) {
+ return SDL_SetError("OpenGL not initialized");
+ }
+
+ /* The android emulator crashes badly if you try to eglMakeCurrent
+ * with a valid context and invalid surface, so we have to check for both here.
+ */
+ if (!egl_context || !egl_surface) {
+ _this->egl_data->eglMakeCurrent(_this->egl_data->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ }
+ else {
+ if (!_this->egl_data->eglMakeCurrent(_this->egl_data->egl_display,
+ egl_surface, egl_surface, egl_context)) {
+ return SDL_SetError("Unable to make EGL context current");
+ }
+ }
+
+ return 0;
+}
+
+int
+SDL_EGL_SetSwapInterval(_THIS, int interval)
+{
+ EGLBoolean status;
+
+ if (!_this->egl_data) {
+ return SDL_SetError("EGL not initialized");
+ }
+
+ status = _this->egl_data->eglSwapInterval(_this->egl_data->egl_display, interval);
+ if (status == EGL_TRUE) {
+ _this->egl_data->egl_swapinterval = interval;
+ return 0;
+ }
+
+ return SDL_SetError("Unable to set the EGL swap interval");
+}
+
+int
+SDL_EGL_GetSwapInterval(_THIS)
+{
+ if (!_this->egl_data) {
+ return SDL_SetError("EGL not initialized");
+ }
+
+ return _this->egl_data->egl_swapinterval;
+}
+
+void
+SDL_EGL_SwapBuffers(_THIS, EGLSurface egl_surface)
+{
+ _this->egl_data->eglSwapBuffers(_this->egl_data->egl_display, egl_surface);
+}
+
+void
+SDL_EGL_DeleteContext(_THIS, SDL_GLContext context)
+{
+ EGLContext egl_context = (EGLContext) context;
+
+ /* Clean up GLES and EGL */
+ if (!_this->egl_data) {
+ return;
+ }
+
+ if (!egl_context && egl_context != EGL_NO_CONTEXT) {
+ SDL_EGL_MakeCurrent(_this, NULL, NULL);
+ _this->egl_data->eglDestroyContext(_this->egl_data->egl_display, egl_context);
+ }
+
+ /* FIXME: This "crappy fix" comes from the X11 code,
+ * it's required so you can create a GLX context, destroy it and create a EGL one */
+ SDL_EGL_UnloadLibrary(_this);
+}
+
+EGLSurface *
+SDL_EGL_CreateSurface(_THIS, NativeWindowType nw)
+{
+ return _this->egl_data->eglCreateWindowSurface(
+ _this->egl_data->egl_display,
+ _this->egl_data->egl_config,
+ nw, NULL);
+}
+
+void
+SDL_EGL_DestroySurface(_THIS, EGLSurface egl_surface)
+{
+ if (!_this->egl_data) {
+ return;
+ }
+
+ if (egl_surface != EGL_NO_SURFACE) {
+ _this->egl_data->eglDestroySurface(_this->egl_data->egl_display, egl_surface);
+ }
+}
+
+#endif /* SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/video/SDL_egl.h b/src/video/SDL_egl.h
new file mode 100644
index 0000000..d613905
--- /dev/null
+++ b/src/video/SDL_egl.h
@@ -0,0 +1,132 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_egl_h
+#define _SDL_egl_h
+
+#if SDL_VIDEO_OPENGL_EGL
+
+#include <EGL/egl.h>
+
+#include <dlfcn.h>
+#if defined(__OpenBSD__) && !defined(__ELF__)
+#define dlsym(x,y) dlsym(x, "_" y)
+#endif
+
+#include "SDL_sysvideo.h"
+
+typedef struct SDL_EGL_VideoData
+{
+ void *egl_dll_handle;
+ EGLDisplay egl_display;
+ EGLConfig egl_config;
+ int egl_swapinterval;
+
+ EGLDisplay(*eglGetDisplay) (NativeDisplayType display);
+ EGLBoolean(*eglInitialize) (EGLDisplay dpy, EGLint * major,
+ EGLint * minor);
+ EGLBoolean(*eglTerminate) (EGLDisplay dpy);
+
+ void *(*eglGetProcAddress) (const char * procName);
+
+ EGLBoolean(*eglChooseConfig) (EGLDisplay dpy,
+ const EGLint * attrib_list,
+ EGLConfig * configs,
+ EGLint config_size, EGLint * num_config);
+
+ EGLContext(*eglCreateContext) (EGLDisplay dpy,
+ EGLConfig config,
+ EGLContext share_list,
+ const EGLint * attrib_list);
+
+ EGLBoolean(*eglDestroyContext) (EGLDisplay dpy, EGLContext ctx);
+
+ EGLSurface(*eglCreateWindowSurface) (EGLDisplay dpy,
+ EGLConfig config,
+ NativeWindowType window,
+ const EGLint * attrib_list);
+ EGLBoolean(*eglDestroySurface) (EGLDisplay dpy, EGLSurface surface);
+
+ EGLBoolean(*eglMakeCurrent) (EGLDisplay dpy, EGLSurface draw,
+ EGLSurface read, EGLContext ctx);
+
+ EGLBoolean(*eglSwapBuffers) (EGLDisplay dpy, EGLSurface draw);
+
+ EGLBoolean(*eglSwapInterval) (EGLDisplay dpy, EGLint interval);
+
+ const char *(*eglQueryString) (EGLDisplay dpy, EGLint name);
+
+ EGLBoolean(*eglGetConfigAttrib) (EGLDisplay dpy, EGLConfig config,
+ EGLint attribute, EGLint * value);
+
+ EGLBoolean(*eglWaitNative) (EGLint engine);
+
+ EGLBoolean(*eglWaitGL)(void);
+} SDL_EGL_VideoData;
+
+/* OpenGLES functions */
+extern int SDL_EGL_GetAttribute(_THIS, SDL_GLattr attrib, int *value);
+extern int SDL_EGL_LoadLibrary(_THIS, const char *path, NativeDisplayType native_display);
+extern void *SDL_EGL_GetProcAddress(_THIS, const char *proc);
+extern void SDL_EGL_UnloadLibrary(_THIS);
+extern int SDL_EGL_ChooseConfig(_THIS);
+extern int SDL_EGL_SetSwapInterval(_THIS, int interval);
+extern int SDL_EGL_GetSwapInterval(_THIS);
+extern void SDL_EGL_DeleteContext(_THIS, SDL_GLContext context);
+extern EGLSurface *SDL_EGL_CreateSurface(_THIS, NativeWindowType nw);
+extern void SDL_EGL_DestroySurface(_THIS, EGLSurface egl_surface);
+
+/* These need to be wrapped to get the surface for the window by the platform GLES implementation */
+extern SDL_GLContext SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface);
+extern int SDL_EGL_MakeCurrent(_THIS, EGLSurface egl_surface, SDL_GLContext context);
+extern void SDL_EGL_SwapBuffers(_THIS, EGLSurface egl_surface);
+
+/* A few of useful macros */
+
+#define SDL_EGL_SwapWindow_impl(BACKEND) void \
+BACKEND ## _GLES_SwapWindow(_THIS, SDL_Window * window) \
+{\
+ SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);\
+}
+
+#define SDL_EGL_MakeCurrent_impl(BACKEND) int \
+BACKEND ## _GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) \
+{\
+ if (window && context) { \
+ return SDL_EGL_MakeCurrent(_this, ((SDL_WindowData *) window->driverdata)->egl_surface, context); \
+ }\
+ else {\
+ return SDL_EGL_MakeCurrent(_this, NULL, NULL);\
+ }\
+}
+
+#define SDL_EGL_CreateContext_impl(BACKEND) SDL_GLContext \
+BACKEND ## _GLES_CreateContext(_THIS, SDL_Window * window) \
+{\
+ return SDL_EGL_CreateContext(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);\
+}
+
+#endif /* SDL_VIDEO_OPENGL_EGL */
+
+#endif /* _SDL_egl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_fillrect.c b/src/video/SDL_fillrect.c
index a99371e..d891e4e 100644
--- a/src/video/SDL_fillrect.c
+++ b/src/video/SDL_fillrect.c
@@ -36,12 +36,13 @@
c128.m128_u32[3] = color;
#else
#define SSE_BEGIN \
+ __m128 c128; \
DECLARE_ALIGNED(Uint32, cccc[4], 16); \
cccc[0] = color; \
cccc[1] = color; \
cccc[2] = color; \
cccc[3] = color; \
- __m128 c128 = *(__m128 *)cccc;
+ c128 = *(__m128 *)cccc;
#endif
#define SSE_WORK \
@@ -59,11 +60,14 @@
static void \
SDL_FillRect##bpp##SSE(Uint8 *pixels, int pitch, Uint32 color, int w, int h) \
{ \
+ int i, n; \
+ Uint8 *p = NULL; \
+ \
SSE_BEGIN; \
\
while (h--) { \
- int i, n = w * bpp; \
- Uint8 *p = pixels; \
+ n = w * bpp; \
+ p = pixels; \
\
if (n > 63) { \
int adjust = 16 - ((uintptr_t)p & 15); \
@@ -94,11 +98,13 @@ SDL_FillRect##bpp##SSE(Uint8 *pixels, int pitch, Uint32 color, int w, int h) \
static void
SDL_FillRect1SSE(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
{
+ int i, n;
+ Uint8 *p = NULL;
+
SSE_BEGIN;
-
while (h--) {
- int i, n = w;
- Uint8 *p = pixels;
+ n = w;
+ p = pixels;
if (n > 63) {
int adjust = 16 - ((uintptr_t)p & 15);
@@ -119,7 +125,7 @@ SDL_FillRect1SSE(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
SSE_END;
}
-/*DEFINE_SSE_FILLRECT(1, Uint8)*/
+/* DEFINE_SSE_FILLRECT(1, Uint8) */
DEFINE_SSE_FILLRECT(2, Uint16)
DEFINE_SSE_FILLRECT(4, Uint32)
@@ -152,11 +158,14 @@ DEFINE_SSE_FILLRECT(4, Uint32)
static void \
SDL_FillRect##bpp##MMX(Uint8 *pixels, int pitch, Uint32 color, int w, int h) \
{ \
+ int i, n; \
+ Uint8 *p = NULL; \
+ \
MMX_BEGIN; \
\
while (h--) { \
- int i, n = w * bpp; \
- Uint8 *p = pixels; \
+ n = w * bpp; \
+ p = pixels; \
\
if (n > 63) { \
int adjust = 8 - ((uintptr_t)p & 7); \
@@ -187,11 +196,14 @@ SDL_FillRect##bpp##MMX(Uint8 *pixels, int pitch, Uint32 color, int w, int h) \
static void
SDL_FillRect1MMX(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
{
+ int i, n;
+ Uint8 *p = NULL;
+
MMX_BEGIN;
while (h--) {
- int i, n = w;
- Uint8 *p = pixels;
+ n = w;
+ p = pixels;
if (n > 63) {
int adjust = 8 - ((uintptr_t)p & 7);
@@ -212,7 +224,7 @@ SDL_FillRect1MMX(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
MMX_END;
}
-/*DEFINE_MMX_FILLRECT(1, Uint8)*/
+/* DEFINE_MMX_FILLRECT(1, Uint8) */
DEFINE_MMX_FILLRECT(2, Uint16)
DEFINE_MMX_FILLRECT(4, Uint32)
@@ -222,9 +234,12 @@ DEFINE_MMX_FILLRECT(4, Uint32)
static void
SDL_FillRect1(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
{
+ int n;
+ Uint8 *p = NULL;
+
while (h--) {
- int n = w;
- Uint8 *p = pixels;
+ n = w;
+ p = pixels;
if (n > 3) {
switch ((uintptr_t) p & 3) {
@@ -258,9 +273,12 @@ SDL_FillRect1(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
static void
SDL_FillRect2(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
{
+ int n;
+ Uint16 *p = NULL;
+
while (h--) {
- int n = w;
- Uint16 *p = (Uint16 *) pixels;
+ n = w;
+ p = (Uint16 *) pixels;
if (n > 1) {
if ((uintptr_t) p & 2) {
@@ -282,10 +300,12 @@ SDL_FillRect3(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
Uint8 r = (Uint8) ((color >> 16) & 0xFF);
Uint8 g = (Uint8) ((color >> 8) & 0xFF);
Uint8 b = (Uint8) (color & 0xFF);
+ int n;
+ Uint8 *p = NULL;
while (h--) {
- int n = w;
- Uint8 *p = pixels;
+ n = w;
+ p = pixels;
while (n--) {
*p++ = r;
diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c
index c472c38..0300155 100644
--- a/src/video/SDL_pixels.c
+++ b/src/video/SDL_pixels.c
@@ -707,9 +707,7 @@ SDL_FreePalette(SDL_Palette * palette)
if (--palette->refcount > 0) {
return;
}
- if (palette->colors) {
- SDL_free(palette->colors);
- }
+ SDL_free(palette->colors);
SDL_free(palette);
}
@@ -985,10 +983,8 @@ SDL_InvalidateMap(SDL_BlitMap * map)
map->dst = NULL;
map->src_palette_version = 0;
map->dst_palette_version = 0;
- if (map->info.table) {
- SDL_free(map->info.table);
- map->info.table = NULL;
- }
+ SDL_free(map->info.table);
+ map->info.table = NULL;
}
int
diff --git a/src/video/SDL_rect.c b/src/video/SDL_rect.c
index 8dcb5b6..b6393fb 100644
--- a/src/video/SDL_rect.c
+++ b/src/video/SDL_rect.c
@@ -296,15 +296,16 @@ SDL_EnclosePoints(const SDL_Point * points, int count, const SDL_Rect * clip,
#define CODE_LEFT 4
#define CODE_RIGHT 8
-static int ComputeOutCode(const SDL_Rect * rect, int x, int y)
+static int
+ComputeOutCode(const SDL_Rect * rect, int x, int y)
{
int code = 0;
- if (y < 0) {
+ if (y < rect->y) {
code |= CODE_TOP;
} else if (y >= rect->y + rect->h) {
code |= CODE_BOTTOM;
}
- if (x < 0) {
+ if (x < rect->x) {
code |= CODE_LEFT;
} else if (x >= rect->x + rect->w) {
code |= CODE_RIGHT;
diff --git a/src/video/SDL_shape.c b/src/video/SDL_shape.c
index e9876e4..308fefc 100644
--- a/src/video/SDL_shape.c
+++ b/src/video/SDL_shape.c
@@ -33,7 +33,7 @@ SDL_Window*
SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags)
{
SDL_Window *result = NULL;
- result = SDL_CreateWindow(title,-1000,-1000,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /*& (~SDL_WINDOW_SHOWN)*/);
+ result = SDL_CreateWindow(title,-1000,-1000,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /* & (~SDL_WINDOW_SHOWN) */);
if(result != NULL) {
result->shaper = SDL_GetVideoDevice()->shape_driver.CreateShaper(result);
if(result->shaper != NULL) {
diff --git a/src/video/SDL_stretch.c b/src/video/SDL_stretch.c
index 69980d0..3eafc20 100644
--- a/src/video/SDL_stretch.c
+++ b/src/video/SDL_stretch.c
@@ -38,7 +38,7 @@
(defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES
/* There's a bug with gcc 4.4.1 and -O2 where srcp doesn't get the correct
* value after the first scanline. FIXME? */
-/*#define USE_ASM_STRETCH*/
+/* #define USE_ASM_STRETCH */
#endif
#ifdef USE_ASM_STRETCH
diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
index 460d53b..d4c852a 100644
--- a/src/video/SDL_surface.c
+++ b/src/video/SDL_surface.c
@@ -596,6 +596,12 @@ SDL_UpperBlit(SDL_Surface * src, const SDL_Rect * srcrect,
h -= dy;
}
+ /* Switch back to a fast blit if we were previously stretching */
+ if (src->map->info.flags & SDL_COPY_NEAREST) {
+ src->map->info.flags &= ~SDL_COPY_NEAREST;
+ SDL_InvalidateMap(src->map);
+ }
+
if (w > 0 && h > 0) {
SDL_Rect sr;
sr.x = srcx;
@@ -747,7 +753,10 @@ SDL_LowerBlitScaled(SDL_Surface * src, SDL_Rect * srcrect,
return 0;
}
- src->map->info.flags |= SDL_COPY_NEAREST;
+ if (!(src->map->info.flags & SDL_COPY_NEAREST)) {
+ src->map->info.flags |= SDL_COPY_NEAREST;
+ SDL_InvalidateMap(src->map);
+ }
if ( !(src->map->info.flags & complex_copy_flags) &&
src->format->format == dst->format->format &&
@@ -801,7 +810,7 @@ SDL_UnlockSurface(SDL_Surface * surface)
* Convert a surface into the specified pixel format.
*/
SDL_Surface *
-SDL_ConvertSurface(SDL_Surface * surface, SDL_PixelFormat * format,
+SDL_ConvertSurface(SDL_Surface * surface, const SDL_PixelFormat * format,
Uint32 flags)
{
SDL_Surface *convert;
@@ -942,7 +951,7 @@ SDL_ConvertSurfaceFormat(SDL_Surface * surface, Uint32 pixel_format,
/*
* Create a surface on the stack for quick blit operations
*/
-static __inline__ SDL_bool
+static SDL_INLINE SDL_bool
SDL_CreateSurfaceOnStack(int width, int height, Uint32 pixel_format,
void * pixels, int pitch, SDL_Surface * surface,
SDL_PixelFormat * format, SDL_BlitMap * blitmap)
@@ -963,7 +972,7 @@ SDL_CreateSurfaceOnStack(int width, int height, Uint32 pixel_format,
surface->h = height;
surface->pitch = pitch;
/* We don't actually need to set up the clip rect for our purposes */
- /*SDL_SetClipRect(surface, NULL);*/
+ /* SDL_SetClipRect(surface, NULL); */
/* Allocate an empty mapping */
SDL_zerop(blitmap);
@@ -1076,7 +1085,7 @@ SDL_FreeSurface(SDL_Surface * surface)
SDL_FreeBlitMap(surface->map);
surface->map = NULL;
}
- if (surface->pixels && ((surface->flags & SDL_PREALLOC) != SDL_PREALLOC)) {
+ if (!(surface->flags & SDL_PREALLOC)) {
SDL_free(surface->pixels);
}
SDL_free(surface);
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
index e149b8a..f3113a7 100644
--- a/src/video/SDL_sysvideo.h
+++ b/src/video/SDL_sysvideo.h
@@ -224,6 +224,7 @@ struct SDL_VideoDevice
void (*GL_UnloadLibrary) (_THIS);
SDL_GLContext(*GL_CreateContext) (_THIS, SDL_Window * window);
int (*GL_MakeCurrent) (_THIS, SDL_Window * window, SDL_GLContext context);
+ void (*GL_GetDrawableSize) (_THIS, SDL_Window * window, int *w, int *h);
int (*GL_SetSwapInterval) (_THIS, int interval);
int (*GL_GetSwapInterval) (_THIS);
void (*GL_SwapWindow) (_THIS, SDL_Window * window);
@@ -291,8 +292,8 @@ struct SDL_VideoDevice
int minor_version;
int flags;
int profile_mask;
- int use_egl;
int share_with_current_context;
+ int framebuffer_srgb_capable;
int retained_backing;
int driver_loaded;
char driver_path[256];
@@ -313,7 +314,11 @@ struct SDL_VideoDevice
/* Data private to this driver */
void *driverdata;
struct SDL_GLDriverData *gl_data;
-
+
+#if SDL_VIDEO_OPENGL_EGL
+ struct SDL_EGL_VideoData *egl_data;
+#endif
+
#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
struct SDL_PrivateGLESData *gles_data;
#endif
@@ -361,6 +366,9 @@ extern VideoBootStrap Android_bootstrap;
#if SDL_VIDEO_DRIVER_PSP
extern VideoBootStrap PSP_bootstrap;
#endif
+#if SDL_VIDEO_DRIVER_RPI
+extern VideoBootStrap RPI_bootstrap;
+#endif
#if SDL_VIDEO_DRIVER_DUMMY
extern VideoBootStrap DUMMY_bootstrap;
#endif
@@ -370,6 +378,7 @@ extern int SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode);
extern int SDL_AddVideoDisplay(const SDL_VideoDisplay * display);
extern SDL_bool SDL_AddDisplayMode(SDL_VideoDisplay *display, const SDL_DisplayMode * mode);
extern SDL_VideoDisplay *SDL_GetDisplayForWindow(SDL_Window *window);
+extern void *SDL_GetDisplayDriverData( int displayIndex );
extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 1404ba0..5c1c6d3 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -39,9 +39,10 @@
#include "SDL_opengles.h"
#endif /* SDL_VIDEO_OPENGL_ES */
-#if SDL_VIDEO_OPENGL_ES2
+/* GL and GLES2 headers conflict on Linux 32 bits */
+#if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
#include "SDL_opengles2.h"
-#endif /* SDL_VIDEO_OPENGL_ES2 */
+#endif /* SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL */
#include "SDL_syswm.h"
@@ -82,6 +83,9 @@ static VideoBootStrap *bootstrap[] = {
#if SDL_VIDEO_DRIVER_PSP
&PSP_bootstrap,
#endif
+#if SDL_VIDEO_DRIVER_RPI
+ &RPI_bootstrap,
+#endif
#if SDL_VIDEO_DRIVER_DUMMY
&DUMMY_bootstrap,
#endif
@@ -265,10 +269,8 @@ SDL_CreateWindowTexture(_THIS, SDL_Window * window, Uint32 * format, void ** pix
SDL_DestroyTexture(data->texture);
data->texture = NULL;
}
- if (data->pixels) {
- SDL_free(data->pixels);
- data->pixels = NULL;
- }
+ SDL_free(data->pixels);
+ data->pixels = NULL;
if (SDL_GetRendererInfo(data->renderer, &info) < 0) {
return -1;
@@ -353,9 +355,7 @@ SDL_DestroyWindowTexture(_THIS, SDL_Window * window)
if (data->renderer) {
SDL_DestroyRenderer(data->renderer);
}
- if (data->pixels) {
- SDL_free(data->pixels);
- }
+ SDL_free(data->pixels);
SDL_free(data);
}
@@ -483,21 +483,21 @@ SDL_VideoInit(const char *driver_name)
_this->gl_config.multisamplesamples = 0;
_this->gl_config.retained_backing = 1;
_this->gl_config.accelerated = -1; /* accelerated or not, both are fine */
+ _this->gl_config.profile_mask = 0;
#if SDL_VIDEO_OPENGL
_this->gl_config.major_version = 2;
_this->gl_config.minor_version = 1;
- _this->gl_config.use_egl = 0;
-#elif SDL_VIDEO_OPENGL_ES
- _this->gl_config.major_version = 1;
- _this->gl_config.minor_version = 1;
- _this->gl_config.use_egl = 1;
#elif SDL_VIDEO_OPENGL_ES2
_this->gl_config.major_version = 2;
_this->gl_config.minor_version = 0;
- _this->gl_config.use_egl = 1;
+ _this->gl_config.profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
+#elif SDL_VIDEO_OPENGL_ES
+ _this->gl_config.major_version = 1;
+ _this->gl_config.minor_version = 1;
+ _this->gl_config.profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
#endif
_this->gl_config.flags = 0;
- _this->gl_config.profile_mask = 0;
+
_this->gl_config.share_with_current_context = 0;
_this->current_glwin_tls = SDL_TLSCreate();
@@ -621,6 +621,14 @@ SDL_GetIndexOfDisplay(SDL_VideoDisplay *display)
return 0;
}
+void *
+SDL_GetDisplayDriverData( int displayIndex )
+{
+ CHECK_DISPLAY_INDEX( displayIndex, NULL );
+
+ return _this->displays[displayIndex].driverdata;
+}
+
const char *
SDL_GetDisplayName(int displayIndex)
{
@@ -1185,6 +1193,7 @@ SDL_Window *
SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
{
SDL_Window *window;
+ const char *hint;
if (!_this) {
/* Initialize the video system if needed */
@@ -1243,6 +1252,17 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN);
window->brightness = 1.0f;
window->next = _this->windows;
+
+ /* Unless the user has specified the high-DPI disabling hint, respect the
+ * SDL_WINDOW_ALLOW_HIGHDPI flag.
+ */
+ hint = SDL_GetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED);
+ if (!hint || *hint != '1') {
+ if ((flags & SDL_WINDOW_ALLOW_HIGHDPI)) {
+ window->flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+ }
+ }
+
if (_this->windows) {
_this->windows->prev = window;
}
@@ -1404,9 +1424,7 @@ SDL_SetWindowTitle(SDL_Window * window, const char *title)
if (title == window->title) {
return;
}
- if (window->title) {
- SDL_free(window->title);
- }
+ SDL_free(window->title);
if (title && *title) {
window->title = SDL_strdup(title);
} else {
@@ -1435,9 +1453,7 @@ SDL_SetWindowIcon(SDL_Window * window, SDL_Surface * icon)
return;
}
- if (window->icon) {
- SDL_FreeSurface(window->icon);
- }
+ SDL_FreeSurface(window->icon);
/* Convert the icon into ARGB8888 */
window->icon = SDL_ConvertSurfaceFormat(icon, SDL_PIXELFORMAT_ARGB8888, 0);
@@ -1458,7 +1474,7 @@ SDL_SetWindowData(SDL_Window * window, const char *name, void *userdata)
CHECK_WINDOW_MAGIC(window, NULL);
/* Input validation */
- if (name == NULL || SDL_strlen(name) == 0) {
+ if (name == NULL || name[0] == '\0') {
SDL_InvalidParamError("name");
return NULL;
}
@@ -1505,7 +1521,7 @@ SDL_GetWindowData(SDL_Window * window, const char *name)
CHECK_WINDOW_MAGIC(window, NULL);
/* Input validation */
- if (name == NULL || SDL_strlen(name) == 0) {
+ if (name == NULL || name[0] == '\0') {
SDL_InvalidParamError("name");
return NULL;
}
@@ -1538,14 +1554,21 @@ SDL_SetWindowPosition(SDL_Window * window, int x, int y)
}
}
- if (!SDL_WINDOWPOS_ISUNDEFINED(x)) {
- window->x = x;
- }
- if (!SDL_WINDOWPOS_ISUNDEFINED(y)) {
- window->y = y;
- }
+ if ((window->flags & SDL_WINDOW_FULLSCREEN)) {
+ if (!SDL_WINDOWPOS_ISUNDEFINED(x)) {
+ window->windowed.x = x;
+ }
+ if (!SDL_WINDOWPOS_ISUNDEFINED(y)) {
+ window->windowed.y = y;
+ }
+ } else {
+ if (!SDL_WINDOWPOS_ISUNDEFINED(x)) {
+ window->x = x;
+ }
+ if (!SDL_WINDOWPOS_ISUNDEFINED(y)) {
+ window->y = y;
+ }
- if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
if (_this->SetWindowPosition) {
_this->SetWindowPosition(_this, window);
}
@@ -1759,7 +1782,7 @@ SDL_MaximizeWindow(SDL_Window * window)
return;
}
- // !!! FIXME: should this check if the window is resizable?
+ /* !!! FIXME: should this check if the window is resizable? */
if (_this->MaximizeWindow) {
_this->MaximizeWindow(_this, window);
@@ -2185,15 +2208,9 @@ SDL_DestroyWindow(SDL_Window * window)
window->magic = NULL;
/* Free memory associated with the window */
- if (window->title) {
- SDL_free(window->title);
- }
- if (window->icon) {
- SDL_FreeSurface(window->icon);
- }
- if (window->gamma) {
- SDL_free(window->gamma);
- }
+ SDL_free(window->title);
+ SDL_FreeSurface(window->icon);
+ SDL_free(window->gamma);
while (window->data) {
SDL_WindowUserData *data = window->data;
@@ -2280,23 +2297,15 @@ SDL_VideoQuit(void)
for (i = 0; i < _this->num_displays; ++i) {
SDL_VideoDisplay *display = &_this->displays[i];
for (j = display->num_display_modes; j--;) {
- if (display->display_modes[j].driverdata) {
- SDL_free(display->display_modes[j].driverdata);
- display->display_modes[j].driverdata = NULL;
- }
- }
- if (display->display_modes) {
- SDL_free(display->display_modes);
- display->display_modes = NULL;
- }
- if (display->desktop_mode.driverdata) {
- SDL_free(display->desktop_mode.driverdata);
- display->desktop_mode.driverdata = NULL;
- }
- if (display->driverdata) {
- SDL_free(display->driverdata);
- display->driverdata = NULL;
+ SDL_free(display->display_modes[j].driverdata);
+ display->display_modes[j].driverdata = NULL;
}
+ SDL_free(display->display_modes);
+ display->display_modes = NULL;
+ SDL_free(display->desktop_mode.driverdata);
+ display->desktop_mode.driverdata = NULL;
+ SDL_free(display->driverdata);
+ display->driverdata = NULL;
}
if (_this->displays) {
for (i = 0; i < _this->num_displays; ++i) {
@@ -2306,10 +2315,8 @@ SDL_VideoQuit(void)
_this->displays = NULL;
_this->num_displays = 0;
}
- if (_this->clipboard_text) {
- SDL_free(_this->clipboard_text);
- _this->clipboard_text = NULL;
- }
+ SDL_free(_this->clipboard_text);
+ _this->clipboard_text = NULL;
_this->free(_this);
_this = NULL;
}
@@ -2329,12 +2336,16 @@ SDL_GL_LoadLibrary(const char *path)
retval = 0;
} else {
if (!_this->GL_LoadLibrary) {
- return SDL_SetError("No dynamic GL support in video driver");
+ return SDL_SetError("No dynamic GL support in video driver");
}
retval = _this->GL_LoadLibrary(_this, path);
}
if (retval == 0) {
++_this->gl_config.driver_loaded;
+ } else {
+ if (_this->GL_UnloadLibrary) {
+ _this->GL_UnloadLibrary(_this);
+ }
}
return (retval);
}
@@ -2378,7 +2389,7 @@ SDL_GL_UnloadLibrary(void)
}
}
-static __inline__ SDL_bool
+static SDL_INLINE SDL_bool
isAtLeastGL3(const char *verstr)
{
return ( verstr && (SDL_atoi(verstr) >= 3) );
@@ -2537,7 +2548,12 @@ SDL_GL_SetAttribute(SDL_GLattr attr, int value)
_this->gl_config.minor_version = value;
break;
case SDL_GL_CONTEXT_EGL:
- _this->gl_config.use_egl = value;
+ /* FIXME: SDL_GL_CONTEXT_EGL to be deprecated in SDL 2.1 */
+ if (value != 0) {
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+ } else {
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, 0);
+ };
break;
case SDL_GL_CONTEXT_FLAGS:
if( value & ~(SDL_GL_CONTEXT_DEBUG_FLAG |
@@ -2561,7 +2577,10 @@ SDL_GL_SetAttribute(SDL_GLattr attr, int value)
break;
case SDL_GL_SHARE_WITH_CURRENT_CONTEXT:
_this->gl_config.share_with_current_context = value;
- break;
+ break;
+ case SDL_GL_FRAMEBUFFER_SRGB_CAPABLE:
+ _this->gl_config.framebuffer_srgb_capable = value;
+ break;
default:
retval = SDL_SetError("Unknown OpenGL attribute");
break;
@@ -2707,8 +2726,14 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
return 0;
}
case SDL_GL_CONTEXT_EGL:
+ /* FIXME: SDL_GL_CONTEXT_EGL to be deprecated in SDL 2.1 */
{
- *value = _this->gl_config.use_egl;
+ if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
+ *value = 1;
+ }
+ else {
+ *value = 0;
+ }
return 0;
}
case SDL_GL_CONTEXT_FLAGS:
@@ -2726,6 +2751,11 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
*value = _this->gl_config.share_with_current_context;
return 0;
}
+ case SDL_GL_FRAMEBUFFER_SRGB_CAPABLE:
+ {
+ *value = _this->gl_config.framebuffer_srgb_capable;
+ return 0;
+ }
default:
return SDL_SetError("Unknown OpenGL attribute");
}
@@ -2820,6 +2850,17 @@ SDL_GL_GetCurrentContext(void)
return (SDL_GLContext)SDL_TLSGet(_this->current_glctx_tls);
}
+void SDL_GL_GetDrawableSize(SDL_Window * window, int *w, int *h)
+{
+ CHECK_WINDOW_MAGIC(window, );
+
+ if (_this->GL_GetDrawableSize) {
+ _this->GL_GetDrawableSize(_this, window, w, h);
+ } else {
+ SDL_GetWindowSize(window, w, h);
+ }
+}
+
int
SDL_GL_SetSwapInterval(int interval)
{
diff --git a/src/video/android/SDL_androidevents.c b/src/video/android/SDL_androidevents.c
index 528fce5..9be49cf 100644
--- a/src/video/android/SDL_androidevents.c
+++ b/src/video/android/SDL_androidevents.c
@@ -27,6 +27,32 @@
#include "SDL_androidevents.h"
#include "SDL_events.h"
+#include "SDL_androidwindow.h"
+
+void android_egl_context_backup();
+void android_egl_context_restore();
+
+void
+android_egl_context_restore()
+{
+ SDL_WindowData *data = (SDL_WindowData *) Android_Window->driverdata;
+ if (SDL_GL_MakeCurrent(Android_Window, (SDL_GLContext) data->egl_context) < 0) {
+ /* The context is no longer valid, create a new one */
+ /* FIXME: Notify the user that the context changed and textures need to be re created */
+ data->egl_context = (EGLContext) SDL_GL_CreateContext(Android_Window);
+ SDL_GL_MakeCurrent(Android_Window, (SDL_GLContext) data->egl_context);
+ }
+}
+
+void
+android_egl_context_backup()
+{
+ /* Keep a copy of the EGL Context so we can try to restore it when we resume */
+ SDL_WindowData *data = (SDL_WindowData *) Android_Window->driverdata;
+ data->egl_context = SDL_GL_GetCurrentContext();
+ /* We need to do this so the EGLSurface can be freed */
+ SDL_GL_MakeCurrent(Android_Window, NULL);
+}
void
Android_PumpEvents(_THIS)
@@ -46,27 +72,25 @@ Android_PumpEvents(_THIS)
#if SDL_ANDROID_BLOCK_ON_PAUSE
if (isPaused && !isPausing) {
+ /* Make sure this is the last thing we do before pausing */
+ android_egl_context_backup();
if(SDL_SemWait(Android_ResumeSem) == 0) {
#else
if (isPaused) {
if(SDL_SemTryWait(Android_ResumeSem) == 0) {
#endif
isPaused = 0;
- /* TODO: Should we double check if we are on the same thread as the one that made the original GL context?
- * This call will go through the following chain of calls in Java:
- * SDLActivity::createGLContext -> SDLActivity:: initEGL -> SDLActivity::createEGLSurface -> SDLActivity::createEGLContext
- * SDLActivity::createEGLContext will attempt to restore the GL context first, and if that fails it will create a new one
- * If a new GL context is created, the user needs to restore the textures manually (TODO: notify the user that this happened with a message)
- */
- SDL_GL_CreateContext(Android_Window);
+
+ /* Restore the GL Context from here, as this operation is thread dependent */
+ android_egl_context_restore();
}
}
else {
#if SDL_ANDROID_BLOCK_ON_PAUSE
if( isPausing || SDL_SemTryWait(Android_PauseSem) == 0 ) {
- /* We've been signaled to pause, but before we block ourselves, we need to make sure that
- SDL_WINDOWEVENT_FOCUS_LOST and SDL_WINDOWEVENT_MINIMIZED have reached the app */
- if (SDL_HasEvent(SDL_WINDOWEVENT)) {
+ /* We've been signaled to pause, but before we block ourselves,
+ we need to make sure that certain key events have reached the app */
+ if (SDL_HasEvent(SDL_WINDOWEVENT) || SDL_HasEvent(SDL_APP_WILLENTERBACKGROUND) || SDL_HasEvent(SDL_APP_DIDENTERBACKGROUND) ) {
isPausing = 1;
}
else {
@@ -76,7 +100,7 @@ Android_PumpEvents(_THIS)
}
#else
if(SDL_SemTryWait(Android_PauseSem) == 0) {
- /* If we fall in here, the system is/was paused */
+ android_egl_context_backup();
isPaused = 1;
}
#endif
diff --git a/src/video/android/SDL_androidgl.c b/src/video/android/SDL_androidgl.c
index 6902bc1..691fbf7 100644
--- a/src/video/android/SDL_androidgl.c
+++ b/src/video/android/SDL_androidgl.c
@@ -25,6 +25,8 @@
/* Android SDL video driver implementation */
#include "SDL_video.h"
+#include "../SDL_egl.h"
+#include "SDL_androidwindow.h"
#include "SDL_androidvideo.h"
#include "../../core/android/SDL_android.h"
@@ -33,95 +35,21 @@
#include <dlfcn.h>
-static void* Android_GLHandle = NULL;
-
-/* GL functions */
-int
-Android_GL_LoadLibrary(_THIS, const char *path)
-{
- if (!Android_GLHandle) {
- Android_GLHandle = dlopen("libGLESv1_CM.so",RTLD_GLOBAL);
- if (!Android_GLHandle) {
- return SDL_SetError("Could not initialize GL ES library\n");
- }
- }
- return 0;
-}
-
-void *
-Android_GL_GetProcAddress(_THIS, const char *proc)
-{
- /*
- !!! FIXME: this _should_ use eglGetProcAddress(), but it appears to be
- !!! FIXME: busted on Android at the moment...
- !!! FIXME: http://code.google.com/p/android/issues/detail?id=7681
- !!! FIXME: ...so revisit this later. --ryan.
- */
- return dlsym(Android_GLHandle, proc);
-}
+SDL_EGL_CreateContext_impl(Android)
+SDL_EGL_MakeCurrent_impl(Android)
void
-Android_GL_UnloadLibrary(_THIS)
-{
- if(Android_GLHandle) {
- dlclose(Android_GLHandle);
- Android_GLHandle = NULL;
- }
-}
-
-SDL_GLContext
-Android_GL_CreateContext(_THIS, SDL_Window * window)
-{
- if (!Android_JNI_CreateContext(_this->gl_config.major_version,
- _this->gl_config.minor_version,
- _this->gl_config.red_size,
- _this->gl_config.green_size,
- _this->gl_config.blue_size,
- _this->gl_config.alpha_size,
- _this->gl_config.buffer_size,
- _this->gl_config.depth_size,
- _this->gl_config.stencil_size,
- _this->gl_config.multisamplebuffers,
- _this->gl_config.multisamplesamples)) {
- SDL_SetError("Couldn't create OpenGL context - see Android log for details");
- return NULL;
- }
- return (SDL_GLContext)1;
-}
-
-int
-Android_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+Android_GLES_SwapWindow(_THIS, SDL_Window * window)
{
- /* There's only one context, nothing to do... */
- return 0;
+ /* FIXME: These two functions were in the Java code, do we really need them? */
+ _this->egl_data->eglWaitNative(EGL_CORE_NATIVE_ENGINE);
+ _this->egl_data->eglWaitGL();
+ SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);
}
int
-Android_GL_SetSwapInterval(_THIS, int interval)
-{
- __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_SetSwapInterval\n");
- return 0;
-}
-
-int
-Android_GL_GetSwapInterval(_THIS)
-{
- __android_log_print(ANDROID_LOG_INFO, "SDL", "[STUB] GL_GetSwapInterval\n");
- return 0;
-}
-
-void
-Android_GL_SwapWindow(_THIS, SDL_Window * window)
-{
- Android_JNI_SwapWindow();
-}
-
-void
-Android_GL_DeleteContext(_THIS, SDL_GLContext context)
-{
- if (context) {
- Android_JNI_DeleteContext();
- }
+Android_GLES_LoadLibrary(_THIS, const char *path) {
+ return SDL_EGL_LoadLibrary(_this, path, (NativeDisplayType) 0);
}
#endif /* SDL_VIDEO_DRIVER_ANDROID */
diff --git a/src/video/android/SDL_androidtouch.c b/src/video/android/SDL_androidtouch.c
index 3265b54..6ad26e2 100644
--- a/src/video/android/SDL_androidtouch.c
+++ b/src/video/android/SDL_androidtouch.c
@@ -31,6 +31,7 @@
#include "SDL_androidtouch.h"
+#include "../../core/android/SDL_android.h"
#define ACTION_DOWN 0
#define ACTION_UP 1
@@ -53,6 +54,19 @@ static void Android_GetWindowCoordinates(float x, float y,
*window_y = (int)(y * window_h);
}
+void Android_InitTouch(void)
+{
+ int i;
+ int* ids;
+ int number = Android_JNI_GetTouchDeviceIds(&ids);
+ if (0 < number) {
+ for (i = 0; i < number; ++i) {
+ SDL_AddTouch((SDL_TouchID) ids[i], ""); /* no error handling */
+ }
+ SDL_free(ids);
+ }
+}
+
void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p)
{
SDL_TouchID touchDeviceId = 0;
diff --git a/src/video/android/SDL_androidtouch.h b/src/video/android/SDL_androidtouch.h
index 50a3ebd..346d73a 100644
--- a/src/video/android/SDL_androidtouch.h
+++ b/src/video/android/SDL_androidtouch.h
@@ -22,6 +22,7 @@
#include "SDL_androidvideo.h"
+extern void Android_InitTouch(void);
extern void Android_OnTouch( int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p);
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidvideo.c b/src/video/android/SDL_androidvideo.c
index 6dcb81e..fc766ec 100644
--- a/src/video/android/SDL_androidvideo.c
+++ b/src/video/android/SDL_androidvideo.c
@@ -36,6 +36,7 @@
#include "SDL_androidclipboard.h"
#include "SDL_androidevents.h"
#include "SDL_androidkeyboard.h"
+#include "SDL_androidtouch.h"
#include "SDL_androidwindow.h"
#define ANDROID_VID_DRIVER_NAME "Android"
@@ -44,17 +45,17 @@
static int Android_VideoInit(_THIS);
static void Android_VideoQuit(_THIS);
+#include "../SDL_egl.h"
/* GL functions (SDL_androidgl.c) */
-extern int Android_GL_LoadLibrary(_THIS, const char *path);
-extern void *Android_GL_GetProcAddress(_THIS, const char *proc);
-extern void Android_GL_UnloadLibrary(_THIS);
-extern SDL_GLContext Android_GL_CreateContext(_THIS, SDL_Window * window);
-extern int Android_GL_MakeCurrent(_THIS, SDL_Window * window,
- SDL_GLContext context);
-extern int Android_GL_SetSwapInterval(_THIS, int interval);
-extern int Android_GL_GetSwapInterval(_THIS);
-extern void Android_GL_SwapWindow(_THIS, SDL_Window * window);
-extern void Android_GL_DeleteContext(_THIS, SDL_GLContext context);
+extern SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window);
+extern int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+extern void Android_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int Android_GLES_LoadLibrary(_THIS, const char *path);
+#define Android_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define Android_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define Android_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define Android_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define Android_GLES_DeleteContext SDL_EGL_DeleteContext
/* Android driver bootstrap functions */
@@ -114,15 +115,15 @@ Android_CreateDevice(int devindex)
device->free = Android_DeleteDevice;
/* GL pointers */
- device->GL_LoadLibrary = Android_GL_LoadLibrary;
- device->GL_GetProcAddress = Android_GL_GetProcAddress;
- device->GL_UnloadLibrary = Android_GL_UnloadLibrary;
- device->GL_CreateContext = Android_GL_CreateContext;
- device->GL_MakeCurrent = Android_GL_MakeCurrent;
- device->GL_SetSwapInterval = Android_GL_SetSwapInterval;
- device->GL_GetSwapInterval = Android_GL_GetSwapInterval;
- device->GL_SwapWindow = Android_GL_SwapWindow;
- device->GL_DeleteContext = Android_GL_DeleteContext;
+ device->GL_LoadLibrary = Android_GLES_LoadLibrary;
+ device->GL_GetProcAddress = Android_GLES_GetProcAddress;
+ device->GL_UnloadLibrary = Android_GLES_UnloadLibrary;
+ device->GL_CreateContext = Android_GLES_CreateContext;
+ device->GL_MakeCurrent = Android_GLES_MakeCurrent;
+ device->GL_SetSwapInterval = Android_GLES_SetSwapInterval;
+ device->GL_GetSwapInterval = Android_GLES_GetSwapInterval;
+ device->GL_SwapWindow = Android_GLES_SwapWindow;
+ device->GL_DeleteContext = Android_GLES_DeleteContext;
/* Text input */
device->StartTextInput = Android_StartTextInput;
@@ -165,6 +166,8 @@ Android_VideoInit(_THIS)
Android_InitKeyboard();
+ Android_InitTouch();
+
/* We're done! */
return 0;
}
diff --git a/src/video/android/SDL_androidwindow.c b/src/video/android/SDL_androidwindow.c
index 70e244e..acc40db 100644
--- a/src/video/android/SDL_androidwindow.c
+++ b/src/video/android/SDL_androidwindow.c
@@ -29,15 +29,15 @@
#include "SDL_androidvideo.h"
#include "SDL_androidwindow.h"
-#include "../../core/android/SDL_android.h"
-
int
Android_CreateWindow(_THIS, SDL_Window * window)
{
+ SDL_WindowData *data;
+
if (Android_Window) {
return SDL_SetError("Android only supports one window");
}
- Android_Window = window;
+
Android_PauseSem = SDL_CreateSemaphore(0);
Android_ResumeSem = SDL_CreateSemaphore(0);
@@ -56,7 +56,29 @@ Android_CreateWindow(_THIS, SDL_Window * window)
/* One window, it always has focus */
SDL_SetMouseFocus(window);
SDL_SetKeyboardFocus(window);
+
+ data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data));
+ if (!data) {
+ return SDL_OutOfMemory();
+ }
+
+ data->native_window = Android_JNI_GetNativeWindow();
+
+ if (!data->native_window) {
+ SDL_free(data);
+ return SDL_SetError("Could not fetch native window");
+ }
+
+ data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->native_window);
+ if (data->egl_surface == EGL_NO_SURFACE) {
+ SDL_free(data);
+ return SDL_SetError("Could not create GLES window surface");
+ }
+
+ window->driverdata = data;
+ Android_Window = window;
+
return 0;
}
@@ -69,12 +91,23 @@ Android_SetWindowTitle(_THIS, SDL_Window * window)
void
Android_DestroyWindow(_THIS, SDL_Window * window)
{
+ SDL_WindowData *data;
+
if (window == Android_Window) {
Android_Window = NULL;
if (Android_PauseSem) SDL_DestroySemaphore(Android_PauseSem);
if (Android_ResumeSem) SDL_DestroySemaphore(Android_ResumeSem);
Android_PauseSem = NULL;
Android_ResumeSem = NULL;
+
+ if(window->driverdata) {
+ data = (SDL_WindowData *) window->driverdata;
+ if(data->native_window) {
+ ANativeWindow_release(data->native_window);
+ }
+ SDL_free(window->driverdata);
+ window->driverdata = NULL;
+ }
}
}
diff --git a/src/video/android/SDL_androidwindow.h b/src/video/android/SDL_androidwindow.h
index c0ef93b..4365cd4 100644
--- a/src/video/android/SDL_androidwindow.h
+++ b/src/video/android/SDL_androidwindow.h
@@ -23,10 +23,21 @@
#ifndef _SDL_androidwindow_h
#define _SDL_androidwindow_h
+#include "../../core/android/SDL_android.h"
+#include "../SDL_egl.h"
+
extern int Android_CreateWindow(_THIS, SDL_Window * window);
extern void Android_SetWindowTitle(_THIS, SDL_Window * window);
extern void Android_DestroyWindow(_THIS, SDL_Window * window);
+typedef struct
+{
+ EGLSurface egl_surface;
+ EGLContext egl_context; /* We use this to preserve the context when losing focus */
+ ANativeWindow* native_window;
+
+} SDL_WindowData;
+
#endif /* _SDL_androidwindow_h */
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/bwindow/SDL_BWin.h b/src/video/bwindow/SDL_BWin.h
index fb576da..6b6a71e 100644
--- a/src/video/bwindow/SDL_BWin.h
+++ b/src/video/bwindow/SDL_BWin.h
@@ -353,7 +353,7 @@ class SDL_BWin:public BDirectWindow
- CTRL+Q to close window (and other shortcuts)
- PrintScreen to make screenshot into /boot/home
- etc.. */
- //BDirectWindow::DispatchMessage(msg, target);
+ /* BDirectWindow::DispatchMessage(msg, target); */
break;
}
@@ -461,9 +461,9 @@ private:
msg.AddBool("focusGained", focusGained);
_PostWindowEvent(msg);
-//FIXME: Why were these here?
-// if false: be_app->SetCursor(B_HAND_CURSOR);
-// if true: SDL_SetCursor(NULL);
+/* FIXME: Why were these here?
+ if false: be_app->SetCursor(B_HAND_CURSOR);
+ if true: SDL_SetCursor(NULL); */
}
void _MouseButtonEvent(int32 buttons) {
diff --git a/src/video/bwindow/SDL_bclipboard.cc b/src/video/bwindow/SDL_bclipboard.cc
index 4801483..2ec80c6 100644
--- a/src/video/bwindow/SDL_bclipboard.cc
+++ b/src/video/bwindow/SDL_bclipboard.cc
@@ -82,14 +82,14 @@ SDL_bool BE_HasClipboardText(_THIS) {
SDL_bool result = SDL_FALSE;
char *text = BE_GetClipboardText(_this);
if (text) {
- result = (SDL_strlen(text)>0) ? SDL_TRUE : SDL_FALSE;
+ result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
SDL_free(text);
}
return result;
}
#ifdef __cplusplus
-} /* Extern C */
+}
#endif
#endif /* SDL_VIDEO_DRIVER_BWINDOW */
diff --git a/src/video/bwindow/SDL_bframebuffer.cc b/src/video/bwindow/SDL_bframebuffer.cc
index 6e7f8c3..69f4a43 100644
--- a/src/video/bwindow/SDL_bframebuffer.cc
+++ b/src/video/bwindow/SDL_bframebuffer.cc
@@ -37,11 +37,11 @@ extern "C" {
int32 BE_UpdateOnce(SDL_Window *window);
-static inline SDL_BWin *_ToBeWin(SDL_Window *window) {
+static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return ((SDL_BWin*)(window->driverdata));
}
-static inline SDL_BApp *_GetBeApp() {
+static SDL_INLINE SDL_BApp *_GetBeApp() {
return ((SDL_BApp*)be_app);
}
diff --git a/src/video/bwindow/SDL_bmodes.cc b/src/video/bwindow/SDL_bmodes.cc
index 41894fb..44e19dc 100644
--- a/src/video/bwindow/SDL_bmodes.cc
+++ b/src/video/bwindow/SDL_bmodes.cc
@@ -48,15 +48,15 @@ typedef struct SDL_DisplayModeData {
};
#endif
-static inline SDL_BWin *_ToBeWin(SDL_Window *window) {
+static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return ((SDL_BWin*)(window->driverdata));
}
-static inline SDL_BApp *_GetBeApp() {
+static SDL_INLINE SDL_BApp *_GetBeApp() {
return ((SDL_BApp*)be_app);
}
-static inline display_mode * _ExtractBMode(SDL_DisplayMode *mode) {
+static SDL_INLINE display_mode * _ExtractBMode(SDL_DisplayMode *mode) {
#if WRAP_BMODE
return ((SDL_DisplayModeData*)mode->driverdata)->bmode;
#else
diff --git a/src/video/bwindow/SDL_bopengl.cc b/src/video/bwindow/SDL_bopengl.cc
index 5acefe2..13b90ad 100644
--- a/src/video/bwindow/SDL_bopengl.cc
+++ b/src/video/bwindow/SDL_bopengl.cc
@@ -37,11 +37,11 @@ extern "C" {
#define BGL_FLAGS BGL_RGB | BGL_DOUBLE
-static inline SDL_BWin *_ToBeWin(SDL_Window *window) {
+static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return ((SDL_BWin*)(window->driverdata));
}
-static inline SDL_BApp *_GetBeApp() {
+static SDL_INLINE SDL_BApp *_GetBeApp() {
return ((SDL_BApp*)be_app);
}
diff --git a/src/video/bwindow/SDL_bopengl.h b/src/video/bwindow/SDL_bopengl.h
index f0279ba..9ec972e 100644
--- a/src/video/bwindow/SDL_bopengl.h
+++ b/src/video/bwindow/SDL_bopengl.h
@@ -29,13 +29,13 @@ extern "C" {
#include "../SDL_sysvideo.h"
-extern int BE_GL_LoadLibrary(_THIS, const char *path); //FIXME
-extern void *BE_GL_GetProcAddress(_THIS, const char *proc); //FIXME
-extern void BE_GL_UnloadLibrary(_THIS); //TODO
+extern int BE_GL_LoadLibrary(_THIS, const char *path); /* FIXME */
+extern void *BE_GL_GetProcAddress(_THIS, const char *proc); /* FIXME */
+extern void BE_GL_UnloadLibrary(_THIS); /* TODO */
extern int BE_GL_MakeCurrent(_THIS, SDL_Window * window,
SDL_GLContext context);
-extern int BE_GL_SetSwapInterval(_THIS, int interval); //TODO
-extern int BE_GL_GetSwapInterval(_THIS); //TODO
+extern int BE_GL_SetSwapInterval(_THIS, int interval); /* TODO */
+extern int BE_GL_GetSwapInterval(_THIS); /* TODO */
extern void BE_GL_SwapWindow(_THIS, SDL_Window * window);
extern SDL_GLContext BE_GL_CreateContext(_THIS, SDL_Window * window);
extern void BE_GL_DeleteContext(_THIS, SDL_GLContext context);
diff --git a/src/video/bwindow/SDL_bwindow.cc b/src/video/bwindow/SDL_bwindow.cc
index c6eb3aa..c898be6 100644
--- a/src/video/bwindow/SDL_bwindow.cc
+++ b/src/video/bwindow/SDL_bwindow.cc
@@ -31,11 +31,11 @@
extern "C" {
#endif
-static inline SDL_BWin *_ToBeWin(SDL_Window *window) {
+static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
return ((SDL_BWin*)(window->driverdata));
}
-static inline SDL_BApp *_GetBeApp() {
+static SDL_INLINE SDL_BApp *_GetBeApp() {
return ((SDL_BApp*)be_app);
}
diff --git a/src/video/cocoa/SDL_cocoaclipboard.m b/src/video/cocoa/SDL_cocoaclipboard.m
index ab31031..62c34b5 100644
--- a/src/video/cocoa/SDL_cocoaclipboard.m
+++ b/src/video/cocoa/SDL_cocoaclipboard.m
@@ -95,7 +95,7 @@ Cocoa_HasClipboardText(_THIS)
SDL_bool result = SDL_FALSE;
char *text = Cocoa_GetClipboardText(_this);
if (text) {
- result = (SDL_strlen(text)>0) ? SDL_TRUE : SDL_FALSE;
+ result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
SDL_free(text);
}
return result;
diff --git a/src/video/cocoa/SDL_cocoaevents.m b/src/video/cocoa/SDL_cocoaevents.m
index f0a65e3..e6b292b 100644
--- a/src/video/cocoa/SDL_cocoaevents.m
+++ b/src/video/cocoa/SDL_cocoaevents.m
@@ -42,12 +42,11 @@
@end
@interface SDLAppDelegate : NSObject {
+@public
BOOL seenFirstActivate;
}
- (id)init;
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
-- (void)applicationDidBecomeActive:(NSNotification *)aNotification;
@end
@implementation SDLAppDelegate : NSObject
@@ -57,18 +56,28 @@
if (self) {
seenFirstActivate = NO;
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(focusSomeWindow:)
+ name:NSApplicationDidBecomeActiveNotification
+ object:nil];
}
return self;
}
+- (void)dealloc
+{
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
{
SDL_SendQuit();
return NSTerminateCancel;
}
-- (void)applicationDidBecomeActive:(NSNotification *)aNotification
+- (void)focusSomeWindow:(NSNotification *)aNotification
{
/* HACK: Ignore the first call. The application gets a
* applicationDidBecomeActive: a little bit after the first window is
@@ -111,6 +120,8 @@
}
@end
+static SDLAppDelegate *appDelegate = nil;
+
static NSString *
GetApplicationName(void)
{
@@ -231,9 +242,21 @@ Cocoa_RegisterApp(void)
CreateApplicationMenus();
}
[NSApp finishLaunching];
+ NSDictionary *appDefaults = [NSDictionary dictionaryWithObject:@"NO" forKey:@"AppleMomentumScrollSupported"];
+ [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults];
+
}
- if (NSApp && ![NSApp delegate]) {
- [NSApp setDelegate:[[SDLAppDelegate alloc] init]];
+ if (NSApp && !appDelegate) {
+ appDelegate = [[SDLAppDelegate alloc] init];
+
+ /* If someone else has an app delegate, it means we can't turn a
+ * termination into SDL_Quit, and we can't handle application:openFile:
+ */
+ if (![NSApp delegate]) {
+ [NSApp setDelegate:appDelegate];
+ } else {
+ appDelegate->seenFirstActivate = YES;
+ }
}
[pool release];
}
@@ -248,7 +271,7 @@ Cocoa_PumpEvents(_THIS)
SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
Uint32 now = SDL_GetTicks();
if (!data->screensaver_activity ||
- (int)(now-data->screensaver_activity) >= 30000) {
+ SDL_TICKS_PASSED(now, data->screensaver_activity + 30000)) {
UpdateSystemActivity(UsrActivity);
data->screensaver_activity = now;
}
diff --git a/src/video/cocoa/SDL_cocoamodes.m b/src/video/cocoa/SDL_cocoamodes.m
index f10e7ee..501684f 100644
--- a/src/video/cocoa/SDL_cocoamodes.m
+++ b/src/video/cocoa/SDL_cocoamodes.m
@@ -33,7 +33,9 @@
/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
#include <AvailabilityMacros.h>
-static inline void Cocoa_ToggleMenuBar(const BOOL show)
+
+static void
+Cocoa_ToggleMenuBar(const BOOL show)
{
/* !!! FIXME: keep an eye on this.
* ShowMenuBar/HideMenuBar is officially unavailable for 64-bit binaries.
@@ -57,7 +59,7 @@ static inline void Cocoa_ToggleMenuBar(const BOOL show)
#define MAC_OS_X_VERSION_MIN_REQUIRED 1050
#endif
-static inline BOOL
+static BOOL
IS_SNOW_LEOPARD_OR_LATER(_THIS)
{
#if FORCE_OLD_API
@@ -179,7 +181,7 @@ GetDisplayMode(_THIS, const void *moderef, SDL_DisplayMode *mode)
return SDL_TRUE;
}
-static inline void
+static void
Cocoa_ReleaseDisplayMode(_THIS, const void *moderef)
{
if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
@@ -187,7 +189,7 @@ Cocoa_ReleaseDisplayMode(_THIS, const void *moderef)
}
}
-static inline void
+static void
Cocoa_ReleaseDisplayModeList(_THIS, CFArrayRef modelist)
{
if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
@@ -281,7 +283,7 @@ Cocoa_InitModes(_THIS)
display.name = (char *)Cocoa_GetDisplayName(displays[i]);
if (!GetDisplayMode (_this, moderef, &mode)) {
Cocoa_ReleaseDisplayMode(_this, moderef);
- if (display.name) SDL_free(display.name);
+ SDL_free(display.name);
SDL_free(displaydata);
continue;
}
@@ -290,7 +292,7 @@ Cocoa_InitModes(_THIS)
display.current_mode = mode;
display.driverdata = displaydata;
SDL_AddVideoDisplay(&display);
- if (display.name) SDL_free(display.name);
+ SDL_free(display.name);
}
}
SDL_stack_free(displays);
diff --git a/src/video/cocoa/SDL_cocoamouse.m b/src/video/cocoa/SDL_cocoamouse.m
index faba961..e834423 100644
--- a/src/video/cocoa/SDL_cocoamouse.m
+++ b/src/video/cocoa/SDL_cocoamouse.m
@@ -204,13 +204,7 @@ static void
Cocoa_WarpMouse(SDL_Window * window, int x, int y)
{
SDL_Mouse *mouse = SDL_GetMouse();
- CGPoint point = CGPointMake(x, y);
-
- if (!(window->flags & SDL_WINDOW_FULLSCREEN))
- {
- point.x += window->x;
- point.y += window->y;
- }
+ CGPoint point = CGPointMake(x + (float)window->x, y + (float)window->y);
{
/* This makes Cocoa_HandleMouseEvent ignore this delta in the next
diff --git a/src/video/cocoa/SDL_cocoaopengl.h b/src/video/cocoa/SDL_cocoaopengl.h
index 2d06700..e7ef1f6 100644
--- a/src/video/cocoa/SDL_cocoaopengl.h
+++ b/src/video/cocoa/SDL_cocoaopengl.h
@@ -54,6 +54,8 @@ extern void Cocoa_GL_UnloadLibrary(_THIS);
extern SDL_GLContext Cocoa_GL_CreateContext(_THIS, SDL_Window * window);
extern int Cocoa_GL_MakeCurrent(_THIS, SDL_Window * window,
SDL_GLContext context);
+extern void Cocoa_GL_GetDrawableSize(_THIS, SDL_Window * window,
+ int * w, int * h);
extern int Cocoa_GL_SetSwapInterval(_THIS, int interval);
extern int Cocoa_GL_GetSwapInterval(_THIS);
extern void Cocoa_GL_SwapWindow(_THIS, SDL_Window * window);
diff --git a/src/video/cocoa/SDL_cocoaopengl.m b/src/video/cocoa/SDL_cocoaopengl.m
index 0d49ba0..13c7777 100644
--- a/src/video/cocoa/SDL_cocoaopengl.m
+++ b/src/video/cocoa/SDL_cocoaopengl.m
@@ -35,6 +35,18 @@
#define DEFAULT_OPENGL "/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib"
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+/* New methods for converting to and from backing store pixels, taken from
+ * AppKite/NSView.h in 10.8 SDK. */
+@interface NSView (Backing)
+- (NSPoint)convertPointToBacking:(NSPoint)aPoint;
+- (NSPoint)convertPointFromBacking:(NSPoint)aPoint;
+- (NSSize)convertSizeToBacking:(NSSize)aSize;
+- (NSSize)convertSizeFromBacking:(NSSize)aSize;
+- (NSRect)convertRectToBacking:(NSRect)aRect;
+- (NSRect)convertRectFromBacking:(NSRect)aRect;
+@end
+#endif
#ifndef kCGLPFAOpenGLProfile
#define kCGLPFAOpenGLProfile 99
@@ -294,6 +306,28 @@ Cocoa_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
return 0;
}
+void
+Cocoa_GL_GetDrawableSize(_THIS, SDL_Window * window, int * w, int * h)
+{
+ SDL_WindowData *windata = (SDL_WindowData *) window->driverdata;
+ NSView *contentView = [windata->nswindow contentView];
+ NSRect viewport = [contentView bounds];
+
+ /* This gives us the correct viewport for a Retina-enabled view, only
+ * supported on 10.7+. */
+ if ([contentView respondsToSelector:@selector(convertRectToBacking:)]) {
+ viewport = [contentView convertRectToBacking:viewport];
+ }
+
+ if (w) {
+ *w = viewport.size.width;
+ }
+
+ if (h) {
+ *h = viewport.size.height;
+ }
+}
+
int
Cocoa_GL_SetSwapInterval(_THIS, int interval)
{
@@ -302,6 +336,10 @@ Cocoa_GL_SetSwapInterval(_THIS, int interval)
GLint value;
int status;
+ if (interval < 0) { /* no extension for this on Mac OS X at the moment. */
+ return SDL_SetError("Late swap tearing currently unsupported");
+ }
+
pool = [[NSAutoreleasePool alloc] init];
nscontext = (NSOpenGLContext*)SDL_GL_GetCurrentContext();
@@ -344,7 +382,7 @@ Cocoa_GL_SwapWindow(_THIS, SDL_Window * window)
pool = [[NSAutoreleasePool alloc] init];
- SDLOpenGLContext* nscontext = (NSOpenGLContext*)SDL_GL_GetCurrentContext();
+ SDLOpenGLContext* nscontext = (SDLOpenGLContext*)SDL_GL_GetCurrentContext();
[nscontext flushBuffer];
[nscontext updateIfNeeded];
diff --git a/src/video/cocoa/SDL_cocoashape.m b/src/video/cocoa/SDL_cocoashape.m
index 7108526..ae8df8d 100644
--- a/src/video/cocoa/SDL_cocoashape.m
+++ b/src/video/cocoa/SDL_cocoashape.m
@@ -82,8 +82,8 @@ Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShape
data->saved = SDL_FALSE;
}
- //[data->context saveGraphicsState];
- //data->saved = SDL_TRUE;
+ /*[data->context saveGraphicsState];*/
+ /*data->saved = SDL_TRUE;*/
[NSGraphicsContext setCurrentContext:data->context];
[[NSColor clearColor] set];
diff --git a/src/video/cocoa/SDL_cocoavideo.m b/src/video/cocoa/SDL_cocoavideo.m
index 8499152..d1b9587 100644
--- a/src/video/cocoa/SDL_cocoavideo.m
+++ b/src/video/cocoa/SDL_cocoavideo.m
@@ -71,9 +71,7 @@ Cocoa_CreateDevice(int devindex)
}
if (!data) {
SDL_OutOfMemory();
- if (device) {
- SDL_free(device);
- }
+ SDL_free(device);
return NULL;
}
device->driverdata = data;
@@ -121,6 +119,7 @@ Cocoa_CreateDevice(int devindex)
device->GL_UnloadLibrary = Cocoa_GL_UnloadLibrary;
device->GL_CreateContext = Cocoa_GL_CreateContext;
device->GL_MakeCurrent = Cocoa_GL_MakeCurrent;
+ device->GL_GetDrawableSize = Cocoa_GL_GetDrawableSize;
device->GL_SetSwapInterval = Cocoa_GL_SetSwapInterval;
device->GL_GetSwapInterval = Cocoa_GL_GetSwapInterval;
device->GL_SwapWindow = Cocoa_GL_SwapWindow;
diff --git a/src/video/cocoa/SDL_cocoawindow.h b/src/video/cocoa/SDL_cocoawindow.h
index 022694f..c08c55c 100644
--- a/src/video/cocoa/SDL_cocoawindow.h
+++ b/src/video/cocoa/SDL_cocoawindow.h
@@ -30,6 +30,7 @@ typedef struct SDL_WindowData SDL_WindowData;
@interface Cocoa_WindowListener : NSResponder <NSWindowDelegate> {
SDL_WindowData *_data;
BOOL observingVisible;
+ BOOL wasCtrlLeft;
BOOL wasVisible;
}
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index 9cee4d3..5529983 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -34,10 +34,17 @@
#include "SDL_cocoamouse.h"
#include "SDL_cocoaopengl.h"
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+/* Taken from AppKit/NSOpenGLView.h in 10.8 SDK. */
+@interface NSView (NSOpenGLSurfaceResolution)
+- (BOOL)wantsBestResolutionOpenGLSurface;
+- (void)setWantsBestResolutionOpenGLSurface:(BOOL)flag;
+@end
+#endif
static Uint32 s_moveHack;
-static __inline__ void ConvertNSRect(NSRect *r)
+static void ConvertNSRect(NSRect *r)
{
r->origin.y = CGDisplayPixelsHigh(kCGDirectMainDisplay) - r->origin.y - r->size.height;
}
@@ -62,6 +69,7 @@ static void ScheduleContextUpdates(SDL_WindowData *data)
_data = data;
observingVisible = YES;
+ wasCtrlLeft = NO;
wasVisible = [window isVisible];
center = [NSNotificationCenter defaultCenter];
@@ -333,7 +341,13 @@ static void ScheduleContextUpdates(SDL_WindowData *data)
switch ([theEvent buttonNumber]) {
case 0:
- button = SDL_BUTTON_LEFT;
+ if ([theEvent modifierFlags] & NSControlKeyMask) {
+ wasCtrlLeft = YES;
+ button = SDL_BUTTON_RIGHT;
+ } else {
+ wasCtrlLeft = NO;
+ button = SDL_BUTTON_LEFT;
+ }
break;
case 1:
button = SDL_BUTTON_RIGHT;
@@ -364,7 +378,12 @@ static void ScheduleContextUpdates(SDL_WindowData *data)
switch ([theEvent buttonNumber]) {
case 0:
- button = SDL_BUTTON_LEFT;
+ if (wasCtrlLeft) {
+ button = SDL_BUTTON_RIGHT;
+ wasCtrlLeft = NO;
+ } else {
+ button = SDL_BUTTON_LEFT;
+ }
break;
case 1:
button = SDL_BUTTON_RIGHT;
@@ -727,6 +746,13 @@ Cocoa_CreateWindow(_THIS, SDL_Window * window)
/* Create a default view for this window */
rect = [nswindow contentRectForFrameRect:[nswindow frame]];
NSView *contentView = [[SDLView alloc] initWithFrame:rect];
+
+ if ((window->flags & SDL_WINDOW_ALLOW_HIGHDPI) > 0) {
+ if ([contentView respondsToSelector:@selector(setWantsBestResolutionOpenGLSurface:)]) {
+ [contentView setWantsBestResolutionOpenGLSurface:YES];
+ }
+ }
+
[nswindow setContentView: contentView];
[contentView release];
@@ -894,8 +920,9 @@ Cocoa_RaiseWindow(_THIS, SDL_Window * window)
SDL_WindowData *windowData = ((SDL_WindowData *) window->driverdata);
NSWindow *nswindow = windowData->nswindow;
- // makeKeyAndOrderFront: has the side-effect of deminiaturizing and showing
- // a minimized or hidden window, so check for that before showing it.
+ /* makeKeyAndOrderFront: has the side-effect of deminiaturizing and showing
+ a minimized or hidden window, so check for that before showing it.
+ */
[windowData->listener pauseVisibleObservation];
if (![nswindow isMiniaturized] && [nswindow isVisible]) {
[nswindow makeKeyAndOrderFront:nil];
@@ -1031,8 +1058,8 @@ Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display
}
s_moveHack = 0;
- [nswindow setFrameOrigin:rect.origin];
[nswindow setContentSize:rect.size];
+ [nswindow setFrameOrigin:rect.origin];
s_moveHack = SDL_GetTicks();
/* When the window style changes the title is cleared */
@@ -1047,9 +1074,11 @@ Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display
[nswindow setLevel:kCGNormalWindowLevel];
}
- [data->listener pauseVisibleObservation];
- [nswindow makeKeyAndOrderFront:nil];
- [data->listener resumeVisibleObservation];
+ if ([nswindow isVisible] || fullscreen) {
+ [data->listener pauseVisibleObservation];
+ [nswindow makeKeyAndOrderFront:nil];
+ [data->listener resumeVisibleObservation];
+ }
ScheduleContextUpdates(data);
diff --git a/src/video/directfb/SDL_DirectFB_WM.c b/src/video/directfb/SDL_DirectFB_WM.c
index 8241d9b..83912bd 100644
--- a/src/video/directfb/SDL_DirectFB_WM.c
+++ b/src/video/directfb/SDL_DirectFB_WM.c
@@ -131,7 +131,7 @@ DirectFB_WM_RedrawLayout(_THIS, SDL_Window * window)
SDL_DFB_CHECK(s->SetBlittingFlags(s, DSBLIT_NOFX));
LoadFont(_this, window);
- /*s->SetDrawingFlags(s, DSDRAW_BLEND); */
+ /* s->SetDrawingFlags(s, DSDRAW_BLEND); */
s->SetColor(s, COLOR_EXPAND(t->frame_color));
/* top */
for (i = 0; i < t->top_size; i++)
@@ -203,7 +203,7 @@ DirectFB_WM_AdjustWindowLayout(SDL_Window * window, int flags, int w, int h)
if (!windata->is_managed)
windata->theme = theme_none;
else if (flags & SDL_WINDOW_BORDERLESS)
- /*desc.caps |= DWCAPS_NODECORATION;) */
+ /* desc.caps |= DWCAPS_NODECORATION;) */
windata->theme = theme_none;
else if (flags & SDL_WINDOW_FULLSCREEN) {
windata->theme = theme_none;
@@ -351,7 +351,7 @@ DirectFB_WM_ProcessEvent(_THIS, SDL_Window * window, DFBWindowEvent * evt)
dy = 0;
SDL_DFB_CHECK(dfbwin->GetSize(dfbwin, &cw, &ch));
- /* necessary to trigger an event - ugly*/
+ /* necessary to trigger an event - ugly */
SDL_DFB_CHECK(dfbwin->DisableEvents(dfbwin, DWET_ALL));
SDL_DFB_CHECK(dfbwin->Resize(dfbwin, cw + dx + 1, ch + dy));
SDL_DFB_CHECK(dfbwin->EnableEvents(dfbwin, DWET_ALL));
diff --git a/src/video/directfb/SDL_DirectFB_events.c b/src/video/directfb/SDL_DirectFB_events.c
index 483ba9c..cb669bc 100644
--- a/src/video/directfb/SDL_DirectFB_events.c
+++ b/src/video/directfb/SDL_DirectFB_events.c
@@ -132,7 +132,7 @@ MotionAllMice(_THIS, int x, int y)
SDL_Mouse *mouse = SDL_GetMouse(index);
mouse->x = mouse->last_x = x;
mouse->y = mouse->last_y = y;
- /*SDL_SendMouseMotion(devdata->mouse_id[index], 0, x, y, 0);*/
+ /* SDL_SendMouseMotion(devdata->mouse_id[index], 0, x, y, 0); */
}
#endif
}
@@ -233,7 +233,7 @@ ProcessWindowEvent(_THIS, SDL_Window *sdlwin, DFBWindowEvent * evt)
case DWET_KEYDOWN:
if (!devdata->use_linux_input) {
DirectFB_TranslateKey(_this, evt, &keysym, &unicode);
- /*printf("Scancode %d %d %d\n", keysym.scancode, evt->key_code, evt->key_id);*/
+ /* printf("Scancode %d %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
SDL_SendKeyboardKey_ex(0, SDL_PRESSED, keysym.scancode);
if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
SDL_zero(text);
@@ -369,7 +369,7 @@ ProcessInputEvent(_THIS, DFBInputEvent * ievt)
case DIET_KEYPRESS:
kbd_idx = KbdIndex(_this, ievt->device_id);
DirectFB_TranslateKeyInputEvent(_this, ievt, &keysym, &unicode);
- /*printf("Scancode %d %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
+ /* printf("Scancode %d %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
SDL_SendKeyboardKey_ex(kbd_idx, SDL_PRESSED, keysym.scancode);
if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
SDL_zero(text);
@@ -742,7 +742,7 @@ DirectFB_InitKeyboard(_THIS)
void
DirectFB_QuitKeyboard(_THIS)
{
- /*SDL_DFB_DEVICEDATA(_this); */
+ /* SDL_DFB_DEVICEDATA(_this); */
SDL_KeyboardQuit();
diff --git a/src/video/directfb/SDL_DirectFB_render.c b/src/video/directfb/SDL_DirectFB_render.c
index 958793d..219f520 100644
--- a/src/video/directfb/SDL_DirectFB_render.c
+++ b/src/video/directfb/SDL_DirectFB_render.c
@@ -131,7 +131,7 @@ SDL_RenderDriver DirectFB_RenderDriver = {
(SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK | SDL_BLENDMODE_BLEND |
SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD),
(SDL_SCALEMODE_NONE | SDL_SCALEMODE_FAST |
- SDL_SCALEMODE_SLOW | SDL_SCALEMODE_BEST),*/
+ SDL_SCALEMODE_SLOW | SDL_SCALEMODE_BEST), */
0,
{
/* formats filled in later */
@@ -167,7 +167,7 @@ typedef struct
#endif
} DirectFB_TextureData;
-static __inline__ void
+static SDL_INLINE void
SDLtoDFBRect(const SDL_Rect * sr, DFBRectangle * dr)
{
dr->x = sr->x;
@@ -175,7 +175,7 @@ SDLtoDFBRect(const SDL_Rect * sr, DFBRectangle * dr)
dr->h = sr->h;
dr->w = sr->w;
}
-static __inline__ void
+static SDL_INLINE void
SDLtoDFBRect_Float(const SDL_FRect * sr, DFBRectangle * dr)
{
dr->x = sr->x;
@@ -211,7 +211,7 @@ TextureHasAlpha(DirectFB_TextureData * data)
#endif
}
-static inline IDirectFBSurface *get_dfb_surface(SDL_Window *window)
+static SDL_INLINE IDirectFBSurface *get_dfb_surface(SDL_Window *window)
{
SDL_SysWMinfo wm_info;
SDL_memset(&wm_info, 0, sizeof(SDL_SysWMinfo));
@@ -222,7 +222,7 @@ static inline IDirectFBSurface *get_dfb_surface(SDL_Window *window)
return wm_info.info.dfb.surface;
}
-static inline IDirectFBWindow *get_dfb_window(SDL_Window *window)
+static SDL_INLINE IDirectFBWindow *get_dfb_window(SDL_Window *window)
{
SDL_SysWMinfo wm_info;
SDL_memset(&wm_info, 0, sizeof(SDL_SysWMinfo));
@@ -266,7 +266,7 @@ SetBlendMode(DirectFB_RenderData * data, int blendMode,
case SDL_BLENDMODE_ADD:
data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
data->drawFlags = DSDRAW_BLEND;
- /* FIXME: SRCALPHA kills performance on radeon ... */
+ /* FIXME: SRCALPHA kills performance on radeon ...
* It will be cheaper to copy the surface to a temporary surface and premultiply
*/
if (source && TextureHasAlpha(source))
@@ -308,7 +308,7 @@ DisplayPaletteChanged(void *userdata, SDL_Palette * palette)
entries[i].r = palette->colors[i].r;
entries[i].g = palette->colors[i].g;
entries[i].b = palette->colors[i].b;
- entries[i].a = palette->colors[i].unused;
+ entries[i].a = palette->colors[i].a;
}
SDL_DFB_CHECKERR(surfpal->SetEntries(surfpal, entries, ncolors, 0));
return 0;
@@ -326,8 +326,8 @@ DirectFB_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
/* Rebind the context to the window area and update matrices */
- /*SDL_CurrentContext = NULL; */
- /*data->updateSize = SDL_TRUE; */
+ /* SDL_CurrentContext = NULL; */
+ /* data->updateSize = SDL_TRUE; */
renddata->size_changed = SDL_TRUE;
}
}
@@ -379,7 +379,7 @@ DirectFB_CreateRenderer(SDL_Window * window, Uint32 flags)
/* FIXME: Yet to be tested */
renderer->RenderReadPixels = DirectFB_RenderReadPixels;
- /*renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
+ /* renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
renderer->DestroyTexture = DirectFB_DestroyTexture;
renderer->DestroyRenderer = DirectFB_DestroyRenderer;
@@ -450,7 +450,7 @@ DirectFB_ActivateRenderer(SDL_Renderer * renderer)
SDL_Window *window = renderer->window;
SDL_DFB_WINDOWDATA(window);
- if (renddata->size_changed /*|| windata->wm_needs_redraw*/) {
+ if (renddata->size_changed /* || windata->wm_needs_redraw */) {
renddata->size_changed = SDL_FALSE;
}
}
@@ -674,7 +674,7 @@ DirectFB_GetTexturePalette(SDL_Renderer * renderer,
colors[i].r = entries[i].r;
colors[i].g = entries[i].g;
colors[i].b = entries[i].b;
- colors[i].unused = SDL_ALPHA_OPAQUE;
+ colors[i].a = SDL_ALPHA_OPAQUE;
}
return 0;
} else {
@@ -701,7 +701,7 @@ DirectFB_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
{
switch (texture->blendMode) {
case SDL_BLENDMODE_NONE:
- /*case SDL_BLENDMODE_MASK: */
+ /* case SDL_BLENDMODE_MASK: */
case SDL_BLENDMODE_BLEND:
case SDL_BLENDMODE_ADD:
case SDL_BLENDMODE_MOD:
@@ -717,7 +717,7 @@ DirectFB_SetDrawBlendMode(SDL_Renderer * renderer)
{
switch (renderer->blendMode) {
case SDL_BLENDMODE_NONE:
- /*case SDL_BLENDMODE_MASK: */
+ /* case SDL_BLENDMODE_MASK: */
case SDL_BLENDMODE_BLEND:
case SDL_BLENDMODE_ADD:
case SDL_BLENDMODE_MOD:
@@ -916,7 +916,7 @@ PrepareDraw(SDL_Renderer * renderer)
switch (renderer->blendMode) {
case SDL_BLENDMODE_NONE:
- /*case SDL_BLENDMODE_MASK: */
+ /* case SDL_BLENDMODE_MASK: */
case SDL_BLENDMODE_BLEND:
break;
case SDL_BLENDMODE_ADD:
@@ -1226,9 +1226,7 @@ DirectFB_DestroyRenderer(SDL_Renderer * renderer)
}
#endif
- if (data) {
- SDL_free(data);
- }
+ SDL_free(data);
SDL_free(renderer);
}
diff --git a/src/video/directfb/SDL_DirectFB_shape.c b/src/video/directfb/SDL_DirectFB_shape.c
index 13c3d70..358078f 100644
--- a/src/video/directfb/SDL_DirectFB_shape.c
+++ b/src/video/directfb/SDL_DirectFB_shape.c
@@ -31,7 +31,7 @@
SDL_Window*
DirectFB_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
- return SDL_CreateWindow(title,x,y,w,h,flags /*| SDL_DFB_WINDOW_SHAPED */);
+ return SDL_CreateWindow(title,x,y,w,h,flags /* | SDL_DFB_WINDOW_SHAPED */);
}
SDL_WindowShaper*
diff --git a/src/video/directfb/SDL_DirectFB_video.c b/src/video/directfb/SDL_DirectFB_video.c
index d20b5f1..4e5eae4 100644
--- a/src/video/directfb/SDL_DirectFB_video.c
+++ b/src/video/directfb/SDL_DirectFB_video.c
@@ -258,7 +258,7 @@ DirectFB_VideoInit(_THIS)
&devdata->events));
} else {
SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb, DICAPS_AXES
- /*DICAPS_ALL */ ,
+ /* DICAPS_ALL */ ,
DFB_TRUE,
&devdata->events));
}
diff --git a/src/video/directfb/SDL_DirectFB_video.h b/src/video/directfb/SDL_DirectFB_video.h
index 53fcdcf..b40bac0 100644
--- a/src/video/directfb/SDL_DirectFB_video.h
+++ b/src/video/directfb/SDL_DirectFB_video.h
@@ -76,7 +76,7 @@
#define DFBENV_USE_WM "SDL_DIRECTFB_WM" /* Default: off */
#define SDL_DFB_RELEASE(x) do { if ( (x) != NULL ) { SDL_DFB_CHECK(x->Release(x)); x = NULL; } } while (0)
-#define SDL_DFB_FREE(x) do { if ( (x) != NULL ) { SDL_free(x); x = NULL; } } while (0)
+#define SDL_DFB_FREE(x) do { SDL_free((x)); (x) = NULL; } while (0)
#define SDL_DFB_UNLOCK(x) do { if ( (x) != NULL ) { x->Unlock(x); } } while (0)
#define SDL_DFB_CONTEXT "SDL_DirectFB"
@@ -88,7 +88,7 @@
#define SDL_DFB_DEBUG(x...) SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, x)
-static inline DFBResult sdl_dfb_check(DFBResult ret, const char *src_file, int src_line) {
+static SDL_INLINE DFBResult sdl_dfb_check(DFBResult ret, const char *src_file, int src_line) {
if (ret != DFB_OK) {
SDL_DFB_LOG("%s (%d):%s", src_file, src_line, DirectFBErrorString (ret) );
SDL_SetError("%s:%s", SDL_DFB_CONTEXT, DirectFBErrorString (ret) );
diff --git a/src/video/directfb/SDL_DirectFB_window.c b/src/video/directfb/SDL_DirectFB_window.c
index cdcb4cc..e373d4b 100644
--- a/src/video/directfb/SDL_DirectFB_window.c
+++ b/src/video/directfb/SDL_DirectFB_window.c
@@ -155,7 +155,7 @@ DirectFB_CreateWindow(_THIS, SDL_Window * window)
SDL_DFB_CHECK(windata->dfbwin->RaiseToTop(windata->dfbwin));
/* remember parent */
- /*windata->sdlwin = window; */
+ /* windata->sdlwin = window; */
/* Add to list ... */
@@ -237,8 +237,7 @@ DirectFB_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
}
return;
error:
- if (surface)
- SDL_FreeSurface(surface);
+ SDL_FreeSurface(surface);
SDL_DFB_RELEASE(windata->icon);
return;
}
diff --git a/src/video/directfb/SDL_DirectFB_window.h b/src/video/directfb/SDL_DirectFB_window.h
index a4a1cc8..96afc59 100644
--- a/src/video/directfb/SDL_DirectFB_window.h
+++ b/src/video/directfb/SDL_DirectFB_window.h
@@ -34,7 +34,7 @@ struct _DFB_WindowData
IDirectFBSurface *surface; /* client drawing surface */
IDirectFBWindow *dfbwin;
IDirectFBEventBuffer *eventbuffer;
- /*SDL_Window *sdlwin; */
+ /* SDL_Window *sdlwin; */
SDL_Window *next;
Uint8 opacity;
DFBRectangle client;
diff --git a/src/video/dummy/SDL_nullframebuffer.c b/src/video/dummy/SDL_nullframebuffer.c
index f390491..f18ceea 100644
--- a/src/video/dummy/SDL_nullframebuffer.c
+++ b/src/video/dummy/SDL_nullframebuffer.c
@@ -38,9 +38,7 @@ int SDL_DUMMY_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * forma
/* Free the old framebuffer surface */
surface = (SDL_Surface *) SDL_GetWindowData(window, DUMMY_SURFACE);
- if (surface) {
- SDL_FreeSurface(surface);
- }
+ SDL_FreeSurface(surface);
/* Create a new one */
SDL_PixelFormatEnumToMasks(surface_format, &bpp, &Rmask, &Gmask, &Bmask, &Amask);
@@ -83,9 +81,7 @@ void SDL_DUMMY_DestroyWindowFramebuffer(_THIS, SDL_Window * window)
SDL_Surface *surface;
surface = (SDL_Surface *) SDL_SetWindowData(window, DUMMY_SURFACE, NULL);
- if (surface) {
- SDL_FreeSurface(surface);
- }
+ SDL_FreeSurface(surface);
}
#endif /* SDL_VIDEO_DRIVER_DUMMY */
diff --git a/src/video/dummy/SDL_nullvideo.c b/src/video/dummy/SDL_nullvideo.c
index 21f1124..9d6ea67 100644
--- a/src/video/dummy/SDL_nullvideo.c
+++ b/src/video/dummy/SDL_nullvideo.c
@@ -82,9 +82,7 @@ DUMMY_CreateDevice(int devindex)
device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
if (!device) {
SDL_OutOfMemory();
- if (device) {
- SDL_free(device);
- }
+ SDL_free(device);
return (0);
}
diff --git a/src/video/psp/SDL_pspevents.c b/src/video/psp/SDL_pspevents.c
index 54cd4e7..87bc529 100644
--- a/src/video/psp/SDL_pspevents.c
+++ b/src/video/psp/SDL_pspevents.c
@@ -118,8 +118,8 @@ void PSP_PumpEvents(_THIS)
pressed = scanData->pressed;
sym.scancode = raw;
sym.sym = keymap[raw];
- /* not tested*/
- /*SDL_PrivateKeyboard(pressed?SDL_PRESSED:SDL_RELEASED, &sym); */
+ /* not tested */
+ /* SDL_PrivateKeyboard(pressed?SDL_PRESSED:SDL_RELEASED, &sym); */
SDL_SendKeyboardKey((keys & keymap_psp[i].id) ?
SDL_PRESSED : SDL_RELEASED, SDL_GetScancodeFromKey(keymap[raw]);
diff --git a/src/video/psp/SDL_pspvideo.c b/src/video/psp/SDL_pspvideo.c
index ed5ab1c..64b48eb 100644
--- a/src/video/psp/SDL_pspvideo.c
+++ b/src/video/psp/SDL_pspvideo.c
@@ -306,7 +306,7 @@ PSP_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
}
-/* TO Write Me*/
+/* TO Write Me */
SDL_bool PSP_HasScreenKeyboardSupport(_THIS)
{
return SDL_FALSE;
diff --git a/src/video/psp/SDL_pspvideo.h b/src/video/psp/SDL_pspvideo.h
index d4ab32b..5b6435f 100644
--- a/src/video/psp/SDL_pspvideo.h
+++ b/src/video/psp/SDL_pspvideo.h
@@ -91,7 +91,7 @@ int PSP_GL_GetSwapInterval(_THIS);
void PSP_GL_SwapWindow(_THIS, SDL_Window * window);
void PSP_GL_DeleteContext(_THIS, SDL_GLContext context);
-/*PSP on screen keyboard */
+/* PSP on screen keyboard */
SDL_bool PSP_HasScreenKeyboardSupport(_THIS);
void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window);
void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);
diff --git a/src/video/raspberry/SDL_rpievents.c b/src/video/raspberry/SDL_rpievents.c
new file mode 100644
index 0000000..8c420fe
--- /dev/null
+++ b/src/video/raspberry/SDL_rpievents.c
@@ -0,0 +1,45 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_RPI
+
+#include "../../events/SDL_sysevents.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "SDL_rpivideo.h"
+#include "SDL_rpievents_c.h"
+
+#ifdef SDL_INPUT_LINUXEV
+#include "../../input/evdev/SDL_evdev.h"
+#endif
+
+void RPI_PumpEvents(_THIS)
+{
+#ifdef SDL_INPUT_LINUXEV
+ SDL_EVDEV_Poll();
+#endif
+
+}
+
+#endif /* SDL_VIDEO_DRIVER_RPI */
+
diff --git a/src/video/raspberry/SDL_rpievents_c.h b/src/video/raspberry/SDL_rpievents_c.h
new file mode 100644
index 0000000..54d3119
--- /dev/null
+++ b/src/video/raspberry/SDL_rpievents_c.h
@@ -0,0 +1,31 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_rpievents_c_h
+#define _SDL_rpievents_c_h
+
+#include "SDL_rpivideo.h"
+
+void RPI_PumpEvents(_THIS);
+void RPI_EventInit(_THIS);
+void RPI_EventQuit(_THIS);
+
+#endif /* _SDL_rpievents_c_h */
diff --git a/src/video/raspberry/SDL_rpimouse.c b/src/video/raspberry/SDL_rpimouse.c
new file mode 100644
index 0000000..429214b
--- /dev/null
+++ b/src/video/raspberry/SDL_rpimouse.c
@@ -0,0 +1,277 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_RPI
+
+#include "SDL_assert.h"
+#include "SDL_surface.h"
+
+#include "SDL_rpivideo.h"
+#include "SDL_rpimouse.h"
+
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/default_cursor.h"
+
+/* Copied from vc_vchi_dispmanx.h which is bugged and tries to include a non existing file */
+/* Attributes changes flag mask */
+#define ELEMENT_CHANGE_LAYER (1<<0)
+#define ELEMENT_CHANGE_OPACITY (1<<1)
+#define ELEMENT_CHANGE_DEST_RECT (1<<2)
+#define ELEMENT_CHANGE_SRC_RECT (1<<3)
+#define ELEMENT_CHANGE_MASK_RESOURCE (1<<4)
+#define ELEMENT_CHANGE_TRANSFORM (1<<5)
+/* End copied from vc_vchi_dispmanx.h */
+
+static SDL_Cursor *RPI_CreateDefaultCursor(void);
+static SDL_Cursor *RPI_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y);
+static int RPI_ShowCursor(SDL_Cursor * cursor);
+static void RPI_MoveCursor(SDL_Cursor * cursor);
+static void RPI_FreeCursor(SDL_Cursor * cursor);
+static void RPI_WarpMouse(SDL_Window * window, int x, int y);
+
+static SDL_Cursor *
+RPI_CreateDefaultCursor(void)
+{
+ return SDL_CreateCursor(default_cdata, default_cmask, DEFAULT_CWIDTH, DEFAULT_CHEIGHT, DEFAULT_CHOTX, DEFAULT_CHOTY);
+}
+
+/* Create a cursor from a surface */
+static SDL_Cursor *
+RPI_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
+{
+ RPI_CursorData *curdata;
+ SDL_Cursor *cursor;
+ int ret;
+ VC_RECT_T dst_rect;
+ Uint32 dummy;
+
+ SDL_assert(surface->format->format == SDL_PIXELFORMAT_ARGB8888);
+ SDL_assert(surface->pitch == surface->w * 4);
+
+ cursor = (SDL_Cursor *) SDL_calloc(1, sizeof(*cursor));
+ curdata = (RPI_CursorData *) SDL_calloc(1, sizeof(*curdata));
+
+ curdata->hot_x = hot_x;
+ curdata->hot_y = hot_y;
+ curdata->w = surface->w;
+ curdata->h = surface->h;
+
+ /* This usage is inspired by Wayland/Weston RPI code, how they figured this out is anyone's guess */
+ curdata->resource = vc_dispmanx_resource_create( VC_IMAGE_ARGB8888, surface->w | (surface->pitch << 16), surface->h | (surface->h << 16), &dummy );
+ SDL_assert(curdata->resource);
+ vc_dispmanx_rect_set( &dst_rect, 0, 0, curdata->w, curdata->h);
+ /* A note from Weston:
+ * vc_dispmanx_resource_write_data() ignores ifmt,
+ * rect.x, rect.width, and uses stride only for computing
+ * the size of the transfer as rect.height * stride.
+ * Therefore we can only write rows starting at x=0.
+ */
+ ret = vc_dispmanx_resource_write_data( curdata->resource, VC_IMAGE_ARGB8888, surface->pitch, surface->pixels, &dst_rect );
+ SDL_assert ( ret == DISPMANX_SUCCESS );
+
+ cursor->driverdata = curdata;
+
+ return cursor;
+
+}
+
+/* Show the specified cursor, or hide if cursor is NULL */
+static int
+RPI_ShowCursor(SDL_Cursor * cursor)
+{
+ int ret;
+ DISPMANX_UPDATE_HANDLE_T update;
+ RPI_CursorData *curdata;
+ VC_RECT_T src_rect, dst_rect;
+ SDL_Mouse *mouse;
+ SDL_VideoDisplay *display;
+ SDL_DisplayData *data;
+ VC_DISPMANX_ALPHA_T alpha = { DISPMANX_FLAGS_ALPHA_FROM_SOURCE /* flags */ , 255 /*opacity 0->255*/, 0 /* mask */ };
+
+ mouse = SDL_GetMouse();
+ if (mouse == NULL) {
+ return -1;
+ }
+
+ if (cursor == NULL) {
+ /* FIXME: We hide the current mouse's cursor, what we actually need is *_HideCursor */
+
+ if ( mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) {
+ curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata;
+ if (curdata->element > DISPMANX_NO_HANDLE) {
+ update = vc_dispmanx_update_start( 10 );
+ SDL_assert( update );
+ ret = vc_dispmanx_element_remove( update, curdata->element );
+ SDL_assert( ret == DISPMANX_SUCCESS );
+ ret = vc_dispmanx_update_submit_sync( update );
+ SDL_assert( ret == DISPMANX_SUCCESS );
+ curdata->element = DISPMANX_NO_HANDLE;
+ }
+ }
+ return 0;
+ }
+
+ curdata = (RPI_CursorData *) cursor->driverdata;
+ if (curdata == NULL) {
+ return -1;
+ }
+
+ if (mouse->focus == NULL) {
+ return -1;
+ }
+
+ display = SDL_GetDisplayForWindow(mouse->focus);
+ if (display == NULL) {
+ return -1;
+ }
+
+ data = (SDL_DisplayData*) display->driverdata;
+ if (data == NULL) {
+ return -1;
+ }
+
+ if (curdata->element == DISPMANX_NO_HANDLE) {
+ vc_dispmanx_rect_set( &src_rect, 0, 0, curdata->w << 16, curdata->h << 16 );
+ vc_dispmanx_rect_set( &dst_rect, 0, 0, curdata->w, curdata->h);
+
+ update = vc_dispmanx_update_start( 10 );
+ SDL_assert( update );
+
+ curdata->element = vc_dispmanx_element_add( update,
+ data->dispman_display,
+ SDL_RPI_MOUSELAYER, // layer
+ &dst_rect,
+ curdata->resource,
+ &src_rect,
+ DISPMANX_PROTECTION_NONE,
+ &alpha,
+ DISPMANX_NO_HANDLE, // clamp
+ VC_IMAGE_ROT0 );
+ SDL_assert( curdata->element > DISPMANX_NO_HANDLE);
+ ret = vc_dispmanx_update_submit_sync( update );
+ SDL_assert( ret == DISPMANX_SUCCESS );
+ }
+
+ return 0;
+}
+
+/* Free a window manager cursor */
+static void
+RPI_FreeCursor(SDL_Cursor * cursor)
+{
+ int ret;
+ DISPMANX_UPDATE_HANDLE_T update;
+ RPI_CursorData *curdata;
+
+ if (cursor != NULL) {
+ curdata = (RPI_CursorData *) cursor->driverdata;
+
+ if (curdata != NULL) {
+ if (curdata->element != DISPMANX_NO_HANDLE) {
+ update = vc_dispmanx_update_start( 10 );
+ SDL_assert( update );
+ ret = vc_dispmanx_element_remove( update, curdata->element );
+ SDL_assert( ret == DISPMANX_SUCCESS );
+ ret = vc_dispmanx_update_submit_sync( update );
+ SDL_assert( ret == DISPMANX_SUCCESS );
+ }
+
+ if (curdata->resource != DISPMANX_NO_HANDLE) {
+ ret = vc_dispmanx_resource_delete( curdata->resource );
+ SDL_assert( ret == DISPMANX_SUCCESS );
+ }
+
+ SDL_free(cursor->driverdata);
+ }
+ SDL_free(cursor);
+ }
+}
+
+/* Warp the mouse to (x,y) */
+static void
+RPI_WarpMouse(SDL_Window * window, int x, int y)
+{
+ RPI_CursorData *curdata;
+ DISPMANX_UPDATE_HANDLE_T update;
+ int ret;
+ VC_RECT_T dst_rect;
+ SDL_Mouse *mouse = SDL_GetMouse();
+
+ if (mouse != NULL && mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) {
+ curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata;
+ if (curdata->element != DISPMANX_NO_HANDLE) {
+ update = vc_dispmanx_update_start( 10 );
+ SDL_assert( update );
+ vc_dispmanx_rect_set( &dst_rect, x, y, curdata->w, curdata->h);
+ ret = vc_dispmanx_element_change_attributes(
+ update,
+ curdata->element,
+ ELEMENT_CHANGE_DEST_RECT,
+ 0,
+ 0,
+ &dst_rect,
+ NULL,
+ DISPMANX_NO_HANDLE,
+ DISPMANX_NO_ROTATE);
+ SDL_assert( ret == DISPMANX_SUCCESS );
+ /* Submit asynchronously, otherwise the peformance suffers a lot */
+ ret = vc_dispmanx_update_submit( update, 0, NULL );
+ SDL_assert( ret == DISPMANX_SUCCESS );
+ }
+ }
+}
+
+void
+RPI_InitMouse(_THIS)
+{
+ /* FIXME: Using UDEV it should be possible to scan all mice
+ * but there's no point in doing so as there's no multimice support...yet!
+ */
+ SDL_Mouse *mouse = SDL_GetMouse();
+
+ mouse->CreateCursor = RPI_CreateCursor;
+ mouse->ShowCursor = RPI_ShowCursor;
+ mouse->MoveCursor = RPI_MoveCursor;
+ mouse->FreeCursor = RPI_FreeCursor;
+ mouse->WarpMouse = RPI_WarpMouse;
+
+ SDL_SetDefaultCursor(RPI_CreateDefaultCursor());
+}
+
+void
+RPI_QuitMouse(_THIS)
+{
+
+}
+
+/* This is called when a mouse motion event occurs */
+static void
+RPI_MoveCursor(SDL_Cursor * cursor)
+{
+ SDL_Mouse *mouse = SDL_GetMouse();
+ RPI_WarpMouse(mouse->focus, mouse->x, mouse->y);
+}
+
+#endif /* SDL_VIDEO_DRIVER_RPI */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpimouse.h b/src/video/raspberry/SDL_rpimouse.h
new file mode 100644
index 0000000..aa8eec9
--- /dev/null
+++ b/src/video/raspberry/SDL_rpimouse.h
@@ -0,0 +1,43 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_RPI_mouse_h
+#define _SDL_RPI_mouse_h
+
+#include "../SDL_sysvideo.h"
+
+typedef struct _RPI_CursorData RPI_CursorData;
+struct _RPI_CursorData
+{
+ DISPMANX_RESOURCE_HANDLE_T resource;
+ DISPMANX_ELEMENT_HANDLE_T element;
+ int hot_x, hot_y;
+ int w, h;
+};
+
+#define SDL_RPI_CURSORDATA(curs) RPI_CursorData *curdata = (RPI_CursorData *) ((curs) ? (curs)->driverdata : NULL)
+
+extern void RPI_InitMouse(_THIS);
+extern void RPI_QuitMouse(_THIS);
+
+#endif /* _SDL_RPI_mouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpiopengles.c b/src/video/raspberry/SDL_rpiopengles.c
new file mode 100644
index 0000000..23c89fe
--- /dev/null
+++ b/src/video/raspberry/SDL_rpiopengles.c
@@ -0,0 +1,42 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_rpivideo.h"
+#include "SDL_rpiopengles.h"
+
+/* EGL implementation of SDL OpenGL support */
+
+int
+RPI_GLES_LoadLibrary(_THIS, const char *path) {
+ return SDL_EGL_LoadLibrary(_this, path, EGL_DEFAULT_DISPLAY);
+}
+
+SDL_EGL_CreateContext_impl(RPI)
+SDL_EGL_SwapWindow_impl(RPI)
+SDL_EGL_MakeCurrent_impl(RPI)
+
+#endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/video/raspberry/SDL_rpiopengles.h b/src/video/raspberry/SDL_rpiopengles.h
new file mode 100644
index 0000000..deb4b2f
--- /dev/null
+++ b/src/video/raspberry/SDL_rpiopengles.h
@@ -0,0 +1,48 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_rpiopengles_h
+#define _SDL_rpiopengles_h
+
+#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
+
+#include "../SDL_sysvideo.h"
+#include "../SDL_egl.h"
+
+/* OpenGLES functions */
+#define RPI_GLES_GetAttribute SDL_EGL_GetAttribute
+#define RPI_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define RPI_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define RPI_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define RPI_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define RPI_GLES_DeleteContext SDL_EGL_DeleteContext
+
+extern int RPI_GLES_LoadLibrary(_THIS, const char *path);
+extern SDL_GLContext RPI_GLES_CreateContext(_THIS, SDL_Window * window);
+extern void RPI_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+
+#endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */
+
+#endif /* _SDL_rpiopengles_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpivideo.c b/src/video/raspberry/SDL_rpivideo.c
new file mode 100644
index 0000000..dfad9ba
--- /dev/null
+++ b/src/video/raspberry/SDL_rpivideo.c
@@ -0,0 +1,360 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_RPI
+
+/* References
+ * http://elinux.org/RPi_VideoCore_APIs
+ * https://github.com/raspberrypi/firmware/blob/master/opt/vc/src/hello_pi/hello_triangle/triangle.c
+ * http://cgit.freedesktop.org/wayland/weston/tree/src/rpi-renderer.c
+ * http://cgit.freedesktop.org/wayland/weston/tree/src/compositor-rpi.c
+ */
+
+/* SDL internals */
+#include "../SDL_sysvideo.h"
+#include "SDL_version.h"
+#include "SDL_syswm.h"
+#include "SDL_loadso.h"
+#include "SDL_events.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_keyboard_c.h"
+
+#ifdef SDL_INPUT_LINUXEV
+#include "../../input/evdev/SDL_evdev.h"
+#endif
+
+/* RPI declarations */
+#include "SDL_rpivideo.h"
+#include "SDL_rpievents_c.h"
+#include "SDL_rpiopengles.h"
+#include "SDL_rpimouse.h"
+
+static int
+RPI_Available(void)
+{
+ return 1;
+}
+
+static void
+RPI_Destroy(SDL_VideoDevice * device)
+{
+ /* SDL_VideoData *phdata = (SDL_VideoData *) device->driverdata; */
+
+ if (device->driverdata != NULL) {
+ device->driverdata = NULL;
+ }
+}
+
+static SDL_VideoDevice *
+RPI_Create()
+{
+ SDL_VideoDevice *device;
+ SDL_VideoData *phdata;
+
+ /* Initialize SDL_VideoDevice structure */
+ device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+ if (device == NULL) {
+ SDL_OutOfMemory();
+ return NULL;
+ }
+
+ /* Initialize internal data */
+ phdata = (SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData));
+ if (phdata == NULL) {
+ SDL_OutOfMemory();
+ SDL_free(device);
+ return NULL;
+ }
+
+ device->driverdata = phdata;
+
+ /* Setup amount of available displays and current display */
+ device->num_displays = 0;
+
+ /* Set device free function */
+ device->free = RPI_Destroy;
+
+ /* Setup all functions which we can handle */
+ device->VideoInit = RPI_VideoInit;
+ device->VideoQuit = RPI_VideoQuit;
+ device->GetDisplayModes = RPI_GetDisplayModes;
+ device->SetDisplayMode = RPI_SetDisplayMode;
+ device->CreateWindow = RPI_CreateWindow;
+ device->CreateWindowFrom = RPI_CreateWindowFrom;
+ device->SetWindowTitle = RPI_SetWindowTitle;
+ device->SetWindowIcon = RPI_SetWindowIcon;
+ device->SetWindowPosition = RPI_SetWindowPosition;
+ device->SetWindowSize = RPI_SetWindowSize;
+ device->ShowWindow = RPI_ShowWindow;
+ device->HideWindow = RPI_HideWindow;
+ device->RaiseWindow = RPI_RaiseWindow;
+ device->MaximizeWindow = RPI_MaximizeWindow;
+ device->MinimizeWindow = RPI_MinimizeWindow;
+ device->RestoreWindow = RPI_RestoreWindow;
+ device->SetWindowGrab = RPI_SetWindowGrab;
+ device->DestroyWindow = RPI_DestroyWindow;
+ device->GetWindowWMInfo = RPI_GetWindowWMInfo;
+ device->GL_LoadLibrary = RPI_GLES_LoadLibrary;
+ device->GL_GetProcAddress = RPI_GLES_GetProcAddress;
+ device->GL_UnloadLibrary = RPI_GLES_UnloadLibrary;
+ device->GL_CreateContext = RPI_GLES_CreateContext;
+ device->GL_MakeCurrent = RPI_GLES_MakeCurrent;
+ device->GL_SetSwapInterval = RPI_GLES_SetSwapInterval;
+ device->GL_GetSwapInterval = RPI_GLES_GetSwapInterval;
+ device->GL_SwapWindow = RPI_GLES_SwapWindow;
+ device->GL_DeleteContext = RPI_GLES_DeleteContext;
+
+ device->PumpEvents = RPI_PumpEvents;
+
+ return device;
+}
+
+VideoBootStrap RPI_bootstrap = {
+ "RPI",
+ "RPI Video Driver",
+ RPI_Available,
+ RPI_Create
+};
+
+/*****************************************************************************/
+/* SDL Video and Display initialization/handling functions */
+/*****************************************************************************/
+int
+RPI_VideoInit(_THIS)
+{
+ SDL_VideoDisplay display;
+ SDL_DisplayMode current_mode;
+ SDL_DisplayData *data;
+ uint32_t w,h;
+
+ /* Initialize BCM Host */
+ bcm_host_init();
+
+ SDL_zero(current_mode);
+
+ if (graphics_get_display_size( 0, &w, &h) < 0) {
+ return -1;
+ }
+
+ current_mode.w = w;
+ current_mode.h = h;
+ /* FIXME: Is there a way to tell the actual refresh rate? */
+ current_mode.refresh_rate = 60;
+ /* 32 bpp for default */
+ current_mode.format = SDL_PIXELFORMAT_ABGR8888;
+
+ current_mode.driverdata = NULL;
+
+ SDL_zero(display);
+ display.desktop_mode = current_mode;
+ display.current_mode = current_mode;
+
+ /* Allocate display internal data */
+ data = (SDL_DisplayData *) SDL_calloc(1, sizeof(SDL_DisplayData));
+ if (data == NULL) {
+ return SDL_OutOfMemory();
+ }
+
+ data->dispman_display = vc_dispmanx_display_open( 0 /* LCD */);
+
+ display.driverdata = data;
+
+ SDL_AddVideoDisplay(&display);
+
+#ifdef SDL_INPUT_LINUXEV
+ SDL_EVDEV_Init();
+#endif
+
+ RPI_InitMouse(_this);
+
+ return 1;
+}
+
+void
+RPI_VideoQuit(_THIS)
+{
+#ifdef SDL_INPUT_LINUXEV
+ SDL_EVDEV_Quit();
+#endif
+}
+
+void
+RPI_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+{
+ /* Only one display mode available, the current one */
+ SDL_AddDisplayMode(display, &display->current_mode);
+}
+
+int
+RPI_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+ return 0;
+}
+
+int
+RPI_CreateWindow(_THIS, SDL_Window * window)
+{
+ SDL_WindowData *wdata;
+ SDL_VideoDisplay *display;
+ SDL_DisplayData *displaydata;
+ VC_RECT_T dst_rect;
+ VC_RECT_T src_rect;
+ VC_DISPMANX_ALPHA_T dispman_alpha;
+ DISPMANX_UPDATE_HANDLE_T dispman_update;
+
+ /* Disable alpha, otherwise the app looks composed with whatever dispman is showing (X11, console,etc) */
+ dispman_alpha.flags = DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS;
+ dispman_alpha.opacity = 0xFF;
+ dispman_alpha.mask = 0;
+
+ /* Allocate window internal data */
+ wdata = (SDL_WindowData *) SDL_calloc(1, sizeof(SDL_WindowData));
+ if (wdata == NULL) {
+ return SDL_OutOfMemory();
+ }
+ display = SDL_GetDisplayForWindow(window);
+ displaydata = (SDL_DisplayData *) display->driverdata;
+
+ /* Windows have one size for now */
+ window->w = display->desktop_mode.w;
+ window->h = display->desktop_mode.h;
+
+ /* OpenGL ES is the law here, buddy */
+ window->flags |= SDL_WINDOW_OPENGL;
+
+ /* Create a dispman element and associate a window to it */
+ dst_rect.x = 0;
+ dst_rect.y = 0;
+ dst_rect.width = window->w;
+ dst_rect.height = window->h;
+
+ src_rect.x = 0;
+ src_rect.y = 0;
+ src_rect.width = window->w << 16;
+ src_rect.height = window->h << 16;
+
+ dispman_update = vc_dispmanx_update_start( 0 );
+ wdata->dispman_window.element = vc_dispmanx_element_add ( dispman_update, displaydata->dispman_display, SDL_RPI_VIDEOLAYER /* layer */, &dst_rect, 0/*src*/, &src_rect, DISPMANX_PROTECTION_NONE, &dispman_alpha /*alpha*/, 0/*clamp*/, 0/*transform*/);
+ wdata->dispman_window.width = window->w;
+ wdata->dispman_window.height = window->h;
+ vc_dispmanx_update_submit_sync( dispman_update );
+
+ if (!_this->egl_data) {
+ if (SDL_GL_LoadLibrary(NULL) < 0) {
+ return -1;
+ }
+ }
+ wdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) &wdata->dispman_window);
+
+ if (wdata->egl_surface == EGL_NO_SURFACE) {
+ return SDL_SetError("Could not create GLES window surface");
+ }
+
+ /* Setup driver data for this window */
+ window->driverdata = wdata;
+
+ /* One window, it always has focus */
+ SDL_SetMouseFocus(window);
+ SDL_SetKeyboardFocus(window);
+
+ /* Window has been successfully created */
+ return 0;
+}
+
+int
+RPI_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
+{
+ return -1;
+}
+
+void
+RPI_SetWindowTitle(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
+{
+}
+void
+RPI_SetWindowPosition(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_SetWindowSize(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_ShowWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_HideWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_RaiseWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_MaximizeWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_MinimizeWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_RestoreWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
+{
+
+}
+void
+RPI_DestroyWindow(_THIS, SDL_Window * window)
+{
+}
+
+/*****************************************************************************/
+/* SDL Window Manager function */
+/*****************************************************************************/
+SDL_bool
+RPI_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
+{
+ if (info->version.major <= SDL_MAJOR_VERSION) {
+ return SDL_TRUE;
+ } else {
+ SDL_SetError("application not compiled with SDL %d.%d\n",
+ SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+ return SDL_FALSE;
+ }
+
+ /* Failed to get window manager information */
+ return SDL_FALSE;
+}
+
+#endif /* SDL_VIDEO_DRIVER_RPI */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpivideo.h b/src/video/raspberry/SDL_rpivideo.h
new file mode 100644
index 0000000..6359bad
--- /dev/null
+++ b/src/video/raspberry/SDL_rpivideo.h
@@ -0,0 +1,98 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __SDL_RPIVIDEO_H__
+#define __SDL_RPIVIDEO_H__
+
+#include "SDL_config.h"
+#include "../SDL_sysvideo.h"
+
+#include "bcm_host.h"
+#include "GLES/gl.h"
+#include "EGL/egl.h"
+#include "EGL/eglext.h"
+
+typedef struct SDL_VideoData
+{
+ uint32_t egl_refcount; /* OpenGL ES reference count */
+} SDL_VideoData;
+
+
+typedef struct SDL_DisplayData
+{
+ DISPMANX_DISPLAY_HANDLE_T dispman_display;
+} SDL_DisplayData;
+
+
+typedef struct SDL_WindowData
+{
+ EGL_DISPMANX_WINDOW_T dispman_window;
+#if SDL_VIDEO_OPENGL_EGL
+ EGLSurface egl_surface;
+#endif
+} SDL_WindowData;
+
+#define SDL_RPI_VIDEOLAYER 10000 /* High enough so to occlude everything */
+#define SDL_RPI_MOUSELAYER SDL_RPI_VIDEOLAYER + 1
+
+
+/****************************************************************************/
+/* SDL_VideoDevice functions declaration */
+/****************************************************************************/
+
+/* Display and window functions */
+int RPI_VideoInit(_THIS);
+void RPI_VideoQuit(_THIS);
+void RPI_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
+int RPI_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+int RPI_CreateWindow(_THIS, SDL_Window * window);
+int RPI_CreateWindowFrom(_THIS, SDL_Window * window, const void *data);
+void RPI_SetWindowTitle(_THIS, SDL_Window * window);
+void RPI_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
+void RPI_SetWindowPosition(_THIS, SDL_Window * window);
+void RPI_SetWindowSize(_THIS, SDL_Window * window);
+void RPI_ShowWindow(_THIS, SDL_Window * window);
+void RPI_HideWindow(_THIS, SDL_Window * window);
+void RPI_RaiseWindow(_THIS, SDL_Window * window);
+void RPI_MaximizeWindow(_THIS, SDL_Window * window);
+void RPI_MinimizeWindow(_THIS, SDL_Window * window);
+void RPI_RestoreWindow(_THIS, SDL_Window * window);
+void RPI_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
+void RPI_DestroyWindow(_THIS, SDL_Window * window);
+
+/* Window manager function */
+SDL_bool RPI_GetWindowWMInfo(_THIS, SDL_Window * window,
+ struct SDL_SysWMinfo *info);
+
+/* OpenGL/OpenGL ES functions */
+int RPI_GLES_LoadLibrary(_THIS, const char *path);
+void *RPI_GLES_GetProcAddress(_THIS, const char *proc);
+void RPI_GLES_UnloadLibrary(_THIS);
+SDL_GLContext RPI_GLES_CreateContext(_THIS, SDL_Window * window);
+int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+int RPI_GLES_SetSwapInterval(_THIS, int interval);
+int RPI_GLES_GetSwapInterval(_THIS);
+void RPI_GLES_SwapWindow(_THIS, SDL_Window * window);
+void RPI_GLES_DeleteContext(_THIS, SDL_GLContext context);
+
+#endif /* __SDL_RPIVIDEO_H__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitopenglview.m b/src/video/uikit/SDL_uikitopenglview.m
index 9f3dc13..b43f345 100644
--- a/src/video/uikit/SDL_uikitopenglview.m
+++ b/src/video/uikit/SDL_uikitopenglview.m
@@ -121,6 +121,8 @@
if (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES) {
return NO;
}
+
+ glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
/* end create buffers */
self.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
@@ -148,6 +150,8 @@
glBindRenderbufferOES(GL_RENDERBUFFER_OES, depthRenderbuffer);
glRenderbufferStorageOES(GL_RENDERBUFFER_OES, depthBufferFormat, backingWidth, backingHeight);
}
+
+ glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
}
- (void)setAnimationCallback:(int)interval
@@ -197,7 +201,9 @@
- (void)swapBuffers
{
- glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
+ /* viewRenderbuffer should always be bound here. Code that binds something
+ else is responsible for rebinding viewRenderbuffer, to reduce
+ duplicate state changes. */
[context presentRenderbuffer:GL_RENDERBUFFER_OES];
}
diff --git a/src/video/uikit/SDL_uikitvideo.m b/src/video/uikit/SDL_uikitvideo.m
index 662b109..74b24b8 100644
--- a/src/video/uikit/SDL_uikitvideo.m
+++ b/src/video/uikit/SDL_uikitvideo.m
@@ -63,9 +63,7 @@ UIKit_CreateDevice(int devindex)
/* Initialize all variables that we clean on shutdown */
device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
if (!device) {
- if (device) {
- SDL_free(device);
- }
+ SDL_free(device);
SDL_OutOfMemory();
return (0);
}
diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index e808962..66129be 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -246,8 +246,8 @@
{
if ([string length] == 0) {
/* it wants to replace text with nothing, ie a delete */
- SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_DELETE);
- SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_DELETE);
+ SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_BACKSPACE);
+ SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_BACKSPACE);
}
else {
/* go through all the characters in the string we've been sent
diff --git a/src/video/uikit/SDL_uikitviewcontroller.h b/src/video/uikit/SDL_uikitviewcontroller.h
index 2bc664d..a69c1e1 100644
--- a/src/video/uikit/SDL_uikitviewcontroller.h
+++ b/src/video/uikit/SDL_uikitviewcontroller.h
@@ -35,5 +35,6 @@
- (void)viewDidLayoutSubviews;
- (NSUInteger)supportedInterfaceOrientations;
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orient;
+- (BOOL)prefersStatusBarHidden;
@end
diff --git a/src/video/uikit/SDL_uikitviewcontroller.m b/src/video/uikit/SDL_uikitviewcontroller.m
index 157b70a..077c160 100644
--- a/src/video/uikit/SDL_uikitviewcontroller.m
+++ b/src/video/uikit/SDL_uikitviewcontroller.m
@@ -119,6 +119,15 @@
return (orientationMask & (1 << orient));
}
+- (BOOL)prefersStatusBarHidden
+{
+ if (self->window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) {
+ return YES;
+ } else {
+ return NO;
+ }
+}
+
@end
#endif /* SDL_VIDEO_DRIVER_UIKIT */
diff --git a/src/video/uikit/SDL_uikitwindow.m b/src/video/uikit/SDL_uikitwindow.m
index 0285b6b..6a19462 100644
--- a/src/video/uikit/SDL_uikitwindow.m
+++ b/src/video/uikit/SDL_uikitwindow.m
@@ -99,11 +99,13 @@ static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bo
if (displaydata->uiscreen == [UIScreen mainScreen]) {
window->flags |= SDL_WINDOW_INPUT_FOCUS; /* always has input focus */
+ /* This was setup earlier for our window, and in iOS 7 is controlled by the view, not the application
if ([UIApplication sharedApplication].statusBarHidden) {
window->flags |= SDL_WINDOW_BORDERLESS;
} else {
window->flags &= ~SDL_WINDOW_BORDERLESS;
}
+ */
} else {
window->flags &= ~SDL_WINDOW_RESIZABLE; /* window is NEVER resizeable */
window->flags &= ~SDL_WINDOW_INPUT_FOCUS; /* never has input focus */
diff --git a/src/video/uikit/keyinfotable.h b/src/video/uikit/keyinfotable.h
index d12674b..d588f91 100644
--- a/src/video/uikit/keyinfotable.h
+++ b/src/video/uikit/keyinfotable.h
@@ -166,7 +166,7 @@ static UIKitKeyInfo unicharToUIKeyInfoTable[] = {
/* 124 */{ SDL_SCANCODE_BACKSLASH, KMOD_SHIFT }, /* plus shift modifier '|' */
/* 125 */{ SDL_SCANCODE_RIGHTBRACKET, KMOD_SHIFT }, /* plus shift modifier '}' */
/* 126 */{ SDL_SCANCODE_GRAVE, KMOD_SHIFT }, /* plus shift modifier '~' */
-/* 127 */{ SDL_SCANCODE_DELETE, KMOD_SHIFT }
+/* 127 */{ SDL_SCANCODE_BACKSPACE, KMOD_SHIFT }
};
#endif /* UIKitKeyInfo */
diff --git a/src/video/windows/SDL_windowsclipboard.c b/src/video/windows/SDL_windowsclipboard.c
index 3d1db4a..15eea1a 100644
--- a/src/video/windows/SDL_windowsclipboard.c
+++ b/src/video/windows/SDL_windowsclipboard.c
@@ -137,7 +137,7 @@ WIN_HasClipboardText(_THIS)
SDL_bool result = SDL_FALSE;
char *text = WIN_GetClipboardText(_this);
if (text) {
- result = (SDL_strlen(text)>0) ? SDL_TRUE : SDL_FALSE;
+ result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
SDL_free(text);
}
return result;
diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index acf8d5e..1826258 100644
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@@ -36,7 +36,7 @@
/* For GET_X_LPARAM, GET_Y_LPARAM. */
#include <windowsx.h>
-/*#define WMMSG_DEBUG*/
+/* #define WMMSG_DEBUG */
#ifdef WMMSG_DEBUG
#include <stdio.h>
#include "wmmsg.h"
@@ -256,6 +256,33 @@ WIN_CheckRawMouseButtons( ULONG rawButtons, SDL_WindowData *data )
}
}
+SDL_FORCE_INLINE BOOL
+WIN_ConvertUTF32toUTF8(UINT32 codepoint, char * text)
+{
+ if (codepoint <= 0x7F) {
+ text[0] = (char) codepoint;
+ text[1] = '\0';
+ } else if (codepoint <= 0x7FF) {
+ text[0] = 0xC0 | (char) ((codepoint >> 6) & 0x1F);
+ text[1] = 0x80 | (char) (codepoint & 0x3F);
+ text[2] = '\0';
+ } else if (codepoint <= 0xFFFF) {
+ text[0] = 0xE0 | (char) ((codepoint >> 12) & 0x0F);
+ text[1] = 0x80 | (char) ((codepoint >> 6) & 0x3F);
+ text[2] = 0x80 | (char) (codepoint & 0x3F);
+ text[3] = '\0';
+ } else if (codepoint <= 0x10FFFF) {
+ text[0] = 0xF0 | (char) ((codepoint >> 18) & 0x0F);
+ text[1] = 0x80 | (char) ((codepoint >> 12) & 0x3F);
+ text[2] = 0x80 | (char) ((codepoint >> 6) & 0x3F);
+ text[3] = 0x80 | (char) (codepoint & 0x3F);
+ text[4] = '\0';
+ } else {
+ return SDL_FALSE;
+ }
+ return SDL_TRUE;
+}
+
LRESULT CALLBACK
WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
@@ -282,18 +309,16 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
}
#ifdef WMMSG_DEBUG
- {
- FILE *log = fopen("wmmsg.txt", "a");
- fprintf(log, "Received windows message: %p ", hwnd);
- if (msg > MAX_WMMSG) {
- fprintf(log, "%d", msg);
- } else {
- fprintf(log, "%s", wmtab[msg]);
- }
- fprintf(log, " -- 0x%X, 0x%X\n", wParam, lParam);
- fclose(log);
- }
-#endif
+ {
+ char message[1024];
+ if (msg > MAX_WMMSG) {
+ SDL_snprintf(message, sizeof(message), "Received windows message: %p UNKNOWN (%d) -- 0x%X, 0x%X\n", hwnd, msg, wParam, lParam);
+ } else {
+ SDL_snprintf(message, sizeof(message), "Received windows message: %p %s -- 0x%X, 0x%X\n", hwnd, wmtab[msg], wParam, lParam);
+ }
+ OutputDebugStringA(message);
+ }
+#endif /* WMMSG_DEBUG */
if (IME_HandleMessage(hwnd, msg, wParam, &lParam, data->videodata))
return 0;
@@ -439,10 +464,20 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_MOUSEWHEEL:
{
- /* FIXME: This may need to accumulate deltas up to WHEEL_DELTA */
- short motion = GET_WHEEL_DELTA_WPARAM(wParam) / WHEEL_DELTA;
+ static short s_AccumulatedMotion;
- SDL_SendMouseWheel(data->window, 0, 0, motion);
+ s_AccumulatedMotion += GET_WHEEL_DELTA_WPARAM(wParam);
+ if (s_AccumulatedMotion > 0) {
+ while (s_AccumulatedMotion >= WHEEL_DELTA) {
+ SDL_SendMouseWheel(data->window, 0, 0, 1);
+ s_AccumulatedMotion -= WHEEL_DELTA;
+ }
+ } else {
+ while (s_AccumulatedMotion <= -WHEEL_DELTA) {
+ SDL_SendMouseWheel(data->window, 0, 0, -1);
+ s_AccumulatedMotion += WHEEL_DELTA;
+ }
+ }
break;
}
@@ -459,14 +494,28 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
break;
#endif /* WM_MOUSELEAVE */
- case WM_SYSKEYDOWN:
case WM_KEYDOWN:
+ case WM_SYSKEYDOWN:
{
SDL_Scancode code = WindowsScanCodeToSDLScanCode( lParam, wParam );
if ( code != SDL_SCANCODE_UNKNOWN ) {
SDL_SendKeyboardKey(SDL_PRESSED, code );
}
}
+ if (msg == WM_KEYDOWN) {
+ BYTE keyboardState[256];
+ char text[5];
+ UINT32 utf32 = 0;
+
+ GetKeyboardState(keyboardState);
+ if (ToUnicode(wParam, (lParam >> 16) & 0xff, keyboardState, (LPWSTR)&utf32, 1, 0) > 0) {
+ WORD repitition;
+ for (repitition = lParam & 0xffff; repitition > 0; repitition--) {
+ WIN_ConvertUTF32toUTF8(utf32, text);
+ SDL_SendKeyboardText(text);
+ }
+ }
+ }
returnCode = 0;
break;
@@ -485,24 +534,19 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
returnCode = 0;
break;
- case WM_CHAR:
+ case WM_UNICHAR:
{
- char text[4];
-
- /* Convert to UTF-8 and send it on... */
- if (wParam <= 0x7F) {
- text[0] = (char) wParam;
- text[1] = '\0';
- } else if (wParam <= 0x7FF) {
- text[0] = 0xC0 | (char) ((wParam >> 6) & 0x1F);
- text[1] = 0x80 | (char) (wParam & 0x3F);
- text[2] = '\0';
- } else {
- text[0] = 0xE0 | (char) ((wParam >> 12) & 0x0F);
- text[1] = 0x80 | (char) ((wParam >> 6) & 0x3F);
- text[2] = 0x80 | (char) (wParam & 0x3F);
- text[3] = '\0';
+ if (wParam == UNICODE_NOCHAR) {
+ returnCode = 1;
+ break;
}
+ }
+ /* no break */
+ case WM_CHAR:
+ {
+ char text[5];
+
+ WIN_ConvertUTF32toUTF8(wParam, text);
SDL_SendKeyboardText(text);
}
returnCode = 0;
@@ -772,7 +816,6 @@ WIN_PumpEvents(_THIS)
const Uint8 *keystate;
MSG msg;
while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
- TranslateMessage(&msg);
DispatchMessage(&msg);
}
diff --git a/src/video/windows/SDL_windowskeyboard.c b/src/video/windows/SDL_windowskeyboard.c
index de58480..17d4eed 100644
--- a/src/video/windows/SDL_windowskeyboard.c
+++ b/src/video/windows/SDL_windowskeyboard.c
@@ -758,10 +758,10 @@ IME_GetCandidateList(HIMC himc, SDL_VideoData *videodata)
if (LANG() == LANG_CHS && IME_GetId(videodata, 0)) {
const UINT maxcandchar = 18;
UINT i = 0;
- UINT cchars = 0;
+ size_t cchars = 0;
for (; i < videodata->ime_candcount; ++i) {
- UINT len = SDL_wcslen((LPWSTR)((DWORD_PTR)cand_list + cand_list->dwOffset[i])) + 1;
+ size_t len = SDL_wcslen((LPWSTR)((DWORD_PTR)cand_list + cand_list->dwOffset[i])) + 1;
if (len + cchars > maxcandchar) {
if (i > cand_list->dwSelection)
break;
diff --git a/src/video/windows/SDL_windowsmessagebox.c b/src/video/windows/SDL_windowsmessagebox.c
index bbe7923..06937ad 100644
--- a/src/video/windows/SDL_windowsmessagebox.c
+++ b/src/video/windows/SDL_windowsmessagebox.c
@@ -22,7 +22,9 @@
#if SDL_VIDEO_DRIVER_WINDOWS
-#include "SDL.h"
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_assert.h"
#include "SDL_windowsvideo.h"
@@ -233,9 +235,7 @@ static SDL_bool AddDialogButton(WIN_DialogData *dialog, int x, int y, int w, int
static void FreeDialogData(WIN_DialogData *dialog)
{
- if (dialog->data) {
- SDL_free(dialog->data);
- }
+ SDL_free(dialog->data);
SDL_free(dialog);
}
@@ -342,7 +342,8 @@ int
WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
{
WIN_DialogData *dialog;
- int i, x, y, which;
+ int i, x, y;
+ UINT_PTR which;
const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
HFONT DialogFont;
SIZE Size;
diff --git a/src/video/windows/SDL_windowsopengl.c b/src/video/windows/SDL_windowsopengl.c
index 9cda415..20d9913 100644
--- a/src/video/windows/SDL_windowsopengl.c
+++ b/src/video/windows/SDL_windowsopengl.c
@@ -23,6 +23,7 @@
#if SDL_VIDEO_DRIVER_WINDOWS
#include "SDL_assert.h"
+#include "SDL_loadso.h"
#include "SDL_windowsvideo.h"
/* WGL implementation of SDL OpenGL support */
@@ -67,6 +68,11 @@
#define WGL_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004
#endif
+#ifndef WGL_ARB_framebuffer_sRGB
+#define WGL_ARB_framebuffer_sRGB
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9
+#endif
+
typedef HGLRC(APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC,
HGLRC
hShareContext,
@@ -76,8 +82,7 @@ typedef HGLRC(APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC,
int
WIN_GL_LoadLibrary(_THIS, const char *path)
{
- LPTSTR wpath;
- HANDLE handle;
+ void *handle;
if (path == NULL) {
path = SDL_getenv("SDL_OPENGL_LIBRARY");
@@ -85,23 +90,15 @@ WIN_GL_LoadLibrary(_THIS, const char *path)
if (path == NULL) {
path = DEFAULT_OPENGL;
}
- wpath = WIN_UTF8ToString(path);
- _this->gl_config.dll_handle = LoadLibrary(wpath);
- SDL_free(wpath);
+ _this->gl_config.dll_handle = SDL_LoadObject(path);
if (!_this->gl_config.dll_handle) {
- char message[1024];
- SDL_snprintf(message, SDL_arraysize(message), "LoadLibrary(\"%s\")",
- path);
- return WIN_SetError(message);
+ return -1;
}
SDL_strlcpy(_this->gl_config.driver_path, path,
SDL_arraysize(_this->gl_config.driver_path));
/* Allocate OpenGL memory */
- _this->gl_data =
- (struct SDL_GLDriverData *) SDL_calloc(1,
- sizeof(struct
- SDL_GLDriverData));
+ _this->gl_data = (struct SDL_GLDriverData *) SDL_calloc(1, sizeof(struct SDL_GLDriverData));
if (!_this->gl_data) {
return SDL_OutOfMemory();
}
@@ -109,21 +106,20 @@ WIN_GL_LoadLibrary(_THIS, const char *path)
/* Load function pointers */
handle = _this->gl_config.dll_handle;
_this->gl_data->wglGetProcAddress = (void *(WINAPI *) (const char *))
- GetProcAddress(handle, "wglGetProcAddress");
+ SDL_LoadFunction(handle, "wglGetProcAddress");
_this->gl_data->wglCreateContext = (HGLRC(WINAPI *) (HDC))
- GetProcAddress(handle, "wglCreateContext");
+ SDL_LoadFunction(handle, "wglCreateContext");
_this->gl_data->wglDeleteContext = (BOOL(WINAPI *) (HGLRC))
- GetProcAddress(handle, "wglDeleteContext");
+ SDL_LoadFunction(handle, "wglDeleteContext");
_this->gl_data->wglMakeCurrent = (BOOL(WINAPI *) (HDC, HGLRC))
- GetProcAddress(handle, "wglMakeCurrent");
+ SDL_LoadFunction(handle, "wglMakeCurrent");
_this->gl_data->wglShareLists = (BOOL(WINAPI *) (HGLRC, HGLRC))
- GetProcAddress(handle, "wglShareLists");
+ SDL_LoadFunction(handle, "wglShareLists");
if (!_this->gl_data->wglGetProcAddress ||
!_this->gl_data->wglCreateContext ||
!_this->gl_data->wglDeleteContext ||
!_this->gl_data->wglMakeCurrent) {
- SDL_UnloadObject(handle);
return SDL_SetError("Could not retrieve OpenGL functions");
}
@@ -147,7 +143,7 @@ WIN_GL_GetProcAddress(_THIS, const char *proc)
void
WIN_GL_UnloadLibrary(_THIS)
{
- FreeLibrary((HMODULE) _this->gl_config.dll_handle);
+ SDL_UnloadObject(_this->gl_config.dll_handle);
_this->gl_config.dll_handle = NULL;
/* Free OpenGL memory */
@@ -495,6 +491,11 @@ WIN_GL_SetupWindowInternal(_THIS, SDL_Window * window)
*iAttr++ = _this->gl_config.multisamplesamples;
}
+ if (_this->gl_config.framebuffer_srgb_capable) {
+ *iAttr++ = WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB;
+ *iAttr++ = _this->gl_config.framebuffer_srgb_capable;
+ }
+
/* We always choose either FULL or NO accel on Windows, because of flaky
drivers. If the app didn't specify, we use FULL, because that's
probably what they wanted (and if you didn't care and got FULL, that's
diff --git a/src/video/windows/SDL_windowsvideo.c b/src/video/windows/SDL_windowsvideo.c
index 883cafa..8f708cf 100644
--- a/src/video/windows/SDL_windowsvideo.c
+++ b/src/video/windows/SDL_windowsvideo.c
@@ -25,6 +25,7 @@
#include "SDL_main.h"
#include "SDL_video.h"
#include "SDL_mouse.h"
+#include "SDL_system.h"
#include "../SDL_sysvideo.h"
#include "../SDL_pixels_c.h"
@@ -75,9 +76,7 @@ WIN_CreateDevice(int devindex)
data = NULL;
}
if (!data) {
- if (device) {
- SDL_free(device);
- }
+ SDL_free(device);
SDL_OutOfMemory();
return NULL;
}
@@ -176,6 +175,76 @@ WIN_VideoQuit(_THIS)
WIN_QuitMouse(_this);
}
+
+#define D3D_DEBUG_INFO
+#include <d3d9.h>
+
+SDL_bool
+D3D_LoadDLL( void **pD3DDLL, IDirect3D9 **pDirect3D9Interface )
+{
+ *pD3DDLL = SDL_LoadObject("D3D9.DLL");
+ if (*pD3DDLL) {
+ IDirect3D9 *(WINAPI * D3DCreate) (UINT SDKVersion);
+
+ D3DCreate =
+ (IDirect3D9 * (WINAPI *) (UINT)) SDL_LoadFunction(*pD3DDLL,
+ "Direct3DCreate9");
+ if (D3DCreate) {
+ *pDirect3D9Interface = D3DCreate(D3D_SDK_VERSION);
+ }
+ if (!*pDirect3D9Interface) {
+ SDL_UnloadObject(*pD3DDLL);
+ *pD3DDLL = NULL;
+ return SDL_FALSE;
+ }
+
+ return SDL_TRUE;
+ } else {
+ *pDirect3D9Interface = NULL;
+ return SDL_FALSE;
+ }
+}
+
+
+int
+SDL_Direct3D9GetAdapterIndex( int displayIndex )
+{
+ void *pD3DDLL;
+ IDirect3D9 *pD3D;
+ if (!D3D_LoadDLL(&pD3DDLL, &pD3D)) {
+ SDL_SetError("Unable to create Direct3D interface");
+ return D3DADAPTER_DEFAULT;
+ } else {
+ SDL_DisplayData *pData = (SDL_DisplayData *)SDL_GetDisplayDriverData(displayIndex);
+ int adapterIndex = D3DADAPTER_DEFAULT;
+
+ if (!pData) {
+ SDL_SetError("Invalid display index");
+ adapterIndex = -1; /* make sure we return something invalid */
+ } else {
+ char *displayName = WIN_StringToUTF8(pData->DeviceName);
+ unsigned int count = IDirect3D9_GetAdapterCount(pD3D);
+ unsigned int i;
+ for (i=0; i<count; i++) {
+ D3DADAPTER_IDENTIFIER9 id;
+ IDirect3D9_GetAdapterIdentifier(pD3D, i, 0, &id);
+
+ if (SDL_strcmp(id.DeviceName, displayName) == 0) {
+ adapterIndex = i;
+ break;
+ }
+ }
+ SDL_free(displayName);
+ }
+
+ /* free up the D3D stuff we inited */
+ IDirect3D9_Release(pD3D);
+ SDL_UnloadObject(pD3DDLL);
+
+ return adapterIndex;
+ }
+}
+
#endif /* SDL_VIDEO_DRIVER_WINDOWS */
/* vim: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsvideo.h b/src/video/windows/SDL_windowsvideo.h
index 0943708..ff2b4a2 100644
--- a/src/video/windows/SDL_windowsvideo.h
+++ b/src/video/windows/SDL_windowsvideo.h
@@ -23,10 +23,10 @@
#ifndef _SDL_windowsvideo_h
#define _SDL_windowsvideo_h
-#include "../SDL_sysvideo.h"
-
#include "../../core/windows/SDL_windows.h"
+#include "../SDL_sysvideo.h"
+
#if defined(_MSC_VER)
#include <msctf.h>
#else
@@ -170,6 +170,10 @@ typedef struct SDL_VideoData
TSFSink *ime_ippasink;
} SDL_VideoData;
+
+typedef struct IDirect3D9 IDirect3D9;
+extern SDL_bool D3D_LoadDLL( void **pD3DDLL, IDirect3D9 **pDirect3D9Interface );
+
#endif /* _SDL_windowsvideo_h */
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowswindow.c b/src/video/windows/SDL_windowswindow.c
index e83115f..cd53975 100644
--- a/src/video/windows/SDL_windowswindow.c
+++ b/src/video/windows/SDL_windowswindow.c
@@ -22,6 +22,8 @@
#if SDL_VIDEO_DRIVER_WINDOWS
+#include "../../core/windows/SDL_windows.h"
+
#include "SDL_assert.h"
#include "../SDL_sysvideo.h"
#include "../SDL_pixels_c.h"
@@ -113,7 +115,7 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
SDL_WindowData *data;
/* Allocate the window data */
- data = (SDL_WindowData *) SDL_malloc(sizeof(*data));
+ data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data));
if (!data) {
return SDL_OutOfMemory();
}
@@ -157,7 +159,7 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
int w = rect.right;
int h = rect.bottom;
if ((window->w && window->w != w) || (window->h && window->h != h)) {
- // We tried to create a window larger than the desktop and Windows didn't allow it. Override!
+ /* We tried to create a window larger than the desktop and Windows didn't allow it. Override! */
WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_NOZORDER | SWP_NOACTIVATE);
} else {
window->w = w;
@@ -319,9 +321,7 @@ WIN_SetWindowTitle(_THIS, SDL_Window * window)
title = NULL;
}
SetWindowText(hwnd, title ? title : TEXT(""));
- if (title) {
- SDL_free(title);
- }
+ SDL_free(title);
}
void
@@ -405,6 +405,9 @@ void
WIN_RaiseWindow(_THIS, SDL_Window * window)
{
WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOSIZE);
+
+ /* Raising the window while alt-tabbed can cause it to be minimized for some reason? */
+ WIN_RestoreWindow(_this, window);
}
void
diff --git a/src/video/x11/SDL_x11clipboard.c b/src/video/x11/SDL_x11clipboard.c
index 54b5eb6..e6ca86b 100644
--- a/src/video/x11/SDL_x11clipboard.c
+++ b/src/video/x11/SDL_x11clipboard.c
@@ -31,7 +31,7 @@
/* If you don't support UTF-8, you might use XA_STRING here */
#ifdef X_HAVE_UTF8_STRING
-#define TEXT_FORMAT XInternAtom(display, "UTF8_STRING", False)
+#define TEXT_FORMAT X11_XInternAtom(display, "UTF8_STRING", False)
#else
#define TEXT_FORMAT XA_STRING
#endif
@@ -55,7 +55,7 @@ X11_SetClipboardText(_THIS, const char *text)
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
Atom format;
Window window;
- Atom XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0);
+ Atom XA_CLIPBOARD = X11_XInternAtom(display, "CLIPBOARD", 0);
/* Get the SDL window that will own the selection */
window = GetWindow(_this);
@@ -65,17 +65,17 @@ X11_SetClipboardText(_THIS, const char *text)
/* Save the selection on the root window */
format = TEXT_FORMAT;
- XChangeProperty(display, DefaultRootWindow(display),
+ X11_XChangeProperty(display, DefaultRootWindow(display),
XA_CUT_BUFFER0, format, 8, PropModeReplace,
(const unsigned char *)text, SDL_strlen(text));
if (XA_CLIPBOARD != None &&
- XGetSelectionOwner(display, XA_CLIPBOARD) != window) {
- XSetSelectionOwner(display, XA_CLIPBOARD, window, CurrentTime);
+ X11_XGetSelectionOwner(display, XA_CLIPBOARD) != window) {
+ X11_XSetSelectionOwner(display, XA_CLIPBOARD, window, CurrentTime);
}
- if (XGetSelectionOwner(display, XA_PRIMARY) != window) {
- XSetSelectionOwner(display, XA_PRIMARY, window, CurrentTime);
+ if (X11_XGetSelectionOwner(display, XA_PRIMARY) != window) {
+ X11_XSetSelectionOwner(display, XA_PRIMARY, window, CurrentTime);
}
return 0;
}
@@ -97,7 +97,7 @@ X11_GetClipboardText(_THIS)
char *text;
Uint32 waitStart;
Uint32 waitElapsed;
- Atom XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0);
+ Atom XA_CLIPBOARD = X11_XInternAtom(display, "CLIPBOARD", 0);
if (XA_CLIPBOARD == None) {
SDL_SetError("Couldn't access X clipboard");
return SDL_strdup("");
@@ -108,15 +108,15 @@ X11_GetClipboardText(_THIS)
/* Get the window that holds the selection */
window = GetWindow(_this);
format = TEXT_FORMAT;
- owner = XGetSelectionOwner(display, XA_CLIPBOARD);
+ owner = X11_XGetSelectionOwner(display, XA_CLIPBOARD);
if ((owner == None) || (owner == window)) {
owner = DefaultRootWindow(display);
selection = XA_CUT_BUFFER0;
} else {
/* Request that the selection owner copy the data to our window */
owner = window;
- selection = XInternAtom(display, "SDL_SELECTION", False);
- XConvertSelection(display, XA_CLIPBOARD, format, selection, owner,
+ selection = X11_XInternAtom(display, "SDL_SELECTION", False);
+ X11_XConvertSelection(display, XA_CLIPBOARD, format, selection, owner,
CurrentTime);
/* When using synergy on Linux and when data has been put in the clipboard
@@ -139,7 +139,7 @@ X11_GetClipboardText(_THIS)
}
}
- if (XGetWindowProperty(display, owner, selection, 0, INT_MAX/4, False,
+ if (X11_XGetWindowProperty(display, owner, selection, 0, INT_MAX/4, False,
format, &seln_type, &seln_format, &nbytes, &overflow, &src)
== Success) {
if (seln_type == format) {
@@ -149,7 +149,7 @@ X11_GetClipboardText(_THIS)
text[nbytes] = '\0';
}
}
- XFree(src);
+ X11_XFree(src);
}
if (!text) {
@@ -165,7 +165,7 @@ X11_HasClipboardText(_THIS)
SDL_bool result = SDL_FALSE;
char *text = X11_GetClipboardText(_this);
if (text) {
- result = (SDL_strlen(text)>0) ? SDL_TRUE : SDL_FALSE;
+ result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
SDL_free(text);
}
return result;
diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c
index ab0eafb..24caea4 100644
--- a/src/video/x11/SDL_x11dyn.c
+++ b/src/video/x11/SDL_x11dyn.c
@@ -103,24 +103,19 @@ X11_GetSym(const char *fnname, int *pHasModule)
return fn;
}
+#endif /* SDL_VIDEO_DRIVER_X11_DYNAMIC */
/* Define all the function pointers and wrappers... */
#define SDL_X11_MODULE(modname)
-#define SDL_X11_SYM(rc,fn,params,args,ret) \
- typedef rc (*SDL_DYNX11FN_##fn) params; \
- static SDL_DYNX11FN_##fn p##fn = NULL; \
- rc fn params { ret p##fn args ; }
+#define SDL_X11_SYM(rc,fn,params,args,ret) SDL_DYNX11FN_##fn X11_##fn = NULL;
#include "SDL_x11sym.h"
#undef SDL_X11_MODULE
#undef SDL_X11_SYM
-#endif /* SDL_VIDEO_DRIVER_X11_DYNAMIC */
/* Annoying varargs entry point... */
#ifdef X_HAVE_UTF8_STRING
-typedef XIC(*SDL_DYNX11FN_XCreateIC) (XIM,...);
-SDL_DYNX11FN_XCreateIC pXCreateIC = NULL;
-typedef char *(*SDL_DYNX11FN_XGetICValues) (XIC, ...);
-SDL_DYNX11FN_XGetICValues pXGetICValues = NULL;
+SDL_DYNX11FN_XCreateIC X11_XCreateIC = NULL;
+SDL_DYNX11FN_XGetICValues X11_XGetICValues = NULL;
#endif
/* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */
@@ -130,13 +125,11 @@ SDL_DYNX11FN_XGetICValues pXGetICValues = NULL;
#undef SDL_X11_MODULE
#undef SDL_X11_SYM
-
static int x11_load_refcount = 0;
void
SDL_X11_UnloadSymbols(void)
{
-#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
/* Don't actually unload if more than one module is using the libs... */
if (x11_load_refcount > 0) {
if (--x11_load_refcount == 0) {
@@ -144,25 +137,26 @@ SDL_X11_UnloadSymbols(void)
/* set all the function pointers to NULL. */
#define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 0;
-#define SDL_X11_SYM(rc,fn,params,args,ret) p##fn = NULL;
+#define SDL_X11_SYM(rc,fn,params,args,ret) X11_##fn = NULL;
#include "SDL_x11sym.h"
#undef SDL_X11_MODULE
#undef SDL_X11_SYM
#ifdef X_HAVE_UTF8_STRING
- pXCreateIC = NULL;
- pXGetICValues = NULL;
+ X11_XCreateIC = NULL;
+ X11_XGetICValues = NULL;
#endif
+#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
if (x11libs[i].lib != NULL) {
SDL_UnloadObject(x11libs[i].lib);
x11libs[i].lib = NULL;
}
}
+#endif
}
}
-#endif
}
/* returns non-zero if all needed symbols were loaded. */
@@ -171,9 +165,9 @@ SDL_X11_LoadSymbols(void)
{
int rc = 1; /* always succeed if not using Dynamic X11 stuff. */
-#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
/* deal with multiple modules (dga, x11, etc) needing these symbols... */
if (x11_load_refcount++ == 0) {
+#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
int i;
int *thismod = NULL;
for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
@@ -189,15 +183,15 @@ SDL_X11_LoadSymbols(void)
#undef SDL_X11_SYM
#define SDL_X11_MODULE(modname) thismod = &SDL_X11_HAVE_##modname;
-#define SDL_X11_SYM(a,fn,x,y,z) p##fn = (SDL_DYNX11FN_##fn) X11_GetSym(#fn,thismod);
+#define SDL_X11_SYM(a,fn,x,y,z) X11_##fn = (SDL_DYNX11FN_##fn) X11_GetSym(#fn,thismod);
#include "SDL_x11sym.h"
#undef SDL_X11_MODULE
#undef SDL_X11_SYM
#ifdef X_HAVE_UTF8_STRING
- pXCreateIC = (SDL_DYNX11FN_XCreateIC)
+ X11_XCreateIC = (SDL_DYNX11FN_XCreateIC)
X11_GetSym("XCreateIC", &SDL_X11_HAVE_UTF8);
- pXGetICValues = (SDL_DYNX11FN_XGetICValues)
+ X11_XGetICValues = (SDL_DYNX11FN_XGetICValues)
X11_GetSym("XGetICValues", &SDL_X11_HAVE_UTF8);
#endif
@@ -209,19 +203,21 @@ SDL_X11_LoadSymbols(void)
SDL_X11_UnloadSymbols();
rc = 0;
}
- }
-#else
+
+#else /* no dynamic X11 */
+
#define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 1; /* default yes */
-#define SDL_X11_SYM(a,fn,x,y,z)
+#define SDL_X11_SYM(a,fn,x,y,z) X11_##fn = fn;
#include "SDL_x11sym.h"
#undef SDL_X11_MODULE
#undef SDL_X11_SYM
#ifdef X_HAVE_UTF8_STRING
- pXCreateIC = XCreateIC;
- pXGetICValues = XGetICValues;
+ X11_XCreateIC = XCreateIC;
+ X11_XGetICValues = XGetICValues;
#endif
#endif
+ }
return rc;
}
diff --git a/src/video/x11/SDL_x11dyn.h b/src/video/x11/SDL_x11dyn.h
index 2cebf3b..168c07e 100644
--- a/src/video/x11/SDL_x11dyn.h
+++ b/src/video/x11/SDL_x11dyn.h
@@ -69,35 +69,34 @@
#include <X11/extensions/xf86vmode.h>
#endif
-/*
- * When using the "dynamic X11" functionality, we duplicate all the Xlib
- * symbols that would be referenced by SDL inside of SDL itself.
- * These duplicated symbols just serve as passthroughs to the functions
- * in Xlib, that was dynamically loaded.
- *
- * This allows us to use Xlib as-is when linking against it directly, but
- * also handles all the strange cases where there was code in the Xlib
- * headers that may or may not exist or vary on a given platform.
- */
#ifdef __cplusplus
extern "C"
{
#endif
/* evil function signatures... */
- typedef Bool(*SDL_X11_XESetWireToEventRetType) (Display *, XEvent *,
- xEvent *);
- typedef int (*SDL_X11_XSynchronizeRetType) (Display *);
- typedef Status(*SDL_X11_XESetEventToWireRetType) (Display *, XEvent *,
- xEvent *);
-
- int SDL_X11_LoadSymbols(void);
- void SDL_X11_UnloadSymbols(void);
+typedef Bool(*SDL_X11_XESetWireToEventRetType) (Display *, XEvent *, xEvent *);
+typedef int (*SDL_X11_XSynchronizeRetType) (Display *);
+typedef Status(*SDL_X11_XESetEventToWireRetType) (Display *, XEvent *, xEvent *);
+
+int SDL_X11_LoadSymbols(void);
+void SDL_X11_UnloadSymbols(void);
+
+/* Declare all the function pointers and wrappers... */
+#define SDL_X11_MODULE(modname)
+#define SDL_X11_SYM(rc,fn,params,args,ret) \
+ typedef rc (*SDL_DYNX11FN_##fn) params; \
+ extern SDL_DYNX11FN_##fn X11_##fn;
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
-/* That's really annoying...make these function pointers no matter what. */
+/* Annoying varargs entry point... */
#ifdef X_HAVE_UTF8_STRING
- extern XIC(*pXCreateIC) (XIM, ...);
- extern char *(*pXGetICValues) (XIC, ...);
+typedef XIC(*SDL_DYNX11FN_XCreateIC) (XIM,...);
+typedef char *(*SDL_DYNX11FN_XGetICValues) (XIC, ...);
+extern SDL_DYNX11FN_XCreateIC X11_XCreateIC;
+extern SDL_DYNX11FN_XGetICValues X11_XGetICValues;
#endif
/* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */
@@ -107,7 +106,6 @@ extern "C"
#undef SDL_X11_MODULE
#undef SDL_X11_SYM
-
#ifdef __cplusplus
}
#endif
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index a9a3ac9..d9dcc2d 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -48,7 +48,7 @@ typedef struct {
} SDL_x11Prop;
/* Reads property
- Must call XFree on results
+ Must call X11_XFree on results
*/
static void X11_ReadProperty(SDL_x11Prop *p, Display *disp, Window w, Atom prop)
{
@@ -60,8 +60,8 @@ static void X11_ReadProperty(SDL_x11Prop *p, Display *disp, Window w, Atom prop)
int bytes_fetch = 0;
do {
- if (ret != 0) XFree(ret);
- XGetWindowProperty(disp, w, prop, 0, bytes_fetch, False, AnyPropertyType, &type, &fmt, &count, &bytes_left, &ret);
+ if (ret != 0) X11_XFree(ret);
+ X11_XGetWindowProperty(disp, w, prop, 0, bytes_fetch, False, AnyPropertyType, &type, &fmt, &count, &bytes_left, &ret);
bytes_fetch += bytes_left;
} while (bytes_left != 0);
@@ -79,9 +79,9 @@ static Atom X11_PickTarget(Display *disp, Atom list[], int list_count)
char *name;
int i;
for (i=0; i < list_count && request == None; i++) {
- name = XGetAtomName(disp, list[i]);
+ name = X11_XGetAtomName(disp, list[i]);
if (strcmp("text/uri-list", name)==0) request = list[i];
- XFree(name);
+ X11_XFree(name);
}
return request;
}
@@ -97,7 +97,7 @@ static Atom X11_PickTargetFromAtoms(Display *disp, Atom a0, Atom a1, Atom a2)
if (a2 != None) atom[count++] = a2;
return X11_PickTarget(disp, atom, count);
}
-/*#define DEBUG_XEVENTS*/
+/* #define DEBUG_XEVENTS */
struct KeyRepeatCheckData
{
@@ -125,8 +125,8 @@ static SDL_bool X11_KeyRepeat(Display *display, XEvent *event)
struct KeyRepeatCheckData d;
d.event = event;
d.found = SDL_FALSE;
- if (XPending(display))
- XCheckIfEvent(display, &dummyev, X11_KeyRepeatCheckIfEvent,
+ if (X11_XPending(display))
+ X11_XCheckIfEvent(display, &dummyev, X11_KeyRepeatCheckIfEvent,
(XPointer) &d);
return d.found;
}
@@ -135,7 +135,9 @@ static Bool X11_IsWheelCheckIfEvent(Display *display, XEvent *chkev,
XPointer arg)
{
XEvent *event = (XEvent *) arg;
+ /* we only handle buttons 4 and 5 - false positive avoidance */
if (chkev->type == ButtonRelease &&
+ (event->xbutton.button == Button4 || event->xbutton.button == Button5) &&
chkev->xbutton.button == event->xbutton.button &&
chkev->xbutton.time == event->xbutton.time)
return True;
@@ -145,13 +147,18 @@ static Bool X11_IsWheelCheckIfEvent(Display *display, XEvent *chkev,
static SDL_bool X11_IsWheelEvent(Display * display,XEvent * event,int * ticks)
{
XEvent relevent;
- if (XPending(display)) {
+ if (X11_XPending(display)) {
/* according to the xlib docs, no specific mouse wheel events exist.
however, mouse wheel events trigger a button press and a button release
immediately. thus, checking if the same button was released at the same
time as it was pressed, should be an adequate hack to derive a mouse
- wheel event. */
- if (XCheckIfEvent(display, &relevent, X11_IsWheelCheckIfEvent,
+ wheel event.
+ However, there is broken and unusual hardware out there...
+ - False positive: a button for which a release event is
+ generated (or synthesised) immediately.
+ - False negative: a wheel which, when rolled, doesn't have
+ a release event generated immediately. */
+ if (X11_XCheckIfEvent(display, &relevent, X11_IsWheelCheckIfEvent,
(XPointer) event)) {
/* by default, X11 only knows 5 buttons. on most 3 button + wheel mouse,
@@ -173,11 +180,12 @@ static SDL_bool X11_IsWheelEvent(Display * display,XEvent * event,int * ticks)
*/
static char* X11_URIToLocal(char* uri) {
char *file = NULL;
+ SDL_bool local;
if (memcmp(uri,"file:/",6) == 0) uri += 6; /* local file? */
else if (strstr(uri,":/") != NULL) return file; /* wrong scheme */
- SDL_bool local = uri[0] != '/' || ( uri[0] != '\0' && uri[1] == '/' );
+ local = uri[0] != '/' || ( uri[0] != '\0' && uri[1] == '/' );
/* got a hostname? */
if ( !local && uri[0] == '/' && uri[2] != '/' ) {
@@ -209,9 +217,9 @@ static void X11_HandleGenericEvent(SDL_VideoData *videodata,XEvent event)
{
/* event is a union, so cookie == &event, but this is type safe. */
XGenericEventCookie *cookie = &event.xcookie;
- if (XGetEventData(videodata->display, cookie)) {
+ if (X11_XGetEventData(videodata->display, cookie)) {
X11_HandleXinput2Event(videodata, cookie);
- XFreeEventData(videodata->display, cookie);
+ X11_XFreeEventData(videodata->display, cookie);
}
}
#endif /* SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS */
@@ -226,7 +234,7 @@ X11_DispatchFocusIn(SDL_WindowData *data)
SDL_SetKeyboardFocus(data->window);
#ifdef X_HAVE_UTF8_STRING
if (data->ic) {
- XSetICFocus(data->ic);
+ X11_XSetICFocus(data->ic);
}
#endif
}
@@ -240,7 +248,7 @@ X11_DispatchFocusOut(SDL_WindowData *data)
SDL_SetKeyboardFocus(NULL);
#ifdef X_HAVE_UTF8_STRING
if (data->ic) {
- XUnsetICFocus(data->ic);
+ X11_XUnsetICFocus(data->ic);
}
#endif
}
@@ -267,13 +275,14 @@ X11_DispatchEvent(_THIS)
SDL_WindowData *data;
XEvent xevent;
int i;
+ XClientMessageEvent m;
SDL_zero(xevent); /* valgrind fix. --ryan. */
- XNextEvent(display, &xevent);
+ X11_XNextEvent(display, &xevent);
/* filter events catchs XIM events and sends them to the correct
handler */
- if (XFilterEvent(&xevent, None) == True) {
+ if (X11_XFilterEvent(&xevent, None) == True) {
#if 0
printf("Filtered event type = %d display = %d window = %d\n",
xevent.type, xevent.xany.display, xevent.xany.window);
@@ -384,7 +393,7 @@ X11_DispatchEvent(_THIS)
I think it's better to think the ALT key is held down
when it's not, then always lose the ALT modifier on Unity.
*/
- /*SDL_ResetKeyboard();*/
+ /* SDL_ResetKeyboard(); */
}
data->pending_focus = PENDING_FOCUS_IN;
data->pending_focus_time = SDL_GetTicks() + PENDING_FOCUS_IN_TIME;
@@ -440,25 +449,25 @@ X11_DispatchEvent(_THIS)
#endif
SDL_SendKeyboardKey(SDL_PRESSED, videodata->key_layout[keycode]);
#if 1
- if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN) {
+ if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN && keycode) {
int min_keycode, max_keycode;
- XDisplayKeycodes(display, &min_keycode, &max_keycode);
+ X11_XDisplayKeycodes(display, &min_keycode, &max_keycode);
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
- keysym = XkbKeycodeToKeysym(display, keycode, 0, 0);
+ keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
#else
keysym = XKeycodeToKeysym(display, keycode, 0);
#endif
fprintf(stderr,
"The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list <sdl@libsdl.org> X11 KeyCode %d (%d), X11 KeySym 0x%lX (%s).\n",
keycode, keycode - min_keycode, keysym,
- XKeysymToString(keysym));
+ X11_XKeysymToString(keysym));
}
#endif
/* */
SDL_zero(text);
#ifdef X_HAVE_UTF8_STRING
if (data->ic) {
- Xutf8LookupString(data->ic, &xevent.xkey, text, sizeof(text),
+ X11_Xutf8LookupString(data->ic, &xevent.xkey, text, sizeof(text),
&keysym, &status);
}
#else
@@ -510,10 +519,35 @@ X11_DispatchEvent(_THIS)
xevent.xconfigure.x, xevent.xconfigure.y,
xevent.xconfigure.width, xevent.xconfigure.height);
#endif
+ long border_left = 0;
+ long border_right = 0;
+ long border_top = 0;
+ long border_bottom = 0;
+ if (data->xwindow) {
+ Atom _net_frame_extents = X11_XInternAtom(display, "_NET_FRAME_EXTENTS", 0);
+ Atom type = None;
+ int format;
+ unsigned long nitems = 0, bytes_after;
+ unsigned char *property;
+ X11_XGetWindowProperty(display, data->xwindow,
+ _net_frame_extents, 0, 16, 0,
+ XA_CARDINAL, &type, &format,
+ &nitems, &bytes_after, &property);
+
+ if (type != None && nitems == 4)
+ {
+ border_left = ((long*)property)[0];
+ border_right = ((long*)property)[1];
+ border_top = ((long*)property)[2];
+ border_bottom = ((long*)property)[3];
+ }
+ }
+
if (xevent.xconfigure.x != data->last_xconfigure.x ||
xevent.xconfigure.y != data->last_xconfigure.y) {
SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED,
- xevent.xconfigure.x, xevent.xconfigure.y);
+ xevent.xconfigure.x - border_left,
+ xevent.xconfigure.y - border_top);
}
if (xevent.xconfigure.width != data->last_xconfigure.width ||
xevent.xconfigure.height != data->last_xconfigure.height) {
@@ -540,7 +574,7 @@ X11_DispatchEvent(_THIS)
X11_ReadProperty(&p, display, data->xdnd_source, videodata->XdndTypeList);
/* pick one */
data->xdnd_req = X11_PickTarget(display, (Atom*)p.data, p.count);
- XFree(p.data);
+ X11_XFree(p.data);
} else {
/* pick from list of three */
data->xdnd_req = X11_PickTargetFromAtoms(display, xevent.xclient.data.l[2], xevent.xclient.data.l[3], xevent.xclient.data.l[4]);
@@ -549,7 +583,6 @@ X11_DispatchEvent(_THIS)
else if (xevent.xclient.message_type == videodata->XdndPosition) {
/* reply with status */
- XClientMessageEvent m;
memset(&m, 0, sizeof(XClientMessageEvent));
m.type = ClientMessage;
m.display = xevent.xclient.display;
@@ -562,13 +595,12 @@ X11_DispatchEvent(_THIS)
m.data.l[3] = 0;
m.data.l[4] = videodata->XdndActionCopy; /* we only accept copying anyway */
- XSendEvent(display, xevent.xclient.data.l[0], False, NoEventMask, (XEvent*)&m);
- XFlush(display);
+ X11_XSendEvent(display, xevent.xclient.data.l[0], False, NoEventMask, (XEvent*)&m);
+ X11_XFlush(display);
}
else if(xevent.xclient.message_type == videodata->XdndDrop) {
if (data->xdnd_req == None) {
/* say again - not interested! */
- XClientMessageEvent m;
memset(&m, 0, sizeof(XClientMessageEvent));
m.type = ClientMessage;
m.display = xevent.xclient.display;
@@ -578,13 +610,13 @@ X11_DispatchEvent(_THIS)
m.data.l[0] = data->xwindow;
m.data.l[1] = 0;
m.data.l[2] = None; /* fail! */
- XSendEvent(display, xevent.xclient.data.l[0], False, NoEventMask, (XEvent*)&m);
+ X11_XSendEvent(display, xevent.xclient.data.l[0], False, NoEventMask, (XEvent*)&m);
} else {
/* convert */
if(xdnd_version >= 1) {
- XConvertSelection(display, videodata->XdndSelection, data->xdnd_req, videodata->PRIMARY, data->xwindow, xevent.xclient.data.l[2]);
+ X11_XConvertSelection(display, videodata->XdndSelection, data->xdnd_req, videodata->PRIMARY, data->xwindow, xevent.xclient.data.l[2]);
} else {
- XConvertSelection(display, videodata->XdndSelection, data->xdnd_req, videodata->PRIMARY, data->xwindow, CurrentTime);
+ X11_XConvertSelection(display, videodata->XdndSelection, data->xdnd_req, videodata->PRIMARY, data->xwindow, CurrentTime);
}
}
}
@@ -597,7 +629,7 @@ X11_DispatchEvent(_THIS)
printf("window %p: _NET_WM_PING\n", data);
#endif
xevent.xclient.window = root;
- XSendEvent(display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &xevent);
+ X11_XSendEvent(display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &xevent);
break;
}
@@ -657,13 +689,13 @@ X11_DispatchEvent(_THIS)
Atom real_type;
unsigned long items_read, items_left, i;
- char *name = XGetAtomName(display, xevent.xproperty.atom);
+ char *name = X11_XGetAtomName(display, xevent.xproperty.atom);
if (name) {
printf("window %p: PropertyNotify: %s %s\n", data, name, (xevent.xproperty.state == PropertyDelete) ? "deleted" : "changed");
- XFree(name);
+ X11_XFree(name);
}
- status = XGetWindowProperty(display, data->xwindow, xevent.xproperty.atom, 0L, 8192L, False, AnyPropertyType, &real_type, &real_format, &items_read, &items_left, &propdata);
+ status = X11_XGetWindowProperty(display, data->xwindow, xevent.xproperty.atom, 0L, 8192L, False, AnyPropertyType, &real_type, &real_format, &items_read, &items_left, &propdata);
if (status == Success && items_read > 0) {
if (real_type == XA_INTEGER) {
int *values = (int *)propdata;
@@ -707,23 +739,23 @@ X11_DispatchEvent(_THIS)
printf("{");
for (i = 0; i < items_read; i++) {
- char *name = XGetAtomName(display, atoms[i]);
+ char *name = X11_XGetAtomName(display, atoms[i]);
if (name) {
printf(" %s", name);
- XFree(name);
+ X11_XFree(name);
}
}
printf(" }\n");
} else {
- char *name = XGetAtomName(display, real_type);
+ char *name = X11_XGetAtomName(display, real_type);
printf("Unknown type: %ld (%s)\n", real_type, name ? name : "UNKNOWN");
if (name) {
- XFree(name);
+ X11_XFree(name);
}
}
}
if (status == Success) {
- XFree(propdata);
+ X11_XFree(propdata);
}
#endif /* DEBUG_XEVENTS */
@@ -767,28 +799,28 @@ X11_DispatchEvent(_THIS)
sevent.xselection.property = None;
sevent.xselection.requestor = req->requestor;
sevent.xselection.time = req->time;
- if (XGetWindowProperty(display, DefaultRootWindow(display),
+ if (X11_XGetWindowProperty(display, DefaultRootWindow(display),
XA_CUT_BUFFER0, 0, INT_MAX/4, False, req->target,
&sevent.xselection.target, &seln_format, &nbytes,
&overflow, &seln_data) == Success) {
- Atom XA_TARGETS = XInternAtom(display, "TARGETS", 0);
+ Atom XA_TARGETS = X11_XInternAtom(display, "TARGETS", 0);
if (sevent.xselection.target == req->target) {
- XChangeProperty(display, req->requestor, req->property,
+ X11_XChangeProperty(display, req->requestor, req->property,
sevent.xselection.target, seln_format, PropModeReplace,
seln_data, nbytes);
sevent.xselection.property = req->property;
} else if (XA_TARGETS == req->target) {
Atom SupportedFormats[] = { sevent.xselection.target, XA_TARGETS };
- XChangeProperty(display, req->requestor, req->property,
+ X11_XChangeProperty(display, req->requestor, req->property,
XA_ATOM, 32, PropModeReplace,
(unsigned char*)SupportedFormats,
sizeof(SupportedFormats)/sizeof(*SupportedFormats));
sevent.xselection.property = req->property;
}
- XFree(seln_data);
+ X11_XFree(seln_data);
}
- XSendEvent(display, req->requestor, False, 0, &sevent);
- XSync(display, False);
+ X11_XSendEvent(display, req->requestor, False, 0, &sevent);
+ X11_XSync(display, False);
}
break;
@@ -838,10 +870,9 @@ X11_DispatchEvent(_THIS)
}
}
- XFree(p.data);
+ X11_XFree(p.data);
/* send reply */
- XClientMessageEvent m;
SDL_memset(&m, 0, sizeof(XClientMessageEvent));
m.type = ClientMessage;
m.display = display;
@@ -851,9 +882,9 @@ X11_DispatchEvent(_THIS)
m.data.l[0] = data->xwindow;
m.data.l[1] = 1;
m.data.l[2] = videodata->XdndActionCopy;
- XSendEvent(display, data->xdnd_source, False, NoEventMask, (XEvent*)&m);
+ X11_XSendEvent(display, data->xdnd_source, False, NoEventMask, (XEvent*)&m);
- XSync(display, False);
+ X11_XSync(display, False);
} else {
videodata->selection_waiting = SDL_FALSE;
@@ -881,7 +912,7 @@ X11_HandleFocusChanges(_THIS)
SDL_WindowData *data = videodata->windowlist[i];
if (data && data->pending_focus != PENDING_FOCUS_NONE) {
Uint32 now = SDL_GetTicks();
- if ( (int)(data->pending_focus_time-now) <= 0 ) {
+ if (SDL_TICKS_PASSED(now, data->pending_focus_time)) {
if ( data->pending_focus == PENDING_FOCUS_IN ) {
X11_DispatchFocusIn(data);
} else {
@@ -893,13 +924,13 @@ X11_HandleFocusChanges(_THIS)
}
}
}
-/* Ack! XPending() actually performs a blocking read if no events available */
+/* Ack! X11_XPending() actually performs a blocking read if no events available */
static int
X11_Pending(Display * display)
{
/* Flush the display connection and look to see if events are queued */
- XFlush(display);
- if (XEventsQueued(display, QueuedAlready)) {
+ X11_XFlush(display);
+ if (X11_XEventsQueued(display, QueuedAlready)) {
return (1);
}
@@ -913,7 +944,7 @@ X11_Pending(Display * display)
FD_ZERO(&fdset);
FD_SET(x11_fd, &fdset);
if (select(x11_fd + 1, &fdset, NULL, NULL, &zero_time) == 1) {
- return (XPending(display));
+ return (X11_XPending(display));
}
}
@@ -935,8 +966,8 @@ X11_PumpEvents(_THIS)
if (_this->suspend_screensaver) {
Uint32 now = SDL_GetTicks();
if (!data->screensaver_activity ||
- (int) (now - data->screensaver_activity) >= 30000) {
- XResetScreenSaver(data->display);
+ SDL_TICKS_PASSED(now, data->screensaver_activity + 30000)) {
+ X11_XResetScreenSaver(data->display);
#if SDL_USE_LIBDBUS
SDL_dbus_screensaver_tickle(_this);
@@ -965,16 +996,16 @@ X11_SuspendScreenSaver(_THIS)
int major_version, minor_version;
if (SDL_X11_HAVE_XSS) {
- /* XScreenSaverSuspend was introduced in MIT-SCREEN-SAVER 1.1 */
- if (!XScreenSaverQueryExtension(data->display, &dummy, &dummy) ||
- !XScreenSaverQueryVersion(data->display,
+ /* X11_XScreenSaverSuspend was introduced in MIT-SCREEN-SAVER 1.1 */
+ if (!X11_XScreenSaverQueryExtension(data->display, &dummy, &dummy) ||
+ !X11_XScreenSaverQueryVersion(data->display,
&major_version, &minor_version) ||
major_version < 1 || (major_version == 1 && minor_version < 1)) {
return;
}
- XScreenSaverSuspend(data->display, _this->suspend_screensaver);
- XResetScreenSaver(data->display);
+ X11_XScreenSaverSuspend(data->display, _this->suspend_screensaver);
+ X11_XResetScreenSaver(data->display);
}
#endif
diff --git a/src/video/x11/SDL_x11framebuffer.c b/src/video/x11/SDL_x11framebuffer.c
index 4dfe0d1..af39147 100644
--- a/src/video/x11/SDL_x11framebuffer.c
+++ b/src/video/x11/SDL_x11framebuffer.c
@@ -43,8 +43,8 @@ static int shm_errhandler(Display *d, XErrorEvent *e)
static SDL_bool have_mitshm(void)
{
/* Only use shared memory on local X servers */
- if ( (SDL_strncmp(XDisplayName(NULL), ":", 1) == 0) ||
- (SDL_strncmp(XDisplayName(NULL), "unix:", 5) == 0) ) {
+ if ( (SDL_strncmp(X11_XDisplayName(NULL), ":", 1) == 0) ||
+ (SDL_strncmp(X11_XDisplayName(NULL), "unix:", 5) == 0) ) {
return SDL_X11_HAVE_SHM;
}
return SDL_FALSE;
@@ -66,7 +66,7 @@ X11_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format,
/* Create the graphics context for drawing */
gcv.graphics_exposures = False;
- data->gc = XCreateGC(display, data->xwindow, GCGraphicsExposures, &gcv);
+ data->gc = X11_XCreateGC(display, data->xwindow, GCGraphicsExposures, &gcv);
if (!data->gc) {
return SDL_SetError("Couldn't create graphics context");
}
@@ -95,10 +95,10 @@ X11_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format,
shminfo->readOnly = False;
if ( shminfo->shmaddr != (char *)-1 ) {
shm_error = False;
- X_handler = XSetErrorHandler(shm_errhandler);
- XShmAttach(display, shminfo);
- XSync(display, True);
- XSetErrorHandler(X_handler);
+ X_handler = X11_XSetErrorHandler(shm_errhandler);
+ X11_XShmAttach(display, shminfo);
+ X11_XSync(display, True);
+ X11_XSetErrorHandler(X_handler);
if ( shm_error )
shmdt(shminfo->shmaddr);
} else {
@@ -109,13 +109,13 @@ X11_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format,
shm_error = True;
}
if (!shm_error) {
- data->ximage = XShmCreateImage(display, data->visual,
+ data->ximage = X11_XShmCreateImage(display, data->visual,
vinfo.depth, ZPixmap,
shminfo->shmaddr, shminfo,
window->w, window->h);
if (!data->ximage) {
- XShmDetach(display, shminfo);
- XSync(display, False);
+ X11_XShmDetach(display, shminfo);
+ X11_XSync(display, False);
shmdt(shminfo->shmaddr);
} else {
/* Done! */
@@ -132,7 +132,7 @@ X11_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format,
return SDL_OutOfMemory();
}
- data->ximage = XCreateImage(display, data->visual,
+ data->ximage = X11_XCreateImage(display, data->visual,
vinfo.depth, ZPixmap, 0, (char *)(*pixels),
window->w, window->h, 32, 0);
if (!data->ximage) {
@@ -177,7 +177,7 @@ X11_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects,
if (y + h > window->h)
h = window->h - y;
- XShmPutImage(display, data->xwindow, data->gc, data->ximage,
+ X11_XShmPutImage(display, data->xwindow, data->gc, data->ximage,
x, y, x, y, w, h, False);
}
}
@@ -209,12 +209,12 @@ X11_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects,
if (y + h > window->h)
h = window->h - y;
- XPutImage(display, data->xwindow, data->gc, data->ximage,
+ X11_XPutImage(display, data->xwindow, data->gc, data->ximage,
x, y, x, y, w, h);
}
}
- XSync(display, False);
+ X11_XSync(display, False);
return 0;
}
@@ -237,8 +237,8 @@ X11_DestroyWindowFramebuffer(_THIS, SDL_Window * window)
#ifndef NO_SHARED_MEMORY
if (data->use_mitshm) {
- XShmDetach(display, &data->shminfo);
- XSync(display, False);
+ X11_XShmDetach(display, &data->shminfo);
+ X11_XSync(display, False);
shmdt(data->shminfo.shmaddr);
data->use_mitshm = SDL_FALSE;
}
@@ -247,7 +247,7 @@ X11_DestroyWindowFramebuffer(_THIS, SDL_Window * window)
data->ximage = NULL;
}
if (data->gc) {
- XFreeGC(display, data->gc);
+ X11_XFreeGC(display, data->gc);
data->gc = NULL;
}
}
diff --git a/src/video/x11/SDL_x11keyboard.c b/src/video/x11/SDL_x11keyboard.c
index 81d64b2..f3b83c9 100644
--- a/src/video/x11/SDL_x11keyboard.c
+++ b/src/video/x11/SDL_x11keyboard.c
@@ -135,7 +135,7 @@ static const struct {
static const struct
{
- const SDL_Scancode const *table;
+ SDL_Scancode const *table;
int table_size;
} scancode_set[] = {
{ darwin_scancode_table, SDL_arraysize(darwin_scancode_table) },
@@ -152,7 +152,7 @@ X11_KeyCodeToSDLScancode(Display *display, KeyCode keycode)
int i;
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
- keysym = XkbKeycodeToKeysym(display, keycode, 0, 0);
+ keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
#else
keysym = XKeycodeToKeysym(display, keycode, 0);
#endif
@@ -182,7 +182,7 @@ X11_KeyCodeToUcs4(Display *display, KeyCode keycode)
KeySym keysym;
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
- keysym = XkbKeycodeToKeysym(display, keycode, 0, 0);
+ keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
#else
keysym = XKeycodeToKeysym(display, keycode, 0);
#endif
@@ -197,7 +197,8 @@ int
X11_InitKeyboard(_THIS)
{
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
- int i, j;
+ int i = 0;
+ int j = 0;
int min_keycode, max_keycode;
struct {
SDL_Scancode scancode;
@@ -210,14 +211,14 @@ X11_InitKeyboard(_THIS)
};
SDL_bool fingerprint_detected;
- XAutoRepeatOn(data->display);
+ X11_XAutoRepeatOn(data->display);
/* Try to determine which scancodes are being used based on fingerprint */
fingerprint_detected = SDL_FALSE;
- XDisplayKeycodes(data->display, &min_keycode, &max_keycode);
+ X11_XDisplayKeycodes(data->display, &min_keycode, &max_keycode);
for (i = 0; i < SDL_arraysize(fingerprint); ++i) {
fingerprint[i].value =
- XKeysymToKeycode(data->display, fingerprint[i].keysym) -
+ X11_XKeysymToKeycode(data->display, fingerprint[i].keysym) -
min_keycode;
}
for (i = 0; i < SDL_arraysize(scancode_set); ++i) {
@@ -257,20 +258,20 @@ X11_InitKeyboard(_THIS)
for (i = min_keycode; i <= max_keycode; ++i) {
KeySym sym;
#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
- sym = XkbKeycodeToKeysym(data->display, i, 0, 0);
+ sym = X11_XkbKeycodeToKeysym(data->display, i, 0, 0);
#else
sym = XKeycodeToKeysym(data->display, i, 0);
#endif
if (sym != NoSymbol) {
SDL_Scancode scancode;
printf("code = %d, sym = 0x%X (%s) ", i - min_keycode,
- (unsigned int) sym, XKeysymToString(sym));
+ (unsigned int) sym, X11_XKeysymToString(sym));
scancode = X11_KeyCodeToSDLScancode(data->display, i);
data->key_layout[i] = scancode;
if (scancode == SDL_SCANCODE_UNKNOWN) {
printf("scancode not found\n");
} else {
- printf("scancode = %d (%s)\n", j, SDL_GetScancodeName(j));
+ printf("scancode = %d (%s)\n", scancode, SDL_GetScancodeName(scancode));
}
}
}
diff --git a/src/video/x11/SDL_x11messagebox.c b/src/video/x11/SDL_x11messagebox.c
index f938ded..81c1480 100644
--- a/src/video/x11/SDL_x11messagebox.c
+++ b/src/video/x11/SDL_x11messagebox.c
@@ -112,7 +112,7 @@ typedef struct SDL_MessageBoxDataX11
} SDL_MessageBoxDataX11;
/* Maximum helper for ints. */
-static __inline__ int
+static SDL_INLINE int
IntMax( int a, int b )
{
return ( a > b ) ? a : b;
@@ -124,13 +124,13 @@ GetTextWidthHeight( SDL_MessageBoxDataX11 *data, const char *str, int nbytes, in
{
if (SDL_X11_HAVE_UTF8) {
XRectangle overall_ink, overall_logical;
- Xutf8TextExtents(data->font_set, str, nbytes, &overall_ink, &overall_logical);
+ X11_Xutf8TextExtents(data->font_set, str, nbytes, &overall_ink, &overall_logical);
*pwidth = overall_logical.width;
*pheight = overall_logical.height;
} else {
XCharStruct text_structure;
int font_direction, font_ascent, font_descent;
- XTextExtents( data->font_struct, str, nbytes,
+ X11_XTextExtents( data->font_struct, str, nbytes,
&font_direction, &font_ascent, &font_descent,
&text_structure );
*pwidth = text_structure.width;
@@ -180,7 +180,7 @@ X11_MessageBoxInit( SDL_MessageBoxDataX11 *data, const SDL_MessageBoxData * mess
data->numbuttons = numbuttons;
data->pbuttonid = pbuttonid;
- data->display = XOpenDisplay( NULL );
+ data->display = X11_XOpenDisplay( NULL );
if ( !data->display ) {
return SDL_SetError("Couldn't open X11 display");
}
@@ -188,16 +188,16 @@ X11_MessageBoxInit( SDL_MessageBoxDataX11 *data, const SDL_MessageBoxData * mess
if (SDL_X11_HAVE_UTF8) {
char **missing = NULL;
int num_missing = 0;
- data->font_set = XCreateFontSet(data->display, g_MessageBoxFont,
+ data->font_set = X11_XCreateFontSet(data->display, g_MessageBoxFont,
&missing, &num_missing, NULL);
if ( missing != NULL ) {
- XFreeStringList(missing);
+ X11_XFreeStringList(missing);
}
if ( data->font_set == NULL ) {
return SDL_SetError("Couldn't load font %s", g_MessageBoxFont);
}
} else {
- data->font_struct = XLoadQueryFont( data->display, g_MessageBoxFontLatin1 );
+ data->font_struct = X11_XLoadQueryFont( data->display, g_MessageBoxFontLatin1 );
if ( data->font_struct == NULL ) {
return SDL_SetError("Couldn't load font %s", g_MessageBoxFontLatin1);
}
@@ -338,23 +338,23 @@ static void
X11_MessageBoxShutdown( SDL_MessageBoxDataX11 *data )
{
if ( data->font_set != NULL ) {
- XFreeFontSet( data->display, data->font_set );
+ X11_XFreeFontSet( data->display, data->font_set );
data->font_set = NULL;
}
if ( data->font_struct != NULL ) {
- XFreeFont( data->display, data->font_struct );
+ X11_XFreeFont( data->display, data->font_struct );
data->font_struct = NULL;
}
if ( data->display ) {
if ( data->window != None ) {
- XWithdrawWindow( data->display, data->window, data->screen );
- XDestroyWindow( data->display, data->window );
+ X11_XWithdrawWindow( data->display, data->window, data->screen );
+ X11_XDestroyWindow( data->display, data->window );
data->window = None;
}
- XCloseDisplay( data->display );
+ X11_XCloseDisplay( data->display );
data->display = NULL;
}
}
@@ -384,7 +384,7 @@ X11_MessageBoxCreateWindow( SDL_MessageBoxDataX11 *data )
StructureNotifyMask | FocusChangeMask | PointerMotionMask;
wnd_attr.event_mask = data->event_mask;
- data->window = XCreateWindow(
+ data->window = X11_XCreateWindow(
display, RootWindow(display, data->screen),
0, 0,
data->dialog_width, data->dialog_height,
@@ -396,31 +396,31 @@ X11_MessageBoxCreateWindow( SDL_MessageBoxDataX11 *data )
if ( windowdata ) {
/* http://tronche.com/gui/x/icccm/sec-4.html#WM_TRANSIENT_FOR */
- XSetTransientForHint( display, data->window, windowdata->xwindow );
+ X11_XSetTransientForHint( display, data->window, windowdata->xwindow );
}
- XStoreName( display, data->window, messageboxdata->title );
+ X11_XStoreName( display, data->window, messageboxdata->title );
/* Allow the window to be deleted by the window manager */
- data->wm_protocols = XInternAtom( display, "WM_PROTOCOLS", False );
- data->wm_delete_message = XInternAtom( display, "WM_DELETE_WINDOW", False );
- XSetWMProtocols( display, data->window, &data->wm_delete_message, 1 );
+ data->wm_protocols = X11_XInternAtom( display, "WM_PROTOCOLS", False );
+ data->wm_delete_message = X11_XInternAtom( display, "WM_DELETE_WINDOW", False );
+ X11_XSetWMProtocols( display, data->window, &data->wm_delete_message, 1 );
if ( windowdata ) {
XWindowAttributes attrib;
Window dummy;
- XGetWindowAttributes(display, windowdata->xwindow, &attrib);
+ X11_XGetWindowAttributes(display, windowdata->xwindow, &attrib);
x = attrib.x + ( attrib.width - data->dialog_width ) / 2;
y = attrib.y + ( attrib.height - data->dialog_height ) / 3 ;
- XTranslateCoordinates(display, windowdata->xwindow, RootWindow(display, data->screen), x, y, &x, &y, &dummy);
+ X11_XTranslateCoordinates(display, windowdata->xwindow, RootWindow(display, data->screen), x, y, &x, &y, &dummy);
} else {
x = ( DisplayWidth( display, data->screen ) - data->dialog_width ) / 2;
y = ( DisplayHeight( display, data->screen ) - data->dialog_height ) / 3 ;
}
- XMoveWindow( display, data->window, x, y );
+ X11_XMoveWindow( display, data->window, x, y );
- sizehints = XAllocSizeHints();
+ sizehints = X11_XAllocSizeHints();
if ( sizehints ) {
sizehints->flags = USPosition | USSize | PMaxSize | PMinSize;
sizehints->x = x;
@@ -431,12 +431,12 @@ X11_MessageBoxCreateWindow( SDL_MessageBoxDataX11 *data )
sizehints->min_width = sizehints->max_width = data->dialog_width;
sizehints->min_height = sizehints->max_height = data->dialog_height;
- XSetWMNormalHints( display, data->window, sizehints );
+ X11_XSetWMNormalHints( display, data->window, sizehints );
- XFree( sizehints );
+ X11_XFree( sizehints );
}
- XMapRaised( display, data->window );
+ X11_XMapRaised( display, data->window );
return 0;
}
@@ -448,19 +448,19 @@ X11_MessageBoxDraw( SDL_MessageBoxDataX11 *data, GC ctx )
Window window = data->window;
Display *display = data->display;
- XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BACKGROUND ] );
- XFillRectangle( display, window, ctx, 0, 0, data->dialog_width, data->dialog_height );
+ X11_XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BACKGROUND ] );
+ X11_XFillRectangle( display, window, ctx, 0, 0, data->dialog_width, data->dialog_height );
- XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_TEXT ] );
+ X11_XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_TEXT ] );
for ( i = 0; i < data->numlines; i++ ) {
TextLineData *plinedata = &data->linedata[ i ];
if (SDL_X11_HAVE_UTF8) {
- Xutf8DrawString( display, window, data->font_set, ctx,
+ X11_Xutf8DrawString( display, window, data->font_set, ctx,
data->xtext, data->ytext + i * data->text_height,
plinedata->text, plinedata->length );
} else {
- XDrawString( display, window, ctx,
+ X11_XDrawString( display, window, ctx,
data->xtext, data->ytext + i * data->text_height,
plinedata->text, plinedata->length );
}
@@ -472,27 +472,27 @@ X11_MessageBoxDraw( SDL_MessageBoxDataX11 *data, GC ctx )
int border = ( buttondata->flags & SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT ) ? 2 : 0;
int offset = ( ( data->mouse_over_index == i ) && ( data->button_press_index == data->mouse_over_index ) ) ? 1 : 0;
- XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND ] );
- XFillRectangle( display, window, ctx,
+ X11_XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND ] );
+ X11_XFillRectangle( display, window, ctx,
buttondatax11->rect.x - border, buttondatax11->rect.y - border,
buttondatax11->rect.w + 2 * border, buttondatax11->rect.h + 2 * border );
- XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BUTTON_BORDER ] );
- XDrawRectangle( display, window, ctx,
+ X11_XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BUTTON_BORDER ] );
+ X11_XDrawRectangle( display, window, ctx,
buttondatax11->rect.x, buttondatax11->rect.y,
buttondatax11->rect.w, buttondatax11->rect.h );
- XSetForeground( display, ctx, ( data->mouse_over_index == i ) ?
+ X11_XSetForeground( display, ctx, ( data->mouse_over_index == i ) ?
data->color[ SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED ] :
data->color[ SDL_MESSAGEBOX_COLOR_TEXT ] );
if (SDL_X11_HAVE_UTF8) {
- Xutf8DrawString( display, window, data->font_set, ctx,
+ X11_Xutf8DrawString( display, window, data->font_set, ctx,
buttondatax11->x + offset,
buttondatax11->y + offset,
buttondata->text, buttondatax11->length );
} else {
- XDrawString( display, window, ctx,
+ X11_XDrawString( display, window, ctx,
buttondatax11->x + offset, buttondatax11->y + offset,
buttondata->text, buttondatax11->length );
}
@@ -519,7 +519,7 @@ X11_MessageBoxLoop( SDL_MessageBoxDataX11 *data )
ctx_vals.font = data->font_struct->fid;
}
- ctx = XCreateGC( data->display, data->window, gcflags, &ctx_vals );
+ ctx = X11_XCreateGC( data->display, data->window, gcflags, &ctx_vals );
if ( ctx == None ) {
return SDL_SetError("Couldn't create graphics context");
}
@@ -531,11 +531,11 @@ X11_MessageBoxLoop( SDL_MessageBoxDataX11 *data )
XEvent e;
SDL_bool draw = SDL_TRUE;
- XWindowEvent( data->display, data->window, data->event_mask, &e );
+ X11_XWindowEvent( data->display, data->window, data->event_mask, &e );
- /* If XFilterEvent returns True, then some input method has filtered the
+ /* If X11_XFilterEvent returns True, then some input method has filtered the
event, and the client should discard the event. */
- if ( ( e.type != Expose ) && XFilterEvent( &e, None ) )
+ if ( ( e.type != Expose ) && X11_XFilterEvent( &e, None ) )
continue;
switch( e.type ) {
@@ -574,12 +574,12 @@ X11_MessageBoxLoop( SDL_MessageBoxDataX11 *data )
case KeyPress:
/* Store key press - we make sure in key release that we got both. */
- last_key_pressed = XLookupKeysym( &e.xkey, 0 );
+ last_key_pressed = X11_XLookupKeysym( &e.xkey, 0 );
break;
case KeyRelease: {
Uint32 mask = 0;
- KeySym key = XLookupKeysym( &e.xkey, 0 );
+ KeySym key = X11_XLookupKeysym( &e.xkey, 0 );
/* If this is a key release for something we didn't get the key down for, then bail. */
if ( key != last_key_pressed )
@@ -637,7 +637,7 @@ X11_MessageBoxLoop( SDL_MessageBoxDataX11 *data )
}
}
- XFreeGC( data->display, ctx );
+ X11_XFreeGC( data->display, ctx );
return 0;
}
@@ -667,7 +667,7 @@ X11_ShowMessageBoxImpl(const SDL_MessageBoxData *messageboxdata, int *buttonid)
#endif
/* This code could get called from multiple threads maybe? */
- XInitThreads();
+ X11_XInitThreads();
/* Initialize the return buttonid value to -1 (for error or dialogbox closed). */
*buttonid = -1;
@@ -707,7 +707,7 @@ X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
int status = 0;
/* Need to flush here in case someone has turned grab off and it hasn't gone through yet, etc. */
- XFlush(data->display);
+ X11_XFlush(data->display);
if (pipe(fds) == -1) {
return X11_ShowMessageBoxImpl(messageboxdata, buttonid); /* oh well. */
diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
index b66b94b..a4c242c 100644
--- a/src/video/x11/SDL_x11modes.c
+++ b/src/video/x11/SDL_x11modes.c
@@ -26,7 +26,7 @@
#include "SDL_x11video.h"
#include "edid.h"
-/*#define X11MODES_DEBUG*/
+/* #define X11MODES_DEBUG */
/* I'm becoming more and more convinced that the application should never
* use XRandR, and it's the window manager's responsibility to track and
@@ -38,7 +38,7 @@
*
* However, many people swear by it, so let them swear at it. :)
*/
-/*#define XRANDR_DISABLED_BY_DEFAULT*/
+/* #define XRANDR_DISABLED_BY_DEFAULT */
static int
@@ -54,20 +54,20 @@ get_visualinfo(Display * display, int screen, XVisualInfo * vinfo)
SDL_zero(template);
template.visualid = SDL_strtol(visual_id, NULL, 0);
- vi = XGetVisualInfo(display, VisualIDMask, &template, &nvis);
+ vi = X11_XGetVisualInfo(display, VisualIDMask, &template, &nvis);
if (vi) {
*vinfo = *vi;
- XFree(vi);
+ X11_XFree(vi);
return 0;
}
}
depth = DefaultDepth(display, screen);
if ((X11_UseDirectColorVisuals() &&
- XMatchVisualInfo(display, screen, depth, DirectColor, vinfo)) ||
- XMatchVisualInfo(display, screen, depth, TrueColor, vinfo) ||
- XMatchVisualInfo(display, screen, depth, PseudoColor, vinfo) ||
- XMatchVisualInfo(display, screen, depth, StaticColor, vinfo)) {
+ X11_XMatchVisualInfo(display, screen, depth, DirectColor, vinfo)) ||
+ X11_XMatchVisualInfo(display, screen, depth, TrueColor, vinfo) ||
+ X11_XMatchVisualInfo(display, screen, depth, PseudoColor, vinfo) ||
+ X11_XMatchVisualInfo(display, screen, depth, StaticColor, vinfo)) {
return 0;
}
return -1;
@@ -79,11 +79,11 @@ X11_GetVisualInfoFromVisual(Display * display, Visual * visual, XVisualInfo * vi
XVisualInfo *vi;
int nvis;
- vinfo->visualid = XVisualIDFromVisual(visual);
- vi = XGetVisualInfo(display, VisualIDMask, vinfo, &nvis);
+ vinfo->visualid = X11_XVisualIDFromVisual(visual);
+ vi = X11_XGetVisualInfo(display, VisualIDMask, vinfo, &nvis);
if (vi) {
*vinfo = *vi;
- XFree(vi);
+ X11_XFree(vi);
return 0;
}
return -1;
@@ -108,7 +108,7 @@ X11_GetPixelFormatFromVisualInfo(Display * display, XVisualInfo * vinfo)
bpp = vinfo->depth;
if (bpp == 24) {
int i, n;
- XPixmapFormatValues *p = XListPixmapFormats(display, &n);
+ XPixmapFormatValues *p = X11_XListPixmapFormats(display, &n);
if (p) {
for (i = 0; i < n; ++i) {
if (p[i].depth == 24) {
@@ -116,7 +116,7 @@ X11_GetPixelFormatFromVisualInfo(Display * display, XVisualInfo * vinfo)
break;
}
}
- XFree(p);
+ X11_XFree(p);
}
}
@@ -178,9 +178,9 @@ CheckXinerama(Display * display, int *major, int *minor)
}
/* Query the extension version */
- if (!XineramaQueryExtension(display, &event_base, &error_base) ||
- !XineramaQueryVersion(display, major, minor) ||
- !XineramaIsActive(display)) {
+ if (!X11_XineramaQueryExtension(display, &event_base, &error_base) ||
+ !X11_XineramaQueryVersion(display, major, minor) ||
+ !X11_XineramaIsActive(display)) {
#ifdef X11MODES_DEBUG
printf("Xinerama not active on the display\n");
#endif
@@ -228,7 +228,7 @@ CheckXRandR(Display * display, int *major, int *minor)
}
/* Query the extension version */
- if (!XRRQueryVersion(display, major, minor)) {
+ if (!X11_XRRQueryVersion(display, major, minor)) {
#ifdef X11MODES_DEBUG
printf("XRandR not active on the display\n");
#endif
@@ -261,10 +261,10 @@ SetXRandRModeInfo(Display *display, XRRScreenResources *res, XRROutputInfo *outp
Rotation rotation = 0;
const XRRModeInfo *info = &res->modes[i];
- crtc = XRRGetCrtcInfo(display, res, output_info->crtc);
+ crtc = X11_XRRGetCrtcInfo(display, res, output_info->crtc);
if (crtc) {
rotation = crtc->rotation;
- XRRFreeCrtcInfo(crtc);
+ X11_XRRFreeCrtcInfo(crtc);
}
if (rotation & (XRANDR_ROTATION_LEFT|XRANDR_ROTATION_RIGHT)) {
@@ -313,8 +313,8 @@ CheckVidMode(Display * display, int *major, int *minor)
/* Query the extension version */
vm_error = -1;
- if (!XF86VidModeQueryExtension(display, &vm_event, &vm_error)
- || !XF86VidModeQueryVersion(display, major, minor)) {
+ if (!X11_XF86VidModeQueryExtension(display, &vm_event, &vm_error)
+ || !X11_XF86VidModeQueryVersion(display, major, minor)) {
#ifdef X11MODES_DEBUG
printf("XVidMode not active on the display\n");
#endif
@@ -335,7 +335,7 @@ Bool XF86VidModeGetModeInfo(Display * dpy, int scr,
XF86VidModeModeLine l;
SDL_zerop(info);
SDL_zero(l);
- retval = XF86VidModeGetModeLine(dpy, scr, &dotclock, &l);
+ retval = X11_XF86VidModeGetModeLine(dpy, scr, &dotclock, &l);
info->dotclock = dotclock;
info->hdisplay = l.hdisplay;
info->hsyncstart = l.hsyncstart;
@@ -397,7 +397,7 @@ X11_InitModes(_THIS)
* or newer of the Nvidia binary drivers
*/
if (CheckXinerama(data->display, &xinerama_major, &xinerama_minor)) {
- xinerama = XineramaQueryScreens(data->display, &screencount);
+ xinerama = X11_XineramaQueryScreens(data->display, &screencount);
if (xinerama) {
use_xinerama = xinerama_major * 100 + xinerama_minor;
}
@@ -501,7 +501,7 @@ X11_InitModes(_THIS)
displaydata->depth = vinfo.depth;
displaydata->scanline_pad = SDL_BYTESPERPIXEL(mode.format) * 8;
- pixmapFormats = XListPixmapFormats(data->display, &n);
+ pixmapFormats = X11_XListPixmapFormats(data->display, &n);
if (pixmapFormats) {
for (i = 0; i < n; ++i) {
if (pixmapFormats[i].depth == displaydata->depth) {
@@ -509,7 +509,7 @@ X11_InitModes(_THIS)
break;
}
}
- XFree(pixmapFormats);
+ X11_XFree(pixmapFormats);
}
#if SDL_VIDEO_DRIVER_X11_XINERAMA
@@ -526,13 +526,13 @@ X11_InitModes(_THIS)
#if SDL_VIDEO_DRIVER_X11_XRANDR
if (use_xrandr) {
- res = XRRGetScreenResources(data->display, RootWindow(data->display, displaydata->screen));
+ res = X11_XRRGetScreenResources(data->display, RootWindow(data->display, displaydata->screen));
}
if (res) {
XRROutputInfo *output_info;
XRRCrtcInfo *crtc;
int output;
- Atom EDID = XInternAtom(data->display, "EDID", False);
+ Atom EDID = X11_XInternAtom(data->display, "EDID", False);
Atom *props;
int nprop;
unsigned long width_mm;
@@ -540,10 +540,10 @@ X11_InitModes(_THIS)
int inches = 0;
for (output = 0; output < res->noutput; output++) {
- output_info = XRRGetOutputInfo(data->display, res, res->outputs[output]);
+ output_info = X11_XRRGetOutputInfo(data->display, res, res->outputs[output]);
if (!output_info || !output_info->crtc ||
output_info->connection == RR_Disconnected) {
- XRRFreeOutputInfo(output_info);
+ X11_XRRFreeOutputInfo(output_info);
continue;
}
@@ -551,10 +551,10 @@ X11_InitModes(_THIS)
We're checking the crtc position, but that may not be a valid test
in all cases. Anybody want to give this some love?
*/
- crtc = XRRGetCrtcInfo(data->display, res, output_info->crtc);
+ crtc = X11_XRRGetCrtcInfo(data->display, res, output_info->crtc);
if (!crtc || crtc->x != displaydata->x || crtc->y != displaydata->y) {
- XRRFreeOutputInfo(output_info);
- XRRFreeCrtcInfo(crtc);
+ X11_XRRFreeOutputInfo(output_info);
+ X11_XRRFreeCrtcInfo(crtc);
continue;
}
@@ -570,7 +570,7 @@ X11_InitModes(_THIS)
SDL_strlcpy(display_name, output_info->name, sizeof(display_name));
/* See if we can get the EDID data for the real monitor name */
- props = XRRListOutputProperties(data->display, res->outputs[output], &nprop);
+ props = X11_XRRListOutputProperties(data->display, res->outputs[output], &nprop);
for (i = 0; i < nprop; ++i) {
unsigned char *prop;
int actual_format;
@@ -578,7 +578,7 @@ X11_InitModes(_THIS)
Atom actual_type;
if (props[i] == EDID) {
- if (XRRGetOutputProperty(data->display,
+ if (X11_XRRGetOutputProperty(data->display,
res->outputs[output], props[i],
0, 100, False, False,
AnyPropertyType,
@@ -593,13 +593,13 @@ X11_InitModes(_THIS)
SDL_strlcpy(display_name, info->dsc_product_name, sizeof(display_name));
free(info);
}
- XFree(prop);
+ X11_XFree(prop);
}
break;
}
}
if (props) {
- XFree(props);
+ X11_XFree(props);
}
if (*display_name && inches) {
@@ -610,8 +610,8 @@ X11_InitModes(_THIS)
printf("Display name: %s\n", display_name);
#endif
- XRRFreeOutputInfo(output_info);
- XRRFreeCrtcInfo(crtc);
+ X11_XRRFreeOutputInfo(output_info);
+ X11_XRRFreeCrtcInfo(crtc);
break;
}
#ifdef X11MODES_DEBUG
@@ -619,7 +619,7 @@ X11_InitModes(_THIS)
printf("Couldn't find XRandR CRTC at %d,%d\n", displaydata->x, displaydata->y);
}
#endif
- XRRFreeScreenResources(res);
+ X11_XRRFreeScreenResources(res);
}
#endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
@@ -652,7 +652,7 @@ X11_InitModes(_THIS)
}
#if SDL_VIDEO_DRIVER_X11_XINERAMA
- if (xinerama) XFree(xinerama);
+ if (xinerama) X11_XFree(xinerama);
#endif
if (_this->num_displays == 0) {
@@ -725,13 +725,13 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
if (data->use_xrandr) {
XRRScreenResources *res;
- res = XRRGetScreenResources (display, RootWindow(display, data->screen));
+ res = X11_XRRGetScreenResources (display, RootWindow(display, data->screen));
if (res) {
SDL_DisplayModeData *modedata;
XRROutputInfo *output_info;
int i;
- output_info = XRRGetOutputInfo(display, res, data->xrandr_output);
+ output_info = X11_XRRGetOutputInfo(display, res, data->xrandr_output);
if (output_info && output_info->connection != RR_Disconnected) {
for (i = 0; i < output_info->nmode; ++i) {
modedata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
@@ -747,8 +747,8 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
}
}
}
- XRRFreeOutputInfo(output_info);
- XRRFreeScreenResources(res);
+ X11_XRRFreeOutputInfo(output_info);
+ X11_XRRFreeScreenResources(res);
}
return;
}
@@ -756,7 +756,7 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
#if SDL_VIDEO_DRIVER_X11_XVIDMODE
if (data->use_vidmode &&
- XF86VidModeGetAllModeLines(display, data->vidmode_screen, &nmodes, &modes)) {
+ X11_XF86VidModeGetAllModeLines(display, data->vidmode_screen, &nmodes, &modes)) {
int i;
#ifdef X11MODES_DEBUG
@@ -780,7 +780,7 @@ X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
SDL_free(modedata);
}
}
- XFree(modes);
+ X11_XFree(modes);
return;
}
#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
@@ -811,41 +811,41 @@ X11_SetDisplayMode(_THIS, SDL_VideoDisplay * sdl_display, SDL_DisplayMode * mode
XRRCrtcInfo *crtc;
Status status;
- res = XRRGetScreenResources (display, RootWindow(display, data->screen));
+ res = X11_XRRGetScreenResources (display, RootWindow(display, data->screen));
if (!res) {
return SDL_SetError("Couldn't get XRandR screen resources");
}
- output_info = XRRGetOutputInfo(display, res, data->xrandr_output);
+ output_info = X11_XRRGetOutputInfo(display, res, data->xrandr_output);
if (!output_info || output_info->connection == RR_Disconnected) {
- XRRFreeScreenResources(res);
+ X11_XRRFreeScreenResources(res);
return SDL_SetError("Couldn't get XRandR output info");
}
- crtc = XRRGetCrtcInfo(display, res, output_info->crtc);
+ crtc = X11_XRRGetCrtcInfo(display, res, output_info->crtc);
if (!crtc) {
- XRRFreeOutputInfo(output_info);
- XRRFreeScreenResources(res);
+ X11_XRRFreeOutputInfo(output_info);
+ X11_XRRFreeScreenResources(res);
return SDL_SetError("Couldn't get XRandR crtc info");
}
- status = XRRSetCrtcConfig (display, res, output_info->crtc, CurrentTime,
+ status = X11_XRRSetCrtcConfig (display, res, output_info->crtc, CurrentTime,
crtc->x, crtc->y, modedata->xrandr_mode, crtc->rotation,
&data->xrandr_output, 1);
- XRRFreeCrtcInfo(crtc);
- XRRFreeOutputInfo(output_info);
- XRRFreeScreenResources(res);
+ X11_XRRFreeCrtcInfo(crtc);
+ X11_XRRFreeOutputInfo(output_info);
+ X11_XRRFreeScreenResources(res);
if (status != Success) {
- return SDL_SetError("XRRSetCrtcConfig failed");
+ return SDL_SetError("X11_XRRSetCrtcConfig failed");
}
}
#endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
#if SDL_VIDEO_DRIVER_X11_XVIDMODE
if (data->use_vidmode) {
- XF86VidModeSwitchToMode(display, data->vidmode_screen, &modedata->vm_mode);
+ X11_XF86VidModeSwitchToMode(display, data->vidmode_screen, &modedata->vm_mode);
}
#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
@@ -872,11 +872,11 @@ X11_GetDisplayBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect)
if (data->use_xinerama) {
Display *display = ((SDL_VideoData *) _this->driverdata)->display;
int screencount;
- XineramaScreenInfo *xinerama = XineramaQueryScreens(display, &screencount);
+ XineramaScreenInfo *xinerama = X11_XineramaQueryScreens(display, &screencount);
if (xinerama) {
rect->x = xinerama[data->xinerama_screen].x_org;
rect->y = xinerama[data->xinerama_screen].y_org;
- XFree(xinerama);
+ X11_XFree(xinerama);
}
}
#endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
diff --git a/src/video/x11/SDL_x11mouse.c b/src/video/x11/SDL_x11mouse.c
index 441ecdf..4bcd9d6 100644
--- a/src/video/x11/SDL_x11mouse.c
+++ b/src/video/x11/SDL_x11mouse.c
@@ -50,12 +50,12 @@ X11_CreateEmptyCursor()
SDL_zero(data);
color.red = color.green = color.blue = 0;
- pixmap = XCreateBitmapFromData(display, DefaultRootWindow(display),
+ pixmap = X11_XCreateBitmapFromData(display, DefaultRootWindow(display),
data, 1, 1);
if (pixmap) {
- x11_empty_cursor = XCreatePixmapCursor(display, pixmap, pixmap,
+ x11_empty_cursor = X11_XCreatePixmapCursor(display, pixmap, pixmap,
&color, &color, 0, 0);
- XFreePixmap(display, pixmap);
+ X11_XFreePixmap(display, pixmap);
}
}
return x11_empty_cursor;
@@ -65,7 +65,7 @@ static void
X11_DestroyEmptyCursor(void)
{
if (x11_empty_cursor != None) {
- XFreeCursor(GetDisplay(), x11_empty_cursor);
+ X11_XFreeCursor(GetDisplay(), x11_empty_cursor);
x11_empty_cursor = None;
}
}
@@ -94,7 +94,7 @@ X11_CreateXCursorCursor(SDL_Surface * surface, int hot_x, int hot_y)
Cursor cursor = None;
XcursorImage *image;
- image = XcursorImageCreate(surface->w, surface->h);
+ image = X11_XcursorImageCreate(surface->w, surface->h);
if (!image) {
SDL_OutOfMemory();
return None;
@@ -107,9 +107,9 @@ X11_CreateXCursorCursor(SDL_Surface * surface, int hot_x, int hot_y)
SDL_assert(surface->pitch == surface->w * 4);
SDL_memcpy(image->pixels, surface->pixels, surface->h * surface->pitch);
- cursor = XcursorImageLoadCursor(display, image);
+ cursor = X11_XcursorImageLoadCursor(display, image);
- XcursorImageDestroy(image);
+ X11_XcursorImageDestroy(image);
return cursor;
}
@@ -186,16 +186,16 @@ X11_CreatePixmapCursor(SDL_Surface * surface, int hot_x, int hot_y)
}
else bg.red = bg.green = bg.blue = 0;
- data_pixmap = XCreateBitmapFromData(display, DefaultRootWindow(display),
+ data_pixmap = X11_XCreateBitmapFromData(display, DefaultRootWindow(display),
(char*)data_bits,
surface->w, surface->h);
- mask_pixmap = XCreateBitmapFromData(display, DefaultRootWindow(display),
+ mask_pixmap = X11_XCreateBitmapFromData(display, DefaultRootWindow(display),
(char*)mask_bits,
surface->w, surface->h);
- cursor = XCreatePixmapCursor(display, data_pixmap, mask_pixmap,
+ cursor = X11_XCreatePixmapCursor(display, data_pixmap, mask_pixmap,
&fg, &bg, hot_x, hot_y);
- XFreePixmap(display, data_pixmap);
- XFreePixmap(display, mask_pixmap);
+ X11_XFreePixmap(display, data_pixmap);
+ X11_XFreePixmap(display, mask_pixmap);
return cursor;
}
@@ -256,7 +256,7 @@ X11_CreateSystemCursor(SDL_SystemCursor id)
if (cursor) {
Cursor x11_cursor;
- x11_cursor = XCreateFontCursor(GetDisplay(), shape);
+ x11_cursor = X11_XCreateFontCursor(GetDisplay(), shape);
cursor->driverdata = (void*)x11_cursor;
} else {
@@ -272,7 +272,7 @@ X11_FreeCursor(SDL_Cursor * cursor)
Cursor x11_cursor = (Cursor)cursor->driverdata;
if (x11_cursor != None) {
- XFreeCursor(GetDisplay(), x11_cursor);
+ X11_XFreeCursor(GetDisplay(), x11_cursor);
}
SDL_free(cursor);
}
@@ -298,12 +298,12 @@ X11_ShowCursor(SDL_Cursor * cursor)
for (window = video->windows; window; window = window->next) {
data = (SDL_WindowData *)window->driverdata;
if (x11_cursor != None) {
- XDefineCursor(display, data->xwindow, x11_cursor);
+ X11_XDefineCursor(display, data->xwindow, x11_cursor);
} else {
- XUndefineCursor(display, data->xwindow);
+ X11_XUndefineCursor(display, data->xwindow);
}
}
- XFlush(display);
+ X11_XFlush(display);
}
return 0;
}
@@ -314,8 +314,8 @@ X11_WarpMouse(SDL_Window * window, int x, int y)
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
Display *display = data->videodata->display;
- XWarpPointer(display, None, data->xwindow, 0, 0, 0, 0, x, y);
- XSync(display, False);
+ X11_XWarpPointer(display, None, data->xwindow, 0, 0, 0, 0, x, y);
+ X11_XSync(display, False);
}
static int
diff --git a/src/video/x11/SDL_x11opengl.c b/src/video/x11/SDL_x11opengl.c
index 2eaed86..a41033a 100644
--- a/src/video/x11/SDL_x11opengl.c
+++ b/src/video/x11/SDL_x11opengl.c
@@ -106,6 +106,13 @@ typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display * dpy,
#endif
#endif
+#ifndef GLX_ARB_framebuffer_sRGB
+#define GLX_ARB_framebuffer_sRGB
+#ifndef GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB
+#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2
+#endif
+#endif
+
#ifndef GLX_EXT_swap_control
#define GLX_SWAP_INTERVAL_EXT 0x20F1
#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2
@@ -140,25 +147,6 @@ X11_GL_LoadLibrary(_THIS, const char *path)
return SDL_SetError("OpenGL context already created");
}
- /* If SDL_GL_CONTEXT_EGL has been changed to 1, switch over to X11_GLES functions */
- if (_this->gl_config.use_egl == 1) {
-#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
- _this->GL_LoadLibrary = X11_GLES_LoadLibrary;
- _this->GL_GetProcAddress = X11_GLES_GetProcAddress;
- _this->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
- _this->GL_CreateContext = X11_GLES_CreateContext;
- _this->GL_MakeCurrent = X11_GLES_MakeCurrent;
- _this->GL_SetSwapInterval = X11_GLES_SetSwapInterval;
- _this->GL_GetSwapInterval = X11_GLES_GetSwapInterval;
- _this->GL_SwapWindow = X11_GLES_SwapWindow;
- _this->GL_DeleteContext = X11_GLES_DeleteContext;
- return X11_GLES_LoadLibrary(_this, path);
-#else
- return SDL_SetError("SDL not configured with OpenGL ES/EGL support");
-#endif
- }
-
-
/* Load the OpenGL library */
if (path == NULL) {
path = SDL_getenv("SDL_OPENGL_LIBRARY");
@@ -228,6 +216,33 @@ X11_GL_LoadLibrary(_THIS, const char *path)
/* Initialize extensions */
X11_GL_InitExtensions(_this);
+
+ /* If we need a GL ES context and there's no
+ * GLX_EXT_create_context_es2_profile extension, switch over to X11_GLES functions
+ */
+ if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES &&
+ ! _this->gl_data->HAS_GLX_EXT_create_context_es2_profile ) {
+#if SDL_VIDEO_OPENGL_EGL
+ X11_GL_UnloadLibrary(_this);
+ /* Better avoid conflicts! */
+ if (_this->gl_config.dll_handle != NULL ) {
+ GL_UnloadObject(_this->gl_config.dll_handle);
+ _this->gl_config.dll_handle = NULL;
+ }
+ _this->GL_LoadLibrary = X11_GLES_LoadLibrary;
+ _this->GL_GetProcAddress = X11_GLES_GetProcAddress;
+ _this->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
+ _this->GL_CreateContext = X11_GLES_CreateContext;
+ _this->GL_MakeCurrent = X11_GLES_MakeCurrent;
+ _this->GL_SetSwapInterval = X11_GLES_SetSwapInterval;
+ _this->GL_GetSwapInterval = X11_GLES_GetSwapInterval;
+ _this->GL_SwapWindow = X11_GLES_SwapWindow;
+ _this->GL_DeleteContext = X11_GLES_DeleteContext;
+ return X11_GLES_LoadLibrary(_this, NULL);
+#else
+ return SDL_SetError("SDL not configured with EGL support");
+#endif
+ }
return 0;
}
@@ -254,10 +269,8 @@ X11_GL_UnloadLibrary(_THIS)
#endif
/* Free OpenGL memory */
- if (_this->gl_data) {
- SDL_free(_this->gl_data);
- _this->gl_data = NULL;
- }
+ SDL_free(_this->gl_data);
+ _this->gl_data = NULL;
}
static SDL_bool
@@ -314,16 +327,16 @@ X11_GL_InitExtensions(_THIS)
xattr.background_pixel = 0;
xattr.border_pixel = 0;
xattr.colormap =
- XCreateColormap(display, RootWindow(display, screen), vinfo->visual,
+ X11_XCreateColormap(display, RootWindow(display, screen), vinfo->visual,
AllocNone);
- w = XCreateWindow(display, RootWindow(display, screen), 0, 0, 32, 32, 0,
+ w = X11_XCreateWindow(display, RootWindow(display, screen), 0, 0, 32, 32, 0,
vinfo->depth, InputOutput, vinfo->visual,
(CWBackPixel | CWBorderPixel | CWColormap), &xattr);
context = _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
if (context) {
_this->gl_data->glXMakeCurrent(display, w, context);
}
- XFree(vinfo);
+ X11_XFree(vinfo);
glXQueryExtensionsStringFunc =
(const char *(*)(Display *, int)) X11_GL_GetProcAddress(_this,
@@ -369,12 +382,17 @@ X11_GL_InitExtensions(_THIS)
if (HasExtension("GLX_EXT_visual_info", extensions)) {
_this->gl_data->HAS_GLX_EXT_visual_info = SDL_TRUE;
}
+
+ /* Check for GLX_EXT_create_context_es2_profile */
+ if (HasExtension("GLX_EXT_create_context_es2_profile", extensions)) {
+ _this->gl_data->HAS_GLX_EXT_create_context_es2_profile = SDL_TRUE;
+ }
if (context) {
_this->gl_data->glXMakeCurrent(display, None, NULL);
_this->gl_data->glXDestroyContext(display, context);
}
- XDestroyWindow(display, w);
+ X11_XDestroyWindow(display, w);
X11_PumpEvents(_this);
}
@@ -461,6 +479,13 @@ X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int si
attribs[i++] = _this->gl_config.multisamplesamples;
}
+ if (_this->gl_config.framebuffer_srgb_capable) {
+ attribs[i++] = GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB;
+ if( for_FBConfig ) {
+ attribs[i++] = True;
+ }
+ }
+
if (_this->gl_config.accelerated >= 0 &&
_this->gl_data->HAS_GLX_EXT_visual_rating) {
attribs[i++] = GLX_VISUAL_CAVEAT_EXT;
@@ -546,6 +571,7 @@ X11_GL_CreateContext(_THIS, SDL_Window * window)
XVisualInfo v, *vinfo;
int n;
GLXContext context = NULL, share_context;
+ PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs = NULL;
if (_this->gl_config.share_with_current_context) {
share_context = (GLXContext)SDL_GL_GetCurrentContext();
@@ -554,13 +580,13 @@ X11_GL_CreateContext(_THIS, SDL_Window * window)
}
/* We do this to create a clean separation between X and GLX errors. */
- XSync(display, False);
+ X11_XSync(display, False);
errorBase = _this->gl_data->errorBase;
- handler = XSetErrorHandler(X11_GL_CreateContextErrorHandler);
- XGetWindowAttributes(display, data->xwindow, &xattr);
+ handler = X11_XSetErrorHandler(X11_GL_CreateContextErrorHandler);
+ X11_XGetWindowAttributes(display, data->xwindow, &xattr);
v.screen = screen;
- v.visualid = XVisualIDFromVisual(xattr.visual);
- vinfo = XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n);
+ v.visualid = X11_XVisualIDFromVisual(xattr.visual);
+ vinfo = X11_XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n);
if (vinfo) {
if (_this->gl_config.major_version < 3 &&
_this->gl_config.profile_mask == 0 &&
@@ -599,7 +625,7 @@ X11_GL_CreateContext(_THIS, SDL_Window * window)
attribs[iattr++] = 0;
/* Get a pointer to the context creation function for GL 3.0 */
- PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs =
+ glXCreateContextAttribs =
(PFNGLXCREATECONTEXTATTRIBSARBPROC) _this->gl_data->
glXGetProcAddress((GLubyte *)
"glXCreateContextAttribsARB");
@@ -644,10 +670,10 @@ X11_GL_CreateContext(_THIS, SDL_Window * window)
}
}
}
- XFree(vinfo);
+ X11_XFree(vinfo);
}
- XSync(display, False);
- XSetErrorHandler(handler);
+ X11_XSync(display, False);
+ X11_XSetErrorHandler(handler);
if (!context) {
SDL_SetError("Could not create GL context");
@@ -789,7 +815,7 @@ X11_GL_DeleteContext(_THIS, SDL_GLContext context)
return;
}
_this->gl_data->glXDestroyContext(display, glx_context);
- XSync(display, False);
+ X11_XSync(display, False);
}
#endif /* SDL_VIDEO_OPENGL_GLX */
diff --git a/src/video/x11/SDL_x11opengl.h b/src/video/x11/SDL_x11opengl.h
index db1b315..27d7f9a 100644
--- a/src/video/x11/SDL_x11opengl.h
+++ b/src/video/x11/SDL_x11opengl.h
@@ -34,6 +34,7 @@ struct SDL_GLDriverData
SDL_bool HAS_GLX_EXT_visual_rating;
SDL_bool HAS_GLX_EXT_visual_info;
SDL_bool HAS_GLX_EXT_swap_control_tear;
+ SDL_bool HAS_GLX_EXT_create_context_es2_profile;
Bool (*glXQueryExtension) (Display*,int*,int*);
void *(*glXGetProcAddress) (const GLubyte*);
diff --git a/src/video/x11/SDL_x11opengles.c b/src/video/x11/SDL_x11opengles.c
index ba72aff..f972cee 100644
--- a/src/video/x11/SDL_x11opengles.c
+++ b/src/video/x11/SDL_x11opengles.c
@@ -20,86 +20,22 @@
*/
#include "SDL_config.h"
-#if SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_ES
+#if SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL
#include "SDL_x11video.h"
#include "SDL_x11opengles.h"
#include "SDL_x11opengl.h"
-#define DEFAULT_EGL "libEGL.so"
-#define DEFAULT_OGL_ES2 "libGLESv2.so"
-#define DEFAULT_OGL_ES_PVR "libGLES_CM.so"
-#define DEFAULT_OGL_ES "libGLESv1_CM.so"
-
-#define LOAD_FUNC(NAME) \
- *((void**)&_this->gles_data->NAME) = dlsym(handle, #NAME); \
- if (!_this->gles_data->NAME) \
- { \
- return SDL_SetError("Could not retrieve EGL function " #NAME); \
- }
-
-/* GLES implementation of SDL OpenGL support */
-
-void *
-X11_GLES_GetProcAddress(_THIS, const char *proc)
-{
- static char procname[1024];
- void *handle;
- void *retval;
-
- handle = _this->gles_data->egl_dll_handle;
- if (_this->gles_data->eglGetProcAddress) {
- retval = _this->gles_data->eglGetProcAddress(proc);
- if (retval) {
- return retval;
- }
- }
-
- handle = _this->gl_config.dll_handle;
-#if defined(__OpenBSD__) && !defined(__ELF__)
-#undef dlsym(x,y);
-#endif
- retval = dlsym(handle, proc);
- if (!retval && strlen(proc) <= 1022) {
- procname[0] = '_';
- strcpy(procname + 1, proc);
- retval = dlsym(handle, procname);
- }
- return retval;
-}
-
-void
-X11_GLES_UnloadLibrary(_THIS)
-{
- if ((_this->gles_data) && (_this->gl_config.driver_loaded)) {
- _this->gles_data->eglTerminate(_this->gles_data->egl_display);
-
- dlclose(_this->gl_config.dll_handle);
- dlclose(_this->gles_data->egl_dll_handle);
-
- SDL_free(_this->gles_data);
- _this->gles_data = NULL;
-
- _this->gl_config.dll_handle = NULL;
- _this->gl_config.driver_loaded = 0;
- }
-}
+/* EGL implementation of SDL OpenGL support */
int
-X11_GLES_LoadLibrary(_THIS, const char *path)
-{
- void *handle;
- int dlopen_flags;
-
+X11_GLES_LoadLibrary(_THIS, const char *path) {
+
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
- if (_this->gles_data) {
- return SDL_SetError("OpenGL ES context already created");
- }
-
- /* If SDL_GL_CONTEXT_EGL has been changed to 0, switch over to X11_GL functions */
- if (_this->gl_config.use_egl == 0) {
-#if SDL_VIDEO_OPENGL_GLX
+ /* If the profile requested is not GL ES, switch over to X11_GL functions */
+ if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) {
+ #if SDL_VIDEO_OPENGL_GLX
_this->GL_LoadLibrary = X11_GL_LoadLibrary;
_this->GL_GetProcAddress = X11_GL_GetProcAddress;
_this->GL_UnloadLibrary = X11_GL_UnloadLibrary;
@@ -110,331 +46,63 @@ X11_GLES_LoadLibrary(_THIS, const char *path)
_this->GL_SwapWindow = X11_GL_SwapWindow;
_this->GL_DeleteContext = X11_GL_DeleteContext;
return X11_GL_LoadLibrary(_this, path);
-#else
+ #else
return SDL_SetError("SDL not configured with OpenGL/GLX support");
-#endif
+ #endif
}
-
-#ifdef RTLD_GLOBAL
- dlopen_flags = RTLD_LAZY | RTLD_GLOBAL;
-#else
- dlopen_flags = RTLD_LAZY;
-#endif
- handle = dlopen(path, dlopen_flags);
- /* Catch the case where the application isn't linked with EGL */
- if ((dlsym(handle, "eglChooseConfig") == NULL) && (path == NULL)) {
-
- dlclose(handle);
- path = getenv("SDL_VIDEO_EGL_DRIVER");
- if (path == NULL) {
- path = DEFAULT_EGL;
- }
- handle = dlopen(path, dlopen_flags);
- }
-
- if (handle == NULL) {
- return SDL_SetError("Could not load OpenGL ES/EGL library");
- }
-
- /* Unload the old driver and reset the pointers */
- X11_GLES_UnloadLibrary(_this);
-
- _this->gles_data = (struct SDL_PrivateGLESData *) SDL_calloc(1, sizeof(SDL_PrivateGLESData));
- if (!_this->gles_data) {
- return SDL_OutOfMemory();
- }
-
- /* Load new function pointers */
- LOAD_FUNC(eglGetDisplay);
- LOAD_FUNC(eglInitialize);
- LOAD_FUNC(eglTerminate);
- LOAD_FUNC(eglGetProcAddress);
- LOAD_FUNC(eglChooseConfig);
- LOAD_FUNC(eglGetConfigAttrib);
- LOAD_FUNC(eglCreateContext);
- LOAD_FUNC(eglDestroyContext);
- LOAD_FUNC(eglCreateWindowSurface);
- LOAD_FUNC(eglDestroySurface);
- LOAD_FUNC(eglMakeCurrent);
- LOAD_FUNC(eglSwapBuffers);
- LOAD_FUNC(eglSwapInterval);
-
- _this->gles_data->egl_display =
- _this->gles_data->eglGetDisplay((NativeDisplayType) data->display);
-
- if (!_this->gles_data->egl_display) {
- return SDL_SetError("Could not get EGL display");
- }
-
- if (_this->gles_data->
- eglInitialize(_this->gles_data->egl_display, NULL,
- NULL) != EGL_TRUE) {
- return SDL_SetError("Could not initialize EGL");
- }
-
- _this->gles_data->egl_dll_handle = handle;
-
- path = getenv("SDL_VIDEO_GL_DRIVER");
- handle = dlopen(path, dlopen_flags);
- if ((path == NULL) | (handle == NULL)) {
- if (_this->gl_config.major_version > 1) {
- path = DEFAULT_OGL_ES2;
- handle = dlopen(path, dlopen_flags);
- } else {
- path = DEFAULT_OGL_ES;
- handle = dlopen(path, dlopen_flags);
- if (handle == NULL) {
- path = DEFAULT_OGL_ES_PVR;
- handle = dlopen(path, dlopen_flags);
- }
- }
- }
-
- if (handle == NULL) {
- return SDL_SetError("Could not initialize OpenGL ES library");
- }
-
- _this->gl_config.dll_handle = handle;
- _this->gl_config.driver_loaded = 1;
-
- if (path) {
- strncpy(_this->gl_config.driver_path, path,
- sizeof(_this->gl_config.driver_path) - 1);
- } else {
- strcpy(_this->gl_config.driver_path, "");
- }
- return 0;
+
+ return SDL_EGL_LoadLibrary(_this, path, (NativeDisplayType) data->display);
}
XVisualInfo *
X11_GLES_GetVisual(_THIS, Display * display, int screen)
{
- /* 64 seems nice. */
- EGLint attribs[64];
- EGLint found_configs = 0;
+
+ XVisualInfo *egl_visualinfo = NULL;
EGLint visual_id;
- int i;
+ XVisualInfo vi_in;
+ int out_count;
- if (!_this->gles_data) {
+ if (!_this->egl_data) {
/* The EGL library wasn't loaded, SDL_GetError() should have info */
return NULL;
}
- i = 0;
- attribs[i++] = EGL_RED_SIZE;
- attribs[i++] = _this->gl_config.red_size;
- attribs[i++] = EGL_GREEN_SIZE;
- attribs[i++] = _this->gl_config.green_size;
- attribs[i++] = EGL_BLUE_SIZE;
- attribs[i++] = _this->gl_config.blue_size;
-
- if (_this->gl_config.alpha_size) {
- attribs[i++] = EGL_ALPHA_SIZE;
- attribs[i++] = _this->gl_config.alpha_size;
- }
-
- if (_this->gl_config.buffer_size) {
- attribs[i++] = EGL_BUFFER_SIZE;
- attribs[i++] = _this->gl_config.buffer_size;
- }
-
- attribs[i++] = EGL_DEPTH_SIZE;
- attribs[i++] = _this->gl_config.depth_size;
-
- if (_this->gl_config.stencil_size) {
- attribs[i++] = EGL_STENCIL_SIZE;
- attribs[i++] = _this->gl_config.stencil_size;
- }
-
- if (_this->gl_config.multisamplebuffers) {
- attribs[i++] = EGL_SAMPLE_BUFFERS;
- attribs[i++] = _this->gl_config.multisamplebuffers;
- }
-
- if (_this->gl_config.multisamplesamples) {
- attribs[i++] = EGL_SAMPLES;
- attribs[i++] = _this->gl_config.multisamplesamples;
- }
-
- attribs[i++] = EGL_RENDERABLE_TYPE;
- if (_this->gl_config.major_version == 2) {
- attribs[i++] = EGL_OPENGL_ES2_BIT;
- } else {
- attribs[i++] = EGL_OPENGL_ES_BIT;
- }
-
- attribs[i++] = EGL_NONE;
-
- if (_this->gles_data->eglChooseConfig(_this->gles_data->egl_display,
- attribs,
- &_this->gles_data->egl_config, 1,
- &found_configs) == EGL_FALSE ||
- found_configs == 0) {
- SDL_SetError("Couldn't find matching EGL config");
- return NULL;
- }
-
- if (_this->gles_data->eglGetConfigAttrib(_this->gles_data->egl_display,
- _this->gles_data->egl_config,
- EGL_NATIVE_VISUAL_ID,
- &visual_id) ==
- EGL_FALSE || !visual_id) {
+ if (_this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display,
+ _this->egl_data->egl_config,
+ EGL_NATIVE_VISUAL_ID,
+ &visual_id) == EGL_FALSE || !visual_id) {
/* Use the default visual when all else fails */
- XVisualInfo vi_in;
- int out_count;
vi_in.screen = screen;
-
- _this->gles_data->egl_visualinfo = XGetVisualInfo(display,
- VisualScreenMask,
- &vi_in, &out_count);
+ egl_visualinfo = X11_XGetVisualInfo(display,
+ VisualScreenMask,
+ &vi_in, &out_count);
} else {
- XVisualInfo vi_in;
- int out_count;
-
vi_in.screen = screen;
vi_in.visualid = visual_id;
- _this->gles_data->egl_visualinfo = XGetVisualInfo(display,
- VisualScreenMask |
- VisualIDMask,
- &vi_in, &out_count);
+ egl_visualinfo = X11_XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &vi_in, &out_count);
}
- return _this->gles_data->egl_visualinfo;
+ return egl_visualinfo;
}
SDL_GLContext
X11_GLES_CreateContext(_THIS, SDL_Window * window)
{
- EGLint context_attrib_list[] = {
- EGL_CONTEXT_CLIENT_VERSION,
- 1,
- EGL_NONE
- };
-
+ SDL_GLContext context;
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
Display *display = data->videodata->display;
- SDL_GLContext context = (SDL_GLContext)1;
- XSync(display, False);
-
- if (_this->gl_config.major_version) {
- context_attrib_list[1] = _this->gl_config.major_version;
- }
-
- _this->gles_data->egl_context =
- _this->gles_data->eglCreateContext(_this->gles_data->egl_display,
- _this->gles_data->egl_config,
- EGL_NO_CONTEXT, context_attrib_list);
- XSync(display, False);
-
- if (_this->gles_data->egl_context == EGL_NO_CONTEXT) {
- SDL_SetError("Could not create EGL context");
- return NULL;
- }
-
- _this->gles_data->egl_swapinterval = 0;
-
- if (X11_GLES_MakeCurrent(_this, window, context) < 0) {
- X11_GLES_DeleteContext(_this, context);
- return NULL;
- }
+ X11_XSync(display, False);
+ context = SDL_EGL_CreateContext(_this, data->egl_surface);
+ X11_XSync(display, False);
return context;
}
-int
-X11_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
-{
-/*
- SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
- Display *display = data->videodata->display;
-*/
-
- if (!_this->gles_data) {
- return SDL_SetError("OpenGL not initialized");
- }
-
- if (!_this->gles_data->eglMakeCurrent(_this->gles_data->egl_display,
- _this->gles_data->egl_surface,
- _this->gles_data->egl_surface,
- _this->gles_data->egl_context)) {
- return SDL_SetError("Unable to make EGL context current");
- }
-
-/*
- XSync(display, False);
-*/
-
- return 1;
-}
-
-int
-X11_GLES_SetSwapInterval(_THIS, int interval)
-{
- if (_this->gles_data) {
- return SDL_SetError("OpenGL ES context not active");
- }
-
- EGLBoolean status;
- status = _this->gles_data->eglSwapInterval(_this->gles_data->egl_display, interval);
- if (status == EGL_TRUE) {
- _this->gles_data->egl_swapinterval = interval;
- return 0;
- }
-
- return SDL_SetError("Unable to set the EGL swap interval");
-}
-
-int
-X11_GLES_GetSwapInterval(_THIS)
-{
- if (_this->gles_data) {
- return SDL_SetError("OpenGL ES context not active");
- }
-
- return _this->gles_data->egl_swapinterval;
-}
-
-void
-X11_GLES_SwapWindow(_THIS, SDL_Window * window)
-{
- _this->gles_data->eglSwapBuffers(_this->gles_data->egl_display,
- _this->gles_data->egl_surface);
-}
-
-void
-X11_GLES_DeleteContext(_THIS, SDL_GLContext context)
-{
- /* Clean up GLES and EGL */
- if (!_this->gles_data) {
- return;
- }
-
- if (_this->gles_data->egl_context != EGL_NO_CONTEXT ||
- _this->gles_data->egl_surface != EGL_NO_SURFACE) {
- _this->gles_data->eglMakeCurrent(_this->gles_data->egl_display,
- EGL_NO_SURFACE, EGL_NO_SURFACE,
- EGL_NO_CONTEXT);
-
- if (_this->gles_data->egl_context != EGL_NO_CONTEXT) {
- _this->gles_data->eglDestroyContext(_this->gles_data->egl_display,
- _this->gles_data->
- egl_context);
- _this->gles_data->egl_context = EGL_NO_CONTEXT;
- }
-
- if (_this->gles_data->egl_surface != EGL_NO_SURFACE) {
- _this->gles_data->eglDestroySurface(_this->gles_data->egl_display,
- _this->gles_data->
- egl_surface);
- _this->gles_data->egl_surface = EGL_NO_SURFACE;
- }
- }
-
- /* crappy fix */
- X11_GLES_UnloadLibrary(_this);
-}
+SDL_EGL_SwapWindow_impl(X11)
+SDL_EGL_MakeCurrent_impl(X11)
-#endif /* SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_ES */
+#endif /* SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL */
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11opengles.h b/src/video/x11/SDL_x11opengles.h
index fa1506c..978f91f 100644
--- a/src/video/x11/SDL_x11opengles.h
+++ b/src/video/x11/SDL_x11opengles.h
@@ -23,81 +23,30 @@
#ifndef _SDL_x11opengles_h
#define _SDL_x11opengles_h
-#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
-#include <GLES/gl.h>
-#include <GLES/egl.h>
-#include <dlfcn.h>
-#if defined(__OpenBSD__) && !defined(__ELF__)
-#define dlsym(x,y) dlsym(x, "_" y)
-#endif
+#if SDL_VIDEO_OPENGL_EGL
#include "../SDL_sysvideo.h"
+#include "../SDL_egl.h"
typedef struct SDL_PrivateGLESData
{
- XVisualInfo *egl_visualinfo;
- void *egl_dll_handle;
- EGLDisplay egl_display;
- EGLContext egl_context; /* Current GLES context */
- EGLSurface egl_surface;
- EGLConfig egl_config;
- int egl_swapinterval;
-
- EGLDisplay(*eglGetDisplay) (NativeDisplayType display);
- EGLBoolean(*eglInitialize) (EGLDisplay dpy, EGLint * major,
- EGLint * minor);
- EGLBoolean(*eglTerminate) (EGLDisplay dpy);
-
- void *(*eglGetProcAddress) (const char * procName);
-
- EGLBoolean(*eglChooseConfig) (EGLDisplay dpy,
- const EGLint * attrib_list,
- EGLConfig * configs,
- EGLint config_size, EGLint * num_config);
-
- EGLContext(*eglCreateContext) (EGLDisplay dpy,
- EGLConfig config,
- EGLContext share_list,
- const EGLint * attrib_list);
-
- EGLBoolean(*eglDestroyContext) (EGLDisplay dpy, EGLContext ctx);
-
- EGLSurface(*eglCreateWindowSurface) (EGLDisplay dpy,
- EGLConfig config,
- NativeWindowType window,
- const EGLint * attrib_list);
- EGLBoolean(*eglDestroySurface) (EGLDisplay dpy, EGLSurface surface);
-
- EGLBoolean(*eglMakeCurrent) (EGLDisplay dpy, EGLSurface draw,
- EGLSurface read, EGLContext ctx);
-
- EGLBoolean(*eglSwapBuffers) (EGLDisplay dpy, EGLSurface draw);
-
- EGLBoolean(*eglSwapInterval) (EGLDisplay dpy, EGLint interval);
-
- const char *(*eglQueryString) (EGLDisplay dpy, EGLint name);
-
- EGLBoolean(*eglGetConfigAttrib) (EGLDisplay dpy, EGLConfig config,
- EGLint attribute, EGLint * value);
-
} SDL_PrivateGLESData;
/* OpenGLES functions */
-extern SDL_GLContext X11_GLES_CreateContext(_THIS, SDL_Window * window);
-extern XVisualInfo *X11_GLES_GetVisual(_THIS, Display * display, int screen);
-extern int X11_GLES_MakeCurrent(_THIS, SDL_Window * window,
- SDL_GLContext context);
-extern int X11_GLES_GetAttribute(_THIS, SDL_GLattr attrib, int *value);
-extern int X11_GLES_LoadLibrary(_THIS, const char *path);
-extern void *X11_GLES_GetProcAddress(_THIS, const char *proc);
-extern void X11_GLES_UnloadLibrary(_THIS);
+#define X11_GLES_GetAttribute SDL_EGL_GetAttribute
+#define X11_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define X11_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define X11_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define X11_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define X11_GLES_DeleteContext SDL_EGL_DeleteContext
-extern int X11_GLES_SetSwapInterval(_THIS, int interval);
-extern int X11_GLES_GetSwapInterval(_THIS);
+extern int X11_GLES_LoadLibrary(_THIS, const char *path);
+extern XVisualInfo *X11_GLES_GetVisual(_THIS, Display * display, int screen);
+extern SDL_GLContext X11_GLES_CreateContext(_THIS, SDL_Window * window);
extern void X11_GLES_SwapWindow(_THIS, SDL_Window * window);
-extern void X11_GLES_DeleteContext(_THIS, SDL_GLContext context);
+extern int X11_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
-#endif /* SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2 */
+#endif /* SDL_VIDEO_OPENGL_EGL */
#endif /* _SDL_x11opengles_h */
diff --git a/src/video/x11/SDL_x11shape.c b/src/video/x11/SDL_x11shape.c
index cea2807..af89851 100644
--- a/src/video/x11/SDL_x11shape.c
+++ b/src/video/x11/SDL_x11shape.c
@@ -36,6 +36,8 @@ X11_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned
SDL_WindowShaper*
X11_CreateShaper(SDL_Window* window) {
SDL_WindowShaper* result = NULL;
+ SDL_ShapeData* data = NULL;
+ int resized_properly;
#if SDL_VIDEO_DRIVER_X11_XSHAPE
if (SDL_X11_HAVE_XSHAPE) { /* Make sure X server supports it. */
@@ -44,12 +46,12 @@ X11_CreateShaper(SDL_Window* window) {
result->mode.mode = ShapeModeDefault;
result->mode.parameters.binarizationCutoff = 1;
result->userx = result->usery = 0;
- SDL_ShapeData* data = SDL_malloc(sizeof(SDL_ShapeData));
+ data = SDL_malloc(sizeof(SDL_ShapeData));
result->driverdata = data;
data->bitmapsize = 0;
data->bitmap = NULL;
window->shaper = result;
- int resized_properly = X11_ResizeWindowShape(window);
+ resized_properly = X11_ResizeWindowShape(window);
SDL_assert(resized_properly == 0);
}
#endif
@@ -60,9 +62,9 @@ X11_CreateShaper(SDL_Window* window) {
int
X11_ResizeWindowShape(SDL_Window* window) {
SDL_ShapeData* data = window->shaper->driverdata;
+ unsigned int bitmapsize = window->w / 8;
SDL_assert(data != NULL);
- unsigned int bitmapsize = window->w / 8;
if(window->w % 8 > 0)
bitmapsize += 1;
bitmapsize *= window->h;
@@ -86,6 +88,10 @@ X11_ResizeWindowShape(SDL_Window* window) {
int
X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode) {
+ SDL_ShapeData *data = NULL;
+ SDL_WindowData *windowdata = NULL;
+ Pixmap shapemask;
+
if(shaper == NULL || shape == NULL || shaper->driverdata == NULL)
return -1;
@@ -94,18 +100,18 @@ X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMo
return -2;
if(shape->w != shaper->window->w || shape->h != shaper->window->h)
return -3;
- SDL_ShapeData *data = shaper->driverdata;
+ data = shaper->driverdata;
/* Assume that shaper->alphacutoff already has a value, because SDL_SetWindowShape() should have given it one. */
SDL_CalculateShapeBitmap(shaper->mode,shape,data->bitmap,8);
- SDL_WindowData *windowdata = (SDL_WindowData*)(shaper->window->driverdata);
- Pixmap shapemask = XCreateBitmapFromData(windowdata->videodata->display,windowdata->xwindow,data->bitmap,shaper->window->w,shaper->window->h);
+ windowdata = (SDL_WindowData*)(shaper->window->driverdata);
+ shapemask = X11_XCreateBitmapFromData(windowdata->videodata->display,windowdata->xwindow,data->bitmap,shaper->window->w,shaper->window->h);
- XShapeCombineMask(windowdata->videodata->display,windowdata->xwindow, ShapeBounding, 0, 0,shapemask, ShapeSet);
- XSync(windowdata->videodata->display,False);
+ X11_XShapeCombineMask(windowdata->videodata->display,windowdata->xwindow, ShapeBounding, 0, 0,shapemask, ShapeSet);
+ X11_XSync(windowdata->videodata->display,False);
- XFreePixmap(windowdata->videodata->display,shapemask);
+ X11_XFreePixmap(windowdata->videodata->display,shapemask);
#endif
return 0;
diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
index 79f61e0..1ee982b 100644
--- a/src/video/x11/SDL_x11sym.h
+++ b/src/video/x11/SDL_x11sym.h
@@ -176,9 +176,9 @@ SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,KeyCode b,int c),(a,b,c),return)
SDL_X11_MODULE(UTF8)
SDL_X11_SYM(int,Xutf8TextListToTextProperty,(Display* a,char** b,int c,XICCEncodingStyle d,XTextProperty* e),(a,b,c,d,e),return)
SDL_X11_SYM(int,Xutf8LookupString,(XIC a,XKeyPressedEvent* b,char* c,int d,KeySym* e,Status* f),(a,b,c,d,e,f),return)
-/*SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return) !!! ARGH! */
+/* SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return) !!! ARGH! */
SDL_X11_SYM(void,XDestroyIC,(XIC a),(a),)
-/*SDL_X11_SYM(char*,XGetICValues,(XIC, ...),return) !!! ARGH! */
+/* SDL_X11_SYM(char*,XGetICValues,(XIC, ...),return) !!! ARGH! */
SDL_X11_SYM(void,XSetICFocus,(XIC a),(a),)
SDL_X11_SYM(void,XUnsetICFocus,(XIC a),(a),)
SDL_X11_SYM(XIM,XOpenIM,(Display* a,struct _XrmHashBucketRec* b,char* c,char* d),(a,b,c,d),return)
diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
index 86597ec..c84d4ec 100644
--- a/src/video/x11/SDL_x11video.c
+++ b/src/video/x11/SDL_x11video.c
@@ -35,7 +35,7 @@
#include "SDL_x11touch.h"
#include "SDL_x11xinput2.h"
-#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+#if SDL_VIDEO_OPENGL_EGL
#include "SDL_x11opengles.h"
#endif
@@ -230,9 +230,9 @@ X11_Available(void)
{
Display *display = NULL;
if (SDL_X11_LoadSymbols()) {
- display = XOpenDisplay(NULL);
+ display = X11_XOpenDisplay(NULL);
if (display != NULL) {
- XCloseDisplay(display);
+ X11_XCloseDisplay(display);
}
SDL_X11_UnloadSymbols();
}
@@ -244,7 +244,7 @@ X11_DeleteDevice(SDL_VideoDevice * device)
{
SDL_VideoData *data = (SDL_VideoData *) device->driverdata;
if (data->display) {
- XCloseDisplay(data->display);
+ X11_XCloseDisplay(data->display);
}
SDL_free(data->windowlist);
SDL_free(device->driverdata);
@@ -259,10 +259,11 @@ static int (*orig_x11_errhandler) (Display *, XErrorEvent *) = NULL;
static int
X11_SafetyNetErrHandler(Display * d, XErrorEvent * e)
{
+ SDL_VideoDevice *device = NULL;
/* if we trigger an error in our error handler, don't try again. */
if (!safety_net_triggered) {
safety_net_triggered = SDL_TRUE;
- SDL_VideoDevice *device = SDL_GetVideoDevice();
+ device = SDL_GetVideoDevice();
if (device != NULL) {
int i;
for (i = 0; i < device->num_displays; i++) {
@@ -295,7 +296,7 @@ X11_CreateDevice(int devindex)
/* Need for threading gl calls. This is also required for the proprietary
nVidia driver to be threaded. */
- XInitThreads();
+ X11_XInitThreads();
/* Initialize all variables that we clean on shutdown */
device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
@@ -312,14 +313,14 @@ X11_CreateDevice(int devindex)
device->driverdata = data;
/* FIXME: Do we need this?
- if ( (SDL_strncmp(XDisplayName(display), ":", 1) == 0) ||
- (SDL_strncmp(XDisplayName(display), "unix:", 5) == 0) ) {
+ if ( (SDL_strncmp(X11_XDisplayName(display), ":", 1) == 0) ||
+ (SDL_strncmp(X11_XDisplayName(display), "unix:", 5) == 0) ) {
local_X11 = 1;
} else {
local_X11 = 0;
}
*/
- data->display = XOpenDisplay(display);
+ data->display = X11_XOpenDisplay(display);
#if defined(__osf__) && defined(SDL_VIDEO_DRIVER_X11_DYNAMIC)
/* On Tru64 if linking without -lX11, it fails and you get following message.
* Xlib: connection to ":0.0" refused by server
@@ -330,7 +331,7 @@ X11_CreateDevice(int devindex)
*/
if (data->display == NULL) {
SDL_Delay(1000);
- data->display = XOpenDisplay(display);
+ data->display = X11_XOpenDisplay(display);
}
#endif
if (data->display == NULL) {
@@ -340,12 +341,12 @@ X11_CreateDevice(int devindex)
return NULL;
}
#ifdef X11_DEBUG
- XSynchronize(data->display, True);
+ X11_XSynchronize(data->display, True);
#endif
/* Hook up an X11 error handler to recover the desktop resolution. */
safety_net_triggered = SDL_FALSE;
- orig_x11_errhandler = XSetErrorHandler(X11_SafetyNetErrHandler);
+ orig_x11_errhandler = X11_XSetErrorHandler(X11_SafetyNetErrHandler);
/* Set the function pointers */
device->VideoInit = X11_VideoInit;
@@ -394,7 +395,7 @@ X11_CreateDevice(int devindex)
device->GL_GetSwapInterval = X11_GL_GetSwapInterval;
device->GL_SwapWindow = X11_GL_SwapWindow;
device->GL_DeleteContext = X11_GL_DeleteContext;
-#elif SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+#elif SDL_VIDEO_OPENGL_EGL
device->GL_LoadLibrary = X11_GLES_LoadLibrary;
device->GL_GetProcAddress = X11_GLES_GetProcAddress;
device->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
@@ -447,31 +448,31 @@ X11_CheckWindowManager(_THIS)
#endif
/* Set up a handler to gracefully catch errors */
- XSync(display, False);
- handler = XSetErrorHandler(X11_CheckWindowManagerErrorHandler);
+ X11_XSync(display, False);
+ handler = X11_XSetErrorHandler(X11_CheckWindowManagerErrorHandler);
- _NET_SUPPORTING_WM_CHECK = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
- status = XGetWindowProperty(display, DefaultRootWindow(display), _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
+ _NET_SUPPORTING_WM_CHECK = X11_XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
+ status = X11_XGetWindowProperty(display, DefaultRootWindow(display), _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
if (status == Success && items_read) {
wm_window = ((Window*)propdata)[0];
}
if (propdata) {
- XFree(propdata);
+ X11_XFree(propdata);
}
if (wm_window) {
- status = XGetWindowProperty(display, wm_window, _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
+ status = X11_XGetWindowProperty(display, wm_window, _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
if (status != Success || !items_read || wm_window != ((Window*)propdata)[0]) {
wm_window = None;
}
if (propdata) {
- XFree(propdata);
+ X11_XFree(propdata);
}
}
/* Reset the error handler, we're done checking */
- XSync(display, False);
- XSetErrorHandler(handler);
+ X11_XSync(display, False);
+ X11_XSetErrorHandler(handler);
if (!wm_window) {
#ifdef DEBUG_WINDOW_MANAGER
@@ -504,12 +505,12 @@ X11_VideoInit(_THIS)
#ifdef X_HAVE_UTF8_STRING
if (SDL_X11_HAVE_UTF8) {
data->im =
- XOpenIM(data->display, NULL, data->classname, data->classname);
+ X11_XOpenIM(data->display, NULL, data->classname, data->classname);
}
#endif
/* Look up some useful Atoms */
-#define GET_ATOM(X) data->X = XInternAtom(data->display, #X, False)
+#define GET_ATOM(X) data->X = X11_XInternAtom(data->display, #X, False)
GET_ATOM(WM_PROTOCOLS);
GET_ATOM(WM_DELETE_WINDOW);
GET_ATOM(_NET_WM_STATE);
@@ -564,12 +565,10 @@ X11_VideoQuit(_THIS)
{
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
- if (data->classname) {
- SDL_free(data->classname);
- }
+ SDL_free(data->classname);
#ifdef X_HAVE_UTF8_STRING
if (data->im) {
- XCloseIM(data->im);
+ X11_XCloseIM(data->im);
}
#endif
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index 02529e0..62a7e73 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -34,7 +34,7 @@
#include "SDL_x11shape.h"
#include "SDL_x11xinput2.h"
-#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+#if SDL_VIDEO_OPENGL_EGL
#include "SDL_x11opengles.h"
#endif
@@ -61,12 +61,12 @@ static Bool isConfigureNotify(Display *dpy, XEvent *ev, XPointer win)
/*
static Bool
-XIfEventTimeout(Display *display, XEvent *event_return, Bool (*predicate)(), XPointer arg, int timeoutMS)
+X11_XIfEventTimeout(Display *display, XEvent *event_return, Bool (*predicate)(), XPointer arg, int timeoutMS)
{
Uint32 start = SDL_GetTicks();
- while (!XCheckIfEvent(display, event_return, predicate, arg)) {
- if ((SDL_GetTicks() - start) >= timeoutMS) {
+ while (!X11_XCheckIfEvent(display, event_return, predicate, arg)) {
+ if (SDL_TICKS_PASSED(SDL_GetTicks(), start + timeoutMS)) {
return False;
}
}
@@ -88,7 +88,7 @@ X11_IsWindowMapped(_THIS, SDL_Window * window)
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
XWindowAttributes attr;
- XGetWindowAttributes(videodata->display, data->xwindow, &attr);
+ X11_XGetWindowAttributes(videodata->display, data->xwindow, &attr);
if (attr.map_state != IsUnmapped) {
return SDL_TRUE;
} else {
@@ -110,7 +110,7 @@ X11_IsActionAllowed(SDL_Window *window, Atom action)
Atom *list;
SDL_bool ret = SDL_FALSE;
- if (XGetWindowProperty(display, data->xwindow, _NET_WM_ALLOWED_ACTIONS, 0, 1024, False, XA_ATOM, &type, &form, &len, &remain, (unsigned char **)&list) == Success)
+ if (X11_XGetWindowProperty(display, data->xwindow, _NET_WM_ALLOWED_ACTIONS, 0, 1024, False, XA_ATOM, &type, &form, &len, &remain, (unsigned char **)&list) == Success)
{
for (i=0; i<len; ++i)
{
@@ -119,7 +119,7 @@ X11_IsActionAllowed(SDL_Window *window, Atom action)
break;
}
}
- XFree(list);
+ X11_XFree(list);
}
return ret;
}
@@ -131,7 +131,7 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags)
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
Display *display = videodata->display;
Atom _NET_WM_STATE = videodata->_NET_WM_STATE;
- /*Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN;*/
+ /* Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN; */
Atom _NET_WM_STATE_FOCUSED = videodata->_NET_WM_STATE_FOCUSED;
Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT;
Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
@@ -141,7 +141,7 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags)
/* The window manager sets this property, we shouldn't set it.
If we did, this would indicate to the window manager that we don't
- actually want to be mapped during XMapRaised(), which would be bad.
+ actually want to be mapped during X11_XMapRaised(), which would be bad.
*
if (flags & SDL_WINDOW_HIDDEN) {
atoms[count++] = _NET_WM_STATE_HIDDEN;
@@ -158,10 +158,10 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags)
atoms[count++] = _NET_WM_STATE_FULLSCREEN;
}
if (count > 0) {
- XChangeProperty(display, xwindow, _NET_WM_STATE, XA_ATOM, 32,
+ X11_XChangeProperty(display, xwindow, _NET_WM_STATE, XA_ATOM, 32,
PropModeReplace, (unsigned char *)atoms, count);
} else {
- XDeleteProperty(display, xwindow, _NET_WM_STATE);
+ X11_XDeleteProperty(display, xwindow, _NET_WM_STATE);
}
}
@@ -183,7 +183,7 @@ X11_GetNetWMState(_THIS, Window xwindow)
long maxLength = 1024;
Uint32 flags = 0;
- if (XGetWindowProperty(display, xwindow, _NET_WM_STATE,
+ if (X11_XGetWindowProperty(display, xwindow, _NET_WM_STATE,
0l, maxLength, False, XA_ATOM, &actualType,
&actualFormat, &numItems, &bytesAfter,
&propertyValue) == Success) {
@@ -209,11 +209,11 @@ X11_GetNetWMState(_THIS, Window xwindow)
} else if (fullscreen == 1) {
flags |= SDL_WINDOW_FULLSCREEN;
}
- XFree(propertyValue);
+ X11_XFree(propertyValue);
}
/* FIXME, check the size hints for resizable */
- /*flags |= SDL_WINDOW_RESIZABLE;*/
+ /* flags |= SDL_WINDOW_RESIZABLE; */
return flags;
}
@@ -237,7 +237,7 @@ SetupWindowData(_THIS, SDL_Window * window, Window w, BOOL created)
#ifdef X_HAVE_UTF8_STRING
if (SDL_X11_HAVE_UTF8 && videodata->im) {
data->ic =
- pXCreateIC(videodata->im, XNClientWindow, w, XNFocusWindow, w,
+ X11_XCreateIC(videodata->im, XNClientWindow, w, XNFocusWindow, w,
XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
XNResourceName, videodata->classname, XNResourceClass,
videodata->classname, NULL);
@@ -270,7 +270,7 @@ SetupWindowData(_THIS, SDL_Window * window, Window w, BOOL created)
{
XWindowAttributes attrib;
- XGetWindowAttributes(data->videodata->display, w, &attrib);
+ X11_XGetWindowAttributes(data->videodata->display, w, &attrib);
window->x = attrib.x;
window->y = attrib.y;
window->w = attrib.width;
@@ -289,7 +289,7 @@ SetupWindowData(_THIS, SDL_Window * window, Window w, BOOL created)
{
Window FocalWindow;
int RevertTo=0;
- XGetInputFocus(data->videodata->display, &FocalWindow, &RevertTo);
+ X11_XGetInputFocus(data->videodata->display, &FocalWindow, &RevertTo);
if (FocalWindow==w)
{
window->flags |= SDL_WINDOW_INPUT_FOCUS;
@@ -318,7 +318,7 @@ SetWindowBordered(Display *display, int screen, Window window, SDL_bool border)
* Gnome is similar: just use the Motif atom.
*/
- Atom WM_HINTS = XInternAtom(display, "_MOTIF_WM_HINTS", True);
+ Atom WM_HINTS = X11_XInternAtom(display, "_MOTIF_WM_HINTS", True);
if (WM_HINTS != None) {
/* Hints used by Motif compliant window managers */
struct
@@ -332,11 +332,11 @@ SetWindowBordered(Display *display, int screen, Window window, SDL_bool border)
(1L << 1), 0, border ? 1 : 0, 0, 0
};
- XChangeProperty(display, window, WM_HINTS, WM_HINTS, 32,
+ X11_XChangeProperty(display, window, WM_HINTS, WM_HINTS, 32,
PropModeReplace, (unsigned char *) &MWMHints,
sizeof(MWMHints) / 4);
} else { /* set the transient hints instead, if necessary */
- XSetTransientForHint(display, window, RootWindow(display, screen));
+ X11_XSetTransientForHint(display, window, RootWindow(display, screen));
}
}
@@ -346,6 +346,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
SDL_DisplayData *displaydata =
(SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+ SDL_WindowData *windowdata;
Display *display = data->display;
int screen = displaydata->screen;
Visual *visual;
@@ -363,12 +364,17 @@ X11_CreateWindow(_THIS, SDL_Window * window)
Atom XdndAware, xdnd_version = 5;
Uint32 fevent = 0;
-#if SDL_VIDEO_OPENGL_GLX || SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
- if (window->flags & SDL_WINDOW_OPENGL) {
- XVisualInfo *vinfo;
+#if SDL_VIDEO_OPENGL_GLX || SDL_VIDEO_OPENGL_EGL
+ if ((window->flags & SDL_WINDOW_OPENGL) &&
+ !SDL_getenv("SDL_VIDEO_X11_VISUALID")) {
+ XVisualInfo *vinfo = NULL;
-#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
- if (_this->gl_config.use_egl == 1) {
+#if SDL_VIDEO_OPENGL_EGL
+ if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES
+#if SDL_VIDEO_OPENGL_GLX
+ && ( !_this->gl_data || ! _this->gl_data->HAS_GLX_EXT_create_context_es2_profile )
+#endif
+ ){
vinfo = X11_GLES_GetVisual(_this, display, screen);
} else
#endif
@@ -377,12 +383,13 @@ X11_CreateWindow(_THIS, SDL_Window * window)
vinfo = X11_GL_GetVisual(_this, display, screen);
#endif
}
+
if (!vinfo) {
return -1;
}
visual = vinfo->visual;
depth = vinfo->depth;
- XFree(vinfo);
+ X11_XFree(vinfo);
} else
#endif
{
@@ -391,7 +398,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
}
xattr.override_redirect = False;
- xattr.background_pixel = 0;
+ xattr.background_pixmap = None;
xattr.border_pixel = 0;
if (visual->class == DirectColor) {
@@ -403,7 +410,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
int rshift, gshift, bshift;
xattr.colormap =
- XCreateColormap(display, RootWindow(display, screen),
+ X11_XCreateColormap(display, RootWindow(display, screen),
visual, AllocAll);
/* If we can't create a colormap, then we must die */
@@ -464,48 +471,28 @@ X11_CreateWindow(_THIS, SDL_Window * window)
colorcells[i].flags = DoRed | DoGreen | DoBlue;
}
- XStoreColors(display, xattr.colormap, colorcells, ncolors);
+ X11_XStoreColors(display, xattr.colormap, colorcells, ncolors);
SDL_free(colorcells);
} else {
xattr.colormap =
- XCreateColormap(display, RootWindow(display, screen),
+ X11_XCreateColormap(display, RootWindow(display, screen),
visual, AllocNone);
}
- w = XCreateWindow(display, RootWindow(display, screen),
+ w = X11_XCreateWindow(display, RootWindow(display, screen),
window->x, window->y, window->w, window->h,
0, depth, InputOutput, visual,
- (CWOverrideRedirect | CWBackPixel | CWBorderPixel |
+ (CWOverrideRedirect | CWBackPixmap | CWBorderPixel |
CWColormap), &xattr);
if (!w) {
return SDL_SetError("Couldn't create window");
}
-#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
- if ((window->flags & SDL_WINDOW_OPENGL) && (_this->gl_config.use_egl == 1)) {
- if (!_this->gles_data) {
- XDestroyWindow(display, w);
- return -1;
- }
-
- /* Create the GLES window surface */
- _this->gles_data->egl_surface =
- _this->gles_data->eglCreateWindowSurface(_this->gles_data->
- egl_display,
- _this->gles_data->egl_config,
- (NativeWindowType) w, NULL);
-
- if (_this->gles_data->egl_surface == EGL_NO_SURFACE) {
- XDestroyWindow(display, w);
- return SDL_SetError("Could not create GLES window surface");
- }
- }
-#endif
SetWindowBordered(display, screen, w,
(window->flags & SDL_WINDOW_BORDERLESS) == 0);
- sizehints = XAllocSizeHints();
+ sizehints = X11_XAllocSizeHints();
/* Setup the normal size hints */
sizehints->flags = 0;
if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
@@ -518,25 +505,25 @@ X11_CreateWindow(_THIS, SDL_Window * window)
sizehints->flags |= USPosition;
/* Setup the input hints so we get keyboard input */
- wmhints = XAllocWMHints();
+ wmhints = X11_XAllocWMHints();
wmhints->input = True;
wmhints->flags = InputHint;
/* Setup the class hints so we can get an icon (AfterStep) */
- classhints = XAllocClassHint();
+ classhints = X11_XAllocClassHint();
classhints->res_name = data->classname;
classhints->res_class = data->classname;
/* Set the size, input and class hints, and define WM_CLIENT_MACHINE and WM_LOCALE_NAME */
- XSetWMProperties(display, w, NULL, NULL, NULL, 0, sizehints, wmhints, classhints);
+ X11_XSetWMProperties(display, w, NULL, NULL, NULL, 0, sizehints, wmhints, classhints);
- XFree(sizehints);
- XFree(wmhints);
- XFree(classhints);
+ X11_XFree(sizehints);
+ X11_XFree(wmhints);
+ X11_XFree(classhints);
/* Set the PID related to the window for the given hostname, if possible */
if (data->pid > 0) {
- _NET_WM_PID = XInternAtom(display, "_NET_WM_PID", False);
- XChangeProperty(display, w, _NET_WM_PID, XA_CARDINAL, 32, PropModeReplace,
+ _NET_WM_PID = X11_XInternAtom(display, "_NET_WM_PID", False);
+ X11_XChangeProperty(display, w, _NET_WM_PID, XA_CARDINAL, 32, PropModeReplace,
(unsigned char *)&data->pid, 1);
}
@@ -544,14 +531,14 @@ X11_CreateWindow(_THIS, SDL_Window * window)
X11_SetNetWMState(_this, w, window->flags);
/* Let the window manager know we're a "normal" window */
- _NET_WM_WINDOW_TYPE = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
- _NET_WM_WINDOW_TYPE_NORMAL = XInternAtom(display, "_NET_WM_WINDOW_TYPE_NORMAL", False);
- XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
+ _NET_WM_WINDOW_TYPE = X11_XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
+ _NET_WM_WINDOW_TYPE_NORMAL = X11_XInternAtom(display, "_NET_WM_WINDOW_TYPE_NORMAL", False);
+ X11_XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
PropModeReplace,
(unsigned char *)&_NET_WM_WINDOW_TYPE_NORMAL, 1);
- _NET_WM_BYPASS_COMPOSITOR = XInternAtom(display, "_NET_WM_BYPASS_COMPOSITOR", False);
- XChangeProperty(display, w, _NET_WM_BYPASS_COMPOSITOR, XA_CARDINAL, 32,
+ _NET_WM_BYPASS_COMPOSITOR = X11_XInternAtom(display, "_NET_WM_BYPASS_COMPOSITOR", False);
+ X11_XChangeProperty(display, w, _NET_WM_BYPASS_COMPOSITOR, XA_CARDINAL, 32,
PropModeReplace,
(unsigned char *)&_NET_WM_BYPASS_COMPOSITOR_HINT_ON, 1);
@@ -560,36 +547,59 @@ X11_CreateWindow(_THIS, SDL_Window * window)
data->WM_DELETE_WINDOW, /* Allow window to be deleted by the WM */
data->_NET_WM_PING, /* Respond so WM knows we're alive */
};
- XSetWMProtocols(display, w, protocols, sizeof (protocols) / sizeof (protocols[0]));
+ X11_XSetWMProtocols(display, w, protocols, sizeof (protocols) / sizeof (protocols[0]));
}
if (SetupWindowData(_this, window, w, SDL_TRUE) < 0) {
- XDestroyWindow(display, w);
+ X11_XDestroyWindow(display, w);
return -1;
}
+ windowdata = (SDL_WindowData *) window->driverdata;
+
+#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+ if ((window->flags & SDL_WINDOW_OPENGL) &&
+ _this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES
+#if SDL_VIDEO_OPENGL_GLX
+ && ( !_this->gl_data || ! _this->gl_data->HAS_GLX_EXT_create_context_es2_profile )
+#endif
+ ) {
+ if (!_this->egl_data) {
+ X11_XDestroyWindow(display, w);
+ return -1;
+ }
+
+ /* Create the GLES window surface */
+ windowdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) w);
+
+ if (windowdata->egl_surface == EGL_NO_SURFACE) {
+ X11_XDestroyWindow(display, w);
+ return SDL_SetError("Could not create GLES window surface");
+ }
+ }
+#endif
+
#ifdef X_HAVE_UTF8_STRING
- if (SDL_X11_HAVE_UTF8) {
- pXGetICValues(((SDL_WindowData *) window->driverdata)->ic,
- XNFilterEvents, &fevent, NULL);
+ if (SDL_X11_HAVE_UTF8 && windowdata->ic) {
+ X11_XGetICValues(windowdata->ic, XNFilterEvents, &fevent, NULL);
}
#endif
X11_Xinput2SelectTouch(_this, window);
- XSelectInput(display, w,
+ X11_XSelectInput(display, w,
(FocusChangeMask | EnterWindowMask | LeaveWindowMask |
ExposureMask | ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | KeyPressMask | KeyReleaseMask |
PropertyChangeMask | StructureNotifyMask |
KeymapStateMask | fevent));
- XdndAware = XInternAtom(display, "XdndAware", False);
- XChangeProperty(display, w, XdndAware, XA_ATOM, 32,
+ XdndAware = X11_XInternAtom(display, "XdndAware", False);
+ X11_XChangeProperty(display, w, XdndAware, XA_ATOM, 32,
PropModeReplace,
(unsigned char*)&xdnd_version, 1);
- XFlush(display);
+ X11_XFlush(display);
return 0;
}
@@ -618,14 +628,14 @@ X11_GetWindowTitle(_THIS, Window xwindow)
unsigned char *propdata;
char *title = NULL;
- status = XGetWindowProperty(display, xwindow, data->_NET_WM_NAME,
+ status = X11_XGetWindowProperty(display, xwindow, data->_NET_WM_NAME,
0L, 8192L, False, data->UTF8_STRING, &real_type, &real_format,
&items_read, &items_left, &propdata);
if (status == Success && propdata) {
title = SDL_strdup(SDL_static_cast(char*, propdata));
- XFree(propdata);
+ X11_XFree(propdata);
} else {
- status = XGetWindowProperty(display, xwindow, XA_WM_NAME,
+ status = X11_XGetWindowProperty(display, xwindow, XA_WM_NAME,
0L, 8192L, False, XA_STRING, &real_type, &real_format,
&items_read, &items_left, &propdata);
if (status == Success && propdata) {
@@ -658,21 +668,21 @@ X11_SetWindowTitle(_THIS, SDL_Window * window)
SDL_OutOfMemory();
return;
}
- status = XStringListToTextProperty(&title_locale, 1, &titleprop);
+ status = X11_XStringListToTextProperty(&title_locale, 1, &titleprop);
SDL_free(title_locale);
if (status) {
- XSetTextProperty(display, data->xwindow, &titleprop, XA_WM_NAME);
- XFree(titleprop.value);
+ X11_XSetTextProperty(display, data->xwindow, &titleprop, XA_WM_NAME);
+ X11_XFree(titleprop.value);
}
#ifdef X_HAVE_UTF8_STRING
if (SDL_X11_HAVE_UTF8) {
status =
- Xutf8TextListToTextProperty(display, (char **) &title, 1,
+ X11_Xutf8TextListToTextProperty(display, (char **) &title, 1,
XUTF8StringStyle, &titleprop);
if (status == Success) {
- XSetTextProperty(display, data->xwindow, &titleprop,
+ X11_XSetTextProperty(display, data->xwindow, &titleprop,
_NET_WM_NAME);
- XFree(titleprop.value);
+ X11_XFree(titleprop.value);
}
}
#endif
@@ -683,27 +693,27 @@ X11_SetWindowTitle(_THIS, SDL_Window * window)
SDL_OutOfMemory();
return;
}
- status = XStringListToTextProperty(&icon_locale, 1, &iconprop);
+ status = X11_XStringListToTextProperty(&icon_locale, 1, &iconprop);
SDL_free(icon_locale);
if (status) {
- XSetTextProperty(display, data->xwindow, &iconprop,
+ X11_XSetTextProperty(display, data->xwindow, &iconprop,
XA_WM_ICON_NAME);
- XFree(iconprop.value);
+ X11_XFree(iconprop.value);
}
#ifdef X_HAVE_UTF8_STRING
if (SDL_X11_HAVE_UTF8) {
status =
- Xutf8TextListToTextProperty(display, (char **) &icon, 1,
+ X11_Xutf8TextListToTextProperty(display, (char **) &icon, 1,
XUTF8StringStyle, &iconprop);
if (status == Success) {
- XSetTextProperty(display, data->xwindow, &iconprop,
+ X11_XSetTextProperty(display, data->xwindow, &iconprop,
_NET_WM_ICON_NAME);
- XFree(iconprop.value);
+ X11_XFree(iconprop.value);
}
}
#endif
}
- XFlush(display);
+ X11_XFlush(display);
}
void
@@ -735,15 +745,15 @@ X11_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
*dst++ = *src++;
}
}
- XChangeProperty(display, data->xwindow, _NET_WM_ICON, XA_CARDINAL,
+ X11_XChangeProperty(display, data->xwindow, _NET_WM_ICON, XA_CARDINAL,
32, PropModeReplace, (unsigned char *) propdata,
propsize);
}
SDL_free(propdata);
} else {
- XDeleteProperty(display, data->xwindow, _NET_WM_ICON);
+ X11_XDeleteProperty(display, data->xwindow, _NET_WM_ICON);
}
- XFlush(display);
+ X11_XFlush(display);
}
void
@@ -752,8 +762,8 @@ X11_SetWindowPosition(_THIS, SDL_Window * window)
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
Display *display = data->videodata->display;
- XMoveWindow(display, data->xwindow, window->x, window->y);
- XFlush(display);
+ X11_XMoveWindow(display, data->xwindow, window->x, window->y);
+ X11_XFlush(display);
}
void
@@ -763,26 +773,26 @@ X11_SetWindowMinimumSize(_THIS, SDL_Window * window)
Display *display = data->videodata->display;
if (window->flags & SDL_WINDOW_RESIZABLE) {
- XSizeHints *sizehints = XAllocSizeHints();
+ XSizeHints *sizehints = X11_XAllocSizeHints();
long userhints;
- XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
+ X11_XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
sizehints->min_width = window->min_w;
sizehints->min_height = window->min_h;
sizehints->flags |= PMinSize;
- XSetWMNormalHints(display, data->xwindow, sizehints);
+ X11_XSetWMNormalHints(display, data->xwindow, sizehints);
- XFree(sizehints);
+ X11_XFree(sizehints);
/* See comment in X11_SetWindowSize. */
- XResizeWindow(display, data->xwindow, window->w, window->h);
- XMoveWindow(display, data->xwindow, window->x, window->y);
- XRaiseWindow(display, data->xwindow);
+ X11_XResizeWindow(display, data->xwindow, window->w, window->h);
+ X11_XMoveWindow(display, data->xwindow, window->x, window->y);
+ X11_XRaiseWindow(display, data->xwindow);
}
- XFlush(display);
+ X11_XFlush(display);
}
void
@@ -792,26 +802,26 @@ X11_SetWindowMaximumSize(_THIS, SDL_Window * window)
Display *display = data->videodata->display;
if (window->flags & SDL_WINDOW_RESIZABLE) {
- XSizeHints *sizehints = XAllocSizeHints();
+ XSizeHints *sizehints = X11_XAllocSizeHints();
long userhints;
- XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
+ X11_XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
sizehints->max_width = window->max_w;
sizehints->max_height = window->max_h;
sizehints->flags |= PMaxSize;
- XSetWMNormalHints(display, data->xwindow, sizehints);
+ X11_XSetWMNormalHints(display, data->xwindow, sizehints);
- XFree(sizehints);
+ X11_XFree(sizehints);
/* See comment in X11_SetWindowSize. */
- XResizeWindow(display, data->xwindow, window->w, window->h);
- XMoveWindow(display, data->xwindow, window->x, window->y);
- XRaiseWindow(display, data->xwindow);
+ X11_XResizeWindow(display, data->xwindow, window->w, window->h);
+ X11_XMoveWindow(display, data->xwindow, window->x, window->y);
+ X11_XRaiseWindow(display, data->xwindow);
}
- XFlush(display);
+ X11_XFlush(display);
}
void
@@ -824,20 +834,20 @@ X11_SetWindowSize(_THIS, SDL_Window * window)
X11_ResizeWindowShape(window);
}
if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
- /* Apparently, if the X11 Window is set to a 'non-resizable' window, you cannot resize it using the XResizeWindow, thus
- we must set the size hints to adjust the window size.*/
- XSizeHints *sizehints = XAllocSizeHints();
+ /* Apparently, if the X11 Window is set to a 'non-resizable' window, you cannot resize it using the X11_XResizeWindow, thus
+ we must set the size hints to adjust the window size. */
+ XSizeHints *sizehints = X11_XAllocSizeHints();
long userhints;
- XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
+ X11_XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
sizehints->min_width = sizehints->max_width = window->w;
sizehints->min_height = sizehints->max_height = window->h;
sizehints->flags |= PMinSize | PMaxSize;
- XSetWMNormalHints(display, data->xwindow, sizehints);
+ X11_XSetWMNormalHints(display, data->xwindow, sizehints);
- XFree(sizehints);
+ X11_XFree(sizehints);
/* From Pierre-Loup:
WMs each have their little quirks with that. When you change the
@@ -855,14 +865,14 @@ X11_SetWindowSize(_THIS, SDL_Window * window)
hide/show, because there are supposedly subtle problems with doing so
and transitioning from windowed to fullscreen in Unity.
*/
- XResizeWindow(display, data->xwindow, window->w, window->h);
- XMoveWindow(display, data->xwindow, window->x, window->y);
- XRaiseWindow(display, data->xwindow);
+ X11_XResizeWindow(display, data->xwindow, window->w, window->h);
+ X11_XMoveWindow(display, data->xwindow, window->x, window->y);
+ X11_XRaiseWindow(display, data->xwindow);
} else {
- XResizeWindow(display, data->xwindow, window->w, window->h);
+ X11_XResizeWindow(display, data->xwindow, window->w, window->h);
}
- XFlush(display);
+ X11_XFlush(display);
}
void
@@ -877,25 +887,25 @@ X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered)
XEvent event;
SetWindowBordered(display, displaydata->screen, data->xwindow, bordered);
- XFlush(display);
- XIfEvent(display, &event, &isConfigureNotify, (XPointer)&data->xwindow);
+ X11_XFlush(display);
+ X11_XIfEvent(display, &event, &isConfigureNotify, (XPointer)&data->xwindow);
if (visible) {
XWindowAttributes attr;
do {
- XSync(display, False);
- XGetWindowAttributes(display, data->xwindow, &attr);
+ X11_XSync(display, False);
+ X11_XGetWindowAttributes(display, data->xwindow, &attr);
} while (attr.map_state != IsViewable);
if (focused) {
- XSetInputFocus(display, data->xwindow, RevertToParent, CurrentTime);
+ X11_XSetInputFocus(display, data->xwindow, RevertToParent, CurrentTime);
}
}
/* make sure these don't make it to the real event queue if they fired here. */
- XSync(display, False);
- XCheckIfEvent(display, &event, &isUnmapNotify, (XPointer)&data->xwindow);
- XCheckIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
+ X11_XSync(display, False);
+ X11_XCheckIfEvent(display, &event, &isUnmapNotify, (XPointer)&data->xwindow);
+ X11_XCheckIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
}
void
@@ -906,12 +916,12 @@ X11_ShowWindow(_THIS, SDL_Window * window)
XEvent event;
if (!X11_IsWindowMapped(_this, window)) {
- XMapRaised(display, data->xwindow);
+ X11_XMapRaised(display, data->xwindow);
/* Blocking wait for "MapNotify" event.
- * We use XIfEvent because XWindowEvent takes a mask rather than a type,
+ * We use X11_XIfEvent because pXWindowEvent takes a mask rather than a type,
* and XCheckTypedWindowEvent doesn't block */
- XIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
- XFlush(display);
+ X11_XIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
+ X11_XFlush(display);
}
}
@@ -924,10 +934,38 @@ X11_HideWindow(_THIS, SDL_Window * window)
XEvent event;
if (X11_IsWindowMapped(_this, window)) {
- XWithdrawWindow(display, data->xwindow, displaydata->screen);
+ X11_XWithdrawWindow(display, data->xwindow, displaydata->screen);
/* Blocking wait for "UnmapNotify" event */
- XIfEvent(display, &event, &isUnmapNotify, (XPointer)&data->xwindow);
- XFlush(display);
+ X11_XIfEvent(display, &event, &isUnmapNotify, (XPointer)&data->xwindow);
+ X11_XFlush(display);
+ }
+}
+
+static void
+SetWindowActive(_THIS, SDL_Window * window)
+{
+ SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+ SDL_DisplayData *displaydata =
+ (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+ Display *display = data->videodata->display;
+ Atom _NET_ACTIVE_WINDOW = data->videodata->_NET_ACTIVE_WINDOW;
+
+ if (X11_IsWindowMapped(_this, window)) {
+ XEvent e;
+
+ SDL_zero(e);
+ e.xany.type = ClientMessage;
+ e.xclient.message_type = _NET_ACTIVE_WINDOW;
+ e.xclient.format = 32;
+ e.xclient.window = data->xwindow;
+ e.xclient.data.l[0] = 1; /* source indication. 1 = application */
+ e.xclient.data.l[1] = CurrentTime;
+ e.xclient.data.l[2] = 0;
+
+ X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0,
+ SubstructureNotifyMask | SubstructureRedirectMask, &e);
+
+ X11_XFlush(display);
}
}
@@ -937,8 +975,9 @@ X11_RaiseWindow(_THIS, SDL_Window * window)
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
Display *display = data->videodata->display;
- XRaiseWindow(display, data->xwindow);
- XFlush(display);
+ X11_XRaiseWindow(display, data->xwindow);
+ SetWindowActive(_this, window);
+ X11_XFlush(display);
}
static void
@@ -972,12 +1011,12 @@ SetWindowMaximized(_THIS, SDL_Window * window, SDL_bool maximized)
e.xclient.data.l[2] = _NET_WM_STATE_MAXIMIZED_HORZ;
e.xclient.data.l[3] = 0l;
- XSendEvent(display, RootWindow(display, displaydata->screen), 0,
+ X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0,
SubstructureNotifyMask | SubstructureRedirectMask, &e);
} else {
X11_SetNetWMState(_this, data->xwindow, window->flags);
}
- XFlush(display);
+ X11_XFlush(display);
}
void
@@ -994,44 +1033,16 @@ X11_MinimizeWindow(_THIS, SDL_Window * window)
(SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
Display *display = data->videodata->display;
- XIconifyWindow(display, data->xwindow, displaydata->screen);
- XFlush(display);
-}
-
-static void
-SetWindowActive(_THIS, SDL_Window * window)
-{
- SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
- SDL_DisplayData *displaydata =
- (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
- Display *display = data->videodata->display;
- Atom _NET_ACTIVE_WINDOW = data->videodata->_NET_ACTIVE_WINDOW;
-
- if (X11_IsWindowMapped(_this, window)) {
- XEvent e;
-
- SDL_zero(e);
- e.xany.type = ClientMessage;
- e.xclient.message_type = _NET_ACTIVE_WINDOW;
- e.xclient.format = 32;
- e.xclient.window = data->xwindow;
- e.xclient.data.l[0] = 1; /* source indication. 1 = application */
- e.xclient.data.l[1] = CurrentTime;
- e.xclient.data.l[2] = 0;
-
- XSendEvent(display, RootWindow(display, displaydata->screen), 0,
- SubstructureNotifyMask | SubstructureRedirectMask, &e);
-
- XFlush(display);
- }
+ X11_XIconifyWindow(display, data->xwindow, displaydata->screen);
+ X11_XFlush(display);
}
void
X11_RestoreWindow(_THIS, SDL_Window * window)
{
SetWindowMaximized(_this, window, SDL_FALSE);
- SetWindowActive(_this, window);
X11_ShowWindow(_this, window);
+ SetWindowActive(_this, window);
}
/* This asks the Window Manager to handle fullscreen for us. Most don't do it right, though. */
@@ -1050,9 +1061,9 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
/* Compiz refuses fullscreen toggle if we're not resizable, so update the hints so we
can be resized to the fullscreen resolution (or reset so we're not resizable again) */
- XSizeHints *sizehints = XAllocSizeHints();
+ XSizeHints *sizehints = X11_XAllocSizeHints();
long flags = 0;
- XGetWMNormalHints(display, data->xwindow, sizehints, &flags);
+ X11_XGetWMNormalHints(display, data->xwindow, sizehints, &flags);
/* set the resize flags on */
if (fullscreen) {
/* we are going fullscreen so turn the flags off */
@@ -1063,8 +1074,8 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
sizehints->min_width = sizehints->max_width = window->windowed.w;
sizehints->min_height = sizehints->max_height = window->windowed.h;
}
- XSetWMNormalHints(display, data->xwindow, sizehints);
- XFree(sizehints);
+ X11_XSetWMNormalHints(display, data->xwindow, sizehints);
+ X11_XFree(sizehints);
}
SDL_zero(e);
@@ -1077,7 +1088,7 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
e.xclient.data.l[1] = _NET_WM_STATE_FULLSCREEN;
e.xclient.data.l[3] = 0l;
- XSendEvent(display, RootWindow(display, displaydata->screen), 0,
+ X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0,
SubstructureNotifyMask | SubstructureRedirectMask, &e);
} else {
Uint32 flags;
@@ -1093,13 +1104,13 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
if (data->visual->class == DirectColor) {
if ( fullscreen ) {
- XInstallColormap(display, data->colormap);
+ X11_XInstallColormap(display, data->colormap);
} else {
- XUninstallColormap(display, data->colormap);
+ X11_XUninstallColormap(display, data->colormap);
}
}
- XFlush(display);
+ X11_XFlush(display);
}
/* This handles fullscreen itself, outside the Window Manager. */
@@ -1134,48 +1145,48 @@ X11_BeginWindowFullscreenLegacy(_THIS, SDL_Window * window, SDL_VideoDisplay * _
xattr.colormap = data->colormap;
xattrmask |= CWColormap;
- data->fswindow = XCreateWindow(display, root,
+ data->fswindow = X11_XCreateWindow(display, root,
rect.x, rect.y, rect.w, rect.h, 0,
displaydata->depth, InputOutput,
visual, xattrmask, &xattr);
- XSelectInput(display, data->fswindow, StructureNotifyMask);
- XSetWindowBackground(display, data->fswindow, 0);
- XInstallColormap(display, data->colormap);
- XClearWindow(display, data->fswindow);
- XMapRaised(display, data->fswindow);
+ X11_XSelectInput(display, data->fswindow, StructureNotifyMask);
+ X11_XSetWindowBackground(display, data->fswindow, 0);
+ X11_XInstallColormap(display, data->colormap);
+ X11_XClearWindow(display, data->fswindow);
+ X11_XMapRaised(display, data->fswindow);
/* Make sure the fswindow is in view by warping mouse to the corner */
- XUngrabPointer(display, CurrentTime);
- XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
+ X11_XUngrabPointer(display, CurrentTime);
+ X11_XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
/* Wait to be mapped, filter Unmap event out if it arrives. */
- XIfEvent(display, &ev, &isMapNotify, (XPointer)&data->fswindow);
- XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->fswindow);
+ X11_XIfEvent(display, &ev, &isMapNotify, (XPointer)&data->fswindow);
+ X11_XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->fswindow);
#if SDL_VIDEO_DRIVER_X11_XVIDMODE
if ( displaydata->use_vidmode ) {
- XF86VidModeLockModeSwitch(display, screen, True);
+ X11_XF86VidModeLockModeSwitch(display, screen, True);
}
#endif
SetWindowBordered(display, displaydata->screen, data->xwindow, SDL_FALSE);
/* Center actual window within our cover-the-screen window. */
- XReparentWindow(display, data->xwindow, data->fswindow,
+ X11_XReparentWindow(display, data->xwindow, data->fswindow,
(rect.w - window->w) / 2, (rect.h - window->h) / 2);
/* Move the mouse to the upper left to make sure it's on-screen */
- XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
+ X11_XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
/* Center mouse in the fullscreen window. */
rect.x += (rect.w / 2);
rect.y += (rect.h / 2);
- XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
+ X11_XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
/* Wait to be mapped, filter Unmap event out if it arrives. */
- XIfEvent(display, &ev, &isMapNotify, (XPointer)&data->xwindow);
- XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->xwindow);
+ X11_XIfEvent(display, &ev, &isMapNotify, (XPointer)&data->xwindow);
+ X11_XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->xwindow);
SDL_UpdateWindowGrab(window);
}
@@ -1199,27 +1210,27 @@ X11_EndWindowFullscreenLegacy(_THIS, SDL_Window * window, SDL_VideoDisplay * _di
#if SDL_VIDEO_DRIVER_X11_VIDMODE
if ( displaydata->use_vidmode ) {
- XF86VidModeLockModeSwitch(display, screen, False);
+ X11_XF86VidModeLockModeSwitch(display, screen, False);
}
#endif
SDL_UpdateWindowGrab(window);
- XReparentWindow(display, data->xwindow, root, window->x, window->y);
+ X11_XReparentWindow(display, data->xwindow, root, window->x, window->y);
/* flush these events so they don't confuse normal event handling */
- XSync(display, False);
- XCheckIfEvent(display, &ev, &isMapNotify, (XPointer)&data->xwindow);
- XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->xwindow);
+ X11_XSync(display, False);
+ X11_XCheckIfEvent(display, &ev, &isMapNotify, (XPointer)&data->xwindow);
+ X11_XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->xwindow);
SetWindowBordered(display, screen, data->xwindow,
(window->flags & SDL_WINDOW_BORDERLESS) == 0);
- XWithdrawWindow(display, fswindow, screen);
+ X11_XWithdrawWindow(display, fswindow, screen);
/* Wait to be unmapped. */
- XIfEvent(display, &ev, &isUnmapNotify, (XPointer)&fswindow);
- XDestroyWindow(display, fswindow);
+ X11_XIfEvent(display, &ev, &isUnmapNotify, (XPointer)&fswindow);
+ X11_XDestroyWindow(display, fswindow);
}
@@ -1317,8 +1328,8 @@ X11_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp)
colorcells[i].flags = DoRed | DoGreen | DoBlue;
}
- XStoreColors(display, colormap, colorcells, ncolors);
- XFlush(display);
+ X11_XStoreColors(display, colormap, colorcells, ncolors);
+ X11_XFlush(display);
SDL_free(colorcells);
return 0;
@@ -1343,7 +1354,7 @@ X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
/* Try to grab the mouse */
for (;;) {
int result =
- XGrabPointer(display, data->xwindow, True, 0, GrabModeAsync,
+ X11_XGrabPointer(display, data->xwindow, True, 0, GrabModeAsync,
GrabModeAsync, data->xwindow, None, CurrentTime);
if (result == GrabSuccess) {
break;
@@ -1352,7 +1363,7 @@ X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
}
/* Raise the window if we grab the mouse */
- XRaiseWindow(display, data->xwindow);
+ X11_XRaiseWindow(display, data->xwindow);
/* Now grab the keyboard */
hint = SDL_GetHint(SDL_HINT_GRAB_KEYBOARD);
@@ -1365,14 +1376,14 @@ X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
grab_keyboard = oldstyle_fullscreen;
}
if (grab_keyboard) {
- XGrabKeyboard(display, data->xwindow, True, GrabModeAsync,
+ X11_XGrabKeyboard(display, data->xwindow, True, GrabModeAsync,
GrabModeAsync, CurrentTime);
}
} else {
- XUngrabPointer(display, CurrentTime);
- XUngrabKeyboard(display, CurrentTime);
+ X11_XUngrabPointer(display, CurrentTime);
+ X11_XUngrabKeyboard(display, CurrentTime);
}
- XSync(display, False);
+ X11_XSync(display, False);
}
void
@@ -1400,12 +1411,12 @@ X11_DestroyWindow(_THIS, SDL_Window * window)
}
#ifdef X_HAVE_UTF8_STRING
if (data->ic) {
- XDestroyIC(data->ic);
+ X11_XDestroyIC(data->ic);
}
#endif
if (data->created) {
- XDestroyWindow(display, data->xwindow);
- XFlush(display);
+ X11_XDestroyWindow(display, data->xwindow);
+ X11_XFlush(display);
}
SDL_free(data);
}
diff --git a/src/video/x11/SDL_x11window.h b/src/video/x11/SDL_x11window.h
index f53fd8a..b0eff5c 100644
--- a/src/video/x11/SDL_x11window.h
+++ b/src/video/x11/SDL_x11window.h
@@ -30,6 +30,10 @@
#define PENDING_FOCUS_IN_TIME 200
#define PENDING_FOCUS_OUT_TIME 200
+#if SDL_VIDEO_OPENGL_EGL
+#include <EGL/egl.h>
+#endif
+
typedef enum
{
PENDING_FOCUS_NONE,
@@ -59,6 +63,9 @@ typedef struct
struct SDL_VideoData *videodata;
Atom xdnd_req;
Window xdnd_source;
+#if SDL_VIDEO_OPENGL_EGL
+ EGLSurface egl_surface;
+#endif
} SDL_WindowData;
extern void X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags);
diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c
index 1b86c67..719d2e3 100644
--- a/src/video/x11/SDL_x11xinput2.c
+++ b/src/video/x11/SDL_x11xinput2.c
@@ -36,7 +36,7 @@ static int xinput2_initialized = 0;
static int xinput2_multitouch_supported = 0;
#endif
-/* Opcode returned XQueryExtension
+/* Opcode returned X11_XQueryExtension
* It will be used in event processing
* to know that the event came from
* this extension */
@@ -82,40 +82,40 @@ X11_InitXinput2(_THIS)
* "As XI2 progresses it becomes important that you use this call as the server may treat the client
* differently depending on the supported version".
*
- * FIXME:event and err are not needed but if not passed XQueryExtension returns SegmentationFault
+ * FIXME:event and err are not needed but if not passed X11_XQueryExtension returns SegmentationFault
*/
if (!SDL_X11_HAVE_XINPUT2 ||
- !XQueryExtension(data->display, "XInputExtension", &xinput2_opcode, &event, &err)) {
+ !X11_XQueryExtension(data->display, "XInputExtension", &xinput2_opcode, &event, &err)) {
return;
}
outmajor = major;
outminor = minor;
- if (XIQueryVersion(data->display, &outmajor, &outminor) != Success) {
+ if (X11_XIQueryVersion(data->display, &outmajor, &outminor) != Success) {
return;
}
- /*Check supported version*/
+ /* Check supported version */
if(outmajor * 1000 + outminor < major * 1000 + minor) {
- /*X server does not support the version we want*/
+ /* X server does not support the version we want */
return;
}
xinput2_initialized = 1;
#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
- /*XInput 2.2*/
+ /* XInput 2.2 */
if(outmajor * 1000 + outminor >= major * 1000 + minor) {
xinput2_multitouch_supported = 1;
}
#endif
- /*Enable Raw motion events for this display*/
+ /* Enable Raw motion events for this display */
eventmask.deviceid = XIAllMasterDevices;
eventmask.mask_len = sizeof(mask);
eventmask.mask = mask;
XISetMask(mask, XI_RawMotion);
- if (XISelectEvents(data->display,DefaultRootWindow(data->display),&eventmask,1) != Success) {
+ if (X11_XISelectEvents(data->display,DefaultRootWindow(data->display),&eventmask,1) != Success) {
return;
}
#endif
@@ -179,7 +179,7 @@ X11_InitXinput2Multitouch(_THIS)
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
XIDeviceInfo *info;
int ndevices,i,j;
- info = XIQueryDevice(data->display, XIAllMasterDevices, &ndevices);
+ info = X11_XIQueryDevice(data->display, XIAllMasterDevices, &ndevices);
for (i = 0; i < ndevices; i++) {
XIDeviceInfo *dev = &info[i];
@@ -188,7 +188,7 @@ X11_InitXinput2Multitouch(_THIS)
XIAnyClassInfo *class = dev->classes[j];
XITouchClassInfo *t = (XITouchClassInfo*)class;
- /*Only touch devices*/
+ /* Only touch devices */
if (class->type != XITouchClass)
continue;
@@ -198,7 +198,7 @@ X11_InitXinput2Multitouch(_THIS)
}
}
}
- XIFreeDeviceInfo(info);
+ X11_XIFreeDeviceInfo(info);
#endif
}
@@ -206,14 +206,17 @@ void
X11_Xinput2SelectTouch(_THIS, SDL_Window *window)
{
#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+ SDL_VideoData *data = NULL;
+ XIEventMask eventmask;
+ unsigned char mask[3] = { 0,0,0 };
+ SDL_WindowData *window_data = NULL;
+
if (!X11_Xinput2IsMultitouchSupported()) {
return;
}
- SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
- XIEventMask eventmask;
- unsigned char mask[3] = { 0,0,0 };
- SDL_WindowData *window_data = (SDL_WindowData*)window->driverdata;
+ data = (SDL_VideoData *) _this->driverdata;
+ window_data = (SDL_WindowData*)window->driverdata;
eventmask.deviceid = XIAllMasterDevices;
eventmask.mask_len = sizeof(mask);
@@ -223,7 +226,7 @@ X11_Xinput2SelectTouch(_THIS, SDL_Window *window)
XISetMask(mask, XI_TouchUpdate);
XISetMask(mask, XI_TouchEnd);
- XISelectEvents(data->display,window_data->xwindow,&eventmask,1);
+ X11_XISelectEvents(data->display,window_data->xwindow,&eventmask,1);
#endif
}
diff --git a/src/video/x11/SDL_x11xinput2.h b/src/video/x11/SDL_x11xinput2.h
index 56a4b90..920c170 100644
--- a/src/video/x11/SDL_x11xinput2.h
+++ b/src/video/x11/SDL_x11xinput2.h
@@ -24,8 +24,8 @@
#define _SDL_x11xinput2_h
#ifndef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
-/*Define XGenericEventCookie as forward declaration when
- *xinput2 is not available in order to compile*/
+/* Define XGenericEventCookie as forward declaration when
+ *xinput2 is not available in order to compile */
struct XGenericEventCookie;
typedef struct XGenericEventCookie XGenericEventCookie;
#endif
diff --git a/src/video/x11/imKStoUCS.h b/src/video/x11/imKStoUCS.h
index 252f9a4..cc684c2 100644
--- a/src/video/x11/imKStoUCS.h
+++ b/src/video/x11/imKStoUCS.h
@@ -28,4 +28,4 @@ Project.
extern unsigned int X11_KeySymToUcs4(KeySym keysym);
-#endif /*_imKStoUCS_h */
+#endif /* _imKStoUCS_h */
diff --git a/test/Makefile.in b/test/Makefile.in
index 2a39afc..f57c460 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -4,7 +4,7 @@ srcdir = @srcdir@
CC = @CC@
EXE = @EXE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -g
LIBS = @LIBS@
TARGETS = \
@@ -14,6 +14,7 @@ TARGETS = \
testautomation$(EXE) \
testdraw2$(EXE) \
testdrawchessboard$(EXE) \
+ testdropfile$(EXE) \
testerror$(EXE) \
testfile$(EXE) \
testgamecontroller$(EXE) \
@@ -36,6 +37,7 @@ TARGETS = \
testoverlay2$(EXE) \
testplatform$(EXE) \
testpower$(EXE) \
+ testfilesystem$(EXE) \
testrendertarget$(EXE) \
testresample$(EXE) \
testscale$(EXE) \
@@ -107,6 +109,9 @@ testdraw2$(EXE): $(srcdir)/testdraw2.c
testdrawchessboard$(EXE): $(srcdir)/testdrawchessboard.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+testdropfile$(EXE): $(srcdir)/testdropfile.c
+ $(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+
testerror$(EXE): $(srcdir)/testerror.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
@@ -123,7 +128,7 @@ testgl2$(EXE): $(srcdir)/testgl2.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS) @GLLIB@ @MATHLIB@
testgles$(EXE): $(srcdir)/testgles.c
- $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @GLLIB@ @MATHLIB@
+ $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @GLESLIB@ @MATHLIB@
testhaptic$(EXE): $(srcdir)/testhaptic.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
@@ -180,6 +185,9 @@ testplatform$(EXE): $(srcdir)/testplatform.c
testpower$(EXE): $(srcdir)/testpower.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+testfilesystem$(EXE): $(srcdir)/testfilesystem.c
+ $(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+
testrendertarget$(EXE): $(srcdir)/testrendertarget.c
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
diff --git a/test/checkkeys.c b/test/checkkeys.c
index 61e8be0..5f2d148 100644
--- a/test/checkkeys.c
+++ b/test/checkkeys.c
@@ -117,13 +117,13 @@ PrintKey(SDL_Keysym * sym, SDL_bool pressed, SDL_bool repeat)
static void
PrintText(char *text)
{
- unsigned char *spot, expanded[1024];
+ char *spot, expanded[1024];
expanded[0] = '\0';
for ( spot = text; *spot; ++spot )
{
size_t length = SDL_strlen(expanded);
- SDL_snprintf(expanded + length, sizeof(expanded) - length, "\\x%.2x", *spot);
+ SDL_snprintf(expanded + length, sizeof(expanded) - length, "\\x%.2x", (unsigned char)*spot);
}
SDL_Log("Text (%s): \"%s%s\"\n", expanded, *text == '"' ? "\\" : "", text);
}
@@ -134,10 +134,13 @@ main(int argc, char *argv[])
SDL_Window *window;
SDL_Event event;
int done;
+
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
/* Initialize SDL */
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
}
@@ -146,7 +149,7 @@ main(int argc, char *argv[])
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
640, 480, 0);
if (!window) {
- fprintf(stderr, "Couldn't create 640x480 window: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create 640x480 window: %s\n",
SDL_GetError());
quit(2);
}
@@ -166,7 +169,7 @@ main(int argc, char *argv[])
switch (event.type) {
case SDL_KEYDOWN:
case SDL_KEYUP:
- PrintKey(&event.key.keysym, event.key.state, event.key.repeat);
+ PrintKey(&event.key.keysym, (event.key.state == SDL_PRESSED) ? SDL_TRUE : SDL_FALSE, (event.key.repeat) ? SDL_TRUE : SDL_FALSE);
break;
case SDL_TEXTINPUT:
PrintText(event.text.text);
diff --git a/test/configure b/test/configure
index 319c032..136606c 100755
--- a/test/configure
+++ b/test/configure
@@ -586,6 +586,7 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
SDL_TTF_LIB
XLIB
+GLESLIB
GLLIB
CPP
XMKMF
@@ -3785,16 +3786,21 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
if test x$have_x = xyes; then
- if test x$ac_x_includes = xno || test x$ac_x_includes = x; then
+ if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone || test "x$ac_x_includes" = x; then
:
else
CFLAGS="$CFLAGS -I$ac_x_includes"
fi
- if test x$ac_x_libraries = xno || test x$ac_x_libraries = x; then
+ if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
:
else
- XPATH="-L$ac_x_libraries"
- XLIB="-L$ac_x_libraries -lX11"
+ if test "x$ac_x_libraries" = x; then
+ XPATH=""
+ XLIB="-lX11"
+ else
+ XPATH="-L$ac_x_libraries"
+ XLIB="-L$ac_x_libraries -lX11"
+ fi
fi
fi
@@ -3855,19 +3861,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
$as_echo "$have_opengles" >&6; }
GLLIB=""
+GLESLIB=""
if test x$have_opengles = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGLES"
- GLLIB="$XPATH -lGLESv1_CM"
-elif test x$have_opengl = xyes; then
+ GLESLIB="$XPATH -lGLESv1_CM"
+fi
+if test x$have_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
GLLIB="$XPATH $SYS_GL_LIBS"
-else
- GLLIB=""
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TTF_Init in -lSDL2_ttf" >&5
$as_echo_n "checking for TTF_Init in -lSDL2_ttf... " >&6; }
if ${ac_cv_lib_SDL2_ttf_TTF_Init+:} false; then :
diff --git a/test/configure.in b/test/configure.in
index b748007..eb30287 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -91,16 +91,21 @@ LIBS="$LIBS -lSDL2_test $SDL_LIBS"
dnl Check for X11 path, needed for OpenGL on some systems
AC_PATH_X
if test x$have_x = xyes; then
- if test x$ac_x_includes = xno || test x$ac_x_includes = x; then
+ if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone || test "x$ac_x_includes" = x; then
:
else
CFLAGS="$CFLAGS -I$ac_x_includes"
fi
- if test x$ac_x_libraries = xno || test x$ac_x_libraries = x; then
+ if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
:
else
- XPATH="-L$ac_x_libraries"
- XLIB="-L$ac_x_libraries -lX11"
+ if test "x$ac_x_libraries" = x; then
+ XPATH=""
+ XLIB="-lX11"
+ else
+ XPATH="-L$ac_x_libraries"
+ XLIB="-L$ac_x_libraries -lX11"
+ fi
fi
fi
@@ -131,17 +136,18 @@ have_opengles=yes
AC_MSG_RESULT($have_opengles)
GLLIB=""
+GLESLIB=""
if test x$have_opengles = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGLES"
- GLLIB="$XPATH -lGLESv1_CM"
-elif test x$have_opengl = xyes; then
+ GLESLIB="$XPATH -lGLESv1_CM"
+fi
+if test x$have_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
GLLIB="$XPATH $SYS_GL_LIBS"
-else
- GLLIB=""
fi
AC_SUBST(GLLIB)
+AC_SUBST(GLESLIB)
AC_SUBST(XLIB)
dnl Check for SDL_ttf
diff --git a/test/loopwave.c b/test/loopwave.c
index de8329a..403d16c 100644
--- a/test/loopwave.c
+++ b/test/loopwave.c
@@ -1,146 +1,144 @@
-/*
- Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely.
-*/
-
-/* Program to load a wave file and loop playing it using SDL sound */
-
-/* loopwaves.c is much more robust in handling WAVE files --
- This is only for simple WAVEs
-*/
-#include "SDL_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
-#include "SDL.h"
-#include "SDL_audio.h"
-
-struct
-{
- SDL_AudioSpec spec;
- Uint8 *sound; /* Pointer to wave data */
- Uint32 soundlen; /* Length of wave data */
- int soundpos; /* Current play position */
-} wave;
-
-
-/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
-static void
-quit(int rc)
-{
- SDL_Quit();
- exit(rc);
-}
-
-
-void SDLCALL
-fillerup(void *unused, Uint8 * stream, int len)
-{
- Uint8 *waveptr;
- int waveleft;
-
- /* Set up the pointers */
- waveptr = wave.sound + wave.soundpos;
- waveleft = wave.soundlen - wave.soundpos;
-
- /* Go! */
- while (waveleft <= len) {
- SDL_memcpy(stream, waveptr, waveleft);
- stream += waveleft;
- len -= waveleft;
- waveptr = wave.sound;
- waveleft = wave.soundlen;
- wave.soundpos = 0;
- }
- SDL_memcpy(stream, waveptr, len);
- wave.soundpos += len;
-}
-
-static int done = 0;
-void
-poked(int sig)
-{
- done = 1;
-}
-
-int
-main(int argc, char *argv[])
-{
- int i;
- char filename[4096];
-
- /* Load the SDL library */
- if (SDL_Init(SDL_INIT_AUDIO) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
- return (1);
- }
-
- if (argc >= 1) {
- SDL_strlcpy(filename, argv[1], sizeof(filename));
- } else {
- SDL_strlcpy(filename, "sample.wav", sizeof(filename));
- }
- /* Load the wave file into memory */
- if (SDL_LoadWAV(filename, &wave.spec, &wave.sound, &wave.soundlen) == NULL) {
- fprintf(stderr, "Couldn't load %s: %s\n", filename, SDL_GetError());
- quit(1);
- }
-
- wave.spec.callback = fillerup;
-#if HAVE_SIGNAL_H
- /* Set the signals */
-#ifdef SIGHUP
- signal(SIGHUP, poked);
-#endif
- signal(SIGINT, poked);
-#ifdef SIGQUIT
- signal(SIGQUIT, poked);
-#endif
- signal(SIGTERM, poked);
-#endif /* HAVE_SIGNAL_H */
-
- /* Show the list of available drivers */
- printf("Available audio drivers: ");
- for (i = 0; i < SDL_GetNumAudioDrivers(); ++i) {
- if (i == 0) {
- printf("%s", SDL_GetAudioDriver(i));
- } else {
- printf(", %s", SDL_GetAudioDriver(i));
- }
- }
- printf("\n");
-
- /* Initialize fillerup() variables */
- if (SDL_OpenAudio(&wave.spec, NULL) < 0) {
- fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
- SDL_FreeWAV(wave.sound);
- quit(2);
- }
-
- printf("Using audio driver: %s\n", SDL_GetCurrentAudioDriver());
-
- /* Let the audio run */
- SDL_PauseAudio(0);
- while (!done && (SDL_GetAudioStatus() == SDL_AUDIO_PLAYING))
- SDL_Delay(1000);
-
- /* Clean up on signal */
- SDL_CloseAudio();
- SDL_FreeWAV(wave.sound);
- SDL_Quit();
- return (0);
-}
-
-/* vi: set ts=4 sw=4 expandtab: */
+/*
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely.
+*/
+
+/* Program to load a wave file and loop playing it using SDL sound */
+
+/* loopwaves.c is much more robust in handling WAVE files --
+ This is only for simple WAVEs
+*/
+#include "SDL_config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#if HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
+#include "SDL.h"
+#include "SDL_audio.h"
+
+struct
+{
+ SDL_AudioSpec spec;
+ Uint8 *sound; /* Pointer to wave data */
+ Uint32 soundlen; /* Length of wave data */
+ int soundpos; /* Current play position */
+} wave;
+
+
+/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
+static void
+quit(int rc)
+{
+ SDL_Quit();
+ exit(rc);
+}
+
+
+void SDLCALL
+fillerup(void *unused, Uint8 * stream, int len)
+{
+ Uint8 *waveptr;
+ int waveleft;
+
+ /* Set up the pointers */
+ waveptr = wave.sound + wave.soundpos;
+ waveleft = wave.soundlen - wave.soundpos;
+
+ /* Go! */
+ while (waveleft <= len) {
+ SDL_memcpy(stream, waveptr, waveleft);
+ stream += waveleft;
+ len -= waveleft;
+ waveptr = wave.sound;
+ waveleft = wave.soundlen;
+ wave.soundpos = 0;
+ }
+ SDL_memcpy(stream, waveptr, len);
+ wave.soundpos += len;
+}
+
+static int done = 0;
+void
+poked(int sig)
+{
+ done = 1;
+}
+
+int
+main(int argc, char *argv[])
+{
+ int i;
+ char filename[4096];
+
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
+ /* Load the SDL library */
+ if (SDL_Init(SDL_INIT_AUDIO) < 0) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ return (1);
+ }
+
+ if (argc >= 1) {
+ SDL_strlcpy(filename, argv[1], sizeof(filename));
+ } else {
+ SDL_strlcpy(filename, "sample.wav", sizeof(filename));
+ }
+ /* Load the wave file into memory */
+ if (SDL_LoadWAV(filename, &wave.spec, &wave.sound, &wave.soundlen) == NULL) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s\n", argv[1], SDL_GetError());
+ quit(1);
+ }
+
+ wave.spec.callback = fillerup;
+#if HAVE_SIGNAL_H
+ /* Set the signals */
+#ifdef SIGHUP
+ signal(SIGHUP, poked);
+#endif
+ signal(SIGINT, poked);
+#ifdef SIGQUIT
+ signal(SIGQUIT, poked);
+#endif
+ signal(SIGTERM, poked);
+#endif /* HAVE_SIGNAL_H */
+
+ /* Show the list of available drivers */
+ SDL_Log("Available audio drivers:");
+ for (i = 0; i < SDL_GetNumAudioDrivers(); ++i) {
+ SDL_Log("%i: %s", i, SDL_GetAudioDriver(i));
+ }
+
+ /* Initialize fillerup() variables */
+ if (SDL_OpenAudio(&wave.spec, NULL) < 0) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open audio: %s\n", SDL_GetError());
+ SDL_FreeWAV(wave.sound);
+ quit(2);
+ }
+
+ SDL_Log("Using audio driver: %s\n", SDL_GetCurrentAudioDriver());
+
+ /* Let the audio run */
+ SDL_PauseAudio(0);
+ while (!done && (SDL_GetAudioStatus() == SDL_AUDIO_PLAYING))
+ SDL_Delay(1000);
+
+ /* Clean up on signal */
+ SDL_CloseAudio();
+ SDL_FreeWAV(wave.sound);
+ SDL_Quit();
+ return (0);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testatomic.c b/test/testatomic.c
index be60a61..b360616 100644
--- a/test/testatomic.c
+++ b/test/testatomic.c
@@ -45,39 +45,39 @@ void RunBasicTest()
SDL_atomic_t v;
SDL_bool tfret = SDL_FALSE;
- printf("\nspin lock---------------------------------------\n\n");
+ SDL_Log("\nspin lock---------------------------------------\n\n");
SDL_AtomicLock(&lock);
- printf("AtomicLock lock=%d\n", lock);
+ SDL_Log("AtomicLock lock=%d\n", lock);
SDL_AtomicUnlock(&lock);
- printf("AtomicUnlock lock=%d\n", lock);
+ SDL_Log("AtomicUnlock lock=%d\n", lock);
- printf("\natomic -----------------------------------------\n\n");
+ SDL_Log("\natomic -----------------------------------------\n\n");
SDL_AtomicSet(&v, 0);
- tfret = SDL_AtomicSet(&v, 10) == 0;
- printf("AtomicSet(10) tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
- tfret = SDL_AtomicAdd(&v, 10) == 10;
- printf("AtomicAdd(10) tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
+ tfret = SDL_AtomicSet(&v, 10) == 0 ? SDL_TRUE : SDL_FALSE;
+ SDL_Log("AtomicSet(10) tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
+ tfret = SDL_AtomicAdd(&v, 10) == 10 ? SDL_TRUE : SDL_FALSE;
+ SDL_Log("AtomicAdd(10) tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
SDL_AtomicSet(&v, 0);
SDL_AtomicIncRef(&v);
- tfret = (SDL_AtomicGet(&v) == 1);
- printf("AtomicIncRef() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
+ tfret = (SDL_AtomicGet(&v) == 1) ? SDL_TRUE : SDL_FALSE;
+ SDL_Log("AtomicIncRef() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
SDL_AtomicIncRef(&v);
- tfret = (SDL_AtomicGet(&v) == 2);
- printf("AtomicIncRef() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
- tfret = (SDL_AtomicDecRef(&v) == SDL_FALSE);
- printf("AtomicDecRef() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
- tfret = (SDL_AtomicDecRef(&v) == SDL_TRUE);
- printf("AtomicDecRef() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
+ tfret = (SDL_AtomicGet(&v) == 2) ? SDL_TRUE : SDL_FALSE;
+ SDL_Log("AtomicIncRef() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
+ tfret = (SDL_AtomicDecRef(&v) == SDL_FALSE) ? SDL_TRUE : SDL_FALSE;
+ SDL_Log("AtomicDecRef() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
+ tfret = (SDL_AtomicDecRef(&v) == SDL_TRUE) ? SDL_TRUE : SDL_FALSE;
+ SDL_Log("AtomicDecRef() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
SDL_AtomicSet(&v, 10);
- tfret = (SDL_AtomicCAS(&v, 0, 20) == SDL_FALSE);
- printf("AtomicCAS() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
+ tfret = (SDL_AtomicCAS(&v, 0, 20) == SDL_FALSE) ? SDL_TRUE : SDL_FALSE;
+ SDL_Log("AtomicCAS() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
value = SDL_AtomicGet(&v);
- tfret = (SDL_AtomicCAS(&v, value, 20) == SDL_TRUE);
- printf("AtomicCAS() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
+ tfret = (SDL_AtomicCAS(&v, value, 20) == SDL_TRUE) ? SDL_TRUE : SDL_FALSE;
+ SDL_Log("AtomicCAS() tfret=%s val=%d\n", tf(tfret), SDL_AtomicGet(&v));
}
/**************************************************************************/
@@ -120,7 +120,7 @@ static
int adder(void* junk)
{
unsigned long N=NInter;
- printf("Thread subtracting %d %lu times\n",CountInc,N);
+ SDL_Log("Thread subtracting %d %lu times\n",CountInc,N);
while (N--) {
SDL_AtomicAdd(&good, -CountInc);
bad-=CountInc;
@@ -152,7 +152,7 @@ void runAdder(void)
end = SDL_GetTicks();
- printf("Finished in %f sec\n", (end - start) / 1000.f);
+ SDL_Log("Finished in %f sec\n", (end - start) / 1000.f);
}
static
@@ -161,28 +161,28 @@ void RunEpicTest()
int b;
atomicValue v;
- printf("\nepic test---------------------------------------\n\n");
+ SDL_Log("\nepic test---------------------------------------\n\n");
- printf("Size asserted to be >= 32-bit\n");
+ SDL_Log("Size asserted to be >= 32-bit\n");
SDL_assert(sizeof(atomicValue)>=4);
- printf("Check static initializer\n");
+ SDL_Log("Check static initializer\n");
v=SDL_AtomicGet(&good);
SDL_assert(v==42);
SDL_assert(bad==42);
- printf("Test negative values\n");
+ SDL_Log("Test negative values\n");
SDL_AtomicSet(&good, -5);
v=SDL_AtomicGet(&good);
SDL_assert(v==-5);
- printf("Verify maximum value\n");
+ SDL_Log("Verify maximum value\n");
SDL_AtomicSet(&good, CountTo);
v=SDL_AtomicGet(&good);
SDL_assert(v==CountTo);
- printf("Test compare and exchange\n");
+ SDL_Log("Test compare and exchange\n");
b=SDL_AtomicCAS(&good, 500, 43);
SDL_assert(!b); /* no swap since CountTo!=500 */
@@ -194,7 +194,7 @@ void RunEpicTest()
v=SDL_AtomicGet(&good);
SDL_assert(v==44);
- printf("Test Add\n");
+ SDL_Log("Test Add\n");
v=SDL_AtomicAdd(&good, 1);
SDL_assert(v==44);
@@ -206,7 +206,7 @@ void RunEpicTest()
v=SDL_AtomicGet(&good);
SDL_assert(v==55);
- printf("Test Add (Negative values)\n");
+ SDL_Log("Test Add (Negative values)\n");
v=SDL_AtomicAdd(&good, -20);
SDL_assert(v==55);
@@ -223,7 +223,7 @@ void RunEpicTest()
v=SDL_AtomicGet(&good);
SDL_assert(v==15);
- printf("Reset before count down test\n");
+ SDL_Log("Reset before count down test\n");
SDL_AtomicSet(&good, CountTo);
v=SDL_AtomicGet(&good);
SDL_assert(v==CountTo);
@@ -231,11 +231,11 @@ void RunEpicTest()
bad=CountTo;
SDL_assert(bad==CountTo);
- printf("Counting down from %d, Expect %d remaining\n",CountTo,Expect);
+ SDL_Log("Counting down from %d, Expect %d remaining\n",CountTo,Expect);
runAdder();
v=SDL_AtomicGet(&good);
- printf("Atomic %d Non-Atomic %d\n",v,bad);
+ SDL_Log("Atomic %d Non-Atomic %d\n",v,bad);
SDL_assert(v==Expect);
SDL_assert(bad!=Expect);
}
@@ -429,7 +429,7 @@ static SDL_bool EnqueueEvent_Mutex(SDL_EventQueue *queue, const SDL_Event *event
} else if (delta < 0) {
/* We ran into an old queue entry, which means it still needs to be dequeued */
} else {
- printf("ERROR: mutex failed!\n");
+ SDL_Log("ERROR: mutex failed!\n");
}
SDL_UnlockMutex(queue->mutex);
@@ -462,7 +462,7 @@ static SDL_bool DequeueEvent_Mutex(SDL_EventQueue *queue, SDL_Event *event)
} else if (delta < 0) {
/* We ran into an old queue entry, which means we've hit empty */
} else {
- printf("ERROR: mutex failed!\n");
+ SDL_Log("ERROR: mutex failed!\n");
}
SDL_UnlockMutex(queue->mutex);
@@ -598,9 +598,11 @@ static void RunFIFOTest(SDL_bool lock_free)
Uint32 start, end;
int i, j;
int grand_total;
+ char textBuffer[1024];
+ int len;
- printf("\nFIFO test---------------------------------------\n\n");
- printf("Mode: %s\n", lock_free ? "LockFree" : "Mutex");
+ SDL_Log("\nFIFO test---------------------------------------\n\n");
+ SDL_Log("Mode: %s\n", lock_free ? "LockFree" : "Mutex");
readersDone = SDL_CreateSemaphore(0);
writersDone = SDL_CreateSemaphore(0);
@@ -622,7 +624,7 @@ static void RunFIFOTest(SDL_bool lock_free)
#endif
/* Start the readers first */
- printf("Starting %d readers\n", NUM_READERS);
+ SDL_Log("Starting %d readers\n", NUM_READERS);
SDL_zero(readerData);
SDL_AtomicSet(&readersRunning, NUM_READERS);
for (i = 0; i < NUM_READERS; ++i) {
@@ -634,7 +636,7 @@ static void RunFIFOTest(SDL_bool lock_free)
}
/* Start up the writers */
- printf("Starting %d writers\n", NUM_WRITERS);
+ SDL_Log("Starting %d writers\n", NUM_WRITERS);
SDL_zero(writerData);
SDL_AtomicSet(&writersRunning, NUM_WRITERS);
for (i = 0; i < NUM_WRITERS; ++i) {
@@ -668,16 +670,16 @@ static void RunFIFOTest(SDL_bool lock_free)
SDL_DestroyMutex(queue.mutex);
}
- printf("Finished in %f sec\n", (end - start) / 1000.f);
+ SDL_Log("Finished in %f sec\n", (end - start) / 1000.f);
- printf("\n");
+ SDL_Log("\n");
for (i = 0; i < NUM_WRITERS; ++i) {
- printf("Writer %d wrote %d events, had %d waits\n", i, EVENTS_PER_WRITER, writerData[i].waits);
+ SDL_Log("Writer %d wrote %d events, had %d waits\n", i, EVENTS_PER_WRITER, writerData[i].waits);
}
- printf("Writers wrote %d total events\n", NUM_WRITERS*EVENTS_PER_WRITER);
+ SDL_Log("Writers wrote %d total events\n", NUM_WRITERS*EVENTS_PER_WRITER);
/* Print a breakdown of which readers read messages from which writer */
- printf("\n");
+ SDL_Log("\n");
grand_total = 0;
for (i = 0; i < NUM_READERS; ++i) {
int total = 0;
@@ -685,17 +687,21 @@ static void RunFIFOTest(SDL_bool lock_free)
total += readerData[i].counters[j];
}
grand_total += total;
- printf("Reader %d read %d events, had %d waits\n", i, total, readerData[i].waits);
- printf(" { ");
+ SDL_Log("Reader %d read %d events, had %d waits\n", i, total, readerData[i].waits);
+ SDL_snprintf(textBuffer, sizeof(textBuffer), " { ");
for (j = 0; j < NUM_WRITERS; ++j) {
if (j > 0) {
- printf(", ");
+ len = SDL_strlen(textBuffer);
+ SDL_snprintf(textBuffer + len, sizeof(textBuffer) - len, ", ");
}
- printf("%d", readerData[i].counters[j]);
+ len = SDL_strlen(textBuffer);
+ SDL_snprintf(textBuffer + len, sizeof(textBuffer) - len, "%d", readerData[i].counters[j]);
}
- printf(" }\n");
+ len = SDL_strlen(textBuffer);
+ SDL_snprintf(textBuffer + len, sizeof(textBuffer) - len, " }\n");
+ SDL_Log(textBuffer);
}
- printf("Readers read %d total events\n", grand_total);
+ SDL_Log("Readers read %d total events\n", grand_total);
}
/* End FIFO test */
@@ -704,6 +710,9 @@ static void RunFIFOTest(SDL_bool lock_free)
int
main(int argc, char *argv[])
{
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
RunBasicTest();
RunEpicTest();
/* This test is really slow, so don't run it by default */
diff --git a/test/testaudioinfo.c b/test/testaudioinfo.c
index c1d7fa3..a65db5f 100644
--- a/test/testaudioinfo.c
+++ b/test/testaudioinfo.c
@@ -18,18 +18,18 @@ print_devices(int iscapture)
const char *typestr = ((iscapture) ? "capture" : "output");
int n = SDL_GetNumAudioDevices(iscapture);
- printf("%s devices:\n", typestr);
+ SDL_Log("%s devices:\n", typestr);
if (n == -1)
- printf(" Driver can't detect specific %s devices.\n\n", typestr);
+ SDL_Log(" Driver can't detect specific %s devices.\n\n", typestr);
else if (n == 0)
- printf(" No %s devices found.\n\n", typestr);
+ SDL_Log(" No %s devices found.\n\n", typestr);
else {
int i;
for (i = 0; i < n; i++) {
- printf(" %s\n", SDL_GetAudioDeviceName(i, iscapture));
+ SDL_Log(" %s\n", SDL_GetAudioDeviceName(i, iscapture));
}
- printf("\n");
+ SDL_Log("\n");
}
}
@@ -38,26 +38,29 @@ main(int argc, char **argv)
{
int n;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Load the SDL library */
if (SDL_Init(SDL_INIT_AUDIO) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
}
/* Print available audio drivers */
n = SDL_GetNumAudioDrivers();
if (n == 0) {
- printf("No built-in audio drivers\n\n");
+ SDL_Log("No built-in audio drivers\n\n");
} else {
int i;
- printf("Built-in audio drivers:\n");
+ SDL_Log("Built-in audio drivers:\n");
for (i = 0; i < n; ++i) {
- printf(" %s\n", SDL_GetAudioDriver(i));
+ SDL_Log(" %s\n", SDL_GetAudioDriver(i));
}
- printf("\n");
+ SDL_Log("\n");
}
- printf("Using audio driver: %s\n\n", SDL_GetCurrentAudioDriver());
+ SDL_Log("Using audio driver: %s\n\n", SDL_GetCurrentAudioDriver());
print_devices(0);
print_devices(1);
diff --git a/test/testautomation.c b/test/testautomation.c
index 5eea7ec..0a181bd 100644
--- a/test/testautomation.c
+++ b/test/testautomation.c
@@ -80,8 +80,7 @@ main(int argc, char *argv[])
}
}
if (consumed < 0) {
- fprintf(stderr,
- "Usage: %s %s [--iterations #] [--execKey #] [--seed string] [--filter suite_name|test_name]\n",
+ SDL_Log("Usage: %s %s [--iterations #] [--execKey #] [--seed string] [--filter suite_name|test_name]\n",
argv[0], SDLTest_CommonUsage(state));
quit(1);
}
@@ -114,12 +113,8 @@ main(int argc, char *argv[])
}
/* Clean up */
- if (userRunSeed != NULL) {
- SDL_free(userRunSeed);
- }
- if (filter != NULL) {
- SDL_free(filter);
- }
+ SDL_free(userRunSeed);
+ SDL_free(filter);
/* Shutdown everything */
quit(result);
diff --git a/test/testautomation_audio.c b/test/testautomation_audio.c
index 90b08ac..c5c3f04 100644
--- a/test/testautomation_audio.c
+++ b/test/testautomation_audio.c
@@ -77,7 +77,7 @@ int audio_initQuitAudio()
audioDriver = SDL_GetAudioDriver(i);
SDLTest_AssertPass("Call to SDL_GetAudioDriver(%d)", i);
SDLTest_AssertCheck(audioDriver != NULL, "Audio driver name is not NULL");
- SDLTest_AssertCheck(SDL_strlen(audioDriver) > 0, "Audio driver name is not empty; got: %s", audioDriver);
+ SDLTest_AssertCheck(audioDriver[0] != '\0', "Audio driver name is not empty; got: %s", audioDriver);
/* Call Init */
result = SDL_AudioInit(audioDriver);
@@ -134,7 +134,7 @@ int audio_initOpenCloseQuitAudio()
audioDriver = SDL_GetAudioDriver(i);
SDLTest_AssertPass("Call to SDL_GetAudioDriver(%d)", i);
SDLTest_AssertCheck(audioDriver != NULL, "Audio driver name is not NULL");
- SDLTest_AssertCheck(SDL_strlen(audioDriver) > 0, "Audio driver name is not empty; got: %s", audioDriver);
+ SDLTest_AssertCheck(audioDriver[0] != '\0', "Audio driver name is not empty; got: %s", audioDriver);
/* Change specs */
for (j = 0; j < 2; j++) {
@@ -226,14 +226,14 @@ int audio_enumerateAndNameAudioDevices()
SDLTest_AssertPass("Call to SDL_GetAudioDeviceName(%i, %i)", i, t);
SDLTest_AssertCheck(name != NULL, "Verify result from SDL_GetAudioDeviceName(%i, %i) is not NULL", i, t);
if (name != NULL) {
- SDLTest_AssertCheck(SDL_strlen(name)>0, "verify result from SDL_GetAudioDeviceName(%i, %i) is not empty, got: '%s'", i, t, name);
+ SDLTest_AssertCheck(name[0] != '\0', "verify result from SDL_GetAudioDeviceName(%i, %i) is not empty, got: '%s'", i, t, name);
if (t==1) {
/* Also try non-zero type */
tt = t + SDLTest_RandomIntegerInRange(1,10);
nameAgain = SDL_GetAudioDeviceName(i, tt);
SDLTest_AssertCheck(nameAgain != NULL, "Verify result from SDL_GetAudioDeviceName(%i, %i) is not NULL", i, tt);
if (nameAgain != NULL) {
- SDLTest_AssertCheck(SDL_strlen(nameAgain)>0, "Verify result from SDL_GetAudioDeviceName(%i, %i) is not empty, got: '%s'", i, tt, nameAgain);
+ SDLTest_AssertCheck(nameAgain[0] != '\0', "Verify result from SDL_GetAudioDeviceName(%i, %i) is not empty, got: '%s'", i, tt, nameAgain);
SDLTest_AssertCheck(SDL_strcmp(name, nameAgain)==0,
"Verify SDL_GetAudioDeviceName(%i, %i) and SDL_GetAudioDeviceName(%i %i) return the same string",
i, t, i, tt);
@@ -318,7 +318,7 @@ int audio_printAudioDrivers()
SDLTest_AssertPass("Call to SDL_GetAudioDriver(%i)", i);
SDLTest_AssertCheck(name != NULL, "Verify returned name is not NULL");
if (name != NULL) {
- SDLTest_AssertCheck(SDL_strlen(name)>0, "Verify returned name is not empty, got: '%s'", name);
+ SDLTest_AssertCheck(name[0] != '\0', "Verify returned name is not empty, got: '%s'", name);
}
}
}
@@ -339,7 +339,7 @@ int audio_printCurrentAudioDriver()
SDLTest_AssertPass("Call to SDL_GetCurrentAudioDriver()");
SDLTest_AssertCheck(name != NULL, "Verify returned name is not NULL");
if (name != NULL) {
- SDLTest_AssertCheck(SDL_strlen(name)>0, "Verify returned name is not empty, got: '%s'", name);
+ SDLTest_AssertCheck(name[0] != '\0', "Verify returned name is not empty, got: '%s'", name);
}
return TEST_COMPLETED;
@@ -509,7 +509,7 @@ int audio_buildAudioCVTNegative()
SDLTest_AssertCheck(result == -1, "Verify result value; expected: -1, got: %i", result);
error = SDL_GetError();
SDLTest_AssertPass("Call to SDL_GetError()");
- SDLTest_AssertCheck(error != NULL && SDL_strlen(error)>0, "Validate that error message was not NULL or empty");
+ SDLTest_AssertCheck(error != NULL && error[0] != '\0', "Validate that error message was not NULL or empty");
}
SDL_ClearError();
@@ -643,7 +643,7 @@ int audio_lockUnlockOpenAudioDevice()
SDL_Delay(10);
SDLTest_Log("Simulate callback processing - delay");
- /* Unlock again*/
+ /* Unlock again */
SDL_UnlockAudioDevice(id);
SDLTest_AssertPass("SDL_UnlockAudioDevice(%i)", id);
@@ -747,11 +747,9 @@ int audio_convertAudio()
SDLTest_AssertCheck(cvt.len_ratio > 0.0, "Verify conversion length ratio; expected: >0; got: %f", cvt.len_ratio);
/* Free converted buffer */
- if (cvt.buf != NULL) {
SDL_free(cvt.buf);
cvt.buf = NULL;
- }
- }
+ }
}
}
}
diff --git a/test/testautomation_clipboard.c b/test/testautomation_clipboard.c
index 92aec7d..9ce4f51 100644
--- a/test/testautomation_clipboard.c
+++ b/test/testautomation_clipboard.c
@@ -41,7 +41,7 @@ clipboard_testGetClipboardText(void *arg)
charResult = SDL_GetClipboardText();
SDLTest_AssertPass("Call to SDL_GetClipboardText succeeded");
- if (charResult) SDL_free(charResult);
+ SDL_free(charResult);
return TEST_COMPLETED;
}
@@ -69,8 +69,8 @@ clipboard_testSetClipboardText(void *arg)
textRef, text);
/* Cleanup */
- if (textRef) SDL_free(textRef);
- if (text) SDL_free(text);
+ SDL_free(textRef);
+ SDL_free(text);
return TEST_COMPLETED;
}
@@ -118,7 +118,7 @@ clipboard_testClipboardTextFunctions(void *arg)
charResult != NULL,
"Verify SDL_GetClipboardText did not return NULL");
SDLTest_AssertCheck(
- SDL_strlen(charResult) == 0,
+ charResult[0] == '\0',
"Verify SDL_GetClipboardText returned string with length 0, got length %i",
SDL_strlen(charResult));
intResult = SDL_SetClipboardText((const char *)text);
@@ -145,9 +145,9 @@ clipboard_testClipboardTextFunctions(void *arg)
textRef, charResult);
/* Cleanup */
- if (textRef) SDL_free(textRef);
- if (text) SDL_free(text);
- if (charResult) SDL_free(charResult);
+ SDL_free(textRef);
+ SDL_free(text);
+ SDL_free(charResult);
return TEST_COMPLETED;
}
diff --git a/test/testautomation_events.c b/test/testautomation_events.c
index 638607e..f9eb5bb 100644
--- a/test/testautomation_events.c
+++ b/test/testautomation_events.c
@@ -58,7 +58,7 @@ events_pushPumpAndPollUserevent(void *arg)
event1.user.data1 = (void *)&_userdataValue1;
event1.user.data2 = (void *)&_userdataValue2;
- /* Push a user event onto the queue and force queue update*/
+ /* Push a user event onto the queue and force queue update */
SDL_PushEvent(&event1);
SDLTest_AssertPass("Call to SDL_PushEvent()");
SDL_PumpEvents();
@@ -101,7 +101,7 @@ events_addDelEventWatch(void *arg)
SDL_AddEventWatch(_events_sampleNullEventFilter, NULL);
SDLTest_AssertPass("Call to SDL_AddEventWatch()");
- /* Push a user event onto the queue and force queue update*/
+ /* Push a user event onto the queue and force queue update */
SDL_PushEvent(&event);
SDLTest_AssertPass("Call to SDL_PushEvent()");
SDL_PumpEvents();
@@ -112,7 +112,7 @@ events_addDelEventWatch(void *arg)
SDL_DelEventWatch(_events_sampleNullEventFilter, NULL);
SDLTest_AssertPass("Call to SDL_DelEventWatch()");
- /* Push a user event onto the queue and force queue update*/
+ /* Push a user event onto the queue and force queue update */
_eventFilterCalled = 0;
SDL_PushEvent(&event);
SDLTest_AssertPass("Call to SDL_PushEvent()");
@@ -152,7 +152,7 @@ events_addDelEventWatchWithUserdata(void *arg)
SDL_AddEventWatch(_events_sampleNullEventFilter, (void *)&_userdataValue);
SDLTest_AssertPass("Call to SDL_AddEventWatch()");
- /* Push a user event onto the queue and force queue update*/
+ /* Push a user event onto the queue and force queue update */
SDL_PushEvent(&event);
SDLTest_AssertPass("Call to SDL_PushEvent()");
SDL_PumpEvents();
@@ -163,7 +163,7 @@ events_addDelEventWatchWithUserdata(void *arg)
SDL_DelEventWatch(_events_sampleNullEventFilter, (void *)&_userdataValue);
SDLTest_AssertPass("Call to SDL_DelEventWatch()");
- /* Push a user event onto the queue and force queue update*/
+ /* Push a user event onto the queue and force queue update */
_eventFilterCalled = 0;
SDL_PushEvent(&event);
SDLTest_AssertPass("Call to SDL_PushEvent()");
diff --git a/test/testautomation_main.c b/test/testautomation_main.c
index f695903..ef8f19e 100644
--- a/test/testautomation_main.c
+++ b/test/testautomation_main.c
@@ -1,7 +1,7 @@
/**
* Automated SDL subsystems management test.
*
- * Written by Jørgen Tjernø "jorgenpt"
+ * Written by J�rgen Tjern� "jorgenpt"
*
* Released under Public Domain.
*/
@@ -10,7 +10,7 @@
#include "SDL_test.h"
-/*!
+/* !
* \brief Tests SDL_Init() and SDL_Quit() of Joystick and Haptic subsystems
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_Init
@@ -38,7 +38,7 @@ static int main_testInitQuitJoystickHaptic (void *arg)
#endif
}
-/*!
+/* !
* \brief Tests SDL_InitSubSystem() and SDL_QuitSubSystem()
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_Init
@@ -79,16 +79,16 @@ static int main_testImpliedJoystickInit (void *arg)
#else
int initialized_system;
- // First initialize the controller
+ /* First initialize the controller */
SDLTest_AssertCheck( (SDL_WasInit(joy_and_controller) & joy_and_controller) == 0, "SDL_WasInit() before init should be false for joystick & controller" );
SDLTest_AssertCheck( SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == 0, "SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER)" );
- // Then make sure this implicitly initialized the joystick subsystem
+ /* Then make sure this implicitly initialized the joystick subsystem */
initialized_system = SDL_WasInit(joy_and_controller);
SDLTest_AssertCheck( (initialized_system & joy_and_controller) == joy_and_controller, "SDL_WasInit() should be true for joystick & controller (%x)", initialized_system );
- // Then quit the controller, and make sure that implicitly also quits the
- // joystick subsystem
+ /* Then quit the controller, and make sure that implicitly also quits the */
+ /* joystick subsystem */
SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
initialized_system = SDL_WasInit(joy_and_controller);
SDLTest_AssertCheck( (initialized_system & joy_and_controller) == 0, "SDL_WasInit() should be false for joystick & controller (%x)", initialized_system );
@@ -104,17 +104,17 @@ static int main_testImpliedJoystickQuit (void *arg)
#else
int initialized_system;
- // First initialize the controller and the joystick (explicitly)
+ /* First initialize the controller and the joystick (explicitly) */
SDLTest_AssertCheck( (SDL_WasInit(joy_and_controller) & joy_and_controller) == 0, "SDL_WasInit() before init should be false for joystick & controller" );
SDLTest_AssertCheck( SDL_InitSubSystem(SDL_INIT_JOYSTICK) == 0, "SDL_InitSubSystem(SDL_INIT_JOYSTICK)" );
SDLTest_AssertCheck( SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == 0, "SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER)" );
- // Then make sure they're both initialized properly
+ /* Then make sure they're both initialized properly */
initialized_system = SDL_WasInit(joy_and_controller);
SDLTest_AssertCheck( (initialized_system & joy_and_controller) == joy_and_controller, "SDL_WasInit() should be true for joystick & controller (%x)", initialized_system );
- // Then quit the controller, and make sure that it does NOT quit the
- // explicitly initialized joystick subsystem.
+ /* Then quit the controller, and make sure that it does NOT quit the */
+ /* explicitly initialized joystick subsystem. */
SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
initialized_system = SDL_WasInit(joy_and_controller);
SDLTest_AssertCheck( (initialized_system & joy_and_controller) == SDL_INIT_JOYSTICK, "SDL_WasInit() should be false for joystick & controller (%x)", initialized_system );
diff --git a/test/testautomation_pixels.c b/test/testautomation_pixels.c
index 48f9838..04e00de 100644
--- a/test/testautomation_pixels.c
+++ b/test/testautomation_pixels.c
@@ -242,7 +242,7 @@ pixels_getPixelFormatName(void *arg)
SDLTest_AssertPass("Call to SDL_GetPixelFormatName()");
SDLTest_AssertCheck(result != NULL, "Verify result is not NULL");
if (result != NULL) {
- SDLTest_AssertCheck(SDL_strlen(result) > 0, "Verify result is non-empty");
+ SDLTest_AssertCheck(result[0] != '\0', "Verify result is non-empty");
SDLTest_AssertCheck(SDL_strcmp(result, unknownFormat) == 0,
"Verify result text; expected: %s, got %s", unknownFormat, result);
}
@@ -257,7 +257,7 @@ pixels_getPixelFormatName(void *arg)
SDLTest_AssertPass("Call to SDL_GetPixelFormatName()");
SDLTest_AssertCheck(result != NULL, "Verify result is not NULL");
if (result != NULL) {
- SDLTest_AssertCheck(SDL_strlen(result) > 0, "Verify result is non-empty");
+ SDLTest_AssertCheck(result[0] != '\0', "Verify result is non-empty");
SDLTest_AssertCheck(SDL_strcmp(result, _RGBPixelFormatsVerbose[i]) == 0,
"Verify result text; expected: %s, got %s", _RGBPixelFormatsVerbose[i], result);
}
@@ -273,7 +273,7 @@ pixels_getPixelFormatName(void *arg)
SDLTest_AssertPass("Call to SDL_GetPixelFormatName()");
SDLTest_AssertCheck(result != NULL, "Verify result is not NULL");
if (result != NULL) {
- SDLTest_AssertCheck(SDL_strlen(result) > 0, "Verify result is non-empty");
+ SDLTest_AssertCheck(result[0] != '\0', "Verify result is non-empty");
SDLTest_AssertCheck(SDL_strcmp(result, _nonRGBPixelFormatsVerbose[i]) == 0,
"Verify result text; expected: %s, got %s", _nonRGBPixelFormatsVerbose[i], result);
}
@@ -290,14 +290,14 @@ pixels_getPixelFormatName(void *arg)
SDLTest_AssertPass("Call to SDL_GetPixelFormatName(%u)", format);
SDLTest_AssertCheck(result != NULL, "Verify result is not NULL");
if (result != NULL) {
- SDLTest_AssertCheck(SDL_strlen(result) > 0,
+ SDLTest_AssertCheck(result[0] != '\0',
"Verify result is non-empty; got: %s", result);
SDLTest_AssertCheck(SDL_strcmp(result, _invalidPixelFormatsVerbose[i]) == 0,
"Validate name is UNKNOWN, expected: '%s', got: '%s'", _invalidPixelFormatsVerbose[i], result);
}
error = SDL_GetError();
SDLTest_AssertPass("Call to SDL_GetError()");
- SDLTest_AssertCheck(error != NULL && SDL_strlen(error) == 0, "Validate that error message is empty");
+ SDLTest_AssertCheck(error == NULL || error[0] == '\0', "Validate that error message is empty");
}
return TEST_COMPLETED;
@@ -411,7 +411,7 @@ pixels_calcGammaRamp(void *arg)
int changed;
Uint16 magic = 0xbeef;
- /* Allocate temp ramp array and fill with some value*/
+ /* Allocate temp ramp array and fill with some value */
ramp = (Uint16 *)SDL_malloc(256 * sizeof(Uint16));
SDLTest_AssertCheck(ramp != NULL, "Validate temp ramp array could be allocated");
if (ramp == NULL) return TEST_ABORTED;
diff --git a/test/testautomation_platform.c b/test/testautomation_platform.c
index 5ed2aba..19896b4 100644
--- a/test/testautomation_platform.c
+++ b/test/testautomation_platform.c
@@ -102,7 +102,7 @@ int platform_testEndianessAndSwap(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_GetXYZ() functions
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_GetPlatform
@@ -151,7 +151,7 @@ int platform_testGetFunctions (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_HasXYZ() functions
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_Has3DNow
@@ -168,7 +168,7 @@ int platform_testHasFunctions (void *arg)
{
int ret;
- // TODO: independently determine and compare values as well
+ /* TODO: independently determine and compare values as well */
ret = SDL_HasRDTSC();
SDLTest_AssertPass("SDL_HasRDTSC()");
@@ -200,7 +200,7 @@ int platform_testHasFunctions (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_GetVersion
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_GetVersion
@@ -225,7 +225,7 @@ int platform_testGetVersion(void *arg)
}
-/*!
+/* !
* \brief Tests SDL_VERSION macro
*/
int platform_testSDLVersion(void *arg)
@@ -248,7 +248,7 @@ int platform_testSDLVersion(void *arg)
}
-/*!
+/* !
* \brief Tests default SDL_Init
*/
int platform_testDefaultInit(void *arg)
@@ -270,7 +270,7 @@ int platform_testDefaultInit(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_Get/Set/ClearError
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_GetError
@@ -315,14 +315,14 @@ int platform_testGetSetClearError(void *arg)
lastError);
}
- // Clean up
+ /* Clean up */
SDL_ClearError();
SDLTest_AssertPass("SDL_ClearError()");
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_SetError with empty input
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_SetError
@@ -351,14 +351,14 @@ int platform_testSetErrorEmptyInput(void *arg)
lastError);
}
- // Clean up
+ /* Clean up */
SDL_ClearError();
SDLTest_AssertPass("SDL_ClearError()");
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_SetError with invalid input
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_SetError
@@ -370,11 +370,11 @@ int platform_testSetErrorInvalidInput(void *arg)
char *lastError;
int len;
- // Reset
+ /* Reset */
SDL_ClearError();
SDLTest_AssertPass("SDL_ClearError()");
- // Check for no-op
+ /* Check for no-op */
SDL_SetError(testError);
SDLTest_AssertPass("SDL_SetError()");
lastError = (char *)SDL_GetError();
@@ -392,11 +392,11 @@ int platform_testSetErrorInvalidInput(void *arg)
lastError);
}
- // Set
+ /* Set */
SDL_SetError(probeError);
SDLTest_AssertPass("SDL_SetError()");
- // Check for no-op
+ /* Check for no-op */
SDL_SetError(testError);
SDLTest_AssertPass("SDL_SetError()");
lastError = (char *)SDL_GetError();
@@ -415,14 +415,14 @@ int platform_testSetErrorInvalidInput(void *arg)
lastError);
}
- // Clean up
+ /* Clean up */
SDL_ClearError();
SDLTest_AssertPass("SDL_ClearError()");
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_GetPowerInfo
* \sa
* http://wiki.libsdl.org/moin.cgi/SDL_GetPowerInfo
@@ -472,7 +472,7 @@ int platform_testGetPowerInfo(void *arg)
pct);
}
- // Partial return value variations
+ /* Partial return value variations */
stateAgain = SDL_GetPowerInfo(&secsAgain, NULL);
SDLTest_AssertCheck(
state==stateAgain,
diff --git a/test/testautomation_rect.c b/test/testautomation_rect.c
index 77a7347..abf19f5 100644
--- a/test/testautomation_rect.c
+++ b/test/testautomation_rect.c
@@ -12,7 +12,7 @@
/* Helper functions */
-/*!
+/* !
* \brief Private helper to check SDL_IntersectRectAndLine results
*/
void _validateIntersectRectAndLineResults(
@@ -39,7 +39,7 @@ void _validateIntersectRectAndLineResults(
/* Test case functions */
-/*!
+/* !
* \brief Tests SDL_IntersectRectAndLine() clipping cases
*
* \sa
@@ -110,7 +110,7 @@ rect_testIntersectRectAndLine (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_IntersectRectAndLine() non-clipping case line inside
*
* \sa
@@ -177,7 +177,7 @@ rect_testIntersectRectAndLineInside (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_IntersectRectAndLine() non-clipping cases outside
*
* \sa
@@ -232,7 +232,7 @@ rect_testIntersectRectAndLineOutside (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_IntersectRectAndLine() with empty rectangle
*
* \sa
@@ -267,7 +267,7 @@ rect_testIntersectRectAndLineEmpty (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Negative tests against SDL_IntersectRectAndLine() with invalid parameters
*
* \sa
@@ -302,7 +302,7 @@ rect_testIntersectRectAndLineParam (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Private helper to check SDL_HasIntersection results
*/
void _validateHasIntersectionResults(
@@ -325,7 +325,7 @@ void _validateHasIntersectionResults(
refRectB->x, refRectB->y, refRectB->w, refRectB->h);
}
-/*!
+/* !
* \brief Private helper to check SDL_IntersectRect results
*/
void _validateIntersectRectResults(
@@ -344,7 +344,7 @@ void _validateIntersectRectResults(
}
}
-/*!
+/* !
* \brief Private helper to check SDL_UnionRect results
*/
void _validateUnionRectResults(
@@ -367,7 +367,7 @@ void _validateUnionRectResults(
expectedResult->x, expectedResult->y, expectedResult->w, expectedResult->h);
}
-/*!
+/* !
* \brief Private helper to check SDL_RectEmpty results
*/
void _validateRectEmptyResults(
@@ -385,7 +385,7 @@ void _validateRectEmptyResults(
refRect->x, refRect->y, refRect->w, refRect->h);
}
-/*!
+/* !
* \brief Private helper to check SDL_RectEquals results
*/
void _validateRectEqualsResults(
@@ -408,7 +408,7 @@ void _validateRectEqualsResults(
refRectB->x, refRectB->y, refRectB->w, refRectB->h);
}
-/*!
+/* !
* \brief Tests SDL_IntersectRect() with B fully inside A
*
* \sa
@@ -423,7 +423,7 @@ int rect_testIntersectRectInside (void *arg)
SDL_Rect result;
SDL_bool intersection;
- // rectB fully contained in rectA
+ /* rectB fully contained in rectA */
refRectB.x = 0;
refRectB.y = 0;
refRectB.w = SDLTest_RandomIntegerInRange(refRectA.x + 1, refRectA.x + refRectA.w - 1);
@@ -436,7 +436,7 @@ int rect_testIntersectRectInside (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_IntersectRect() with B fully outside A
*
* \sa
@@ -451,7 +451,7 @@ int rect_testIntersectRectOutside (void *arg)
SDL_Rect result;
SDL_bool intersection;
- // rectB fully outside of rectA
+ /* rectB fully outside of rectA */
refRectB.x = refRectA.x + refRectA.w + SDLTest_RandomIntegerInRange(1, 10);
refRectB.y = refRectA.y + refRectA.h + SDLTest_RandomIntegerInRange(1, 10);
refRectB.w = refRectA.w;
@@ -464,7 +464,7 @@ int rect_testIntersectRectOutside (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_IntersectRect() with B partially intersecting A
*
* \sa
@@ -480,7 +480,7 @@ int rect_testIntersectRectPartial (void *arg)
SDL_Rect expectedResult;
SDL_bool intersection;
- // rectB partially contained in rectA
+ /* rectB partially contained in rectA */
refRectB.x = SDLTest_RandomIntegerInRange(refRectA.x + 1, refRectA.x + refRectA.w - 1);
refRectB.y = SDLTest_RandomIntegerInRange(refRectA.y + 1, refRectA.y + refRectA.h - 1);
refRectB.w = refRectA.w;
@@ -494,7 +494,7 @@ int rect_testIntersectRectPartial (void *arg)
intersection = SDL_IntersectRect(&rectA, &rectB, &result);
_validateIntersectRectResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB, &result, &expectedResult);
- // rectB right edge
+ /* rectB right edge */
refRectB.x = rectA.w - 1;
refRectB.y = rectA.y;
refRectB.w = SDLTest_RandomIntegerInRange(1, refRectA.w - 1);
@@ -508,7 +508,7 @@ int rect_testIntersectRectPartial (void *arg)
intersection = SDL_IntersectRect(&rectA, &rectB, &result);
_validateIntersectRectResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB, &result, &expectedResult);
- // rectB left edge
+ /* rectB left edge */
refRectB.x = 1 - rectA.w;
refRectB.y = rectA.y;
refRectB.w = refRectA.w;
@@ -522,7 +522,7 @@ int rect_testIntersectRectPartial (void *arg)
intersection = SDL_IntersectRect(&rectA, &rectB, &result);
_validateIntersectRectResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB, &result, &expectedResult);
- // rectB bottom edge
+ /* rectB bottom edge */
refRectB.x = rectA.x;
refRectB.y = rectA.h - 1;
refRectB.w = SDLTest_RandomIntegerInRange(1, refRectA.w - 1);
@@ -536,7 +536,7 @@ int rect_testIntersectRectPartial (void *arg)
intersection = SDL_IntersectRect(&rectA, &rectB, &result);
_validateIntersectRectResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB, &result, &expectedResult);
- // rectB top edge
+ /* rectB top edge */
refRectB.x = rectA.x;
refRectB.y = 1 - rectA.h;
refRectB.w = SDLTest_RandomIntegerInRange(1, refRectA.w - 1);
@@ -553,7 +553,7 @@ int rect_testIntersectRectPartial (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_IntersectRect() with 1x1 pixel sized rectangles
*
* \sa
@@ -569,7 +569,7 @@ int rect_testIntersectRectPoint (void *arg)
SDL_bool intersection;
int offsetX, offsetY;
- // intersecting pixels
+ /* intersecting pixels */
refRectA.x = SDLTest_RandomIntegerInRange(1, 100);
refRectA.y = SDLTest_RandomIntegerInRange(1, 100);
refRectB.x = refRectA.x;
@@ -579,7 +579,7 @@ int rect_testIntersectRectPoint (void *arg)
intersection = SDL_IntersectRect(&rectA, &rectB, &result);
_validateIntersectRectResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB, &result, &refRectA);
- // non-intersecting pixels cases
+ /* non-intersecting pixels cases */
for (offsetX = -1; offsetX <= 1; offsetX++) {
for (offsetY = -1; offsetY <= 1; offsetY++) {
if (offsetX != 0 || offsetY != 0) {
@@ -600,7 +600,7 @@ int rect_testIntersectRectPoint (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_IntersectRect() with empty rectangles
*
* \sa
@@ -616,7 +616,7 @@ int rect_testIntersectRectEmpty (void *arg)
SDL_bool intersection;
SDL_bool empty;
- // Rect A empty
+ /* Rect A empty */
result.w = SDLTest_RandomIntegerInRange(1, 100);
result.h = SDLTest_RandomIntegerInRange(1, 100);
refRectA.x = SDLTest_RandomIntegerInRange(1, 100);
@@ -633,7 +633,7 @@ int rect_testIntersectRectEmpty (void *arg)
empty = (SDL_bool)SDL_RectEmpty(&result);
SDLTest_AssertCheck(empty == SDL_TRUE, "Validate result is empty Rect; got: %s", (empty == SDL_TRUE) ? "SDL_TRUE" : "SDL_FALSE");
- // Rect B empty
+ /* Rect B empty */
result.w = SDLTest_RandomIntegerInRange(1, 100);
result.h = SDLTest_RandomIntegerInRange(1, 100);
refRectA.x = SDLTest_RandomIntegerInRange(1, 100);
@@ -650,7 +650,7 @@ int rect_testIntersectRectEmpty (void *arg)
empty = (SDL_bool)SDL_RectEmpty(&result);
SDLTest_AssertCheck(empty == SDL_TRUE, "Validate result is empty Rect; got: %s", (empty == SDL_TRUE) ? "SDL_TRUE" : "SDL_FALSE");
- // Rect A and B empty
+ /* Rect A and B empty */
result.w = SDLTest_RandomIntegerInRange(1, 100);
result.h = SDLTest_RandomIntegerInRange(1, 100);
refRectA.x = SDLTest_RandomIntegerInRange(1, 100);
@@ -672,7 +672,7 @@ int rect_testIntersectRectEmpty (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Negative tests against SDL_IntersectRect() with invalid parameters
*
* \sa
@@ -685,7 +685,7 @@ int rect_testIntersectRectParam(void *arg)
SDL_Rect result;
SDL_bool intersection;
- // invalid parameter combinations
+ /* invalid parameter combinations */
intersection = SDL_IntersectRect((SDL_Rect *)NULL, &rectB, &result);
SDLTest_AssertCheck(intersection == SDL_FALSE, "Check that function returns SDL_FALSE when 1st parameter is NULL");
intersection = SDL_IntersectRect(&rectA, (SDL_Rect *)NULL, &result);
@@ -702,7 +702,7 @@ int rect_testIntersectRectParam(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_HasIntersection() with B fully inside A
*
* \sa
@@ -716,7 +716,7 @@ int rect_testHasIntersectionInside (void *arg)
SDL_Rect rectB;
SDL_bool intersection;
- // rectB fully contained in rectA
+ /* rectB fully contained in rectA */
refRectB.x = 0;
refRectB.y = 0;
refRectB.w = SDLTest_RandomIntegerInRange(refRectA.x + 1, refRectA.x + refRectA.w - 1);
@@ -729,7 +729,7 @@ int rect_testHasIntersectionInside (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_HasIntersection() with B fully outside A
*
* \sa
@@ -743,7 +743,7 @@ int rect_testHasIntersectionOutside (void *arg)
SDL_Rect rectB;
SDL_bool intersection;
- // rectB fully outside of rectA
+ /* rectB fully outside of rectA */
refRectB.x = refRectA.x + refRectA.w + SDLTest_RandomIntegerInRange(1, 10);
refRectB.y = refRectA.y + refRectA.h + SDLTest_RandomIntegerInRange(1, 10);
refRectB.w = refRectA.w;
@@ -756,7 +756,7 @@ int rect_testHasIntersectionOutside (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_HasIntersection() with B partially intersecting A
*
* \sa
@@ -770,7 +770,7 @@ int rect_testHasIntersectionPartial (void *arg)
SDL_Rect rectB;
SDL_bool intersection;
- // rectB partially contained in rectA
+ /* rectB partially contained in rectA */
refRectB.x = SDLTest_RandomIntegerInRange(refRectA.x + 1, refRectA.x + refRectA.w - 1);
refRectB.y = SDLTest_RandomIntegerInRange(refRectA.y + 1, refRectA.y + refRectA.h - 1);
refRectB.w = refRectA.w;
@@ -780,7 +780,7 @@ int rect_testHasIntersectionPartial (void *arg)
intersection = SDL_HasIntersection(&rectA, &rectB);
_validateHasIntersectionResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB);
- // rectB right edge
+ /* rectB right edge */
refRectB.x = rectA.w - 1;
refRectB.y = rectA.y;
refRectB.w = SDLTest_RandomIntegerInRange(1, refRectA.w - 1);
@@ -790,7 +790,7 @@ int rect_testHasIntersectionPartial (void *arg)
intersection = SDL_HasIntersection(&rectA, &rectB);
_validateHasIntersectionResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB);
- // rectB left edge
+ /* rectB left edge */
refRectB.x = 1 - rectA.w;
refRectB.y = rectA.y;
refRectB.w = refRectA.w;
@@ -800,7 +800,7 @@ int rect_testHasIntersectionPartial (void *arg)
intersection = SDL_HasIntersection(&rectA, &rectB);
_validateHasIntersectionResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB);
- // rectB bottom edge
+ /* rectB bottom edge */
refRectB.x = rectA.x;
refRectB.y = rectA.h - 1;
refRectB.w = SDLTest_RandomIntegerInRange(1, refRectA.w - 1);
@@ -810,7 +810,7 @@ int rect_testHasIntersectionPartial (void *arg)
intersection = SDL_HasIntersection(&rectA, &rectB);
_validateHasIntersectionResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB);
- // rectB top edge
+ /* rectB top edge */
refRectB.x = rectA.x;
refRectB.y = 1 - rectA.h;
refRectB.w = SDLTest_RandomIntegerInRange(1, refRectA.w - 1);
@@ -823,7 +823,7 @@ int rect_testHasIntersectionPartial (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_HasIntersection() with 1x1 pixel sized rectangles
*
* \sa
@@ -838,7 +838,7 @@ int rect_testHasIntersectionPoint (void *arg)
SDL_bool intersection;
int offsetX, offsetY;
- // intersecting pixels
+ /* intersecting pixels */
refRectA.x = SDLTest_RandomIntegerInRange(1, 100);
refRectA.y = SDLTest_RandomIntegerInRange(1, 100);
refRectB.x = refRectA.x;
@@ -848,7 +848,7 @@ int rect_testHasIntersectionPoint (void *arg)
intersection = SDL_HasIntersection(&rectA, &rectB);
_validateHasIntersectionResults(intersection, SDL_TRUE, &rectA, &rectB, &refRectA, &refRectB);
- // non-intersecting pixels cases
+ /* non-intersecting pixels cases */
for (offsetX = -1; offsetX <= 1; offsetX++) {
for (offsetY = -1; offsetY <= 1; offsetY++) {
if (offsetX != 0 || offsetY != 0) {
@@ -869,7 +869,7 @@ int rect_testHasIntersectionPoint (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_HasIntersection() with empty rectangles
*
* \sa
@@ -883,7 +883,7 @@ int rect_testHasIntersectionEmpty (void *arg)
SDL_Rect rectB;
SDL_bool intersection;
- // Rect A empty
+ /* Rect A empty */
refRectA.x = SDLTest_RandomIntegerInRange(1, 100);
refRectA.y = SDLTest_RandomIntegerInRange(1, 100);
refRectA.w = SDLTest_RandomIntegerInRange(1, 100);
@@ -896,7 +896,7 @@ int rect_testHasIntersectionEmpty (void *arg)
intersection = SDL_HasIntersection(&rectA, &rectB);
_validateHasIntersectionResults(intersection, SDL_FALSE, &rectA, &rectB, &refRectA, &refRectB);
- // Rect B empty
+ /* Rect B empty */
refRectA.x = SDLTest_RandomIntegerInRange(1, 100);
refRectA.y = SDLTest_RandomIntegerInRange(1, 100);
refRectA.w = SDLTest_RandomIntegerInRange(1, 100);
@@ -909,7 +909,7 @@ int rect_testHasIntersectionEmpty (void *arg)
intersection = SDL_HasIntersection(&rectA, &rectB);
_validateHasIntersectionResults(intersection, SDL_FALSE, &rectA, &rectB, &refRectA, &refRectB);
- // Rect A and B empty
+ /* Rect A and B empty */
refRectA.x = SDLTest_RandomIntegerInRange(1, 100);
refRectA.y = SDLTest_RandomIntegerInRange(1, 100);
refRectA.w = SDLTest_RandomIntegerInRange(1, 100);
@@ -927,7 +927,7 @@ int rect_testHasIntersectionEmpty (void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Negative tests against SDL_HasIntersection() with invalid parameters
*
* \sa
@@ -939,7 +939,7 @@ int rect_testHasIntersectionParam(void *arg)
SDL_Rect rectB;
SDL_bool intersection;
- // invalid parameter combinations
+ /* invalid parameter combinations */
intersection = SDL_HasIntersection((SDL_Rect *)NULL, &rectB);
SDLTest_AssertCheck(intersection == SDL_FALSE, "Check that function returns SDL_FALSE when 1st parameter is NULL");
intersection = SDL_HasIntersection(&rectA, (SDL_Rect *)NULL);
@@ -950,7 +950,7 @@ int rect_testHasIntersectionParam(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Test SDL_EnclosePoints() without clipping
*
* \sa
@@ -969,7 +969,7 @@ int rect_testEnclosePoints(void *arg)
int minx = 0, maxx = 0, miny = 0, maxy = 0;
int i;
- // Create input data, tracking result
+ /* Create input data, tracking result */
for (i=0; i<numPoints; i++) {
newx = SDLTest_RandomIntegerInRange(-1024, 1024);
newy = SDLTest_RandomIntegerInRange(-1024, 1024);
@@ -990,7 +990,7 @@ int rect_testEnclosePoints(void *arg)
}
}
- // Call function and validate - special case: no result requested
+ /* Call function and validate - special case: no result requested */
anyEnclosedNoResult = SDL_EnclosePoints((const SDL_Point *)points, numPoints, (const SDL_Rect *)NULL, (SDL_Rect *)NULL);
SDLTest_AssertCheck(expectedEnclosed==anyEnclosedNoResult,
"Check expected return value %s, got %s",
@@ -1002,7 +1002,7 @@ int rect_testEnclosePoints(void *arg)
i, refPoints[i].x, refPoints[i].y, points[i].x, points[i].y);
}
- // Call function and validate
+ /* Call function and validate */
anyEnclosed = SDL_EnclosePoints((const SDL_Point *)points, numPoints, (const SDL_Rect *)NULL, &result);
SDLTest_AssertCheck(expectedEnclosed==anyEnclosed,
"Check return value %s, got %s",
@@ -1020,7 +1020,7 @@ int rect_testEnclosePoints(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Test SDL_EnclosePoints() with repeated input points
*
* \sa
@@ -1040,7 +1040,7 @@ int rect_testEnclosePointsRepeatedInput(void *arg)
int minx = 0, maxx = 0, miny = 0, maxy = 0;
int i;
- // Create input data, tracking result
+ /* Create input data, tracking result */
for (i=0; i<numPoints; i++) {
if (i < halfPoints) {
newx = SDLTest_RandomIntegerInRange(-1024, 1024);
@@ -1066,7 +1066,7 @@ int rect_testEnclosePointsRepeatedInput(void *arg)
}
}
- // Call function and validate - special case: no result requested
+ /* Call function and validate - special case: no result requested */
anyEnclosedNoResult = SDL_EnclosePoints((const SDL_Point *)points, numPoints, (const SDL_Rect *)NULL, (SDL_Rect *)NULL);
SDLTest_AssertCheck(expectedEnclosed==anyEnclosedNoResult,
"Check return value %s, got %s",
@@ -1078,7 +1078,7 @@ int rect_testEnclosePointsRepeatedInput(void *arg)
i, refPoints[i].x, refPoints[i].y, points[i].x, points[i].y);
}
- // Call function and validate
+ /* Call function and validate */
anyEnclosed = SDL_EnclosePoints((const SDL_Point *)points, numPoints, (const SDL_Rect *)NULL, &result);
SDLTest_AssertCheck(expectedEnclosed==anyEnclosed,
"Check return value %s, got %s",
@@ -1096,7 +1096,7 @@ int rect_testEnclosePointsRepeatedInput(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Test SDL_EnclosePoints() with clipping
*
* \sa
@@ -1117,13 +1117,13 @@ int rect_testEnclosePointsWithClipping(void *arg)
int minx = 0, maxx = 0, miny = 0, maxy = 0;
int i;
- // Setup clipping rectangle
+ /* Setup clipping rectangle */
refClip.x = SDLTest_RandomIntegerInRange(-1024, 1024);
refClip.y = SDLTest_RandomIntegerInRange(-1024, 1024);
refClip.w = SDLTest_RandomIntegerInRange(1, 1024);
refClip.h = SDLTest_RandomIntegerInRange(1, 1024);
- // Create input data, tracking result
+ /* Create input data, tracking result */
for (i=0; i<numPoints; i++) {
newx = SDLTest_RandomIntegerInRange(-1024, 1024);
newy = SDLTest_RandomIntegerInRange(-1024, 1024);
@@ -1148,7 +1148,7 @@ int rect_testEnclosePointsWithClipping(void *arg)
}
}
- // Call function and validate - special case: no result requested
+ /* Call function and validate - special case: no result requested */
clip = refClip;
anyEnclosedNoResult = SDL_EnclosePoints((const SDL_Point *)points, numPoints, (const SDL_Rect *)&clip, (SDL_Rect *)NULL);
SDLTest_AssertCheck(expectedEnclosed==anyEnclosedNoResult,
@@ -1163,7 +1163,7 @@ int rect_testEnclosePointsWithClipping(void *arg)
SDLTest_AssertCheck(refClip.x==clip.x && refClip.y==clip.y && refClip.w==clip.w && refClip.h==clip.h,
"Check that source clipping rectangle was not modified");
- // Call function and validate
+ /* Call function and validate */
anyEnclosed = SDL_EnclosePoints((const SDL_Point *)points, numPoints, (const SDL_Rect *)&clip, &result);
SDLTest_AssertCheck(expectedEnclosed==anyEnclosed,
"Check return value %s, got %s",
@@ -1195,7 +1195,7 @@ int rect_testEnclosePointsWithClipping(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Negative tests against SDL_EnclosePoints() with invalid parameters
*
* \sa
@@ -1209,7 +1209,7 @@ int rect_testEnclosePointsParam(void *arg)
SDL_Rect result;
SDL_bool anyEnclosed;
- // invalid parameter combinations
+ /* invalid parameter combinations */
anyEnclosed = SDL_EnclosePoints((SDL_Point *)NULL, 1, (const SDL_Rect *)&clip, &result);
SDLTest_AssertCheck(anyEnclosed == SDL_FALSE, "Check that functions returns SDL_FALSE when 1st parameter is NULL");
anyEnclosed = SDL_EnclosePoints((const SDL_Point *)points, 0, (const SDL_Rect *)&clip, &result);
@@ -1223,7 +1223,7 @@ int rect_testEnclosePointsParam(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_UnionRect() where rect B is outside rect A
*
* \sa
@@ -1294,7 +1294,7 @@ int rect_testUnionRectOutside(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_UnionRect() where rect A or rect B are empty
*
* \sa
@@ -1359,7 +1359,7 @@ int rect_testUnionRectEmpty(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_UnionRect() where rect B is inside rect A
*
* \sa
@@ -1423,7 +1423,7 @@ int rect_testUnionRectInside(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Negative tests against SDL_UnionRect() with invalid parameters
*
* \sa
@@ -1434,7 +1434,7 @@ int rect_testUnionRectParam(void *arg)
SDL_Rect rectA, rectB;
SDL_Rect result;
- // invalid parameter combinations
+ /* invalid parameter combinations */
SDL_UnionRect((SDL_Rect *)NULL, &rectB, &result);
SDLTest_AssertPass("Check that function returns when 1st parameter is NULL");
SDL_UnionRect(&rectA, (SDL_Rect *)NULL, &result);
@@ -1451,7 +1451,7 @@ int rect_testUnionRectParam(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_RectEmpty() with various inputs
*
* \sa
@@ -1465,7 +1465,7 @@ int rect_testRectEmpty(void *arg)
SDL_bool result;
int w, h;
- // Non-empty case
+ /* Non-empty case */
refRect.x=SDLTest_RandomIntegerInRange(-1024, 1024);
refRect.y=SDLTest_RandomIntegerInRange(-1024, 1024);
refRect.w=SDLTest_RandomIntegerInRange(256, 1024);
@@ -1475,7 +1475,7 @@ int rect_testRectEmpty(void *arg)
result = (SDL_bool)SDL_RectEmpty((const SDL_Rect *)&rect);
_validateRectEmptyResults(result, expectedResult, &rect, &refRect);
- // Empty case
+ /* Empty case */
for (w=-1; w<2; w++) {
for (h=-1; h<2; h++) {
if ((w != 1) || (h != 1)) {
@@ -1494,7 +1494,7 @@ int rect_testRectEmpty(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Negative tests against SDL_RectEmpty() with invalid parameters
*
* \sa
@@ -1504,14 +1504,14 @@ int rect_testRectEmptyParam(void *arg)
{
SDL_bool result;
- // invalid parameter combinations
+ /* invalid parameter combinations */
result = (SDL_bool)SDL_RectEmpty((const SDL_Rect *)NULL);
SDLTest_AssertCheck(result == SDL_TRUE, "Check that function returns TRUE when 1st parameter is NULL");
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Tests SDL_RectEquals() with various inputs
*
* \sa
@@ -1526,7 +1526,7 @@ int rect_testRectEquals(void *arg)
SDL_bool expectedResult;
SDL_bool result;
- // Equals
+ /* Equals */
refRectA.x=SDLTest_RandomIntegerInRange(-1024, 1024);
refRectA.y=SDLTest_RandomIntegerInRange(-1024, 1024);
refRectA.w=SDLTest_RandomIntegerInRange(1, 1024);
@@ -1541,7 +1541,7 @@ int rect_testRectEquals(void *arg)
return TEST_COMPLETED;
}
-/*!
+/* !
* \brief Negative tests against SDL_RectEquals() with invalid parameters
*
* \sa
@@ -1563,7 +1563,7 @@ int rect_testRectEqualsParam(void *arg)
rectB.w=SDLTest_RandomIntegerInRange(1, 1024);
rectB.h=SDLTest_RandomIntegerInRange(1, 1024);
- // invalid parameter combinations
+ /* invalid parameter combinations */
result = (SDL_bool)SDL_RectEquals((const SDL_Rect *)NULL, (const SDL_Rect *)&rectB);
SDLTest_AssertCheck(result == SDL_FALSE, "Check that function returns SDL_FALSE when 1st parameter is NULL");
result = (SDL_bool)SDL_RectEquals((const SDL_Rect *)&rectA, (const SDL_Rect *)NULL);
@@ -1674,7 +1674,7 @@ static const SDLTest_TestCaseReference rectTest29 =
{ (SDLTest_TestCaseFp)rect_testRectEqualsParam, "rect_testRectEqualsParam", "Negative tests against SDL_RectEquals with invalid parameters", TEST_ENABLED };
-/*!
+/* !
* \brief Sequence of Rect test cases; functions that handle simple rectangles including overlaps and merges.
*
* \sa
diff --git a/test/testautomation_render.c b/test/testautomation_render.c
index d582cb0..e380181 100644
--- a/test/testautomation_render.c
+++ b/test/testautomation_render.c
@@ -190,10 +190,8 @@ int render_testPrimitives (void *arg)
_compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE );
/* Clean up. */
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
return TEST_COMPLETED;
}
@@ -333,10 +331,8 @@ int render_testPrimitivesBlend (void *arg)
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
/* Clean up. */
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
return TEST_COMPLETED;
}
@@ -400,10 +396,8 @@ render_testBlit(void *arg)
/* Clean up. */
SDL_DestroyTexture( tface );
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
return TEST_COMPLETED;
}
@@ -470,10 +464,8 @@ render_testBlitColor (void *arg)
/* Clean up. */
SDL_DestroyTexture( tface );
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
return TEST_COMPLETED;
}
@@ -543,10 +535,8 @@ render_testBlitAlpha (void *arg)
/* Clean up. */
SDL_DestroyTexture( tface );
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
return TEST_COMPLETED;
}
@@ -655,37 +645,29 @@ render_testBlitBlend (void *arg)
_testBlitBlendMode( tface, SDL_BLENDMODE_NONE );
referenceSurface = SDLTest_ImageBlitBlendNone();
_compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE );
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
/* Test Blend. */
_testBlitBlendMode( tface, SDL_BLENDMODE_BLEND );
referenceSurface = SDLTest_ImageBlitBlend();
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
/* Test Add. */
_testBlitBlendMode( tface, SDL_BLENDMODE_ADD );
referenceSurface = SDLTest_ImageBlitBlendAdd();
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
/* Test Mod. */
_testBlitBlendMode( tface, SDL_BLENDMODE_MOD);
referenceSurface = SDLTest_ImageBlitBlendMod();
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
/* Clear surface. */
_clearScreen();
@@ -733,10 +715,8 @@ render_testBlitBlend (void *arg)
/* Check to see if final image matches. */
referenceSurface = SDLTest_ImageBlitBlendAll();
_compare(referenceSurface, ALLOWABLE_ERROR_BLENDED);
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
return TEST_COMPLETED;
}
@@ -995,12 +975,8 @@ _compare(SDL_Surface *referenceSurface, int allowable_error)
SDLTest_AssertCheck(result == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", result);
/* Clean up. */
- if (pixels != NULL) {
- SDL_free(pixels);
- }
- if (testSurface != NULL) {
- SDL_FreeSurface(testSurface);
- }
+ SDL_free(pixels);
+ SDL_FreeSurface(testSurface);
}
/**
diff --git a/test/testautomation_rwops.c b/test/testautomation_rwops.c
index f536d8b..c8e1c59 100644
--- a/test/testautomation_rwops.c
+++ b/test/testautomation_rwops.c
@@ -165,7 +165,7 @@ _testGenericRWopsValidations(SDL_RWops *rw, int write)
i);
}
-/*!
+/* !
* Negative test for SDL_RWFromFile parameters
*
* \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile
@@ -305,7 +305,7 @@ rwops_testFileRead(void)
SDLTest_AssertPass("Call to SDL_RWFromFile(..,\"r\") succeeded");
SDLTest_AssertCheck(rw != NULL, "Verify opening file with SDL_RWFromFile in read mode does not return NULL");
- // Bail out if NULL
+ /* Bail out if NULL */
if (rw == NULL) return TEST_ABORTED;
/* Check type */
@@ -352,7 +352,7 @@ rwops_testFileWrite(void)
SDLTest_AssertPass("Call to SDL_RWFromFile(..,\"w+\") succeeded");
SDLTest_AssertCheck(rw != NULL, "Verify opening file with SDL_RWFromFile in write mode does not return NULL");
- // Bail out if NULL
+ /* Bail out if NULL */
if (rw == NULL) return TEST_ABORTED;
/* Check type */
@@ -642,7 +642,7 @@ rwops_testFileWriteReadEndian(void)
SDLTest_AssertPass("Call to SDL_RWFromFile(..,\"w+\")");
SDLTest_AssertCheck(rw != NULL, "Verify opening file with SDL_RWFromFile in write mode does not return NULL");
- // Bail out if NULL
+ /* Bail out if NULL */
if (rw == NULL) return TEST_ABORTED;
/* Write test data */
diff --git a/test/testautomation_sdltest.c b/test/testautomation_sdltest.c
index e0d921b..d9ce7d2 100644
--- a/test/testautomation_sdltest.c
+++ b/test/testautomation_sdltest.c
@@ -192,7 +192,7 @@ sdltest_randomBoundaryNumberUint8(void *arg)
"Validate result value for parameters (1,255,SDL_FALSE); expected: 0, got: %lld", uresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomUintXBoundaryValue(0, 0xfe, SDL_FALSE) returns 0xff (no error) */
uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(0, 254, SDL_FALSE);
@@ -202,7 +202,7 @@ sdltest_randomBoundaryNumberUint8(void *arg)
"Validate result value for parameters (0,254,SDL_FALSE); expected: 0xff, got: %lld", uresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomUintXBoundaryValue(0, 0xff, SDL_FALSE) returns 0 (sets error) */
uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(0, 255, SDL_FALSE);
@@ -302,7 +302,7 @@ sdltest_randomBoundaryNumberUint16(void *arg)
"Validate result value for parameters (1,0xffff,SDL_FALSE); expected: 0, got: %lld", uresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomUintXBoundaryValue(0, 0xfffe, SDL_FALSE) returns 0xffff (no error) */
uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(0, 0xfffe, SDL_FALSE);
@@ -312,7 +312,7 @@ sdltest_randomBoundaryNumberUint16(void *arg)
"Validate result value for parameters (0,0xfffe,SDL_FALSE); expected: 0xffff, got: %lld", uresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomUintXBoundaryValue(0, 0xffff, SDL_FALSE) returns 0 (sets error) */
uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(0, 0xffff, SDL_FALSE);
@@ -412,7 +412,7 @@ sdltest_randomBoundaryNumberUint32(void *arg)
"Validate result value for parameters (1,0xffffffff,SDL_FALSE); expected: 0, got: %lld", uresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomUintXBoundaryValue(0, 0xfffffffe, SDL_FALSE) returns 0xffffffff (no error) */
uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(0, 0xfffffffe, SDL_FALSE);
@@ -422,7 +422,7 @@ sdltest_randomBoundaryNumberUint32(void *arg)
"Validate result value for parameters (0,0xfffffffe,SDL_FALSE); expected: 0xffffffff, got: %lld", uresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomUintXBoundaryValue(0, 0xffffffff, SDL_FALSE) returns 0 (sets error) */
uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(0, 0xffffffff, SDL_FALSE);
@@ -522,7 +522,7 @@ sdltest_randomBoundaryNumberUint64(void *arg)
"Validate result value for parameters (1,0xffffffffffffffff,SDL_FALSE); expected: 0, got: %lld", uresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomUintXBoundaryValue(0, 0xfffffffffffffffe, SDL_FALSE) returns 0xffffffffffffffff (no error) */
uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(0, (Uint64)0xfffffffffffffffeULL, SDL_FALSE);
@@ -532,7 +532,7 @@ sdltest_randomBoundaryNumberUint64(void *arg)
"Validate result value for parameters (0,0xfffffffffffffffe,SDL_FALSE); expected: 0xffffffffffffffff, got: %lld", uresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomUintXBoundaryValue(0, 0xffffffffffffffff, SDL_FALSE) returns 0 (sets error) */
uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(0, (Uint64)0xffffffffffffffffULL, SDL_FALSE);
@@ -632,7 +632,7 @@ sdltest_randomBoundaryNumberSint8(void *arg)
"Validate result value for parameters (SCHAR_MIN + 1,SCHAR_MAX,SDL_FALSE); expected: %d, got: %lld", SCHAR_MIN, sresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomSintXBoundaryValue(SCHAR_MIN, SCHAR_MAX - 1, SDL_FALSE) returns SCHAR_MAX (no error) */
sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(SCHAR_MIN, SCHAR_MAX -1, SDL_FALSE);
@@ -642,7 +642,7 @@ sdltest_randomBoundaryNumberSint8(void *arg)
"Validate result value for parameters (SCHAR_MIN,SCHAR_MAX - 1,SDL_FALSE); expected: %d, got: %lld", SCHAR_MAX, sresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomSintXBoundaryValue(SCHAR_MIN, SCHAR_MAX, SDL_FALSE) returns SCHAR_MIN (sets error) */
sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(SCHAR_MIN, SCHAR_MAX, SDL_FALSE);
@@ -742,7 +742,7 @@ sdltest_randomBoundaryNumberSint16(void *arg)
"Validate result value for parameters (SHRT_MIN+1,SHRT_MAX,SDL_FALSE); expected: %d, got: %lld", SHRT_MIN, sresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomSintXBoundaryValue(SHRT_MIN, SHRT_MAX - 1, SDL_FALSE) returns SHRT_MAX (no error) */
sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(SHRT_MIN, SHRT_MAX - 1, SDL_FALSE);
@@ -752,7 +752,7 @@ sdltest_randomBoundaryNumberSint16(void *arg)
"Validate result value for parameters (SHRT_MIN,SHRT_MAX - 1,SDL_FALSE); expected: %d, got: %lld", SHRT_MAX, sresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomSintXBoundaryValue(SHRT_MIN, SHRT_MAX, SDL_FALSE) returns 0 (sets error) */
sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(SHRT_MIN, SHRT_MAX, SDL_FALSE);
@@ -859,7 +859,7 @@ sdltest_randomBoundaryNumberSint32(void *arg)
"Validate result value for parameters (LONG_MIN+1,LONG_MAX,SDL_FALSE); expected: %d, got: %lld", long_min, sresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomSintXBoundaryValue(LONG_MIN, LONG_MAX - 1, SDL_FALSE) returns LONG_MAX (no error) */
sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(long_min, long_max - 1, SDL_FALSE);
@@ -869,7 +869,7 @@ sdltest_randomBoundaryNumberSint32(void *arg)
"Validate result value for parameters (LONG_MIN,LONG_MAX - 1,SDL_FALSE); expected: %d, got: %lld", long_max, sresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomSintXBoundaryValue(LONG_MIN, LONG_MAX, SDL_FALSE) returns 0 (sets error) */
sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(long_min, long_max, SDL_FALSE);
@@ -969,7 +969,7 @@ sdltest_randomBoundaryNumberSint64(void *arg)
"Validate result value for parameters (LLONG_MIN+1,LLONG_MAX,SDL_FALSE); expected: %lld, got: %lld", LLONG_MIN, sresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomSintXBoundaryValue(LLONG_MIN, LLONG_MAX - 1, SDL_FALSE) returns LLONG_MAX (no error) */
sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(LLONG_MIN, LLONG_MAX - 1, SDL_FALSE);
@@ -979,7 +979,7 @@ sdltest_randomBoundaryNumberSint64(void *arg)
"Validate result value for parameters (LLONG_MIN,LLONG_MAX - 1,SDL_FALSE); expected: %lld, got: %lld", LLONG_MAX, sresult);
lastError = (char *)SDL_GetError();
SDLTest_AssertPass("SDL_GetError()");
- SDLTest_AssertCheck(lastError == NULL || SDL_strlen(lastError) == 0, "Validate no error message was set");
+ SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
/* RandomSintXBoundaryValue(LLONG_MIN, LLONG_MAX, SDL_FALSE) returns 0 (sets error) */
sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(LLONG_MIN, LLONG_MAX, SDL_FALSE);
diff --git a/test/testautomation_suites.h b/test/testautomation_suites.h
index 695681b..1ba7c95 100644
--- a/test/testautomation_suites.h
+++ b/test/testautomation_suites.h
@@ -8,7 +8,7 @@
#include "SDL_test.h"
-// Test collections
+/* Test collections */
extern SDLTest_TestSuiteReference audioTestSuite;
extern SDLTest_TestSuiteReference clipboardTestSuite;
extern SDLTest_TestSuiteReference eventsTestSuite;
@@ -27,7 +27,7 @@ extern SDLTest_TestSuiteReference syswmTestSuite;
extern SDLTest_TestSuiteReference timerTestSuite;
extern SDLTest_TestSuiteReference videoTestSuite;
-// All test suites
+/* All test suites */
SDLTest_TestSuiteReference *testSuites[] = {
&audioTestSuite,
&clipboardTestSuite,
diff --git a/test/testautomation_surface.c b/test/testautomation_surface.c
index 3f6c56c..d814918 100644
--- a/test/testautomation_surface.c
+++ b/test/testautomation_surface.c
@@ -63,14 +63,10 @@ _surfaceSetUp(void *arg)
void
_surfaceTearDown(void *arg)
{
- if (referenceSurface != NULL) {
- SDL_FreeSurface(referenceSurface);
- referenceSurface = NULL;
- }
- if (testSurface != NULL) {
- SDL_FreeSurface(testSurface);
- testSurface = NULL;
- }
+ SDL_FreeSurface(referenceSurface);
+ referenceSurface = NULL;
+ SDL_FreeSurface(testSurface);
+ testSurface = NULL;
}
/**
@@ -193,10 +189,8 @@ void _testBlitBlendMode(int mode)
SDLTest_AssertCheck(checkFailCount4 == 0, "Validate results from calls to SDL_SetSurfaceBlendMode, expected: 0, got: %i", checkFailCount4);
/* Clean up */
- if (face != NULL) {
- SDL_FreeSurface(face);
- face = NULL;
- }
+ SDL_FreeSurface(face);
+ face = NULL;
}
/* Helper to check that a file exists */
@@ -250,19 +244,15 @@ surface_testSaveLoadBitmap(void *arg)
unlink(sampleFilename);
/* Clean up */
- if (face != NULL) {
SDL_FreeSurface(face);
face = NULL;
- }
- if (rface != NULL) {
SDL_FreeSurface(rface);
rface = NULL;
- }
return TEST_COMPLETED;
}
-/*!
+/* !
* Tests surface conversion.
*/
int
@@ -294,20 +284,16 @@ surface_testSurfaceConversion(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (face != NULL) {
- SDL_FreeSurface( face );
- face = NULL;
- }
- if (rface != NULL) {
- SDL_FreeSurface( rface );
- rface = NULL;
- }
+ SDL_FreeSurface(face);
+ face = NULL;
+ SDL_FreeSurface(rface);
+ rface = NULL;
return TEST_COMPLETED;
}
-/*!
+/* !
* Tests surface conversion across all pixel formats.
*/
int
@@ -360,8 +346,6 @@ surface_testCompleteSurfaceConversion(void *arg)
for ( i = 0; i < SDL_arraysize(pixel_formats); ++i ) {
for ( j = 0; j < SDL_arraysize(pixel_formats); ++j ) {
- /*printf("Converting %s -> %s\n", SDL_GetPixelFormatName(pixel_formats[i]), SDL_GetPixelFormatName(pixel_formats[j]));*/
-
fmt1 = SDL_AllocFormat(pixel_formats[i]);
SDL_assert(fmt1 != NULL);
cvt1 = SDL_ConvertSurface(face, fmt1, 0);
@@ -429,9 +413,7 @@ surface_testBlit(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (compareSurface != NULL) {
- SDL_FreeSurface( compareSurface );
- }
+ SDL_FreeSurface(compareSurface);
return TEST_COMPLETED;
}
@@ -454,9 +436,7 @@ surface_testBlitColorMod(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (compareSurface != NULL) {
- SDL_FreeSurface( compareSurface );
- }
+ SDL_FreeSurface(compareSurface);
return TEST_COMPLETED;
}
@@ -479,9 +459,7 @@ surface_testBlitAlphaMod(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (compareSurface != NULL) {
- SDL_FreeSurface( compareSurface );
- }
+ SDL_FreeSurface(compareSurface);
return TEST_COMPLETED;
}
@@ -505,9 +483,7 @@ surface_testBlitBlendNone(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (compareSurface != NULL) {
- SDL_FreeSurface( compareSurface );
- }
+ SDL_FreeSurface(compareSurface);
return TEST_COMPLETED;
}
@@ -530,9 +506,7 @@ surface_testBlitBlendBlend(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (compareSurface != NULL) {
- SDL_FreeSurface( compareSurface );
- }
+ SDL_FreeSurface(compareSurface);
return TEST_COMPLETED;
}
@@ -555,9 +529,7 @@ surface_testBlitBlendAdd(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (compareSurface != NULL) {
- SDL_FreeSurface( compareSurface );
- }
+ SDL_FreeSurface(compareSurface);
return TEST_COMPLETED;
}
@@ -580,9 +552,7 @@ surface_testBlitBlendMod(void *arg)
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (compareSurface != NULL) {
- SDL_FreeSurface( compareSurface );
- }
+ SDL_FreeSurface(compareSurface);
return TEST_COMPLETED;
}
@@ -605,9 +575,7 @@ surface_testBlitBlendLoop(void *arg) {
SDLTest_AssertCheck(ret == 0, "Validate result from SDLTest_CompareSurfaces, expected: 0, got: %i", ret);
/* Clean up. */
- if (compareSurface != NULL) {
- SDL_FreeSurface(compareSurface);
- }
+ SDL_FreeSurface(compareSurface);
return TEST_COMPLETED;
diff --git a/test/testautomation_video.c b/test/testautomation_video.c
index 4606109..3a7bfca 100644
--- a/test/testautomation_video.c
+++ b/test/testautomation_video.c
@@ -876,7 +876,7 @@ video_getWindowId(void *arg)
/* Clean up */
_destroyVideoSuiteTestWindow(window);
- /* Get window from ID for closed window*/
+ /* Get window from ID for closed window */
result = SDL_GetWindowFromID(id);
SDLTest_AssertPass("Call to SDL_GetWindowID(%d/closed_window)", id);
SDLTest_AssertCheck(result == NULL, "Verify result is NULL");
@@ -1714,10 +1714,10 @@ video_getSetWindowData(void *arg)
_destroyVideoSuiteTestWindow(window);
cleanup:
- if (referenceUserdata != NULL) SDL_free(referenceUserdata);
- if (referenceUserdata2 != NULL) SDL_free(referenceUserdata2);
- if (userdata != NULL) SDL_free(userdata);
- if (userdata2 != NULL) SDL_free(userdata2);
+ SDL_free(referenceUserdata);
+ SDL_free(referenceUserdata2);
+ SDL_free(userdata);
+ SDL_free(userdata2);
return returnValue;
}
diff --git a/test/testdraw2.c b/test/testdraw2.c
index a4509fe..62e2dbf 100644
--- a/test/testdraw2.c
+++ b/test/testdraw2.c
@@ -176,6 +176,9 @@ main(int argc, char *argv[])
SDL_Event event;
Uint32 then, now, frames;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize parameters */
num_objects = NUM_OBJECTS;
@@ -218,8 +221,7 @@ main(int argc, char *argv[])
}
}
if (consumed < 0) {
- fprintf(stderr,
- "Usage: %s %s [--blend none|blend|add|mod] [--cyclecolor] [--cyclealpha]\n",
+ SDL_Log("Usage: %s %s [--blend none|blend|add|mod] [--cyclecolor] [--cyclealpha]\n",
argv[0], SDLTest_CommonUsage(state));
return 1;
}
@@ -251,6 +253,8 @@ main(int argc, char *argv[])
}
for (i = 0; i < state->num_windows; ++i) {
SDL_Renderer *renderer = state->renderers[i];
+ if (state->windows[i] == NULL)
+ continue;
SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
SDL_RenderClear(renderer);
@@ -268,7 +272,7 @@ main(int argc, char *argv[])
now = SDL_GetTicks();
if (now > then) {
double fps = ((double) frames * 1000) / (now - then);
- printf("%2.2f frames per second\n", fps);
+ SDL_Log("%2.2f frames per second\n", fps);
}
return 0;
}
diff --git a/test/testdrawchessboard.c b/test/testdrawchessboard.c
index 002d8d7..567d3fb 100644
--- a/test/testdrawchessboard.c
+++ b/test/testdrawchessboard.c
@@ -54,10 +54,13 @@ main(int argc, char *argv[])
SDL_Surface *surface;
SDL_Renderer *renderer;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize SDL */
if(SDL_Init(SDL_INIT_VIDEO) != 0)
{
- fprintf(stderr,"SDL_Init fail : %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Init fail : %s\n", SDL_GetError());
return 1;
}
@@ -66,14 +69,14 @@ main(int argc, char *argv[])
window = SDL_CreateWindow("Chess Board", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_SHOWN);
if(!window)
{
- fprintf(stderr,"Window creation fail : %s\n",SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Window creation fail : %s\n",SDL_GetError());
return 1;
}
surface = SDL_GetWindowSurface(window);
renderer = SDL_CreateSoftwareRenderer(surface);
if(!renderer)
{
- fprintf(stderr,"Render creation for surface fail : %s\n",SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Render creation for surface fail : %s\n",SDL_GetError());
return 1;
}
diff --git a/test/testdropfile.c b/test/testdropfile.c
new file mode 100644
index 0000000..9f4fa7b
--- /dev/null
+++ b/test/testdropfile.c
@@ -0,0 +1,87 @@
+/*
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "SDL_test_common.h"
+
+static SDLTest_CommonState *state;
+
+/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
+static void
+quit(int rc)
+{
+ SDLTest_CommonQuit(state);
+ exit(rc);
+}
+
+int
+main(int argc, char *argv[])
+{
+ int i, done;
+ SDL_Event event;
+
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
+ /* Initialize test framework */
+ state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
+ if (!state) {
+ return 1;
+ }
+
+ for (i = 1; i < argc;) {
+ int consumed;
+
+ consumed = SDLTest_CommonArg(state, i);
+ if (consumed == 0) {
+ consumed = -1;
+ }
+ if (consumed < 0) {
+ SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
+ quit(1);
+ }
+ i += consumed;
+ }
+ if (!SDLTest_CommonInit(state)) {
+ quit(2);
+ }
+
+ for (i = 0; i < state->num_windows; ++i) {
+ SDL_Renderer *renderer = state->renderers[i];
+ SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
+ SDL_RenderClear(renderer);
+ SDL_RenderPresent(renderer);
+ }
+
+ /* Main render loop */
+ done = 0;
+ while (!done) {
+ /* Check for events */
+ while (SDL_PollEvent(&event)) {
+ SDLTest_CommonEvent(state, &event, &done);
+
+ if (event.type == SDL_DROPFILE) {
+ char *dropped_filedir = event.drop.file;
+ SDL_Log("File dropped on window: %s", dropped_filedir);
+ SDL_free(dropped_filedir);
+ }
+ }
+ }
+
+ quit(0);
+ /* keep the compiler happy ... */
+ return(0);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testerror.c b/test/testerror.c
index e7356c0..e9c76ff 100644
--- a/test/testerror.c
+++ b/test/testerror.c
@@ -36,10 +36,10 @@ ThreadFunc(void *data)
SDL_SetError("Thread %s (%lu) had a problem: %s",
(char *) data, SDL_ThreadID(), "nevermind");
while (alive) {
- printf("Thread '%s' is alive!\n", (char *) data);
+ SDL_Log("Thread '%s' is alive!\n", (char *) data);
SDL_Delay(1 * 1000);
}
- printf("Child thread error string: %s\n", SDL_GetError());
+ SDL_Log("Child thread error string: %s\n", SDL_GetError());
return (0);
}
@@ -48,9 +48,12 @@ main(int argc, char *argv[])
{
SDL_Thread *thread;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Load the SDL library */
if (SDL_Init(0) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
}
@@ -60,15 +63,15 @@ main(int argc, char *argv[])
alive = 1;
thread = SDL_CreateThread(ThreadFunc, NULL, "#1");
if (thread == NULL) {
- fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s\n", SDL_GetError());
quit(1);
}
SDL_Delay(5 * 1000);
- printf("Waiting for thread #1\n");
+ SDL_Log("Waiting for thread #1\n");
alive = 0;
SDL_WaitThread(thread, NULL);
- printf("Main thread error string: %s\n", SDL_GetError());
+ SDL_Log("Main thread error string: %s\n", SDL_GetError());
SDL_Quit();
return (0);
diff --git a/test/testfile.c b/test/testfile.c
index d82d0eb..57ba02f 100644
--- a/test/testfile.c
+++ b/test/testfile.c
@@ -12,7 +12,7 @@
/* sanity tests on SDL_rwops.c (usefull for alternative implementations of stdio rwops) */
-// quiet windows compiler warnings
+/* quiet windows compiler warnings */
#define _CRT_NONSTDC_NO_WARNINGS
#include <stdlib.h>
@@ -44,7 +44,6 @@
static void
cleanup(void)
{
-
unlink(FBASENAME1);
unlink(FBASENAME2);
}
@@ -52,8 +51,7 @@ cleanup(void)
static void
rwops_error_quit(unsigned line, SDL_RWops * rwops)
{
-
- printf("testfile.c(%d): failed\n", line);
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "testfile.c(%d): failed\n", line);
if (rwops) {
rwops->close(rwops); /* This calls SDL_FreeRW(rwops); */
}
@@ -71,6 +69,9 @@ main(int argc, char *argv[])
SDL_RWops *rwops = NULL;
char test_buf[30];
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
cleanup();
/* test 1 : basic argument test: all those calls to SDL_RWFromFile should fail */
@@ -90,7 +91,7 @@ main(int argc, char *argv[])
rwops = SDL_RWFromFile("something", NULL);
if (rwops)
RWOP_ERR_QUIT(rwops);
- printf("test1 OK\n");
+ SDL_Log("test1 OK\n");
/* test 2 : check that inexistent file is not successfully opened/created when required */
/* modes : r, r+ imply that file MUST exist
@@ -123,7 +124,7 @@ main(int argc, char *argv[])
RWOP_ERR_QUIT(rwops);
rwops->close(rwops);
unlink(FBASENAME2);
- printf("test2 OK\n");
+ SDL_Log("test2 OK\n");
/* test 3 : creation, writing , reading, seeking,
test : w mode, r mode, w+ mode
@@ -201,7 +202,7 @@ main(int argc, char *argv[])
if (SDL_memcmp(test_buf, "12345678901234567890", 20))
RWOP_ERR_QUIT(rwops);
rwops->close(rwops);
- printf("test3 OK\n");
+ SDL_Log("test3 OK\n");
/* test 4: same in r+ mode */
rwops = SDL_RWFromFile(FBASENAME1, "rb+"); /* write + read + file must exists, no truncation */
@@ -236,7 +237,7 @@ main(int argc, char *argv[])
if (SDL_memcmp(test_buf, "12345678901234567890", 20))
RWOP_ERR_QUIT(rwops);
rwops->close(rwops);
- printf("test4 OK\n");
+ SDL_Log("test4 OK\n");
/* test5 : append mode */
rwops = SDL_RWFromFile(FBASENAME1, "ab+"); /* write + read + append */
@@ -277,7 +278,7 @@ main(int argc, char *argv[])
if (SDL_memcmp(test_buf, "123456789012345678901234567123", 30))
RWOP_ERR_QUIT(rwops);
rwops->close(rwops);
- printf("test5 OK\n");
+ SDL_Log("test5 OK\n");
cleanup();
return 0; /* all ok */
}
diff --git a/test/testfilesystem.c b/test/testfilesystem.c
new file mode 100644
index 0000000..e1f2513
--- /dev/null
+++ b/test/testfilesystem.c
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely.
+*/
+/* Simple test of power subsystem. */
+
+#include <stdio.h>
+#include "SDL.h"
+
+int
+main(int argc, char *argv[])
+{
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
+ if (SDL_Init(0) == -1) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Init() failed: %s\n", SDL_GetError());
+ return 1;
+ }
+
+ SDL_Log("base path: '%s'\n", SDL_GetBasePath());
+ SDL_Log("pref path: '%s'\n", SDL_GetPrefPath("libsdl", "testfilesystem"));
+
+ SDL_Quit();
+ return 0;
+}
diff --git a/test/testgamecontroller.c b/test/testgamecontroller.c
index cd18aa5..cbdf8c3 100644
--- a/test/testgamecontroller.c
+++ b/test/testgamecontroller.c
@@ -91,7 +91,7 @@ WatchGameController(SDL_GameController * gamecontroller)
const char *name = SDL_GameControllerName(gamecontroller);
const char *basetitle = "Game Controller Test: ";
const size_t titlelen = SDL_strlen(basetitle) + SDL_strlen(name) + 1;
- char *title = SDL_malloc(titlelen);
+ char *title = (char *)SDL_malloc(titlelen);
SDL_Window *window = NULL;
SDL_Renderer *screen = NULL;
int done = 0;
@@ -107,13 +107,13 @@ WatchGameController(SDL_GameController * gamecontroller)
SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH,
SCREEN_HEIGHT, 0);
if (window == NULL) {
- fprintf(stderr, "Couldn't create window: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError());
return;
}
screen = SDL_CreateRenderer(window, -1, 0);
if (screen == NULL) {
- fprintf(stderr, "Couldn't create renderer: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s\n", SDL_GetError());
SDL_DestroyWindow(window);
return;
}
@@ -124,7 +124,7 @@ WatchGameController(SDL_GameController * gamecontroller)
SDL_RaiseWindow(window);
/* Print info about the controller we are watching */
- printf("Watching controller %s\n", name ? name : "Unknown Controller");
+ SDL_Log("Watching controller %s\n", name ? name : "Unknown Controller");
/* Loop, getting controller events! */
while (!done) {
@@ -135,21 +135,21 @@ WatchGameController(SDL_GameController * gamecontroller)
while (SDL_PollEvent(&event)) {
switch (event.type) {
case SDL_CONTROLLERAXISMOTION:
- printf("Controller %d axis %d ('%s') value: %d\n",
+ SDL_Log("Controller %d axis %d ('%s') value: %d\n",
event.caxis.which,
event.caxis.axis,
- ControllerAxisName(event.caxis.axis),
+ ControllerAxisName((SDL_GameControllerAxis)event.caxis.axis),
event.caxis.value);
break;
case SDL_CONTROLLERBUTTONDOWN:
- printf("Controller %d button %d ('%s') down\n",
+ SDL_Log("Controller %d button %d ('%s') down\n",
event.cbutton.which, event.cbutton.button,
- ControllerButtonName(event.cbutton.button));
+ ControllerButtonName((SDL_GameControllerButton)event.cbutton.button));
break;
case SDL_CONTROLLERBUTTONUP:
- printf("Controller %d button %d ('%s') up\n",
+ SDL_Log("Controller %d button %d ('%s') up\n",
event.cbutton.which, event.cbutton.button,
- ControllerButtonName(event.cbutton.button));
+ ControllerButtonName((SDL_GameControllerButton)event.cbutton.button));
break;
case SDL_KEYDOWN:
if (event.key.keysym.sym != SDLK_ESCAPE) {
@@ -167,7 +167,7 @@ WatchGameController(SDL_GameController * gamecontroller)
/* Update visual controller state */
SDL_SetRenderDrawColor(screen, 0x00, 0xFF, 0x00, SDL_ALPHA_OPAQUE);
for (i = 0; i <SDL_CONTROLLER_BUTTON_MAX; ++i) {
- if (SDL_GameControllerGetButton(gamecontroller, i) == SDL_PRESSED) {
+ if (SDL_GameControllerGetButton(gamecontroller, (SDL_GameControllerButton)i) == SDL_PRESSED) {
DrawRect(screen, i * 34, SCREEN_HEIGHT - 34, 32, 32);
}
}
@@ -176,7 +176,7 @@ WatchGameController(SDL_GameController * gamecontroller)
for (i = 0; i < SDL_CONTROLLER_AXIS_MAX / 2; ++i) {
/* Draw the X/Y axis */
int x, y;
- x = (((int) SDL_GameControllerGetAxis(gamecontroller, i * 2 + 0)) + 32768);
+ x = (((int) SDL_GameControllerGetAxis(gamecontroller, (SDL_GameControllerAxis)(i * 2 + 0))) + 32768);
x *= SCREEN_WIDTH;
x /= 65535;
if (x < 0) {
@@ -184,7 +184,7 @@ WatchGameController(SDL_GameController * gamecontroller)
} else if (x > (SCREEN_WIDTH - 16)) {
x = SCREEN_WIDTH - 16;
}
- y = (((int) SDL_GameControllerGetAxis(gamecontroller, i * 2 + 1)) + 32768);
+ y = (((int) SDL_GameControllerGetAxis(gamecontroller, (SDL_GameControllerAxis)(i * 2 + 1))) + 32768);
y *= SCREEN_HEIGHT;
y /= 65535;
if (y < 0) {
@@ -217,16 +217,19 @@ main(int argc, char *argv[])
char guid[64];
SDL_GameController *gamecontroller;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize SDL (Note: video is required to start event loop) */
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER ) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return 1;
}
/* Print information about the controller */
for (i = 0; i < SDL_NumJoysticks(); ++i) {
const char *name;
- const char *description = "Joystick (not recognized as game controller)";
+ const char *description;
SDL_JoystickGetGUIDString(SDL_JoystickGetDeviceGUID(i),
guid, sizeof (guid));
@@ -235,25 +238,27 @@ main(int argc, char *argv[])
{
nController++;
name = SDL_GameControllerNameForIndex(i);
+ description = "Controller";
} else {
name = SDL_JoystickNameForIndex(i);
+ description = "Joystick";
}
- printf("%s %d: %s (guid %s)\n", description, i, name ? name : "Unknown", guid);
+ SDL_Log("%s %d: %s (guid %s)\n", description, i, name ? name : "Unknown", guid);
}
- printf("There are %d game controller(s) attached (%d joystick(s))\n", nController, SDL_NumJoysticks());
+ SDL_Log("There are %d game controller(s) attached (%d joystick(s))\n", nController, SDL_NumJoysticks());
if (argv[1]) {
int device = atoi(argv[1]);
if (device >= SDL_NumJoysticks()) {
- printf("%i is an invalid joystick index.\n", device);
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "%i is an invalid joystick index.\n", device);
retcode = 1;
} else {
SDL_JoystickGetGUIDString(SDL_JoystickGetDeviceGUID(device),
guid, sizeof (guid));
- printf("Attempting to open device %i, guid %s\n", device, guid);
+ SDL_Log("Attempting to open device %i, guid %s\n", device, guid);
gamecontroller = SDL_GameControllerOpen(device);
if (gamecontroller == NULL) {
- printf("Couldn't open joystick %d: %s\n", device, SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open joystick %d: %s\n", device, SDL_GetError());
retcode = 1;
} else {
WatchGameController(gamecontroller);
@@ -272,7 +277,7 @@ main(int argc, char *argv[])
int
main(int argc, char *argv[])
{
- fprintf(stderr, "SDL compiled without Joystick support.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Joystick support.\n");
exit(1);
}
diff --git a/test/testgesture.c b/test/testgesture.c
index e2a9694..016506e 100644
--- a/test/testgesture.c
+++ b/test/testgesture.c
@@ -49,7 +49,7 @@
#define BPP 4
#define DEPTH 32
-//MUST BE A POWER OF 2!
+/* MUST BE A POWER OF 2! */
#define EVENT_BUF_SIZE 256
@@ -102,9 +102,9 @@ void setpix(SDL_Surface *screen, float _x, float _y, unsigned int col)
SDL_memcpy(&colour,pixmem32,screen->format->BytesPerPixel);
SDL_GetRGB(colour,screen->format,&r,&g,&b);
- //r = 0;g = 0; b = 0;
+ /* r = 0;g = 0; b = 0; */
a = (float)((col>>24)&0xFF);
- if(a == 0) a = 0xFF; //Hack, to make things easier.
+ if(a == 0) a = 0xFF; /* Hack, to make things easier. */
a /= 0xFF;
r = (Uint8)(r*(1-a) + ((col>>16)&0xFF)*(a));
g = (Uint8)(g*(1-a) + ((col>> 8)&0xFF)*(a));
@@ -127,7 +127,7 @@ void drawCircle(SDL_Surface* screen,float x,float y,float r,unsigned int c)
float xr;
for(ty = (float)-SDL_fabs(r);ty <= (float)SDL_fabs((int)r);ty++) {
xr = (float)sqrt(r*r - ty*ty);
- if(r > 0) { //r > 0 ==> filled circle
+ if(r > 0) { /* r > 0 ==> filled circle */
for(tx=-xr+.5f;tx<=xr-.5;tx++) {
setpix(screen,x+tx,y+ty,c);
}
@@ -157,7 +157,7 @@ void DrawScreen(SDL_Surface* screen)
setpix(screen,(float)x,(float)y,((x%255)<<16) + ((y%255)<<8) + (x+y)%255);
#endif
- //draw Touch History
+ /* draw Touch History */
for(i = eventWrite; i < eventWrite+EVENT_BUF_SIZE; ++i) {
const SDL_Event *event = &events[i&(EVENT_BUF_SIZE-1)];
float age = (float)(i - eventWrite) / EVENT_BUF_SIZE;
@@ -170,7 +170,7 @@ void DrawScreen(SDL_Surface* screen)
x = event->tfinger.x;
y = event->tfinger.y;
- //draw the touch:
+ /* draw the touch: */
c = colors[event->tfinger.fingerId%7];
col = ((unsigned int)(c*(.1+.85))) | (unsigned int)(0xFF*age)<<24;
@@ -207,7 +207,10 @@ int main(int argc, char* argv[])
SDL_bool quitting = SDL_FALSE;
SDL_RWops *src;
- //gesture variables
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
+ /* gesture variables */
knob.r = .1f;
knob.ang = 0;
@@ -222,7 +225,7 @@ int main(int argc, char* argv[])
while(!quitting) {
while(SDL_PollEvent(&event))
{
- //Record _all_ events
+ /* Record _all_ events */
events[eventWrite & (EVENT_BUF_SIZE-1)] = event;
eventWrite++;
diff --git a/test/testgl2.c b/test/testgl2.c
index eb1a245..19685ea 100644
--- a/test/testgl2.c
+++ b/test/testgl2.c
@@ -180,6 +180,10 @@ main(int argc, char *argv[])
SDL_Event event;
Uint32 then, now, frames;
int status;
+ int dw, dh;
+
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
/* Initialize parameters */
fsaa = 0;
@@ -206,7 +210,7 @@ main(int argc, char *argv[])
}
}
if (consumed < 0) {
- fprintf(stderr, "Usage: %s %s [--fsaa n] [--accel n]\n", argv[0],
+ SDL_Log("Usage: %s %s [--fsaa n] [--accel n]\n", argv[0],
SDLTest_CommonUsage(state));
quit(1);
}
@@ -235,7 +239,7 @@ main(int argc, char *argv[])
/* Create OpenGL context */
context = SDL_GL_CreateContext(state->windows[0]);
if (!context) {
- fprintf(stderr, "SDL_GL_CreateContext(): %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_GL_CreateContext(): %s\n", SDL_GetError());
quit(2);
}
@@ -249,63 +253,67 @@ main(int argc, char *argv[])
}
SDL_GetCurrentDisplayMode(0, &mode);
- printf("Screen BPP : %d\n", SDL_BITSPERPIXEL(mode.format));
- printf("Swap Interval : %d\n", SDL_GL_GetSwapInterval());
- printf("\n");
- printf("Vendor : %s\n", glGetString(GL_VENDOR));
- printf("Renderer : %s\n", glGetString(GL_RENDERER));
- printf("Version : %s\n", glGetString(GL_VERSION));
- printf("Extensions : %s\n", glGetString(GL_EXTENSIONS));
- printf("\n");
+ SDL_Log("Screen BPP : %d\n", SDL_BITSPERPIXEL(mode.format));
+ SDL_Log("Swap Interval : %d\n", SDL_GL_GetSwapInterval());
+ SDL_GetWindowSize(state->windows[0], &dw, &dh);
+ SDL_Log("Window Size : %d,%d\n", dw, dh);
+ SDL_GL_GetDrawableSize(state->windows[0], &dw, &dh);
+ SDL_Log("Draw Size : %d,%d\n", dw, dh);
+ SDL_Log("\n");
+ SDL_Log("Vendor : %s\n", glGetString(GL_VENDOR));
+ SDL_Log("Renderer : %s\n", glGetString(GL_RENDERER));
+ SDL_Log("Version : %s\n", glGetString(GL_VERSION));
+ SDL_Log("Extensions : %s\n", glGetString(GL_EXTENSIONS));
+ SDL_Log("\n");
status = SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value);
if (!status) {
- printf("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value);
+ SDL_Log("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value);
} else {
- printf("Failed to get SDL_GL_RED_SIZE: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_RED_SIZE: %s\n", SDL_GetError());
}
status = SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value);
if (!status) {
- printf("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value);
+ SDL_Log("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value);
} else {
- printf("Failed to get SDL_GL_GREEN_SIZE: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_GREEN_SIZE: %s\n", SDL_GetError());
}
status = SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value);
if (!status) {
- printf("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value);
+ SDL_Log("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value);
} else {
- printf("Failed to get SDL_GL_BLUE_SIZE: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_BLUE_SIZE: %s\n", SDL_GetError());
}
status = SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value);
if (!status) {
- printf("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", 16, value);
+ SDL_Log("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", 16, value);
} else {
- printf("Failed to get SDL_GL_DEPTH_SIZE: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_DEPTH_SIZE: %s\n", SDL_GetError());
}
if (fsaa) {
status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value);
if (!status) {
- printf("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value);
+ SDL_Log("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value);
} else {
- printf("Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n",
SDL_GetError());
}
status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value);
if (!status) {
- printf("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
+ SDL_Log("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
value);
} else {
- printf("Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n",
SDL_GetError());
}
}
if (accel >= 0) {
status = SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &value);
if (!status) {
- printf("SDL_GL_ACCELERATED_VISUAL: requested %d, got %d\n", accel,
+ SDL_Log("SDL_GL_ACCELERATED_VISUAL: requested %d, got %d\n", accel,
value);
} else {
- printf("Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n",
SDL_GetError());
}
}
@@ -319,7 +327,7 @@ main(int argc, char *argv[])
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LESS);
glShadeModel(GL_SMOOTH);
-
+
/* Main render loop */
frames = 0;
then = SDL_GetTicks();
@@ -332,8 +340,10 @@ main(int argc, char *argv[])
}
for (i = 0; i < state->num_windows; ++i) {
int w, h;
+ if (state->windows[i] == NULL)
+ continue;
SDL_GL_MakeCurrent(state->windows[i], context);
- SDL_GetWindowSize(state->windows[i], &w, &h);
+ SDL_GL_GetDrawableSize(state->windows[i], &w, &h);
glViewport(0, 0, w, h);
Render();
SDL_GL_SwapWindow(state->windows[i]);
@@ -343,7 +353,7 @@ main(int argc, char *argv[])
/* Print out some timing information */
now = SDL_GetTicks();
if (now > then) {
- printf("%2.2f frames per second\n",
+ SDL_Log("%2.2f frames per second\n",
((double) frames * 1000) / (now - then));
}
quit(0);
@@ -355,7 +365,7 @@ main(int argc, char *argv[])
int
main(int argc, char *argv[])
{
- printf("No OpenGL support on this system\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "No OpenGL support on this system\n");
return 1;
}
diff --git a/test/testgles.c b/test/testgles.c
index 41312a8..4e1bc07 100644
--- a/test/testgles.c
+++ b/test/testgles.c
@@ -110,6 +110,9 @@ main(int argc, char *argv[])
Uint32 then, now, frames;
int status;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize parameters */
fsaa = 0;
accel = 0;
@@ -143,7 +146,7 @@ main(int argc, char *argv[])
}
}
if (consumed < 0) {
- fprintf(stderr, "Usage: %s %s [--fsaa] [--accel] [--zdepth %%d]\n", argv[0],
+ SDL_Log("Usage: %s %s [--fsaa] [--accel] [--zdepth %%d]\n", argv[0],
SDLTest_CommonUsage(state));
quit(1);
}
@@ -156,6 +159,9 @@ main(int argc, char *argv[])
state->gl_green_size = 5;
state->gl_blue_size = 5;
state->gl_depth_size = depth;
+ state->gl_major_version = 1;
+ state->gl_minor_version = 1;
+ state->gl_profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
if (fsaa) {
state->gl_multisamplebuffers=1;
state->gl_multisamplesamples=fsaa;
@@ -169,7 +175,7 @@ main(int argc, char *argv[])
context = SDL_calloc(state->num_windows, sizeof(context));
if (context == NULL) {
- fprintf(stderr, "Out of memory!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n");
quit(2);
}
@@ -177,7 +183,7 @@ main(int argc, char *argv[])
for (i = 0; i < state->num_windows; i++) {
context[i] = SDL_GL_CreateContext(state->windows[i]);
if (!context[i]) {
- fprintf(stderr, "SDL_GL_CreateContext(): %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_GL_CreateContext(): %s\n", SDL_GetError());
quit(2);
}
}
@@ -189,65 +195,65 @@ main(int argc, char *argv[])
}
SDL_GetCurrentDisplayMode(0, &mode);
- printf("Screen bpp: %d\n", SDL_BITSPERPIXEL(mode.format));
- printf("\n");
- printf("Vendor : %s\n", glGetString(GL_VENDOR));
- printf("Renderer : %s\n", glGetString(GL_RENDERER));
- printf("Version : %s\n", glGetString(GL_VERSION));
- printf("Extensions : %s\n", glGetString(GL_EXTENSIONS));
- printf("\n");
+ SDL_Log("Screen bpp: %d\n", SDL_BITSPERPIXEL(mode.format));
+ SDL_Log("\n");
+ SDL_Log("Vendor : %s\n", glGetString(GL_VENDOR));
+ SDL_Log("Renderer : %s\n", glGetString(GL_RENDERER));
+ SDL_Log("Version : %s\n", glGetString(GL_VERSION));
+ SDL_Log("Extensions : %s\n", glGetString(GL_EXTENSIONS));
+ SDL_Log("\n");
status = SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value);
if (!status) {
- printf("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value);
+ SDL_Log("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value);
} else {
- fprintf(stderr, "Failed to get SDL_GL_RED_SIZE: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_RED_SIZE: %s\n",
SDL_GetError());
}
status = SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value);
if (!status) {
- printf("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value);
+ SDL_Log("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value);
} else {
- fprintf(stderr, "Failed to get SDL_GL_GREEN_SIZE: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_GREEN_SIZE: %s\n",
SDL_GetError());
}
status = SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value);
if (!status) {
- printf("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value);
+ SDL_Log("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value);
} else {
- fprintf(stderr, "Failed to get SDL_GL_BLUE_SIZE: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_BLUE_SIZE: %s\n",
SDL_GetError());
}
status = SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value);
if (!status) {
- printf("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", depth, value);
+ SDL_Log("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", depth, value);
} else {
- fprintf(stderr, "Failed to get SDL_GL_DEPTH_SIZE: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_DEPTH_SIZE: %s\n",
SDL_GetError());
}
if (fsaa) {
status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value);
if (!status) {
- printf("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value);
+ SDL_Log("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value);
} else {
- fprintf(stderr, "Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_MULTISAMPLEBUFFERS: %s\n",
SDL_GetError());
}
status = SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value);
if (!status) {
- printf("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
+ SDL_Log("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
value);
} else {
- fprintf(stderr, "Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_MULTISAMPLESAMPLES: %s\n",
SDL_GetError());
}
}
if (accel) {
status = SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &value);
if (!status) {
- printf("SDL_GL_ACCELERATED_VISUAL: requested 1, got %d\n", value);
+ SDL_Log("SDL_GL_ACCELERATED_VISUAL: requested 1, got %d\n", value);
} else {
- fprintf(stderr, "Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to get SDL_GL_ACCELERATED_VISUAL: %s\n",
SDL_GetError());
}
}
@@ -258,7 +264,7 @@ main(int argc, char *argv[])
status = SDL_GL_MakeCurrent(state->windows[i], context[i]);
if (status) {
- printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
+ SDL_Log("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
/* Continue for next window */
continue;
@@ -292,7 +298,7 @@ main(int argc, char *argv[])
if (event.window.windowID == SDL_GetWindowID(state->windows[i])) {
status = SDL_GL_MakeCurrent(state->windows[i], context[i]);
if (status) {
- printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
+ SDL_Log("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
break;
}
/* Change view port to the new window dimensions */
@@ -309,9 +315,11 @@ main(int argc, char *argv[])
SDLTest_CommonEvent(state, &event, &done);
}
for (i = 0; i < state->num_windows; ++i) {
+ if (state->windows[i] == NULL)
+ continue;
status = SDL_GL_MakeCurrent(state->windows[i], context[i]);
if (status) {
- printf("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
+ SDL_Log("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
/* Continue for next window */
continue;
@@ -324,7 +332,7 @@ main(int argc, char *argv[])
/* Print out some timing information */
now = SDL_GetTicks();
if (now > then) {
- printf("%2.2f frames per second\n",
+ SDL_Log("%2.2f frames per second\n",
((double) frames * 1000) / (now - then));
}
quit(0);
@@ -336,7 +344,7 @@ main(int argc, char *argv[])
int
main(int argc, char *argv[])
{
- printf("No OpenGL ES support on this system\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "No OpenGL ES support on this system\n");
return 1;
}
diff --git a/test/testhaptic.c b/test/testhaptic.c
index 13dd19d..1e9dd3b 100644
--- a/test/testhaptic.c
+++ b/test/testhaptic.c
@@ -26,7 +26,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* includes
*/
#include <stdlib.h>
-#include <stdio.h> /* printf */
#include <string.h> /* strstr */
#include <ctype.h> /* isdigit */
@@ -62,12 +61,15 @@ main(int argc, char **argv)
int nefx;
unsigned int supported;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
name = NULL;
index = -1;
if (argc > 1) {
name = argv[1];
if ((strcmp(name, "--help") == 0) || (strcmp(name, "-h") == 0)) {
- printf("USAGE: %s [device]\n"
+ SDL_Log("USAGE: %s [device]\n"
"If device is a two-digit number it'll use it as an index, otherwise\n"
"it'll use it as if it were part of the device's name.\n",
argv[0]);
@@ -84,7 +86,7 @@ main(int argc, char **argv)
/* Initialize the force feedbackness */
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK |
SDL_INIT_HAPTIC);
- printf("%d Haptic devices detected.\n", SDL_NumHaptics());
+ SDL_Log("%d Haptic devices detected.\n", SDL_NumHaptics());
if (SDL_NumHaptics() > 0) {
/* We'll just use index or the first force feedback device found */
if (name == NULL) {
@@ -98,7 +100,7 @@ main(int argc, char **argv)
}
if (i >= SDL_NumHaptics()) {
- printf("Unable to find device matching '%s', aborting.\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find device matching '%s', aborting.\n",
name);
return 1;
}
@@ -106,14 +108,14 @@ main(int argc, char **argv)
haptic = SDL_HapticOpen(i);
if (haptic == NULL) {
- printf("Unable to create the haptic device: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to create the haptic device: %s\n",
SDL_GetError());
return 1;
}
- printf("Device: %s\n", SDL_HapticName(i));
+ SDL_Log("Device: %s\n", SDL_HapticName(i));
HapticPrintSupported(haptic);
} else {
- printf("No Haptic devices found!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "No Haptic devices found!\n");
return 1;
}
@@ -125,10 +127,10 @@ main(int argc, char **argv)
nefx = 0;
supported = SDL_HapticQuery(haptic);
- printf("\nUploading effects\n");
+ SDL_Log("\nUploading effects\n");
/* First we'll try a SINE effect. */
if (supported & SDL_HAPTIC_SINE) {
- printf(" effect %d: Sine Wave\n", nefx);
+ SDL_Log(" effect %d: Sine Wave\n", nefx);
efx[nefx].type = SDL_HAPTIC_SINE;
efx[nefx].periodic.period = 1000;
efx[nefx].periodic.magnitude = 0x4000;
@@ -137,14 +139,14 @@ main(int argc, char **argv)
efx[nefx].periodic.fade_length = 1000;
id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
if (id[nefx] < 0) {
- printf("UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
abort_execution();
}
nefx++;
}
/* Now we'll try a SAWTOOTHUP */
if (supported & SDL_HAPTIC_SAWTOOTHUP) {
- printf(" effect %d: Sawtooth Up\n", nefx);
+ SDL_Log(" effect %d: Sawtooth Up\n", nefx);
efx[nefx].type = SDL_HAPTIC_SAWTOOTHUP;
efx[nefx].periodic.period = 500;
efx[nefx].periodic.magnitude = 0x5000;
@@ -153,14 +155,14 @@ main(int argc, char **argv)
efx[nefx].periodic.fade_length = 1000;
id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
if (id[nefx] < 0) {
- printf("UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
abort_execution();
}
nefx++;
}
/* Now the classical constant effect. */
if (supported & SDL_HAPTIC_CONSTANT) {
- printf(" effect %d: Constant Force\n", nefx);
+ SDL_Log(" effect %d: Constant Force\n", nefx);
efx[nefx].type = SDL_HAPTIC_CONSTANT;
efx[nefx].constant.direction.type = SDL_HAPTIC_POLAR;
efx[nefx].constant.direction.dir[0] = 20000; /* Force comes from the south-west. */
@@ -170,14 +172,14 @@ main(int argc, char **argv)
efx[nefx].constant.fade_length = 1000;
id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
if (id[nefx] < 0) {
- printf("UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
abort_execution();
}
nefx++;
}
/* The cute spring effect. */
if (supported & SDL_HAPTIC_SPRING) {
- printf(" effect %d: Condition Spring\n", nefx);
+ SDL_Log(" effect %d: Condition Spring\n", nefx);
efx[nefx].type = SDL_HAPTIC_SPRING;
efx[nefx].condition.length = 5000;
for (i = 0; i < SDL_HapticNumAxes(haptic); i++) {
@@ -189,14 +191,14 @@ main(int argc, char **argv)
}
id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
if (id[nefx] < 0) {
- printf("UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
abort_execution();
}
nefx++;
}
/* The pretty awesome inertia effect. */
if (supported & SDL_HAPTIC_INERTIA) {
- printf(" effect %d: Condition Inertia\n", nefx);
+ SDL_Log(" effect %d: Condition Inertia\n", nefx);
efx[nefx].type = SDL_HAPTIC_SPRING;
efx[nefx].condition.length = 5000;
for (i = 0; i < SDL_HapticNumAxes(haptic); i++) {
@@ -207,7 +209,7 @@ main(int argc, char **argv)
}
id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
if (id[nefx] < 0) {
- printf("UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
abort_execution();
}
nefx++;
@@ -215,24 +217,24 @@ main(int argc, char **argv)
/* Finally we'll try a left/right effect. */
if (supported & SDL_HAPTIC_LEFTRIGHT) {
- printf(" effect %d: Left/Right\n", nefx);
+ SDL_Log(" effect %d: Left/Right\n", nefx);
efx[nefx].type = SDL_HAPTIC_LEFTRIGHT;
efx[nefx].leftright.length = 5000;
efx[nefx].leftright.large_magnitude = 0x3000;
efx[nefx].leftright.small_magnitude = 0xFFFF;
id[nefx] = SDL_HapticNewEffect(haptic, &efx[nefx]);
if (id[nefx] < 0) {
- printf("UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "UPLOADING EFFECT ERROR: %s\n", SDL_GetError());
abort_execution();
}
nefx++;
}
- printf
+ SDL_Log
("\nNow playing effects for 5 seconds each with 1 second delay between\n");
for (i = 0; i < nefx; i++) {
- printf(" Playing effect %d\n", i);
+ SDL_Log(" Playing effect %d\n", i);
SDL_HapticRunEffect(haptic, id[i], 1);
SDL_Delay(6000); /* Effects only have length 5000 */
}
@@ -252,7 +254,7 @@ main(int argc, char **argv)
static void
abort_execution(void)
{
- printf("\nAborting program execution.\n");
+ SDL_Log("\nAborting program execution.\n");
SDL_HapticClose(haptic);
SDL_Quit();
@@ -270,42 +272,42 @@ HapticPrintSupported(SDL_Haptic * haptic)
unsigned int supported;
supported = SDL_HapticQuery(haptic);
- printf(" Supported effects [%d effects, %d playing]:\n",
+ SDL_Log(" Supported effects [%d effects, %d playing]:\n",
SDL_HapticNumEffects(haptic), SDL_HapticNumEffectsPlaying(haptic));
if (supported & SDL_HAPTIC_CONSTANT)
- printf(" constant\n");
+ SDL_Log(" constant\n");
if (supported & SDL_HAPTIC_SINE)
- printf(" sine\n");
+ SDL_Log(" sine\n");
/* !!! FIXME: put this back when we have more bits in 2.1 */
- /*if (supported & SDL_HAPTIC_SQUARE)
- printf(" square\n");*/
+ /* if (supported & SDL_HAPTIC_SQUARE)
+ SDL_Log(" square\n"); */
if (supported & SDL_HAPTIC_TRIANGLE)
- printf(" triangle\n");
+ SDL_Log(" triangle\n");
if (supported & SDL_HAPTIC_SAWTOOTHUP)
- printf(" sawtoothup\n");
+ SDL_Log(" sawtoothup\n");
if (supported & SDL_HAPTIC_SAWTOOTHDOWN)
- printf(" sawtoothdown\n");
+ SDL_Log(" sawtoothdown\n");
if (supported & SDL_HAPTIC_RAMP)
- printf(" ramp\n");
+ SDL_Log(" ramp\n");
if (supported & SDL_HAPTIC_FRICTION)
- printf(" friction\n");
+ SDL_Log(" friction\n");
if (supported & SDL_HAPTIC_SPRING)
- printf(" spring\n");
+ SDL_Log(" spring\n");
if (supported & SDL_HAPTIC_DAMPER)
- printf(" damper\n");
+ SDL_Log(" damper\n");
if (supported & SDL_HAPTIC_INERTIA)
- printf(" intertia\n");
+ SDL_Log(" inertia\n");
if (supported & SDL_HAPTIC_CUSTOM)
- printf(" custom\n");
+ SDL_Log(" custom\n");
if (supported & SDL_HAPTIC_LEFTRIGHT)
- printf(" left/right\n");
- printf(" Supported capabilities:\n");
+ SDL_Log(" left/right\n");
+ SDL_Log(" Supported capabilities:\n");
if (supported & SDL_HAPTIC_GAIN)
- printf(" gain\n");
+ SDL_Log(" gain\n");
if (supported & SDL_HAPTIC_AUTOCENTER)
- printf(" autocenter\n");
+ SDL_Log(" autocenter\n");
if (supported & SDL_HAPTIC_STATUS)
- printf(" status\n");
+ SDL_Log(" status\n");
}
#else
@@ -313,7 +315,7 @@ HapticPrintSupported(SDL_Haptic * haptic)
int
main(int argc, char *argv[])
{
- fprintf(stderr, "SDL compiled without Haptic support.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Haptic support.\n");
exit(1);
}
diff --git a/test/testiconv.c b/test/testiconv.c
index d208199..3165b34 100644
--- a/test/testiconv.c
+++ b/test/testiconv.c
@@ -49,12 +49,15 @@ main(int argc, char *argv[])
FILE *file;
int errors = 0;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (!argv[1]) {
argv[1] = "utf8.txt";
}
file = fopen(argv[1], "rb");
if (!file) {
- fprintf(stderr, "Unable to open %s\n", argv[1]);
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to open %s\n", argv[1]);
return (1);
}
@@ -69,15 +72,11 @@ main(int argc, char *argv[])
test[0] = SDL_iconv_string(formats[i], "UCS-4", ucs4, len);
test[1] = SDL_iconv_string("UCS-4", formats[i], test[0], len);
if (!test[1] || SDL_memcmp(test[1], ucs4, len) != 0) {
- fprintf(stderr, "FAIL: %s\n", formats[i]);
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "FAIL: %s\n", formats[i]);
++errors;
}
- if (test[0]) {
- SDL_free(test[0]);
- }
- if (test[1]) {
- SDL_free(test[1]);
- }
+ SDL_free(test[0]);
+ SDL_free(test[1]);
}
test[0] = SDL_iconv_string("UTF-8", "UCS-4", ucs4, len);
SDL_free(ucs4);
diff --git a/test/testime.c b/test/testime.c
index ce9f02b..3d9789a 100644
--- a/test/testime.c
+++ b/test/testime.c
@@ -80,7 +80,7 @@ char *utf8_advance(char *p, size_t distance)
void usage()
{
- printf("usage: testime [--font fontfile]\n");
+ SDL_Log("usage: testime [--font fontfile]\n");
exit(0);
}
@@ -135,7 +135,7 @@ void _Redraw(SDL_Renderer * renderer) {
markedRect.w = textRect.w - w;
if (markedRect.w < 0)
{
- // Stop text input because we cannot hold any more characters
+ /* Stop text input because we cannot hold any more characters */
SDL_StopTextInput();
return;
}
@@ -196,6 +196,8 @@ void Redraw() {
int i;
for (i = 0; i < state->num_windows; ++i) {
SDL_Renderer *renderer = state->renderers[i];
+ if (state->windows[i] == NULL)
+ continue;
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
SDL_RenderClear(renderer);
@@ -210,6 +212,9 @@ int main(int argc, char *argv[]) {
SDL_Event event;
const char *fontname = DEFAULT_FONT;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize test framework */
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
if (!state) {
@@ -251,12 +256,12 @@ int main(int argc, char *argv[]) {
font = TTF_OpenFont(fontname, DEFAULT_PTSIZE);
if (! font)
{
- fprintf(stderr, "Failed to find font: %s\n", TTF_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to find font: %s\n", TTF_GetError());
exit(-1);
}
#endif
- printf("Using font: %s\n", fontname);
+ SDL_Log("Using font: %s\n", fontname);
atexit(SDL_Quit);
InitInput();
@@ -321,33 +326,32 @@ int main(int argc, char *argv[]) {
break;
}
- fprintf(stderr,
- "Keyboard: scancode 0x%08X = %s, keycode 0x%08X = %s\n",
+ SDL_Log("Keyboard: scancode 0x%08X = %s, keycode 0x%08X = %s\n",
event.key.keysym.scancode,
SDL_GetScancodeName(event.key.keysym.scancode),
event.key.keysym.sym, SDL_GetKeyName(event.key.keysym.sym));
break;
case SDL_TEXTINPUT:
- if (SDL_strlen(event.text.text) == 0 || event.text.text[0] == '\n' ||
+ if (event.text.text[0] == '\0' || event.text.text[0] == '\n' ||
markedRect.w < 0)
break;
- fprintf(stderr, "Keyboard: text input \"%s\"\n", event.text.text);
+ SDL_Log("Keyboard: text input \"%s\"\n", event.text.text);
if (SDL_strlen(text) + SDL_strlen(event.text.text) < sizeof(text))
SDL_strlcat(text, event.text.text, sizeof(text));
- fprintf(stderr, "text inputed: %s\n", text);
+ SDL_Log("text inputed: %s\n", text);
- // After text inputed, we can clear up markedText because it
- // is committed
+ /* After text inputed, we can clear up markedText because it */
+ /* is committed */
markedText[0] = 0;
Redraw();
break;
case SDL_TEXTEDITING:
- fprintf(stderr, "text editing \"%s\", selected range (%d, %d)\n",
+ SDL_Log("text editing \"%s\", selected range (%d, %d)\n",
event.edit.text, event.edit.start, event.edit.length);
strcpy(markedText, event.edit.text);
diff --git a/test/testintersections.c b/test/testintersections.c
index d858717..b4deeec 100644
--- a/test/testintersections.c
+++ b/test/testintersections.c
@@ -84,7 +84,7 @@ add_line(int x1, int y1, int x2, int y2)
if ((x1 == x2) && (y1 == y2))
return 0;
- printf("adding line (%d, %d), (%d, %d)\n", x1, y1, x2, y2);
+ SDL_Log("adding line (%d, %d), (%d, %d)\n", x1, y1, x2, y2);
lines[num_lines].x = x1;
lines[num_lines].y = y1;
lines[num_lines].w = x2;
@@ -133,7 +133,7 @@ add_rect(int x1, int y1, int x2, int y2)
if (y1 > y2)
SWAP(int, y1, y2);
- printf("adding rect (%d, %d), (%d, %d) [%dx%d]\n", x1, y1, x2, y2,
+ SDL_Log("adding rect (%d, %d), (%d, %d) [%dx%d]\n", x1, y1, x2, y2,
x2 - x1, y2 - y1);
rects[num_rects].x = x1;
@@ -199,6 +199,9 @@ main(int argc, char *argv[])
SDL_Event event;
Uint32 then, now, frames;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize parameters */
num_objects = NUM_OBJECTS;
@@ -241,8 +244,7 @@ main(int argc, char *argv[])
}
}
if (consumed < 0) {
- fprintf(stderr,
- "Usage: %s %s [--blend none|blend|add|mod] [--cyclecolor] [--cyclealpha]\n",
+ SDL_Log("Usage: %s %s [--blend none|blend|add|mod] [--cyclecolor] [--cyclealpha]\n",
argv[0], SDLTest_CommonUsage(state));
return 1;
}
@@ -308,6 +310,8 @@ main(int argc, char *argv[])
}
for (i = 0; i < state->num_windows; ++i) {
SDL_Renderer *renderer = state->renderers[i];
+ if (state->windows[i] == NULL)
+ continue;
SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
SDL_RenderClear(renderer);
@@ -327,7 +331,7 @@ main(int argc, char *argv[])
now = SDL_GetTicks();
if (now > then) {
double fps = ((double) frames * 1000) / (now - then);
- printf("%2.2f frames per second\n", fps);
+ SDL_Log("%2.2f frames per second\n", fps);
}
return 0;
}
diff --git a/test/testjoystick.c b/test/testjoystick.c
index da307ed..7d3c573 100644
--- a/test/testjoystick.c
+++ b/test/testjoystick.c
@@ -52,13 +52,13 @@ WatchJoystick(SDL_Joystick * joystick)
SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH,
SCREEN_HEIGHT, 0);
if (window == NULL) {
- fprintf(stderr, "Couldn't create window: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError());
return SDL_FALSE;
}
screen = SDL_CreateRenderer(window, -1, 0);
if (screen == NULL) {
- fprintf(stderr, "Couldn't create renderer: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s\n", SDL_GetError());
SDL_DestroyWindow(window);
return SDL_FALSE;
}
@@ -70,9 +70,9 @@ WatchJoystick(SDL_Joystick * joystick)
/* Print info about the joystick we are watching */
name = SDL_JoystickName(joystick);
- printf("Watching joystick %d: (%s)\n", SDL_JoystickInstanceID(joystick),
+ SDL_Log("Watching joystick %d: (%s)\n", SDL_JoystickInstanceID(joystick),
name ? name : "Unknown Joystick");
- printf("Joystick has %d axes, %d hats, %d balls, and %d buttons\n",
+ SDL_Log("Joystick has %d axes, %d hats, %d balls, and %d buttons\n",
SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick),
SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick));
@@ -85,36 +85,36 @@ WatchJoystick(SDL_Joystick * joystick)
while (SDL_PollEvent(&event)) {
switch (event.type) {
case SDL_JOYAXISMOTION:
- printf("Joystick %d axis %d value: %d\n",
+ SDL_Log("Joystick %d axis %d value: %d\n",
event.jaxis.which,
event.jaxis.axis, event.jaxis.value);
break;
case SDL_JOYHATMOTION:
- printf("Joystick %d hat %d value:",
+ SDL_Log("Joystick %d hat %d value:",
event.jhat.which, event.jhat.hat);
if (event.jhat.value == SDL_HAT_CENTERED)
- printf(" centered");
+ SDL_Log(" centered");
if (event.jhat.value & SDL_HAT_UP)
- printf(" up");
+ SDL_Log(" up");
if (event.jhat.value & SDL_HAT_RIGHT)
- printf(" right");
+ SDL_Log(" right");
if (event.jhat.value & SDL_HAT_DOWN)
- printf(" down");
+ SDL_Log(" down");
if (event.jhat.value & SDL_HAT_LEFT)
- printf(" left");
- printf("\n");
+ SDL_Log(" left");
+ SDL_Log("\n");
break;
case SDL_JOYBALLMOTION:
- printf("Joystick %d ball %d delta: (%d,%d)\n",
+ SDL_Log("Joystick %d ball %d delta: (%d,%d)\n",
event.jball.which,
event.jball.ball, event.jball.xrel, event.jball.yrel);
break;
case SDL_JOYBUTTONDOWN:
- printf("Joystick %d button %d down\n",
+ SDL_Log("Joystick %d button %d down\n",
event.jbutton.which, event.jbutton.button);
break;
case SDL_JOYBUTTONUP:
- printf("Joystick %d button %d up\n",
+ SDL_Log("Joystick %d button %d up\n",
event.jbutton.which, event.jbutton.button);
break;
case SDL_KEYDOWN:
@@ -211,31 +211,34 @@ main(int argc, char *argv[])
int i;
SDL_Joystick *joystick;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize SDL (Note: video is required to start event loop) */
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
exit(1);
}
/* Print information about the joysticks */
- printf("There are %d joysticks attached\n", SDL_NumJoysticks());
+ SDL_Log("There are %d joysticks attached\n", SDL_NumJoysticks());
for (i = 0; i < SDL_NumJoysticks(); ++i) {
name = SDL_JoystickNameForIndex(i);
- printf("Joystick %d: %s\n", i, name ? name : "Unknown Joystick");
+ SDL_Log("Joystick %d: %s\n", i, name ? name : "Unknown Joystick");
joystick = SDL_JoystickOpen(i);
if (joystick == NULL) {
- fprintf(stderr, "SDL_JoystickOpen(%d) failed: %s\n", i,
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_JoystickOpen(%d) failed: %s\n", i,
SDL_GetError());
} else {
char guid[64];
SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick),
guid, sizeof (guid));
- printf(" axes: %d\n", SDL_JoystickNumAxes(joystick));
- printf(" balls: %d\n", SDL_JoystickNumBalls(joystick));
- printf(" hats: %d\n", SDL_JoystickNumHats(joystick));
- printf(" buttons: %d\n", SDL_JoystickNumButtons(joystick));
- printf("instance id: %d\n", SDL_JoystickInstanceID(joystick));
- printf(" guid: %s\n", guid);
+ SDL_Log(" axes: %d\n", SDL_JoystickNumAxes(joystick));
+ SDL_Log(" balls: %d\n", SDL_JoystickNumBalls(joystick));
+ SDL_Log(" hats: %d\n", SDL_JoystickNumHats(joystick));
+ SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick));
+ SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick));
+ SDL_Log(" guid: %s\n", guid);
SDL_JoystickClose(joystick);
}
}
@@ -256,7 +259,7 @@ main(int argc, char *argv[])
while ( keepGoing ) {
if (joystick == NULL) {
if ( !reportederror ) {
- printf("Couldn't open joystick %d: %s\n", atoi(argv[1]), SDL_GetError());
+ SDL_Log("Couldn't open joystick %d: %s\n", atoi(argv[1]), SDL_GetError());
keepGoing = SDL_FALSE;
reportederror = SDL_TRUE;
}
@@ -268,7 +271,7 @@ main(int argc, char *argv[])
joystick = NULL;
if (keepGoing) {
- printf("Waiting for attach\n");
+ SDL_Log("Waiting for attach\n");
}
while (keepGoing) {
SDL_WaitEvent(&event);
@@ -296,7 +299,7 @@ main(int argc, char *argv[])
int
main(int argc, char *argv[])
{
- fprintf(stderr, "SDL compiled without Joystick support.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Joystick support.\n");
exit(1);
}
diff --git a/test/testkeys.c b/test/testkeys.c
index 71f8956..f4a35ab 100644
--- a/test/testkeys.c
+++ b/test/testkeys.c
@@ -24,12 +24,15 @@ main(int argc, char *argv[])
{
SDL_Scancode scancode;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
exit(1);
}
for (scancode = 0; scancode < SDL_NUM_SCANCODES; ++scancode) {
- printf("Scancode #%d, \"%s\"\n", scancode,
+ SDL_Log("Scancode #%d, \"%s\"\n", scancode,
SDL_GetScancodeName(scancode));
}
SDL_Quit();
diff --git a/test/testloadso.c b/test/testloadso.c
index 4bf7bf6..946aafd 100644
--- a/test/testloadso.c
+++ b/test/testloadso.c
@@ -33,14 +33,14 @@ main(int argc, char *argv[])
if (argc != 3) {
const char *app = argv[0];
- fprintf(stderr, "USAGE: %s <library> <functionname>\n", app);
- fprintf(stderr, " %s --hello <lib with puts()>\n", app);
+ SDL_Log("USAGE: %s <library> <functionname>\n", app);
+ SDL_Log(" %s --hello <lib with puts()>\n", app);
return 1;
}
/* Initialize SDL */
if (SDL_Init(0) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return 2;
}
@@ -55,23 +55,23 @@ main(int argc, char *argv[])
lib = SDL_LoadObject(libname);
if (lib == NULL) {
- fprintf(stderr, "SDL_LoadObject('%s') failed: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_LoadObject('%s') failed: %s\n",
libname, SDL_GetError());
retval = 3;
} else {
fn = (fntype) SDL_LoadFunction(lib, symname);
if (fn == NULL) {
- fprintf(stderr, "SDL_LoadFunction('%s') failed: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_LoadFunction('%s') failed: %s\n",
symname, SDL_GetError());
retval = 4;
} else {
- printf("Found %s in %s at %p\n", symname, libname, fn);
+ SDL_Log("Found %s in %s at %p\n", symname, libname, fn);
if (hello) {
- printf("Calling function...\n");
+ SDL_Log("Calling function...\n");
fflush(stdout);
fn(" HELLO, WORLD!\n");
- printf("...apparently, we survived. :)\n");
- printf("Unloading library...\n");
+ SDL_Log("...apparently, we survived. :)\n");
+ SDL_Log("Unloading library...\n");
fflush(stdout);
}
}
diff --git a/test/testlock.c b/test/testlock.c
index fcfeb8b..0414fe3 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -40,7 +40,7 @@ SDL_Quit_Wrapper(void)
void
printid(void)
{
- printf("Process %lu: exiting\n", SDL_ThreadID());
+ SDL_Log("Process %lu: exiting\n", SDL_ThreadID());
}
void
@@ -55,7 +55,7 @@ closemutex(int sig)
{
SDL_threadID id = SDL_ThreadID();
int i;
- printf("Process %lu: Cleaning up...\n", id == mainthread ? 0 : id);
+ SDL_Log("Process %lu: Cleaning up...\n", id == mainthread ? 0 : id);
doterminate = 1;
for (i = 0; i < 6; ++i)
SDL_WaitThread(threads[i], NULL);
@@ -69,23 +69,23 @@ Run(void *data)
if (SDL_ThreadID() == mainthread)
signal(SIGTERM, closemutex);
while (!doterminate) {
- printf("Process %lu ready to work\n", SDL_ThreadID());
+ SDL_Log("Process %lu ready to work\n", SDL_ThreadID());
if (SDL_LockMutex(mutex) < 0) {
- fprintf(stderr, "Couldn't lock mutex: %s", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't lock mutex: %s", SDL_GetError());
exit(1);
}
- printf("Process %lu, working!\n", SDL_ThreadID());
+ SDL_Log("Process %lu, working!\n", SDL_ThreadID());
SDL_Delay(1 * 1000);
- printf("Process %lu, done!\n", SDL_ThreadID());
+ SDL_Log("Process %lu, done!\n", SDL_ThreadID());
if (SDL_UnlockMutex(mutex) < 0) {
- fprintf(stderr, "Couldn't unlock mutex: %s", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't unlock mutex: %s", SDL_GetError());
exit(1);
}
/* If this sleep isn't done, then threads may starve */
SDL_Delay(10);
}
if (SDL_ThreadID() == mainthread && doterminate) {
- printf("Process %lu: raising SIGTERM\n", SDL_ThreadID());
+ SDL_Log("Process %lu: raising SIGTERM\n", SDL_ThreadID());
raise(SIGTERM);
}
return (0);
@@ -97,26 +97,29 @@ main(int argc, char *argv[])
int i;
int maxproc = 6;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Load the SDL library */
if (SDL_Init(0) < 0) {
- fprintf(stderr, "%s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "%s\n", SDL_GetError());
exit(1);
}
atexit(SDL_Quit_Wrapper);
if ((mutex = SDL_CreateMutex()) == NULL) {
- fprintf(stderr, "Couldn't create mutex: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create mutex: %s\n", SDL_GetError());
exit(1);
}
mainthread = SDL_ThreadID();
- printf("Main thread: %lu\n", mainthread);
+ SDL_Log("Main thread: %lu\n", mainthread);
atexit(printid);
for (i = 0; i < maxproc; ++i) {
char name[64];
SDL_snprintf(name, sizeof (name), "Worker%d", i);
if ((threads[i] = SDL_CreateThread(Run, name, NULL)) == NULL)
- fprintf(stderr, "Couldn't create thread!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread!\n");
}
signal(SIGINT, terminate);
Run(NULL);
diff --git a/test/testmessage.c b/test/testmessage.c
index f76b7eb..254bd9b 100644
--- a/test/testmessage.c
+++ b/test/testmessage.c
@@ -10,7 +10,7 @@
freely.
*/
-/* Simple test of the SDL MessageBox API*/
+/* Simple test of the SDL MessageBox API */
#include <stdio.h>
#include <stdlib.h>
@@ -46,12 +46,12 @@ button_messagebox(void *eventNumber)
SDL_MessageBoxData data = {
SDL_MESSAGEBOX_INFORMATION,
- NULL, // no parent window
+ NULL, /* no parent window */
"Custom MessageBox",
"This is a custom messagebox",
2,
buttons,
- NULL // Default color scheme
+ NULL /* Default color scheme */
};
int button = -1;
@@ -62,7 +62,7 @@ button_messagebox(void *eventNumber)
success = SDL_ShowMessageBox(&data, &button);
if (success == -1) {
- printf("Error Presenting MessageBox: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError());
if (eventNumber) {
SDL_UserEvent event;
event.type = (intptr_t)eventNumber;
@@ -72,7 +72,7 @@ button_messagebox(void *eventNumber)
quit(2);
}
}
- printf("Pressed button: %d, %s\n", button, button == 1 ? "Cancel" : "OK");
+ SDL_Log("Pressed button: %d, %s\n", button, button == 1 ? "Cancel" : "OK");
if (eventNumber) {
SDL_UserEvent event;
@@ -88,12 +88,15 @@ main(int argc, char *argv[])
{
int success;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Simple MessageBox",
"This is a simple error MessageBox",
NULL);
if (success == -1) {
- printf("Error Presenting MessageBox: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError());
quit(1);
}
@@ -102,7 +105,7 @@ main(int argc, char *argv[])
"This is a simple MessageBox with a newline:\r\nHello world!",
NULL);
if (success == -1) {
- printf("Error Presenting MessageBox: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError());
quit(1);
}
@@ -112,7 +115,7 @@ main(int argc, char *argv[])
"Unicode text: '牛肉西è˜èŠ±' ...",
NULL);
if (success == -1) {
- printf("Error Presenting MessageBox: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError());
quit(1);
}
@@ -122,7 +125,7 @@ main(int argc, char *argv[])
"Unicode text and newline:\r\n'牛肉西è˜èŠ±'\n'牛肉西è˜èŠ±'",
NULL);
if (success == -1) {
- printf("Error Presenting MessageBox: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError());
quit(1);
}
@@ -135,7 +138,7 @@ main(int argc, char *argv[])
subsystem on the main thread.
*/
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
- fprintf(stderr, "Couldn't initialize SDL video subsystem: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL video subsystem: %s\n", SDL_GetError());
return (1);
}
{
@@ -153,7 +156,7 @@ main(int argc, char *argv[])
SDL_WaitThread(thread, &status);
- printf("Message box thread return %i\n", status);
+ SDL_Log("Message box thread return %i\n", status);
}
/* Test showing a message box with a parent window */
@@ -166,7 +169,7 @@ main(int argc, char *argv[])
"This is a simple error MessageBox with a parent window",
window);
if (success == -1) {
- printf("Error Presenting MessageBox: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error Presenting MessageBox: %s\n", SDL_GetError());
quit(1);
}
diff --git a/test/testmultiaudio.c b/test/testmultiaudio.c
index 47a95e3..48d628a 100644
--- a/test/testmultiaudio.c
+++ b/test/testmultiaudio.c
@@ -10,7 +10,6 @@
freely.
*/
#include "SDL.h"
-#include <stdio.h>
static SDL_AudioSpec spec;
static Uint8 *sound = NULL; /* Pointer to wave data */
@@ -51,7 +50,7 @@ test_multi_audio(int devcount)
int i;
if (devcount > 64) {
- fprintf(stderr, "Too many devices (%d), clamping to 64...\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Too many devices (%d), clamping to 64...\n",
devcount);
devcount = 64;
}
@@ -60,33 +59,33 @@ test_multi_audio(int devcount)
for (i = 0; i < devcount; i++) {
const char *devname = SDL_GetAudioDeviceName(i, 0);
- printf("playing on device #%d: ('%s')...", i, devname);
+ SDL_Log("playing on device #%d: ('%s')...", i, devname);
fflush(stdout);
SDL_memset(&cbd[0], '\0', sizeof(callback_data));
spec.userdata = &cbd[0];
cbd[0].dev = SDL_OpenAudioDevice(devname, 0, &spec, NULL, 0);
if (cbd[0].dev == 0) {
- printf("\nOpen device failed: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Open device failed: %s\n", SDL_GetError());
} else {
SDL_PauseAudioDevice(cbd[0].dev, 0);
while (!cbd[0].done)
SDL_Delay(100);
SDL_PauseAudioDevice(cbd[0].dev, 1);
- printf("done.\n");
+ SDL_Log("done.\n");
SDL_CloseAudioDevice(cbd[0].dev);
}
}
SDL_memset(cbd, '\0', sizeof(cbd));
- printf("playing on all devices...\n");
+ SDL_Log("playing on all devices...\n");
for (i = 0; i < devcount; i++) {
const char *devname = SDL_GetAudioDeviceName(i, 0);
spec.userdata = &cbd[i];
cbd[i].dev = SDL_OpenAudioDevice(devname, 0, &spec, NULL, 0);
if (cbd[i].dev == 0) {
- printf("Open device %d failed: %s\n", i, SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Open device %d failed: %s\n", i, SDL_GetError());
}
}
@@ -113,7 +112,7 @@ test_multi_audio(int devcount)
}
}
- printf("All done!\n");
+ SDL_Log("All done!\n");
}
@@ -122,17 +121,20 @@ main(int argc, char **argv)
{
int devcount = 0;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Load the SDL library */
if (SDL_Init(SDL_INIT_AUDIO) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
}
- printf("Using audio driver: %s\n", SDL_GetCurrentAudioDriver());
+ SDL_Log("Using audio driver: %s\n", SDL_GetCurrentAudioDriver());
devcount = SDL_GetNumAudioDevices(0);
if (devcount < 1) {
- fprintf(stderr, "Don't see any specific audio devices!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Don't see any specific audio devices!\n");
} else {
if (argv[1] == NULL) {
argv[1] = "sample.wav";
@@ -140,7 +142,7 @@ main(int argc, char **argv)
/* Load the wave file into memory */
if (SDL_LoadWAV(argv[1], &spec, &sound, &soundlen) == NULL) {
- fprintf(stderr, "Couldn't load %s: %s\n", argv[1],
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s\n", argv[1],
SDL_GetError());
} else {
test_multi_audio(devcount);
diff --git a/test/testnative.c b/test/testnative.c
index 63cba29..0ac99b2 100644
--- a/test/testnative.c
+++ b/test/testnative.c
@@ -58,7 +58,7 @@ LoadSprite(SDL_Renderer *renderer, char *file)
/* Load the sprite image */
temp = SDL_LoadBMP(file);
if (temp == NULL) {
- fprintf(stderr, "Couldn't load %s: %s", file, SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s", file, SDL_GetError());
return 0;
}
@@ -70,7 +70,7 @@ LoadSprite(SDL_Renderer *renderer, char *file)
/* Create textures from the image */
sprite = SDL_CreateTextureFromSurface(renderer, temp);
if (!sprite) {
- fprintf(stderr, "Couldn't create texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create texture: %s\n", SDL_GetError());
SDL_FreeSurface(temp);
return 0;
}
@@ -131,8 +131,11 @@ main(int argc, char *argv[])
int sprite_w, sprite_h;
SDL_Event event;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (SDL_VideoInit(NULL) < 0) {
- fprintf(stderr, "Couldn't initialize SDL video: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL video: %s\n",
SDL_GetError());
exit(1);
}
@@ -146,19 +149,19 @@ main(int argc, char *argv[])
}
}
if (!factory) {
- fprintf(stderr, "Couldn't find native window code for %s driver\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't find native window code for %s driver\n",
driver);
quit(2);
}
- printf("Creating native window for %s driver\n", driver);
+ SDL_Log("Creating native window for %s driver\n", driver);
native_window = factory->CreateNativeWindow(WINDOW_W, WINDOW_H);
if (!native_window) {
- fprintf(stderr, "Couldn't create native window\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create native window\n");
quit(3);
}
window = SDL_CreateWindowFrom(native_window);
if (!window) {
- fprintf(stderr, "Couldn't create SDL window: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create SDL window: %s\n", SDL_GetError());
quit(4);
}
SDL_SetWindowTitle(window, "SDL Native Window Test");
@@ -166,7 +169,7 @@ main(int argc, char *argv[])
/* Create the renderer */
renderer = SDL_CreateRenderer(window, -1, 0);
if (!renderer) {
- fprintf(stderr, "Couldn't create renderer: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create renderer: %s\n", SDL_GetError());
quit(5);
}
@@ -185,7 +188,7 @@ main(int argc, char *argv[])
positions = (SDL_Rect *) SDL_malloc(NUM_SPRITES * sizeof(SDL_Rect));
velocities = (SDL_Rect *) SDL_malloc(NUM_SPRITES * sizeof(SDL_Rect));
if (!positions || !velocities) {
- fprintf(stderr, "Out of memory!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n");
quit(2);
}
srand(time(NULL));
diff --git a/test/testoverlay2.c b/test/testoverlay2.c
index e071614..4561f98 100644
--- a/test/testoverlay2.c
+++ b/test/testoverlay2.c
@@ -209,19 +209,18 @@ ConvertRGBtoYV12(Uint8 *rgb, Uint8 *out, int w, int h,
static void
PrintUsage(char *argv0)
{
- fprintf(stderr, "Usage: %s [arg] [arg] [arg] ...\n", argv0);
- fprintf(stderr, "\n");
- fprintf(stderr, "Where 'arg' is any of the following options:\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -fps <frames per second>\n");
- fprintf(stderr, " -nodelay\n");
- fprintf(stderr, " -format <fmt> (one of the: YV12, IYUV, YUY2, UYVY, YVYU)\n");
- fprintf(stderr, " -scale <scale factor> (initial scale of the overlay)\n");
- fprintf(stderr, " -help (shows this help)\n");
- fprintf(stderr, "\n");
- fprintf(stderr,
- "Press ESC to exit, or SPACE to freeze the movie while application running.\n");
- fprintf(stderr, "\n");
+ SDL_Log("Usage: %s [arg] [arg] [arg] ...\n", argv0);
+ SDL_Log("\n");
+ SDL_Log("Where 'arg' is any of the following options:\n");
+ SDL_Log("\n");
+ SDL_Log(" -fps <frames per second>\n");
+ SDL_Log(" -nodelay\n");
+ SDL_Log(" -format <fmt> (one of the: YV12, IYUV, YUY2, UYVY, YVYU)\n");
+ SDL_Log(" -scale <scale factor> (initial scale of the overlay)\n");
+ SDL_Log(" -help (shows this help)\n");
+ SDL_Log("\n");
+ SDL_Log("Press ESC to exit, or SPACE to freeze the movie while application running.\n");
+ SDL_Log("\n");
}
int
@@ -246,8 +245,11 @@ main(int argc, char **argv)
int scale = 5;
SDL_bool done = SDL_FALSE;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return 3;
}
@@ -256,19 +258,19 @@ main(int argc, char **argv)
if (argv[2]) {
fps = atoi(argv[2]);
if (fps == 0) {
- fprintf(stderr,
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"The -fps option requires an argument [from 1 to 1000], default is 12.\n");
quit(10);
}
if ((fps < 0) || (fps > 1000)) {
- fprintf(stderr,
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"The -fps option must be in range from 1 to 1000, default is 12.\n");
quit(10);
}
argv += 2;
argc -= 2;
} else {
- fprintf(stderr,
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"The -fps option requires an argument [from 1 to 1000], default is 12.\n");
quit(10);
}
@@ -280,19 +282,19 @@ main(int argc, char **argv)
if (argv[2]) {
scale = atoi(argv[2]);
if (scale == 0) {
- fprintf(stderr,
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"The -scale option requires an argument [from 1 to 50], default is 5.\n");
quit(10);
}
if ((scale < 0) || (scale > 50)) {
- fprintf(stderr,
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"The -scale option must be in range from 1 to 50, default is 5.\n");
quit(10);
}
argv += 2;
argc -= 2;
} else {
- fprintf(stderr,
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"The -fps option requires an argument [from 1 to 1000], default is 12.\n");
quit(10);
}
@@ -301,7 +303,7 @@ main(int argc, char **argv)
PrintUsage(argv[0]);
quit(0);
} else {
- fprintf(stderr, "Unrecognized option: %s.\n", argv[1]);
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unrecognized option: %s.\n", argv[1]);
quit(10);
}
break;
@@ -309,7 +311,7 @@ main(int argc, char **argv)
RawMooseData = (Uint8 *) malloc(MOOSEFRAME_SIZE * MOOSEFRAMES_COUNT);
if (RawMooseData == NULL) {
- fprintf(stderr, "Can't allocate memory for movie !\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Can't allocate memory for movie !\n");
free(RawMooseData);
quit(1);
}
@@ -317,7 +319,7 @@ main(int argc, char **argv)
/* load the trojan moose images */
handle = SDL_RWFromFile("moose.dat", "rb");
if (handle == NULL) {
- fprintf(stderr, "Can't find the file moose.dat !\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Can't find the file moose.dat !\n");
free(RawMooseData);
quit(2);
}
@@ -335,26 +337,26 @@ main(int argc, char **argv)
window_w, window_h,
SDL_WINDOW_RESIZABLE);
if (!window) {
- fprintf(stderr, "Couldn't set create window: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set create window: %s\n", SDL_GetError());
free(RawMooseData);
quit(4);
}
renderer = SDL_CreateRenderer(window, -1, 0);
if (!renderer) {
- fprintf(stderr, "Couldn't set create renderer: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set create renderer: %s\n", SDL_GetError());
free(RawMooseData);
quit(4);
}
MooseTexture = SDL_CreateTexture(renderer, pixel_format, SDL_TEXTUREACCESS_STREAMING, MOOSEPIC_W, MOOSEPIC_H);
if (!MooseTexture) {
- fprintf(stderr, "Couldn't set create texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set create texture: %s\n", SDL_GetError());
free(RawMooseData);
quit(5);
}
/* Uncomment this to check vertex color with a YUV texture */
- /*SDL_SetTextureColorMod(MooseTexture, 0xff, 0x80, 0x80);*/
+ /* SDL_SetTextureColorMod(MooseTexture, 0xff, 0x80, 0x80); */
for (i = 0; i < MOOSEFRAMES_COUNT; i++) {
Uint8 MooseFrameRGB[MOOSEFRAME_SIZE*3];
diff --git a/test/testplatform.c b/test/testplatform.c
index 326b6f7..a8ed39d 100644
--- a/test/testplatform.c
+++ b/test/testplatform.c
@@ -35,30 +35,30 @@ TestTypes(SDL_bool verbose)
if (badsize(sizeof(Uint8), 1)) {
if (verbose)
- printf("sizeof(Uint8) != 1, instead = %u\n",
+ SDL_Log("sizeof(Uint8) != 1, instead = %u\n",
(unsigned int)sizeof(Uint8));
++error;
}
if (badsize(sizeof(Uint16), 2)) {
if (verbose)
- printf("sizeof(Uint16) != 2, instead = %u\n",
+ SDL_Log("sizeof(Uint16) != 2, instead = %u\n",
(unsigned int)sizeof(Uint16));
++error;
}
if (badsize(sizeof(Uint32), 4)) {
if (verbose)
- printf("sizeof(Uint32) != 4, instead = %u\n",
+ SDL_Log("sizeof(Uint32) != 4, instead = %u\n",
(unsigned int)sizeof(Uint32));
++error;
}
if (badsize(sizeof(Uint64), 8)) {
if (verbose)
- printf("sizeof(Uint64) != 8, instead = %u\n",
+ SDL_Log("sizeof(Uint64) != 8, instead = %u\n",
(unsigned int)sizeof(Uint64));
++error;
}
if (verbose && !error)
- printf("All data types are the expected size.\n");
+ SDL_Log("All data types are the expected size.\n");
return (error ? 1 : 0);
}
@@ -83,7 +83,7 @@ TestEndian(SDL_bool verbose)
swapped64 |= 0xDEADBEEF;
if (verbose) {
- printf("Detected a %s endian machine.\n",
+ SDL_Log("Detected a %s endian machine.\n",
(SDL_BYTEORDER == SDL_LIL_ENDIAN) ? "little" : "big");
}
if ((*((char *) &value) >> 4) == 0x1) {
@@ -93,44 +93,44 @@ TestEndian(SDL_bool verbose)
}
if (real_byteorder != SDL_BYTEORDER) {
if (verbose) {
- printf("Actually a %s endian machine!\n",
+ SDL_Log("Actually a %s endian machine!\n",
(real_byteorder == SDL_LIL_ENDIAN) ? "little" : "big");
}
++error;
}
if (verbose) {
- printf("Value 16 = 0x%X, swapped = 0x%X\n", value16,
+ SDL_Log("Value 16 = 0x%X, swapped = 0x%X\n", value16,
SDL_Swap16(value16));
}
if (SDL_Swap16(value16) != swapped16) {
if (verbose) {
- printf("16 bit value swapped incorrectly!\n");
+ SDL_Log("16 bit value swapped incorrectly!\n");
}
++error;
}
if (verbose) {
- printf("Value 32 = 0x%X, swapped = 0x%X\n", value32,
+ SDL_Log("Value 32 = 0x%X, swapped = 0x%X\n", value32,
SDL_Swap32(value32));
}
if (SDL_Swap32(value32) != swapped32) {
if (verbose) {
- printf("32 bit value swapped incorrectly!\n");
+ SDL_Log("32 bit value swapped incorrectly!\n");
}
++error;
}
if (verbose) {
#ifdef _MSC_VER
- printf("Value 64 = 0x%I64X, swapped = 0x%I64X\n", value64,
+ SDL_Log("Value 64 = 0x%I64X, swapped = 0x%I64X\n", value64,
SDL_Swap64(value64));
#else
- printf("Value 64 = 0x%llX, swapped = 0x%llX\n",
+ SDL_Log("Value 64 = 0x%llX, swapped = 0x%llX\n",
(unsigned long long) value64,
(unsigned long long) SDL_Swap64(value64));
#endif
}
if (SDL_Swap64(value64) != swapped64) {
if (verbose) {
- printf("64 bit value swapped incorrectly!\n");
+ SDL_Log("64 bit value swapped incorrectly!\n");
}
++error;
}
@@ -142,17 +142,18 @@ int
TestCPUInfo(SDL_bool verbose)
{
if (verbose) {
- printf("CPU count: %d\n", SDL_GetCPUCount());
- printf("CPU cache line size: %d\n", SDL_GetCPUCacheLineSize());
- printf("RDTSC %s\n", SDL_HasRDTSC()? "detected" : "not detected");
- printf("AltiVec %s\n", SDL_HasAltiVec()? "detected" : "not detected");
- printf("MMX %s\n", SDL_HasMMX()? "detected" : "not detected");
- printf("3DNow! %s\n", SDL_Has3DNow()? "detected" : "not detected");
- printf("SSE %s\n", SDL_HasSSE()? "detected" : "not detected");
- printf("SSE2 %s\n", SDL_HasSSE2()? "detected" : "not detected");
- printf("SSE3 %s\n", SDL_HasSSE3()? "detected" : "not detected");
- printf("SSE4.1 %s\n", SDL_HasSSE41()? "detected" : "not detected");
- printf("SSE4.2 %s\n", SDL_HasSSE42()? "detected" : "not detected");
+ SDL_Log("CPU count: %d\n", SDL_GetCPUCount());
+ SDL_Log("CPU cache line size: %d\n", SDL_GetCPUCacheLineSize());
+ SDL_Log("RDTSC %s\n", SDL_HasRDTSC()? "detected" : "not detected");
+ SDL_Log("AltiVec %s\n", SDL_HasAltiVec()? "detected" : "not detected");
+ SDL_Log("MMX %s\n", SDL_HasMMX()? "detected" : "not detected");
+ SDL_Log("3DNow! %s\n", SDL_Has3DNow()? "detected" : "not detected");
+ SDL_Log("SSE %s\n", SDL_HasSSE()? "detected" : "not detected");
+ SDL_Log("SSE2 %s\n", SDL_HasSSE2()? "detected" : "not detected");
+ SDL_Log("SSE3 %s\n", SDL_HasSSE3()? "detected" : "not detected");
+ SDL_Log("SSE4.1 %s\n", SDL_HasSSE41()? "detected" : "not detected");
+ SDL_Log("SSE4.2 %s\n", SDL_HasSSE42()? "detected" : "not detected");
+ SDL_Log("System RAM %d MB\n", SDL_GetSystemRAM());
}
return (0);
}
@@ -176,7 +177,7 @@ TestAssertions(SDL_bool verbose)
{
const SDL_assert_data *item = SDL_GetAssertionReport();
while (item) {
- printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n",
+ SDL_Log("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n",
item->condition, item->function, item->filename,
item->linenum, item->trigger_count,
item->always_ignore ? "yes" : "no");
@@ -192,11 +193,14 @@ main(int argc, char *argv[])
SDL_bool verbose = SDL_TRUE;
int status = 0;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (argv[1] && (SDL_strcmp(argv[1], "-q") == 0)) {
verbose = SDL_FALSE;
}
if (verbose) {
- printf("This system is running %s\n", SDL_GetPlatform());
+ SDL_Log("This system is running %s\n", SDL_GetPlatform());
}
status += TestTypes(verbose);
diff --git a/test/testpower.c b/test/testpower.c
index 3e13d0a..1b32143 100644
--- a/test/testpower.c
+++ b/test/testpower.c
@@ -21,7 +21,7 @@ report_power(void)
const SDL_PowerState state = SDL_GetPowerInfo(&seconds, &percent);
char *statestr = NULL;
- printf("SDL-reported power info...\n");
+ SDL_Log("SDL-reported power info...\n");
switch (state) {
case SDL_POWERSTATE_UNKNOWN:
statestr = "Unknown";
@@ -43,18 +43,18 @@ report_power(void)
break;
}
- printf("State: %s\n", statestr);
+ SDL_Log("State: %s\n", statestr);
if (percent == -1) {
- printf("Percent left: unknown\n");
+ SDL_Log("Percent left: unknown\n");
} else {
- printf("Percent left: %d%%\n", percent);
+ SDL_Log("Percent left: %d%%\n", percent);
}
if (seconds == -1) {
- printf("Time left: unknown\n");
+ SDL_Log("Time left: unknown\n");
} else {
- printf("Time left: %d minutes, %d seconds\n", (int) (seconds / 60),
+ SDL_Log("Time left: %d minutes, %d seconds\n", (int) (seconds / 60),
(int) (seconds % 60));
}
}
@@ -63,8 +63,11 @@ report_power(void)
int
main(int argc, char *argv[])
{
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (SDL_Init(0) == -1) {
- fprintf(stderr, "SDL_Init() failed: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Init() failed: %s\n", SDL_GetError());
return 1;
}
diff --git a/test/testrelative.c b/test/testrelative.c
index fa5bda6..9e8e1e2 100644
--- a/test/testrelative.c
+++ b/test/testrelative.c
@@ -35,6 +35,8 @@ main(int argc, char *argv[])
int i, done;
SDL_Event event;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
/* Initialize test framework */
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
@@ -74,16 +76,16 @@ main(int argc, char *argv[])
switch(event.type) {
case SDL_MOUSEMOTION:
{
- /*printf("mouse motion ABS x %d y %d REL x %d y %d\n",event.motion.x,event.motion.y,event.motion.xrel,event.motion.yrel);*/
rect.x += event.motion.xrel;
rect.y += event.motion.yrel;
-
}
break;
}
}
for (i = 0; i < state->num_windows; ++i) {
SDL_Renderer *renderer = state->renderers[i];
+ if (state->windows[i] == NULL)
+ continue;
SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
SDL_RenderClear(renderer);
diff --git a/test/testrendercopyex.c b/test/testrendercopyex.c
index 6dd59c0..0c8ad7d 100644
--- a/test/testrendercopyex.c
+++ b/test/testrendercopyex.c
@@ -46,7 +46,7 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
/* Load the sprite image */
temp = SDL_LoadBMP(file);
if (temp == NULL) {
- fprintf(stderr, "Couldn't load %s: %s", file, SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s", file, SDL_GetError());
return NULL;
}
@@ -77,7 +77,7 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
/* Create textures from the image */
texture = SDL_CreateTextureFromSurface(renderer, temp);
if (!texture) {
- fprintf(stderr, "Couldn't create texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create texture: %s\n", SDL_GetError());
SDL_FreeSurface(temp);
return NULL;
}
@@ -127,7 +127,7 @@ Draw(DrawState *s)
/* Update the screen! */
SDL_RenderPresent(s->renderer);
- //SDL_Delay(10);
+ /* SDL_Delay(10); */
}
int
@@ -139,6 +139,9 @@ main(int argc, char *argv[])
int frames;
Uint32 then, now;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize test framework */
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
if (!state) {
@@ -149,7 +152,7 @@ main(int argc, char *argv[])
consumed = SDLTest_CommonArg(state, i);
if (consumed == 0) {
- fprintf(stderr, "Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
+ SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
return 1;
}
i += consumed;
@@ -185,6 +188,8 @@ main(int argc, char *argv[])
SDLTest_CommonEvent(state, &event, &done);
}
for (i = 0; i < state->num_windows; ++i) {
+ if (state->windows[i] == NULL)
+ continue;
Draw(&drawstates[i]);
}
}
@@ -193,7 +198,7 @@ main(int argc, char *argv[])
now = SDL_GetTicks();
if (now > then) {
double fps = ((double) frames * 1000) / (now - then);
- printf("%2.2f frames per second\n", fps);
+ SDL_Log("%2.2f frames per second\n", fps);
}
SDL_stack_free(drawstates);
diff --git a/test/testrendertarget.c b/test/testrendertarget.c
index bc31048..ac4aa50 100644
--- a/test/testrendertarget.c
+++ b/test/testrendertarget.c
@@ -46,7 +46,7 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
/* Load the sprite image */
temp = SDL_LoadBMP(file);
if (temp == NULL) {
- fprintf(stderr, "Couldn't load %s: %s", file, SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s", file, SDL_GetError());
return NULL;
}
@@ -77,7 +77,7 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
/* Create textures from the image */
texture = SDL_CreateTextureFromSurface(renderer, temp);
if (!texture) {
- fprintf(stderr, "Couldn't create texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create texture: %s\n", SDL_GetError());
SDL_FreeSurface(temp);
return NULL;
}
@@ -87,7 +87,7 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
return texture;
}
-void
+SDL_bool
DrawComposite(DrawState *s)
{
SDL_Rect viewport, R;
@@ -114,7 +114,7 @@ DrawComposite(DrawState *s)
SDL_RenderCopy(s->renderer, A, NULL, NULL);
SDL_RenderReadPixels(s->renderer, NULL, SDL_PIXELFORMAT_ARGB8888, &P, sizeof(P));
- printf("Blended pixel: 0x%8.8X\n", P);
+ SDL_Log("Blended pixel: 0x%8.8X\n", P);
SDL_DestroyTexture(A);
SDL_DestroyTexture(B);
@@ -167,9 +167,10 @@ DrawComposite(DrawState *s)
/* Update the screen! */
SDL_RenderPresent(s->renderer);
+ return SDL_TRUE;
}
-void
+SDL_bool
Draw(DrawState *s)
{
SDL_Rect viewport;
@@ -178,6 +179,10 @@ Draw(DrawState *s)
SDL_RenderGetViewport(s->renderer, &viewport);
target = SDL_CreateTexture(s->renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_TARGET, viewport.w, viewport.h);
+ if (!target) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create render target texture: %s\n", SDL_GetError());
+ return SDL_FALSE;
+ }
SDL_SetRenderTarget(s->renderer, target);
/* Draw the background */
@@ -206,6 +211,7 @@ Draw(DrawState *s)
/* Update the screen! */
SDL_RenderPresent(s->renderer);
+ return SDL_TRUE;
}
int
@@ -218,6 +224,9 @@ main(int argc, char *argv[])
Uint32 then, now;
SDL_bool test_composite = SDL_FALSE;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize test framework */
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
if (!state) {
@@ -235,8 +244,7 @@ main(int argc, char *argv[])
}
}
if (consumed < 0) {
- fprintf(stderr,
- "Usage: %s %s [--composite]\n",
+ SDL_Log("Usage: %s %s [--composite]\n",
argv[0], SDLTest_CommonUsage(state));
quit(1);
}
@@ -277,10 +285,12 @@ main(int argc, char *argv[])
SDLTest_CommonEvent(state, &event, &done);
}
for (i = 0; i < state->num_windows; ++i) {
+ if (state->windows[i] == NULL)
+ continue;
if (test_composite) {
- DrawComposite(&drawstates[i]);
+ if (!DrawComposite(&drawstates[i])) done = 1;
} else {
- Draw(&drawstates[i]);
+ if (!Draw(&drawstates[i])) done = 1;
}
}
}
@@ -289,7 +299,7 @@ main(int argc, char *argv[])
now = SDL_GetTicks();
if (now > then) {
double fps = ((double) frames * 1000) / (now - then);
- printf("%2.2f frames per second\n", fps);
+ SDL_Log("%2.2f frames per second\n", fps);
}
SDL_stack_free(drawstates);
diff --git a/test/testresample.c b/test/testresample.c
index d79f1ac..a6e859d 100644
--- a/test/testresample.c
+++ b/test/testresample.c
@@ -9,7 +9,7 @@
including commercial applications, and to alter it and redistribute it
freely.
*/
-#include <stdio.h>
+
#include "SDL.h"
int
@@ -25,27 +25,30 @@ main(int argc, char **argv)
int avgbytes = 0;
SDL_RWops *io = NULL;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (argc != 4) {
- fprintf(stderr, "USAGE: %s in.wav out.wav newfreq\n", argv[0]);
+ SDL_Log("USAGE: %s in.wav out.wav newfreq\n", argv[0]);
return 1;
}
cvtfreq = SDL_atoi(argv[3]);
if (SDL_Init(SDL_INIT_AUDIO) == -1) {
- fprintf(stderr, "SDL_Init() failed: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Init() failed: %s\n", SDL_GetError());
return 2;
}
if (SDL_LoadWAV(argv[1], &spec, &data, &len) == NULL) {
- fprintf(stderr, "failed to load %s: %s\n", argv[1], SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "failed to load %s: %s\n", argv[1], SDL_GetError());
SDL_Quit();
return 3;
}
if (SDL_BuildAudioCVT(&cvt, spec.format, spec.channels, spec.freq,
spec.format, spec.channels, cvtfreq) == -1) {
- fprintf(stderr, "failed to build CVT: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "failed to build CVT: %s\n", SDL_GetError());
SDL_FreeWAV(data);
SDL_Quit();
return 4;
@@ -54,7 +57,7 @@ main(int argc, char **argv)
cvt.len = len;
cvt.buf = (Uint8 *) SDL_malloc(len * cvt.len_mult);
if (cvt.buf == NULL) {
- fprintf(stderr, "Out of memory.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory.\n");
SDL_FreeWAV(data);
SDL_Quit();
return 5;
@@ -62,7 +65,7 @@ main(int argc, char **argv)
SDL_memcpy(cvt.buf, data, len);
if (SDL_ConvertAudio(&cvt) == -1) {
- fprintf(stderr, "Conversion failed: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Conversion failed: %s\n", SDL_GetError());
SDL_free(cvt.buf);
SDL_FreeWAV(data);
SDL_Quit();
@@ -72,7 +75,7 @@ main(int argc, char **argv)
/* write out a WAV header... */
io = SDL_RWFromFile(argv[2], "wb");
if (io == NULL) {
- fprintf(stderr, "fopen('%s') failed: %s\n", argv[2], SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "fopen('%s') failed: %s\n", argv[2], SDL_GetError());
SDL_free(cvt.buf);
SDL_FreeWAV(data);
SDL_Quit();
@@ -99,17 +102,17 @@ main(int argc, char **argv)
SDL_RWwrite(io, cvt.buf, cvt.len_cvt, 1);
if (SDL_RWclose(io) == -1) {
- fprintf(stderr, "fclose('%s') failed: %s\n", argv[2], SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "fclose('%s') failed: %s\n", argv[2], SDL_GetError());
SDL_free(cvt.buf);
SDL_FreeWAV(data);
SDL_Quit();
return 8;
- } // if
+ } /* if */
SDL_free(cvt.buf);
SDL_FreeWAV(data);
SDL_Quit();
return 0;
-} // main
+} /* main */
-// end of resample_test.c ...
+/* end of resample_test.c ... */
diff --git a/test/testrumble.c b/test/testrumble.c
index e5b5424..ffcaae4 100644
--- a/test/testrumble.c
+++ b/test/testrumble.c
@@ -26,7 +26,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* includes
*/
#include <stdlib.h>
-#include <stdio.h> /* printf */
#include <string.h> /* strstr */
#include <ctype.h> /* isdigit */
@@ -51,12 +50,15 @@ main(int argc, char **argv)
char *name;
int index;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
name = NULL;
index = -1;
if (argc > 1) {
name = argv[1];
if ((strcmp(name, "--help") == 0) || (strcmp(name, "-h") == 0)) {
- printf("USAGE: %s [device]\n"
+ SDL_Log("USAGE: %s [device]\n"
"If device is a two-digit number it'll use it as an index, otherwise\n"
"it'll use it as if it were part of the device's name.\n",
argv[0]);
@@ -73,7 +75,7 @@ main(int argc, char **argv)
/* Initialize the force feedbackness */
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK |
SDL_INIT_HAPTIC);
- printf("%d Haptic devices detected.\n", SDL_NumHaptics());
+ SDL_Log("%d Haptic devices detected.\n", SDL_NumHaptics());
if (SDL_NumHaptics() > 0) {
/* We'll just use index or the first force feedback device found */
if (name == NULL) {
@@ -87,7 +89,7 @@ main(int argc, char **argv)
}
if (i >= SDL_NumHaptics()) {
- printf("Unable to find device matching '%s', aborting.\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to find device matching '%s', aborting.\n",
name);
return 1;
}
@@ -95,13 +97,13 @@ main(int argc, char **argv)
haptic = SDL_HapticOpen(i);
if (haptic == NULL) {
- printf("Unable to create the haptic device: %s\n",
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to create the haptic device: %s\n",
SDL_GetError());
return 1;
}
- printf("Device: %s\n", SDL_HapticName(i));
+ SDL_Log("Device: %s\n", SDL_HapticName(i));
} else {
- printf("No Haptic devices found!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "No Haptic devices found!\n");
return 1;
}
@@ -109,25 +111,25 @@ main(int argc, char **argv)
SDL_ClearError();
if (SDL_HapticRumbleSupported(haptic) == SDL_FALSE) {
- printf("\nRumble not supported!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Rumble not supported!\n");
return 1;
}
if (SDL_HapticRumbleInit(haptic) != 0) {
- printf("\nFailed to initialize rumble: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to initialize rumble: %s\n", SDL_GetError());
return 1;
}
- printf("Playing 2 second rumble at 0.5 magnitude.\n");
+ SDL_Log("Playing 2 second rumble at 0.5 magnitude.\n");
if (SDL_HapticRumblePlay(haptic, 0.5, 5000) != 0) {
- printf("\nFailed to play rumble: %s\n", SDL_GetError() );
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to play rumble: %s\n", SDL_GetError() );
return 1;
}
SDL_Delay(2000);
- printf("Stopping rumble.\n");
+ SDL_Log("Stopping rumble.\n");
SDL_HapticRumbleStop(haptic);
SDL_Delay(2000);
- printf("Playing 2 second rumble at 0.3 magnitude.\n");
+ SDL_Log("Playing 2 second rumble at 0.3 magnitude.\n");
if (SDL_HapticRumblePlay(haptic, 0.3f, 5000) != 0) {
- printf("\nFailed to play rumble: %s\n", SDL_GetError() );
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to play rumble: %s\n", SDL_GetError() );
return 1;
}
SDL_Delay(2000);
@@ -145,7 +147,7 @@ main(int argc, char **argv)
int
main(int argc, char *argv[])
{
- fprintf(stderr, "SDL compiled without Haptic support.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Haptic support.\n");
exit(1);
}
diff --git a/test/testscale.c b/test/testscale.c
index 0f0096c..8449f23 100644
--- a/test/testscale.c
+++ b/test/testscale.c
@@ -48,7 +48,7 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
/* Load the sprite image */
temp = SDL_LoadBMP(file);
if (temp == NULL) {
- fprintf(stderr, "Couldn't load %s: %s", file, SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s", file, SDL_GetError());
return NULL;
}
@@ -79,7 +79,7 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
/* Create textures from the image */
texture = SDL_CreateTextureFromSurface(renderer, temp);
if (!texture) {
- fprintf(stderr, "Couldn't create texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create texture: %s\n", SDL_GetError());
SDL_FreeSurface(temp);
return NULL;
}
@@ -129,6 +129,9 @@ main(int argc, char *argv[])
int frames;
Uint32 then, now;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize test framework */
state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
if (!state) {
@@ -139,7 +142,7 @@ main(int argc, char *argv[])
consumed = SDLTest_CommonArg(state, i);
if (consumed == 0) {
- fprintf(stderr, "Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
+ SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
return 1;
}
i += consumed;
@@ -175,6 +178,8 @@ main(int argc, char *argv[])
SDLTest_CommonEvent(state, &event, &done);
}
for (i = 0; i < state->num_windows; ++i) {
+ if (state->windows[i] == NULL)
+ continue;
Draw(&drawstates[i]);
}
}
@@ -183,7 +188,7 @@ main(int argc, char *argv[])
now = SDL_GetTicks();
if (now > then) {
double fps = ((double) frames * 1000) / (now - then);
- printf("%2.2f frames per second\n", fps);
+ SDL_Log("%2.2f frames per second\n", fps);
}
SDL_stack_free(drawstates);
diff --git a/test/testsem.c b/test/testsem.c
index eab280e..6a2a59e 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -30,17 +30,15 @@ ThreadFunc(void *data)
int threadnum = (int) (uintptr_t) data;
while (alive) {
SDL_SemWait(sem);
- fprintf(stderr,
- "Thread number %d has got the semaphore (value = %d)!\n",
+ SDL_Log("Thread number %d has got the semaphore (value = %d)!\n",
threadnum, SDL_SemValue(sem));
SDL_Delay(200);
SDL_SemPost(sem);
- fprintf(stderr,
- "Thread number %d has released the semaphore (value = %d)!\n",
+ SDL_Log("Thread number %d has released the semaphore (value = %d)!\n",
threadnum, SDL_SemValue(sem));
SDL_Delay(1); /* For the scheduler */
}
- printf("Thread number %d exiting.\n", threadnum);
+ SDL_Log("Thread number %d exiting.\n", threadnum);
return 0;
}
@@ -59,7 +57,7 @@ TestWaitTimeout(void)
int retval;
sem = SDL_CreateSemaphore(0);
- printf("Waiting 2 seconds on semaphore\n");
+ SDL_Log("Waiting 2 seconds on semaphore\n");
start_ticks = SDL_GetTicks();
retval = SDL_SemWaitTimeout(sem, 2000);
@@ -69,13 +67,13 @@ TestWaitTimeout(void)
/* Accept a little offset in the effective wait */
if (duration > 1900 && duration < 2050)
- printf("Wait done.\n");
+ SDL_Log("Wait done.\n");
else
- fprintf(stderr, "Wait took %d milliseconds\n", duration);
+ SDL_Log("Wait took %d milliseconds\n", duration);
/* Check to make sure the return value indicates timed out */
if (retval != SDL_MUTEX_TIMEDOUT)
- fprintf(stderr, "SDL_SemWaitTimeout returned: %d; expected: %d\n", retval, SDL_MUTEX_TIMEDOUT);
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_SemWaitTimeout returned: %d; expected: %d\n", retval, SDL_MUTEX_TIMEDOUT);
}
int
@@ -85,14 +83,17 @@ main(int argc, char **argv)
uintptr_t i;
int init_sem;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (argc < 2) {
- fprintf(stderr, "Usage: %s init_value\n", argv[0]);
+ SDL_Log("Usage: %s init_value\n", argv[0]);
return (1);
}
/* Load the SDL library */
if (SDL_Init(0) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
}
signal(SIGTERM, killed);
@@ -101,7 +102,7 @@ main(int argc, char **argv)
init_sem = atoi(argv[1]);
sem = SDL_CreateSemaphore(init_sem);
- printf("Running %d threads, semaphore value = %d\n", NUM_THREADS,
+ SDL_Log("Running %d threads, semaphore value = %d\n", NUM_THREADS,
init_sem);
/* Create all the threads */
for (i = 0; i < NUM_THREADS; ++i) {
@@ -114,12 +115,12 @@ main(int argc, char **argv)
SDL_Delay(10 * 1000);
/* Wait for all threads to finish */
- printf("Waiting for threads to finish\n");
+ SDL_Log("Waiting for threads to finish\n");
alive = 0;
for (i = 0; i < NUM_THREADS; ++i) {
SDL_WaitThread(threads[i], NULL);
}
- printf("Finished waiting for threads\n");
+ SDL_Log("Finished waiting for threads\n");
SDL_DestroySemaphore(sem);
diff --git a/test/testshader.c b/test/testshader.c
index 376b445..0446770 100644
--- a/test/testshader.c
+++ b/test/testshader.c
@@ -11,7 +11,6 @@
*/
/* This is a simple example of using GLSL shaders with SDL */
-#include <stdio.h> /* for printf() */
#include "SDL.h"
#ifdef HAVE_OPENGL
@@ -139,7 +138,7 @@ static SDL_bool CompileShader(GLhandleARB shader, const char *source)
glGetObjectParameterivARB(shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
info = SDL_stack_alloc(char, length+1);
glGetInfoLogARB(shader, length, NULL, info);
- fprintf(stderr, "Failed to compile shader:\n%s\n%s", source, info);
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to compile shader:\n%s\n%s", source, info);
SDL_stack_free(info);
return SDL_FALSE;
@@ -245,7 +244,7 @@ static SDL_bool InitShaders()
/* Compile all the shaders */
for (i = 0; i < NUM_SHADERS; ++i) {
if (!CompileShaderProgram(&shaders[i])) {
- fprintf(stderr, "Unable to compile shader!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to compile shader!\n");
return SDL_FALSE;
}
}
@@ -333,19 +332,19 @@ SDL_GL_LoadTexture(SDL_Surface * surface, GLfloat * texcoord)
}
/* A general OpenGL initialization function. Sets all of the initial parameters. */
-void InitGL(int Width, int Height) // We call this right after our OpenGL window is created.
+void InitGL(int Width, int Height) /* We call this right after our OpenGL window is created. */
{
GLdouble aspect;
glViewport(0, 0, Width, Height);
- glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // This Will Clear The Background Color To Black
- glClearDepth(1.0); // Enables Clearing Of The Depth Buffer
- glDepthFunc(GL_LESS); // The Type Of Depth Test To Do
- glEnable(GL_DEPTH_TEST); // Enables Depth Testing
- glShadeModel(GL_SMOOTH); // Enables Smooth Color Shading
+ glClearColor(0.0f, 0.0f, 0.0f, 0.0f); /* This Will Clear The Background Color To Black */
+ glClearDepth(1.0); /* Enables Clearing Of The Depth Buffer */
+ glDepthFunc(GL_LESS); /* The Type Of Depth Test To Do */
+ glEnable(GL_DEPTH_TEST); /* Enables Depth Testing */
+ glShadeModel(GL_SMOOTH); /* Enables Smooth Color Shading */
glMatrixMode(GL_PROJECTION);
- glLoadIdentity(); // Reset The Projection Matrix
+ glLoadIdentity(); /* Reset The Projection Matrix */
aspect = (GLdouble)Width / Height;
glOrtho(-3.0, 3.0, -3.0 / aspect, 3.0 / aspect, 0.0, 1.0);
@@ -364,29 +363,29 @@ void DrawGLScene(SDL_Window *window, GLuint texture, GLfloat * texcoord)
MAXY
};
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear The Screen And The Depth Buffer
- glLoadIdentity(); // Reset The View
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); /* Clear The Screen And The Depth Buffer */
+ glLoadIdentity(); /* Reset The View */
- glTranslatef(-1.5f,0.0f,0.0f); // Move Left 1.5 Units
+ glTranslatef(-1.5f,0.0f,0.0f); /* Move Left 1.5 Units */
- // draw a triangle (in smooth coloring mode)
- glBegin(GL_POLYGON); // start drawing a polygon
- glColor3f(1.0f,0.0f,0.0f); // Set The Color To Red
- glVertex3f( 0.0f, 1.0f, 0.0f); // Top
- glColor3f(0.0f,1.0f,0.0f); // Set The Color To Green
- glVertex3f( 1.0f,-1.0f, 0.0f); // Bottom Right
- glColor3f(0.0f,0.0f,1.0f); // Set The Color To Blue
- glVertex3f(-1.0f,-1.0f, 0.0f); // Bottom Left
- glEnd(); // we're done with the polygon (smooth color interpolation)
+ /* draw a triangle (in smooth coloring mode) */
+ glBegin(GL_POLYGON); /* start drawing a polygon */
+ glColor3f(1.0f,0.0f,0.0f); /* Set The Color To Red */
+ glVertex3f( 0.0f, 1.0f, 0.0f); /* Top */
+ glColor3f(0.0f,1.0f,0.0f); /* Set The Color To Green */
+ glVertex3f( 1.0f,-1.0f, 0.0f); /* Bottom Right */
+ glColor3f(0.0f,0.0f,1.0f); /* Set The Color To Blue */
+ glVertex3f(-1.0f,-1.0f, 0.0f); /* Bottom Left */
+ glEnd(); /* we're done with the polygon (smooth color interpolation) */
- glTranslatef(3.0f,0.0f,0.0f); // Move Right 3 Units
+ glTranslatef(3.0f,0.0f,0.0f); /* Move Right 3 Units */
- // Enable blending
+ /* Enable blending */
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- // draw a textured square (quadrilateral)
+ /* draw a textured square (quadrilateral) */
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, texture);
glColor3f(1.0f,1.0f,1.0f);
@@ -394,23 +393,23 @@ void DrawGLScene(SDL_Window *window, GLuint texture, GLfloat * texcoord)
glUseProgramObjectARB(shaders[current_shader].program);
}
- glBegin(GL_QUADS); // start drawing a polygon (4 sided)
+ glBegin(GL_QUADS); /* start drawing a polygon (4 sided) */
glTexCoord2f(texcoord[MINX], texcoord[MINY]);
- glVertex3f(-1.0f, 1.0f, 0.0f); // Top Left
+ glVertex3f(-1.0f, 1.0f, 0.0f); /* Top Left */
glTexCoord2f(texcoord[MAXX], texcoord[MINY]);
- glVertex3f( 1.0f, 1.0f, 0.0f); // Top Right
+ glVertex3f( 1.0f, 1.0f, 0.0f); /* Top Right */
glTexCoord2f(texcoord[MAXX], texcoord[MAXY]);
- glVertex3f( 1.0f,-1.0f, 0.0f); // Bottom Right
+ glVertex3f( 1.0f,-1.0f, 0.0f); /* Bottom Right */
glTexCoord2f(texcoord[MINX], texcoord[MAXY]);
- glVertex3f(-1.0f,-1.0f, 0.0f); // Bottom Left
- glEnd(); // done with the polygon
+ glVertex3f(-1.0f,-1.0f, 0.0f); /* Bottom Left */
+ glEnd(); /* done with the polygon */
if (shaders_supported) {
glUseProgramObjectARB(0);
}
glDisable(GL_TEXTURE_2D);
- // swap buffers to display, since we're double buffered.
+ /* swap buffers to display, since we're double buffered. */
SDL_GL_SwapWindow(window);
}
@@ -422,29 +421,32 @@ int main(int argc, char **argv)
GLuint texture;
GLfloat texcoords[4];
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Initialize SDL for video output */
if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
- fprintf(stderr, "Unable to initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to initialize SDL: %s\n", SDL_GetError());
exit(1);
}
/* Create a 640x480 OpenGL screen */
window = SDL_CreateWindow( "Shader Demo", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 640, 480, SDL_WINDOW_OPENGL );
if ( !window ) {
- fprintf(stderr, "Unable to create OpenGL window: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to create OpenGL window: %s\n", SDL_GetError());
SDL_Quit();
exit(2);
}
if ( !SDL_GL_CreateContext(window)) {
- fprintf(stderr, "Unable to create OpenGL context: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to create OpenGL context: %s\n", SDL_GetError());
SDL_Quit();
exit(2);
}
surface = SDL_LoadBMP("icon.bmp");
if ( ! surface ) {
- fprintf(stderr, "Unable to load icon.bmp: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Unable to load icon.bmp: %s\n", SDL_GetError());
SDL_Quit();
exit(3);
}
@@ -454,9 +456,9 @@ int main(int argc, char **argv)
/* Loop, drawing and checking events */
InitGL(640, 480);
if (InitShaders()) {
- printf("Shaders supported, press SPACE to cycle them.\n");
+ SDL_Log("Shaders supported, press SPACE to cycle them.\n");
} else {
- printf("Shaders not supported!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Shaders not supported!\n");
}
done = 0;
while ( ! done ) {
@@ -489,7 +491,7 @@ int main(int argc, char **argv)
int
main(int argc, char *argv[])
{
- printf("No OpenGL support on this system\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "No OpenGL support on this system\n");
return 1;
}
diff --git a/test/testshape.c b/test/testshape.c
index 59dfb9f..c202d8e 100644
--- a/test/testshape.c
+++ b/test/testshape.c
@@ -29,11 +29,11 @@ typedef struct LoadedPicture {
void render(SDL_Renderer *renderer,SDL_Texture *texture,SDL_Rect texture_dimensions)
{
- //Clear render-target to blue.
+ /* Clear render-target to blue. */
SDL_SetRenderDrawColor(renderer,0x00,0x00,0xff,0xff);
SDL_RenderClear(renderer);
- //Render the texture.
+ /* Render the texture. */
SDL_RenderCopy(renderer,texture,&texture_dimensions,&texture_dimensions);
SDL_RenderPresent(renderer);
@@ -68,13 +68,16 @@ int main(int argc,char** argv)
int access = 0;
SDL_Rect texture_dimensions;;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if(argc < 2) {
- printf("SDL_Shape requires at least one bitmap file as argument.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Shape requires at least one bitmap file as argument.");
exit(-1);
}
if(SDL_VideoInit(NULL) == -1) {
- printf("Could not initialize SDL video.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Could not initialize SDL video.");
exit(-2);
}
@@ -87,11 +90,10 @@ int main(int argc,char** argv)
if(pictures[i].surface == NULL) {
j = 0;
for(j=0;j<num_pictures;j++)
- if(pictures[j].surface != NULL)
- SDL_FreeSurface(pictures[j].surface);
+ SDL_FreeSurface(pictures[j].surface);
SDL_free(pictures);
SDL_VideoQuit();
- printf("Could not load surface from named bitmap file.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Could not load surface from named bitmap file.");
exit(-3);
}
@@ -112,7 +114,7 @@ int main(int argc,char** argv)
SDL_FreeSurface(pictures[i].surface);
SDL_free(pictures);
SDL_VideoQuit();
- printf("Could not create shaped window for SDL_Shape.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Could not create shaped window for SDL_Shape.");
exit(-4);
}
renderer = SDL_CreateRenderer(window,-1,0);
@@ -122,7 +124,7 @@ int main(int argc,char** argv)
SDL_FreeSurface(pictures[i].surface);
SDL_free(pictures);
SDL_VideoQuit();
- printf("Could not create rendering context for SDL_Shape window.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Could not create rendering context for SDL_Shape window.");
exit(-5);
}
@@ -141,7 +143,7 @@ int main(int argc,char** argv)
SDL_DestroyRenderer(renderer);
SDL_DestroyWindow(window);
SDL_VideoQuit();
- printf("Could not create texture for SDL_shape.\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Could not create texture for SDL_shape.");
exit(-6);
}
}
@@ -185,17 +187,17 @@ int main(int argc,char** argv)
next_time += TICK_INTERVAL;
}
- //Free the textures.
+ /* Free the textures. */
for(i=0;i<num_pictures;i++)
SDL_DestroyTexture(pictures[i].texture);
SDL_DestroyRenderer(renderer);
- //Destroy the window.
+ /* Destroy the window. */
SDL_DestroyWindow(window);
- //Free the original surfaces backing the textures.
+ /* Free the original surfaces backing the textures. */
for(i=0;i<num_pictures;i++)
SDL_FreeSurface(pictures[i].surface);
SDL_free(pictures);
- //Call SDL_VideoQuit() before quitting.
+ /* Call SDL_VideoQuit() before quitting. */
SDL_VideoQuit();
return 0;
diff --git a/test/testsprite2.c b/test/testsprite2.c
index f772969..e0e1cf4 100644
--- a/test/testsprite2.c
+++ b/test/testsprite2.c
@@ -42,15 +42,9 @@ static int iterations = -1;
static void
quit(int rc)
{
- if (sprites) {
- SDL_free(sprites);
- }
- if (positions) {
- SDL_free(positions);
- }
- if (velocities) {
- SDL_free(velocities);
- }
+ SDL_free(sprites);
+ SDL_free(positions);
+ SDL_free(velocities);
SDLTest_CommonQuit(state);
exit(rc);
}
@@ -64,7 +58,7 @@ LoadSprite(const char *file)
/* Load the sprite image */
temp = SDL_LoadBMP(file);
if (temp == NULL) {
- fprintf(stderr, "Couldn't load %s: %s", file, SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s", file, SDL_GetError());
return (-1);
}
sprite_w = temp->w;
@@ -95,7 +89,7 @@ LoadSprite(const char *file)
SDL_Renderer *renderer = state->renderers[i];
sprites[i] = SDL_CreateTextureFromSurface(renderer, temp);
if (!sprites[i]) {
- fprintf(stderr, "Couldn't create texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create texture: %s\n", SDL_GetError());
SDL_FreeSurface(temp);
return (-1);
}
@@ -299,8 +293,7 @@ main(int argc, char *argv[])
}
}
if (consumed < 0) {
- fprintf(stderr,
- "Usage: %s %s [--blend none|blend|add|mod] [--cyclecolor] [--cyclealpha] [--iterations N] [num_sprites] [icon.bmp]\n",
+ SDL_Log("Usage: %s %s [--blend none|blend|add|mod] [--cyclecolor] [--cyclealpha] [--iterations N] [num_sprites] [icon.bmp]\n",
argv[0], SDLTest_CommonUsage(state));
quit(1);
}
@@ -314,7 +307,7 @@ main(int argc, char *argv[])
sprites =
(SDL_Texture **) SDL_malloc(state->num_windows * sizeof(*sprites));
if (!sprites) {
- fprintf(stderr, "Out of memory!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n");
quit(2);
}
for (i = 0; i < state->num_windows; ++i) {
@@ -330,7 +323,7 @@ main(int argc, char *argv[])
positions = (SDL_Rect *) SDL_malloc(num_sprites * sizeof(SDL_Rect));
velocities = (SDL_Rect *) SDL_malloc(num_sprites * sizeof(SDL_Rect));
if (!positions || !velocities) {
- fprintf(stderr, "Out of memory!\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n");
quit(2);
}
@@ -367,6 +360,8 @@ main(int argc, char *argv[])
SDLTest_CommonEvent(state, &event, &done);
}
for (i = 0; i < state->num_windows; ++i) {
+ if (state->windows[i] == NULL)
+ continue;
MoveSprites(state->renderers[i], sprites[i]);
}
}
@@ -375,7 +370,7 @@ main(int argc, char *argv[])
now = SDL_GetTicks();
if (now > then) {
double fps = ((double) frames * 1000) / (now - then);
- printf("%2.2f frames per second\n", fps);
+ SDL_Log("%2.2f frames per second\n", fps);
}
quit(0);
return 0;
diff --git a/test/testspriteminimal.c b/test/testspriteminimal.c
index 6f3ac25..157293f 100644
--- a/test/testspriteminimal.c
+++ b/test/testspriteminimal.c
@@ -42,7 +42,7 @@ LoadSprite(char *file, SDL_Renderer *renderer)
/* Load the sprite image */
temp = SDL_LoadBMP(file);
if (temp == NULL) {
- fprintf(stderr, "Couldn't load %s: %s\n", file, SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't load %s: %s\n", file, SDL_GetError());
return (-1);
}
sprite_w = temp->w;
@@ -73,7 +73,7 @@ LoadSprite(char *file, SDL_Renderer *renderer)
/* Create textures from the image */
sprite = SDL_CreateTextureFromSurface(renderer, temp);
if (!sprite) {
- fprintf(stderr, "Couldn't create texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create texture: %s\n", SDL_GetError());
SDL_FreeSurface(temp);
return (-1);
}
@@ -126,6 +126,9 @@ main(int argc, char *argv[])
int i, done;
SDL_Event event;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (SDL_CreateWindowAndRenderer(WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer) < 0) {
quit(2);
}
diff --git a/test/teststreaming.c b/test/teststreaming.c
index ea3ac2d..1d3f682 100644
--- a/test/teststreaming.c
+++ b/test/teststreaming.c
@@ -68,7 +68,7 @@ void UpdateTexture(SDL_Texture *texture, int frame)
int pitch;
if (SDL_LockTexture(texture, NULL, &pixels, &pitch) < 0) {
- fprintf(stderr, "Couldn't lock texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't lock texture: %s\n", SDL_GetError());
quit(5);
}
src = MooseFrames[frame];
@@ -93,15 +93,18 @@ main(int argc, char **argv)
SDL_bool done = SDL_FALSE;
int frame;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return 1;
}
/* load the moose images */
handle = SDL_RWFromFile("moose.dat", "rb");
if (handle == NULL) {
- fprintf(stderr, "Can't find the file moose.dat !\n");
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Can't find the file moose.dat !\n");
quit(2);
}
SDL_RWread(handle, MooseFrames, MOOSEFRAME_SIZE, MOOSEFRAMES_COUNT);
@@ -115,19 +118,19 @@ main(int argc, char **argv)
MOOSEPIC_W*4, MOOSEPIC_H*4,
SDL_WINDOW_RESIZABLE);
if (!window) {
- fprintf(stderr, "Couldn't set create window: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set create window: %s\n", SDL_GetError());
quit(3);
}
renderer = SDL_CreateRenderer(window, -1, 0);
if (!renderer) {
- fprintf(stderr, "Couldn't set create renderer: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set create renderer: %s\n", SDL_GetError());
quit(4);
}
MooseTexture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, MOOSEPIC_W, MOOSEPIC_H);
if (!MooseTexture) {
- fprintf(stderr, "Couldn't set create texture: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set create texture: %s\n", SDL_GetError());
quit(5);
}
diff --git a/test/testthread.c b/test/testthread.c
index 9cea757..c5ce2d5 100644
--- a/test/testthread.c
+++ b/test/testthread.c
@@ -1,96 +1,99 @@
-/*
- Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely.
-*/
-
-/* Simple test of the SDL threading code */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-
-#include "SDL.h"
-#include "SDL_thread.h"
-
-static SDL_TLSID tls;
-static int alive = 0;
-
-/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
-static void
-quit(int rc)
-{
- SDL_Quit();
- exit(rc);
-}
-
-int SDLCALL
-ThreadFunc(void *data)
-{
- SDL_TLSSet(tls, "baby thread", NULL);
- SDL_Log("Started thread %s: My thread id is %lu, thread data = %s\n",
- (char *) data, SDL_ThreadID(), (const char *)SDL_TLSGet(tls));
- while (alive) {
- SDL_Log("Thread '%s' is alive!\n", (char *) data);
- SDL_Delay(1 * 1000);
- }
- SDL_Log("Thread '%s' exiting!\n", (char *) data);
- return (0);
-}
-
-static void
-killed(int sig)
-{
- SDL_Log("Killed with SIGTERM, waiting 5 seconds to exit\n");
- SDL_Delay(5 * 1000);
- alive = 0;
- quit(0);
-}
-
-int
-main(int argc, char *argv[])
-{
- SDL_Thread *thread;
-
- /* Load the SDL library */
- if (SDL_Init(0) < 0) {
- SDL_Log("Couldn't initialize SDL: %s\n", SDL_GetError());
- return (1);
- }
-
- tls = SDL_TLSCreate();
- SDL_assert(tls);
- SDL_TLSSet(tls, "main thread", NULL);
- SDL_Log("Main thread data initially: %s\n", (const char *)SDL_TLSGet(tls));
-
- alive = 1;
- thread = SDL_CreateThread(ThreadFunc, "One", "#1");
- if (thread == NULL) {
- SDL_Log("Couldn't create thread: %s\n", SDL_GetError());
- quit(1);
- }
- SDL_Delay(5 * 1000);
- SDL_Log("Waiting for thread #1\n");
- alive = 0;
- SDL_WaitThread(thread, NULL);
-
- SDL_Log("Main thread data finally: %s\n", (const char *)SDL_TLSGet(tls));
-
- alive = 1;
- signal(SIGTERM, killed);
- thread = SDL_CreateThread(ThreadFunc, "Two", "#2");
- if (thread == NULL) {
- SDL_Log("Couldn't create thread: %s\n", SDL_GetError());
- quit(1);
- }
- raise(SIGTERM);
-
- SDL_Quit(); /* Never reached */
- return (0); /* Never reached */
-}
+/*
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely.
+*/
+
+/* Simple test of the SDL threading code */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+
+#include "SDL.h"
+#include "SDL_thread.h"
+
+static SDL_TLSID tls;
+static int alive = 0;
+
+/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
+static void
+quit(int rc)
+{
+ SDL_Quit();
+ exit(rc);
+}
+
+int SDLCALL
+ThreadFunc(void *data)
+{
+ SDL_TLSSet(tls, "baby thread", NULL);
+ SDL_Log("Started thread %s: My thread id is %lu, thread data = %s\n",
+ (char *) data, SDL_ThreadID(), (const char *)SDL_TLSGet(tls));
+ while (alive) {
+ SDL_Log("Thread '%s' is alive!\n", (char *) data);
+ SDL_Delay(1 * 1000);
+ }
+ SDL_Log("Thread '%s' exiting!\n", (char *) data);
+ return (0);
+}
+
+static void
+killed(int sig)
+{
+ SDL_Log("Killed with SIGTERM, waiting 5 seconds to exit\n");
+ SDL_Delay(5 * 1000);
+ alive = 0;
+ quit(0);
+}
+
+int
+main(int argc, char *argv[])
+{
+ SDL_Thread *thread;
+
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
+ /* Load the SDL library */
+ if (SDL_Init(0) < 0) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ return (1);
+ }
+
+ tls = SDL_TLSCreate();
+ SDL_assert(tls);
+ SDL_TLSSet(tls, "main thread", NULL);
+ SDL_Log("Main thread data initially: %s\n", (const char *)SDL_TLSGet(tls));
+
+ alive = 1;
+ thread = SDL_CreateThread(ThreadFunc, "One", "#1");
+ if (thread == NULL) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s\n", SDL_GetError());
+ quit(1);
+ }
+ SDL_Delay(5 * 1000);
+ SDL_Log("Waiting for thread #1\n");
+ alive = 0;
+ SDL_WaitThread(thread, NULL);
+
+ SDL_Log("Main thread data finally: %s\n", (const char *)SDL_TLSGet(tls));
+
+ alive = 1;
+ signal(SIGTERM, killed);
+ thread = SDL_CreateThread(ThreadFunc, "Two", "#2");
+ if (thread == NULL) {
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s\n", SDL_GetError());
+ quit(1);
+ }
+ raise(SIGTERM);
+
+ SDL_Quit(); /* Never reached */
+ return (0); /* Never reached */
+}
diff --git a/test/testtimer.c b/test/testtimer.c
index ebc655d..ea985e2 100644
--- a/test/testtimer.c
+++ b/test/testtimer.c
@@ -33,7 +33,7 @@ ticktock(Uint32 interval, void *param)
static Uint32 SDLCALL
callback(Uint32 interval, void *param)
{
- printf("Timer %d : param = %d\n", interval, (int) (uintptr_t) param);
+ SDL_Log("Timer %d : param = %d\n", interval, (int) (uintptr_t) param);
return interval;
}
@@ -45,8 +45,11 @@ main(int argc, char *argv[])
Uint32 start32, now32;
Uint64 start, now;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
if (SDL_Init(SDL_INIT_TIMER) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
}
@@ -61,7 +64,7 @@ main(int argc, char *argv[])
t1 = SDL_AddTimer(desired, ticktock, NULL);
/* Wait 10 seconds */
- printf("Waiting 10 seconds\n");
+ SDL_Log("Waiting 10 seconds\n");
SDL_Delay(10 * 1000);
/* Stop the timer */
@@ -69,28 +72,27 @@ main(int argc, char *argv[])
/* Print the results */
if (ticks) {
- fprintf(stderr,
- "Timer resolution: desired = %d ms, actual = %f ms\n",
+ SDL_Log("Timer resolution: desired = %d ms, actual = %f ms\n",
desired, (double) (10 * 1000) / ticks);
}
/* Test multiple timers */
- printf("Testing multiple timers...\n");
+ SDL_Log("Testing multiple timers...\n");
t1 = SDL_AddTimer(100, callback, (void *) 1);
if (!t1)
- fprintf(stderr, "Could not create timer 1: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,"Could not create timer 1: %s\n", SDL_GetError());
t2 = SDL_AddTimer(50, callback, (void *) 2);
if (!t2)
- fprintf(stderr, "Could not create timer 2: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,"Could not create timer 2: %s\n", SDL_GetError());
t3 = SDL_AddTimer(233, callback, (void *) 3);
if (!t3)
- fprintf(stderr, "Could not create timer 3: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,"Could not create timer 3: %s\n", SDL_GetError());
/* Wait 10 seconds */
- printf("Waiting 10 seconds\n");
+ SDL_Log("Waiting 10 seconds\n");
SDL_Delay(10 * 1000);
- printf("Removing timer 1 and waiting 5 more seconds\n");
+ SDL_Log("Removing timer 1 and waiting 5 more seconds\n");
SDL_RemoveTimer(t1);
SDL_Delay(5 * 1000);
@@ -103,15 +105,15 @@ main(int argc, char *argv[])
ticktock(0, NULL);
}
now = SDL_GetPerformanceCounter();
- printf("1 million iterations of ticktock took %f ms\n", (double)((now - start)*1000) / SDL_GetPerformanceFrequency());
+ SDL_Log("1 million iterations of ticktock took %f ms\n", (double)((now - start)*1000) / SDL_GetPerformanceFrequency());
- printf("Performance counter frequency: %llu\n", (unsigned long long) SDL_GetPerformanceFrequency());
+ SDL_Log("Performance counter frequency: %llu\n", (unsigned long long) SDL_GetPerformanceFrequency());
start32 = SDL_GetTicks();
start = SDL_GetPerformanceCounter();
SDL_Delay(1000);
now = SDL_GetPerformanceCounter();
now32 = SDL_GetTicks();
- printf("Delay 1 second = %d ms in ticks, %f ms according to performance counter\n", (now32-start32), (double)((now - start)*1000) / SDL_GetPerformanceFrequency());
+ SDL_Log("Delay 1 second = %d ms in ticks, %f ms according to performance counter\n", (now32-start32), (double)((now - start)*1000) / SDL_GetPerformanceFrequency());
SDL_Quit();
return (0);
diff --git a/test/testver.c b/test/testver.c
index ecfcdf3..cf3a545 100644
--- a/test/testver.c
+++ b/test/testver.c
@@ -26,17 +26,20 @@ main(int argc, char *argv[])
SDL_version compiled;
SDL_version linked;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
#if SDL_VERSION_ATLEAST(2, 0, 0)
- printf("Compiled with SDL 2.0 or newer\n");
+ SDL_Log("Compiled with SDL 2.0 or newer\n");
#else
- printf("Compiled with SDL older than 2.0\n");
+ SDL_Log("Compiled with SDL older than 2.0\n");
#endif
SDL_VERSION(&compiled);
- printf("Compiled version: %d.%d.%d.%d (%s)\n",
+ SDL_Log("Compiled version: %d.%d.%d.%d (%s)\n",
compiled.major, compiled.minor, compiled.patch,
SDL_REVISION_NUMBER, SDL_REVISION);
SDL_GetVersion(&linked);
- printf("Linked version: %d.%d.%d.%d (%s)\n",
+ SDL_Log("Linked version: %d.%d.%d.%d (%s)\n",
linked.major, linked.minor, linked.patch,
SDL_GetRevisionNumber(), SDL_GetRevision());
SDL_Quit();
diff --git a/test/testwm2.c b/test/testwm2.c
index efe6ea4..127a4d8 100644
--- a/test/testwm2.c
+++ b/test/testwm2.c
@@ -48,6 +48,9 @@ main(int argc, char *argv[])
int system_cursor = -1;
SDL_Cursor *cursor = NULL;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
SDL_assert(SDL_arraysize(cursorNames) == SDL_NUM_SYSTEM_CURSORS);
/* Initialize test framework */
@@ -64,7 +67,7 @@ main(int argc, char *argv[])
consumed = -1;
}
if (consumed < 0) {
- fprintf(stderr, "Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
+ SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
quit(1);
}
i += consumed;
@@ -84,7 +87,7 @@ main(int argc, char *argv[])
if (event.window.event == SDL_WINDOWEVENT_RESIZED) {
SDL_Window *window = SDL_GetWindowFromID(event.window.windowID);
if (window) {
- printf("Window %d resized to %dx%d\n",
+ SDL_Log("Window %d resized to %dx%d\n",
event.window.windowID,
event.window.data1,
event.window.data2);
@@ -93,7 +96,7 @@ main(int argc, char *argv[])
if (event.window.event == SDL_WINDOWEVENT_MOVED) {
SDL_Window *window = SDL_GetWindowFromID(event.window.windowID);
if (window) {
- printf("Window %d moved to %d,%d (display %s)\n",
+ SDL_Log("Window %d moved to %d,%d (display %s)\n",
event.window.windowID,
event.window.data1,
event.window.data2,
@@ -129,7 +132,7 @@ main(int argc, char *argv[])
SDL_FreeCursor(cursor);
quit(0);
- // keep the compiler happy ...
+ /* keep the compiler happy ... */
return(0);
}
diff --git a/test/torturethread.c b/test/torturethread.c
index 795b60b..b22ee2a 100644
--- a/test/torturethread.c
+++ b/test/torturethread.c
@@ -36,7 +36,7 @@ int SDLCALL
SubThreadFunc(void *data)
{
while (!*(int volatile *) data) {
- ; /*SDL_Delay(10); *//* do nothing */
+ ; /* SDL_Delay(10); *//* do nothing */
}
return 0;
}
@@ -49,7 +49,7 @@ ThreadFunc(void *data)
int i;
int tid = (int) (uintptr_t) data;
- fprintf(stderr, "Creating Thread %d\n", tid);
+ SDL_Log("Creating Thread %d\n", tid);
for (i = 0; i < NUMTHREADS; i++) {
char name[64];
@@ -58,18 +58,18 @@ ThreadFunc(void *data)
sub_threads[i] = SDL_CreateThread(SubThreadFunc, name, &flags[i]);
}
- printf("Thread '%d' waiting for signal\n", tid);
+ SDL_Log("Thread '%d' waiting for signal\n", tid);
while (time_for_threads_to_die[tid] != 1) {
; /* do nothing */
}
- printf("Thread '%d' sending signals to subthreads\n", tid);
+ SDL_Log("Thread '%d' sending signals to subthreads\n", tid);
for (i = 0; i < NUMTHREADS; i++) {
flags[i] = 1;
SDL_WaitThread(sub_threads[i], NULL);
}
- printf("Thread '%d' exiting!\n", tid);
+ SDL_Log("Thread '%d' exiting!\n", tid);
return 0;
}
@@ -80,9 +80,12 @@ main(int argc, char *argv[])
SDL_Thread *threads[NUMTHREADS];
int i;
+ /* Enable standard application logging */
+ SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
+
/* Load the SDL library */
if (SDL_Init(0) < 0) {
- fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
}
@@ -94,7 +97,7 @@ main(int argc, char *argv[])
threads[i] = SDL_CreateThread(ThreadFunc, name, (void*) (uintptr_t) i);
if (threads[i] == NULL) {
- fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError());
+ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create thread: %s\n", SDL_GetError());
quit(1);
}
}