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
35730
35731
35732
35733
35734
35735
35736
35737
35738
35739
35740
35741
35742
35743
35744
35745
35746
35747
35748
35749
35750
35751
35752
35753
35754
35755
35756
35757
35758
35759
35760
35761
35762
35763
35764
35765
35766
35767
35768
35769
35770
35771
35772
35773
35774
35775
35776
35777
35778
35779
35780
35781
35782
35783
35784
35785
35786
35787
35788
35789
35790
35791
35792
35793
35794
35795
35796
35797
35798
35799
35800
35801
35802
35803
35804
35805
35806
35807
35808
35809
35810
35811
35812
35813
35814
35815
35816
35817
35818
35819
35820
35821
35822
35823
35824
35825
35826
35827
35828
35829
35830
35831
35832
35833
35834
35835
35836
35837
35838
35839
35840
35841
35842
35843
35844
35845
35846
35847
35848
35849
35850
35851
35852
35853
35854
35855
35856
35857
35858
35859
35860
35861
35862
35863
35864
35865
35866
35867
35868
35869
35870
35871
35872
35873
35874
35875
35876
35877
35878
35879
35880
35881
35882
35883
35884
35885
35886
35887
35888
35889
35890
35891
35892
35893
35894
35895
35896
35897
35898
35899
35900
35901
35902
35903
35904
35905
35906
35907
35908
35909
35910
35911
35912
35913
35914
35915
35916
35917
35918
35919
35920
35921
35922
35923
35924
35925
35926
35927
35928
35929
35930
35931
35932
35933
35934
35935
35936
35937
35938
35939
35940
35941
35942
35943
35944
35945
35946
35947
35948
35949
35950
35951
35952
35953
35954
35955
35956
35957
35958
35959
35960
35961
35962
35963
35964
35965
35966
35967
35968
35969
35970
35971
35972
35973
35974
35975
35976
35977
35978
35979
35980
35981
35982
35983
35984
35985
35986
35987
35988
35989
35990
35991
35992
35993
35994
35995
35996
35997
35998
35999
36000
36001
36002
36003
36004
36005
36006
36007
36008
36009
36010
36011
36012
36013
36014
36015
36016
36017
36018
36019
36020
36021
36022
36023
36024
36025
36026
36027
36028
36029
36030
36031
36032
36033
36034
36035
36036
36037
36038
36039
36040
36041
36042
36043
36044
36045
36046
36047
36048
36049
36050
36051
36052
36053
36054
36055
36056
36057
36058
36059
36060
36061
36062
36063
36064
36065
36066
36067
36068
36069
36070
36071
36072
36073
36074
36075
36076
36077
36078
36079
36080
36081
36082
36083
36084
36085
36086
36087
36088
36089
36090
36091
36092
36093
36094
36095
36096
36097
36098
36099
36100
36101
36102
36103
36104
36105
36106
36107
36108
36109
36110
36111
36112
36113
36114
36115
36116
36117
36118
36119
36120
36121
36122
36123
36124
36125
36126
36127
36128
36129
36130
36131
36132
36133
36134
36135
36136
36137
36138
36139
36140
36141
36142
36143
36144
36145
36146
36147
36148
36149
36150
36151
36152
36153
36154
36155
36156
36157
36158
36159
36160
36161
36162
36163
36164
36165
36166
36167
36168
36169
36170
36171
36172
36173
36174
36175
36176
36177
36178
36179
36180
36181
36182
36183
36184
36185
36186
36187
36188
36189
36190
36191
36192
36193
36194
36195
36196
36197
36198
36199
36200
36201
36202
36203
36204
36205
36206
36207
36208
36209
36210
36211
36212
36213
36214
36215
36216
36217
36218
36219
36220
36221
36222
36223
36224
36225
36226
36227
36228
36229
36230
36231
36232
36233
36234
36235
36236
36237
36238
36239
36240
36241
36242
36243
36244
36245
36246
36247
36248
36249
36250
36251
36252
36253
36254
36255
36256
36257
36258
36259
36260
36261
36262
36263
36264
36265
36266
36267
36268
36269
36270
36271
36272
36273
36274
36275
36276
36277
36278
36279
36280
36281
36282
36283
36284
36285
36286
36287
36288
36289
36290
36291
36292
36293
36294
36295
36296
36297
36298
36299
36300
36301
36302
36303
36304
36305
36306
36307
36308
36309
36310
36311
36312
36313
36314
36315
36316
36317
36318
36319
36320
36321
36322
36323
36324
36325
36326
36327
36328
36329
36330
36331
36332
36333
36334
36335
36336
36337
36338
36339
36340
36341
36342
36343
36344
36345
36346
36347
36348
36349
36350
36351
36352
36353
36354
36355
36356
36357
36358
36359
36360
36361
36362
36363
36364
36365
36366
36367
36368
36369
36370
36371
36372
36373
36374
36375
36376
36377
36378
36379
36380
36381
36382
36383
36384
36385
36386
36387
36388
36389
36390
36391
36392
36393
36394
36395
36396
36397
36398
36399
36400
36401
36402
36403
36404
36405
36406
36407
36408
36409
36410
36411
36412
36413
36414
36415
36416
36417
36418
36419
36420
36421
36422
36423
36424
36425
36426
36427
36428
36429
36430
36431
36432
36433
36434
36435
36436
36437
36438
36439
36440
36441
36442
36443
36444
36445
36446
36447
36448
36449
36450
36451
36452
36453
36454
36455
36456
36457
36458
36459
36460
36461
36462
36463
36464
36465
36466
36467
36468
36469
36470
36471
36472
36473
36474
36475
36476
36477
36478
36479
36480
36481
36482
36483
36484
36485
36486
36487
36488
36489
36490
36491
36492
36493
36494
36495
36496
36497
36498
36499
36500
36501
36502
36503
36504
36505
36506
36507
36508
36509
36510
36511
36512
36513
36514
36515
36516
36517
36518
36519
36520
36521
36522
36523
36524
36525
36526
36527
36528
36529
36530
36531
36532
36533
36534
36535
36536
36537
36538
36539
36540
36541
36542
36543
36544
36545
36546
36547
36548
36549
36550
36551
36552
36553
36554
36555
36556
36557
36558
36559
36560
36561
36562
36563
36564
36565
36566
36567
36568
36569
36570
36571
36572
36573
36574
36575
36576
36577
36578
36579
36580
36581
36582
36583
36584
36585
36586
36587
36588
36589
36590
36591
36592
36593
36594
36595
36596
36597
36598
36599
36600
36601
36602
36603
36604
36605
36606
36607
36608
36609
36610
36611
36612
36613
36614
36615
36616
36617
36618
36619
36620
36621
36622
36623
36624
36625
36626
36627
36628
36629
36630
36631
36632
36633
36634
36635
36636
36637
36638
36639
36640
36641
36642
36643
36644
36645
36646
36647
36648
36649
36650
36651
36652
36653
36654
36655
36656
36657
36658
36659
36660
36661
36662
36663
36664
36665
36666
36667
36668
36669
36670
36671
36672
36673
36674
36675
36676
36677
36678
36679
36680
36681
36682
36683
36684
36685
36686
36687
36688
36689
36690
36691
36692
36693
36694
36695
36696
36697
36698
36699
36700
36701
36702
36703
36704
36705
36706
36707
36708
36709
36710
36711
36712
36713
36714
36715
36716
36717
36718
36719
36720
36721
36722
36723
36724
36725
36726
36727
36728
36729
36730
36731
36732
36733
36734
36735
36736
36737
36738
36739
36740
36741
36742
36743
36744
36745
36746
36747
36748
36749
36750
36751
36752
36753
36754
36755
36756
36757
36758
36759
36760
36761
36762
36763
36764
36765
36766
36767
36768
36769
36770
36771
36772
36773
36774
36775
36776
36777
36778
36779
36780
36781
36782
36783
36784
36785
36786
36787
36788
36789
36790
36791
36792
36793
36794
36795
36796
36797
36798
36799
36800
36801
36802
36803
36804
36805
36806
36807
36808
36809
36810
36811
36812
36813
36814
36815
36816
36817
36818
36819
36820
36821
36822
36823
36824
36825
36826
36827
36828
36829
36830
36831
36832
36833
36834
36835
36836
36837
36838
36839
36840
36841
36842
36843
36844
36845
36846
36847
36848
36849
36850
36851
36852
36853
36854
36855
36856
36857
36858
36859
36860
36861
36862
36863
36864
36865
36866
36867
36868
36869
36870
36871
36872
36873
36874
36875
36876
36877
36878
36879
36880
36881
36882
36883
36884
36885
36886
36887
36888
36889
36890
36891
36892
36893
36894
36895
36896
36897
36898
36899
36900
36901
36902
36903
36904
36905
36906
36907
36908
36909
36910
36911
36912
36913
36914
36915
36916
36917
36918
36919
36920
36921
36922
36923
36924
36925
36926
36927
36928
36929
36930
36931
36932
36933
36934
36935
36936
36937
36938
36939
36940
36941
36942
36943
36944
36945
36946
36947
36948
36949
36950
36951
36952
36953
36954
36955
36956
36957
36958
36959
36960
36961
36962
36963
36964
36965
36966
36967
36968
36969
36970
36971
36972
36973
36974
36975
36976
36977
36978
36979
36980
36981
36982
36983
36984
36985
36986
36987
36988
36989
36990
36991
36992
36993
36994
36995
36996
36997
36998
36999
37000
37001
37002
37003
37004
37005
37006
37007
37008
37009
37010
37011
37012
37013
37014
37015
37016
37017
37018
37019
37020
37021
37022
37023
37024
37025
37026
37027
37028
37029
37030
37031
37032
37033
37034
37035
37036
37037
37038
37039
37040
37041
37042
37043
37044
37045
37046
37047
37048
37049
37050
37051
37052
37053
37054
37055
37056
37057
37058
37059
37060
37061
37062
37063
37064
37065
37066
37067
37068
37069
37070
37071
37072
37073
37074
37075
37076
37077
37078
37079
37080
37081
37082
37083
37084
37085
37086
37087
37088
37089
37090
37091
37092
37093
37094
37095
37096
37097
37098
37099
37100
37101
37102
37103
37104
37105
37106
37107
37108
37109
37110
37111
37112
37113
37114
37115
37116
37117
37118
37119
37120
37121
37122
37123
37124
37125
37126
37127
37128
37129
37130
37131
37132
37133
37134
37135
37136
37137
37138
37139
37140
37141
37142
37143
37144
37145
37146
37147
37148
37149
37150
37151
37152
37153
37154
37155
37156
37157
37158
37159
37160
37161
37162
37163
37164
37165
37166
37167
37168
37169
37170
37171
37172
37173
37174
37175
37176
37177
37178
37179
37180
37181
37182
37183
37184
37185
37186
37187
37188
37189
37190
37191
37192
37193
37194
37195
37196
37197
37198
37199
37200
37201
37202
37203
37204
37205
37206
37207
37208
37209
37210
37211
37212
37213
37214
37215
37216
37217
37218
37219
37220
37221
37222
37223
37224
37225
37226
37227
37228
37229
37230
37231
37232
37233
37234
37235
37236
37237
37238
37239
37240
37241
37242
37243
37244
37245
37246
37247
37248
37249
37250
37251
37252
37253
37254
37255
37256
37257
37258
37259
37260
37261
37262
37263
37264
37265
37266
37267
37268
37269
37270
37271
37272
37273
37274
37275
37276
37277
37278
37279
37280
37281
37282
37283
37284
37285
37286
37287
37288
37289
37290
37291
37292
37293
37294
37295
37296
37297
37298
37299
37300
37301
37302
37303
37304
37305
37306
37307
37308
37309
37310
37311
37312
37313
37314
37315
37316
37317
37318
37319
37320
37321
37322
37323
37324
37325
37326
37327
37328
37329
37330
37331
37332
37333
37334
37335
37336
37337
37338
37339
37340
37341
37342
37343
37344
37345
37346
37347
37348
37349
37350
37351
37352
37353
37354
37355
37356
37357
37358
37359
37360
37361
37362
37363
37364
37365
37366
37367
37368
37369
37370
37371
37372
37373
37374
37375
37376
37377
37378
37379
37380
37381
37382
37383
37384
37385
37386
37387
37388
37389
37390
37391
37392
37393
37394
37395
37396
37397
37398
37399
37400
37401
37402
37403
37404
37405
37406
37407
37408
37409
37410
37411
37412
37413
37414
37415
37416
37417
37418
37419
37420
37421
37422
37423
37424
37425
37426
37427
37428
37429
37430
37431
37432
37433
37434
37435
37436
37437
37438
37439
37440
37441
37442
37443
37444
37445
37446
37447
37448
37449
37450
37451
37452
37453
37454
37455
37456
37457
37458
37459
37460
37461
37462
37463
37464
37465
37466
37467
37468
37469
37470
37471
37472
37473
37474
37475
37476
37477
37478
37479
37480
37481
37482
37483
37484
37485
37486
37487
37488
37489
37490
37491
37492
37493
37494
37495
37496
37497
37498
37499
37500
37501
37502
37503
37504
37505
37506
37507
37508
37509
37510
37511
37512
37513
37514
37515
37516
37517
37518
37519
37520
37521
37522
37523
37524
37525
37526
37527
37528
37529
37530
37531
37532
37533
37534
37535
37536
37537
37538
37539
37540
37541
37542
37543
37544
37545
37546
37547
37548
37549
37550
37551
37552
37553
37554
37555
37556
37557
37558
37559
37560
37561
37562
37563
37564
37565
37566
37567
37568
37569
37570
37571
37572
37573
37574
37575
37576
37577
37578
37579
37580
37581
37582
37583
37584
37585
37586
37587
37588
37589
37590
37591
37592
37593
37594
37595
37596
37597
37598
37599
37600
37601
37602
37603
37604
37605
37606
37607
37608
37609
37610
37611
37612
37613
37614
37615
37616
37617
37618
37619
37620
37621
37622
37623
37624
37625
37626
37627
37628
37629
37630
37631
37632
37633
37634
37635
37636
37637
37638
37639
37640
37641
37642
37643
37644
37645
37646
37647
37648
37649
37650
37651
37652
37653
37654
37655
37656
37657
37658
37659
37660
37661
37662
37663
37664
37665
37666
37667
37668
37669
37670
37671
37672
37673
37674
37675
37676
37677
37678
37679
37680
37681
37682
37683
37684
37685
37686
37687
37688
37689
37690
37691
37692
37693
37694
37695
37696
37697
37698
37699
37700
37701
37702
37703
37704
37705
37706
37707
37708
37709
37710
37711
37712
37713
37714
37715
37716
37717
37718
37719
37720
37721
37722
37723
37724
37725
37726
37727
37728
37729
37730
37731
37732
37733
37734
37735
37736
37737
37738
37739
37740
37741
37742
37743
37744
37745
37746
37747
37748
37749
37750
37751
37752
37753
37754
37755
37756
37757
37758
37759
37760
37761
37762
37763
37764
37765
37766
37767
37768
37769
37770
37771
37772
37773
37774
37775
37776
37777
37778
37779
37780
37781
37782
37783
37784
37785
37786
37787
37788
37789
37790
37791
37792
37793
37794
37795
37796
37797
37798
37799
37800
37801
37802
37803
37804
37805
37806
37807
37808
37809
37810
37811
37812
37813
37814
37815
37816
37817
37818
37819
37820
37821
37822
37823
37824
37825
37826
37827
37828
37829
37830
37831
37832
37833
37834
37835
37836
37837
37838
37839
37840
37841
37842
37843
37844
37845
37846
37847
37848
37849
37850
37851
37852
37853
37854
37855
37856
37857
37858
37859
37860
37861
37862
37863
37864
37865
37866
37867
37868
37869
37870
37871
37872
37873
37874
37875
37876
37877
37878
37879
37880
37881
37882
37883
37884
37885
37886
37887
37888
37889
37890
37891
37892
37893
37894
37895
37896
37897
37898
37899
37900
37901
37902
37903
37904
37905
37906
37907
37908
37909
37910
37911
37912
37913
37914
37915
37916
37917
37918
37919
37920
37921
37922
37923
37924
37925
37926
37927
37928
37929
37930
37931
37932
37933
37934
37935
37936
37937
37938
37939
37940
37941
37942
37943
37944
37945
37946
37947
37948
37949
37950
37951
37952
37953
37954
37955
37956
37957
37958
37959
37960
37961
37962
37963
37964
37965
37966
37967
37968
37969
37970
37971
37972
37973
37974
37975
37976
37977
37978
37979
37980
37981
37982
37983
37984
37985
37986
37987
37988
37989
37990
37991
37992
37993
37994
37995
37996
37997
37998
37999
38000
38001
38002
38003
38004
38005
38006
38007
38008
38009
38010
38011
38012
38013
38014
38015
38016
38017
38018
38019
38020
38021
38022
38023
38024
38025
38026
38027
38028
38029
38030
38031
38032
38033
38034
38035
38036
38037
38038
38039
38040
38041
38042
38043
38044
38045
38046
38047
38048
38049
38050
38051
38052
38053
38054
38055
38056
38057
38058
38059
38060
38061
38062
38063
38064
38065
38066
38067
38068
38069
38070
38071
38072
38073
38074
38075
38076
38077
38078
38079
38080
38081
38082
38083
38084
38085
38086
38087
38088
38089
38090
38091
38092
38093
38094
38095
38096
38097
38098
38099
38100
38101
38102
38103
38104
38105
38106
38107
38108
38109
38110
38111
38112
38113
38114
38115
38116
38117
38118
38119
38120
38121
38122
38123
38124
38125
38126
38127
38128
38129
38130
38131
38132
38133
38134
38135
38136
38137
38138
38139
38140
38141
38142
38143
38144
38145
38146
38147
38148
38149
38150
38151
38152
38153
38154
38155
38156
38157
38158
38159
38160
38161
38162
38163
38164
38165
38166
38167
38168
38169
38170
38171
38172
38173
38174
38175
38176
38177
38178
38179
38180
38181
38182
38183
38184
38185
38186
38187
38188
38189
38190
38191
38192
38193
38194
38195
38196
38197
38198
38199
38200
38201
38202
38203
38204
38205
38206
38207
38208
38209
38210
38211
38212
38213
38214
38215
38216
38217
38218
38219
38220
38221
38222
38223
38224
38225
38226
38227
38228
38229
38230
38231
38232
38233
38234
38235
38236
38237
38238
38239
38240
38241
38242
38243
38244
38245
38246
38247
38248
38249
38250
38251
38252
38253
38254
38255
38256
38257
38258
38259
38260
38261
38262
38263
38264
38265
38266
38267
38268
38269
38270
38271
38272
38273
38274
38275
38276
38277
38278
38279
38280
38281
38282
38283
38284
38285
38286
38287
38288
38289
38290
38291
38292
38293
38294
38295
38296
38297
38298
38299
38300
38301
38302
38303
38304
38305
38306
38307
38308
38309
38310
38311
38312
38313
38314
38315
38316
38317
38318
38319
38320
38321
38322
38323
38324
38325
38326
38327
38328
38329
38330
38331
38332
38333
38334
38335
38336
38337
38338
38339
38340
38341
38342
38343
38344
38345
38346
38347
38348
38349
38350
38351
38352
38353
38354
38355
38356
38357
38358
38359
38360
38361
38362
38363
38364
38365
38366
38367
38368
38369
38370
38371
38372
38373
38374
38375
38376
38377
38378
38379
38380
38381
38382
38383
38384
38385
38386
38387
38388
38389
38390
38391
38392
38393
38394
38395
38396
38397
38398
38399
38400
38401
38402
38403
38404
38405
38406
38407
38408
38409
38410
38411
38412
38413
38414
38415
38416
38417
38418
38419
38420
38421
38422
38423
38424
38425
38426
38427
38428
38429
38430
38431
38432
38433
38434
38435
38436
38437
38438
38439
38440
38441
38442
38443
38444
38445
38446
38447
38448
38449
38450
38451
38452
38453
38454
38455
38456
38457
38458
38459
38460
38461
38462
38463
38464
38465
38466
38467
38468
38469
38470
38471
38472
38473
38474
38475
38476
38477
38478
38479
38480
38481
38482
38483
38484
38485
38486
38487
38488
38489
38490
38491
38492
38493
38494
38495
38496
38497
38498
38499
38500
38501
38502
38503
38504
38505
38506
38507
38508
38509
38510
38511
38512
38513
38514
38515
38516
38517
38518
38519
38520
38521
38522
38523
38524
38525
38526
38527
38528
38529
38530
38531
38532
38533
38534
38535
38536
38537
38538
38539
38540
38541
38542
38543
38544
38545
38546
38547
38548
38549
38550
38551
38552
38553
38554
38555
38556
38557
38558
38559
38560
38561
38562
38563
38564
38565
38566
38567
38568
38569
38570
38571
38572
38573
38574
38575
38576
38577
38578
38579
38580
38581
38582
38583
38584
38585
38586
38587
38588
38589
38590
38591
38592
38593
38594
38595
38596
38597
38598
38599
38600
38601
38602
38603
38604
38605
38606
38607
38608
38609
38610
38611
38612
38613
38614
38615
38616
38617
38618
38619
38620
38621
38622
38623
38624
38625
38626
38627
38628
38629
38630
38631
38632
38633
38634
38635
38636
38637
38638
38639
38640
38641
38642
38643
38644
38645
38646
38647
38648
38649
38650
38651
38652
38653
38654
38655
38656
38657
38658
38659
38660
38661
38662
38663
38664
38665
38666
38667
38668
38669
38670
38671
38672
38673
38674
38675
38676
38677
38678
38679
38680
38681
38682
38683
38684
38685
38686
38687
38688
38689
38690
38691
38692
38693
38694
38695
38696
38697
38698
38699
38700
38701
38702
38703
38704
38705
38706
38707
38708
38709
38710
38711
38712
38713
38714
38715
38716
38717
38718
38719
38720
38721
38722
38723
38724
38725
38726
38727
38728
38729
38730
38731
38732
38733
38734
38735
38736
38737
38738
38739
38740
38741
38742
38743
38744
38745
38746
38747
38748
38749
38750
38751
38752
38753
38754
38755
38756
38757
38758
38759
38760
38761
38762
38763
38764
38765
38766
38767
38768
38769
38770
38771
38772
38773
38774
38775
38776
38777
38778
38779
38780
38781
38782
38783
38784
38785
38786
38787
38788
38789
38790
38791
38792
38793
38794
38795
38796
38797
38798
38799
38800
38801
38802
38803
38804
38805
38806
38807
38808
38809
38810
38811
38812
38813
38814
38815
38816
38817
38818
38819
38820
38821
38822
38823
38824
38825
38826
38827
38828
38829
38830
38831
38832
38833
38834
38835
38836
38837
38838
38839
38840
38841
38842
38843
38844
38845
38846
38847
38848
38849
38850
38851
38852
38853
38854
38855
38856
38857
38858
38859
38860
38861
38862
38863
38864
38865
38866
38867
38868
38869
38870
38871
38872
38873
38874
38875
38876
38877
38878
38879
38880
38881
38882
38883
38884
38885
38886
38887
38888
38889
38890
38891
38892
38893
38894
38895
38896
38897
38898
38899
38900
38901
38902
38903
38904
38905
38906
38907
38908
38909
38910
38911
38912
38913
38914
38915
38916
38917
38918
38919
38920
38921
38922
38923
38924
38925
38926
38927
38928
38929
38930
38931
38932
38933
38934
38935
38936
38937
38938
38939
38940
38941
38942
38943
38944
38945
38946
38947
38948
38949
38950
38951
38952
38953
38954
38955
38956
38957
38958
38959
38960
38961
38962
38963
38964
38965
38966
38967
38968
38969
38970
38971
38972
38973
38974
38975
38976
38977
38978
38979
38980
38981
38982
38983
38984
38985
38986
38987
38988
38989
38990
38991
38992
38993
38994
38995
38996
38997
38998
38999
39000
39001
39002
39003
39004
39005
39006
39007
39008
39009
39010
39011
39012
39013
39014
39015
39016
39017
39018
39019
39020
39021
39022
39023
39024
39025
39026
39027
39028
39029
39030
39031
39032
39033
39034
39035
39036
39037
39038
39039
39040
39041
39042
39043
39044
39045
39046
39047
39048
39049
39050
39051
39052
39053
39054
39055
39056
39057
39058
39059
39060
39061
39062
39063
39064
39065
39066
39067
39068
39069
39070
39071
39072
39073
39074
39075
39076
39077
39078
39079
39080
39081
39082
39083
39084
39085
39086
39087
39088
39089
39090
39091
39092
39093
39094
39095
39096
39097
39098
39099
39100
39101
39102
39103
39104
39105
39106
39107
39108
39109
39110
39111
39112
39113
39114
39115
39116
39117
39118
39119
39120
39121
39122
39123
39124
39125
39126
39127
39128
39129
39130
39131
39132
39133
39134
39135
39136
39137
39138
39139
39140
39141
39142
39143
39144
39145
39146
39147
39148
39149
39150
39151
39152
39153
39154
39155
39156
39157
39158
39159
39160
39161
39162
39163
39164
39165
39166
39167
39168
39169
39170
39171
39172
39173
39174
39175
39176
39177
39178
39179
39180
39181
39182
39183
39184
39185
39186
39187
39188
39189
39190
39191
39192
39193
39194
39195
39196
39197
39198
39199
39200
39201
39202
39203
39204
39205
39206
39207
39208
39209
39210
39211
39212
39213
39214
39215
39216
39217
39218
39219
39220
39221
39222
39223
39224
39225
39226
39227
39228
39229
39230
39231
39232
39233
39234
39235
39236
39237
39238
39239
39240
39241
39242
39243
39244
39245
39246
39247
39248
39249
39250
39251
39252
39253
39254
39255
39256
39257
39258
39259
39260
39261
39262
39263
39264
39265
39266
39267
39268
39269
39270
39271
39272
39273
39274
39275
39276
39277
39278
39279
39280
39281
39282
39283
39284
39285
39286
39287
39288
39289
39290
39291
39292
39293
39294
39295
39296
39297
39298
39299
39300
39301
39302
39303
39304
39305
39306
39307
39308
39309
39310
39311
39312
39313
39314
39315
39316
39317
39318
39319
39320
39321
39322
39323
39324
39325
39326
39327
39328
39329
39330
39331
39332
39333
39334
39335
39336
39337
39338
39339
39340
39341
39342
39343
39344
39345
39346
39347
39348
39349
39350
39351
39352
39353
39354
39355
39356
39357
39358
39359
39360
39361
39362
39363
39364
39365
39366
39367
39368
39369
39370
39371
39372
39373
39374
39375
39376
39377
39378
39379
39380
39381
39382
39383
39384
39385
39386
39387
39388
39389
39390
39391
39392
39393
39394
39395
39396
39397
39398
39399
39400
39401
39402
39403
39404
39405
39406
39407
39408
39409
39410
39411
39412
39413
39414
39415
39416
39417
39418
39419
39420
39421
39422
39423
39424
39425
39426
39427
39428
39429
39430
39431
39432
39433
39434
39435
39436
39437
39438
39439
39440
39441
39442
39443
39444
39445
39446
39447
39448
39449
39450
39451
39452
39453
39454
39455
39456
39457
39458
39459
39460
39461
39462
39463
39464
39465
39466
39467
39468
39469
39470
39471
39472
39473
39474
39475
39476
39477
39478
39479
39480
39481
39482
39483
39484
39485
39486
39487
39488
39489
39490
39491
39492
39493
39494
39495
39496
39497
39498
39499
39500
39501
39502
39503
39504
39505
39506
39507
39508
39509
39510
39511
39512
39513
39514
39515
39516
39517
39518
39519
39520
39521
39522
39523
39524
39525
39526
39527
39528
39529
39530
39531
39532
39533
39534
39535
39536
39537
39538
39539
39540
39541
39542
39543
39544
39545
39546
39547
39548
39549
39550
39551
39552
39553
39554
39555
39556
39557
39558
39559
39560
39561
39562
39563
39564
39565
39566
39567
39568
39569
39570
39571
39572
39573
39574
39575
39576
39577
39578
39579
39580
39581
39582
39583
39584
39585
39586
39587
39588
39589
39590
39591
39592
39593
39594
39595
39596
39597
39598
39599
39600
39601
39602
39603
39604
39605
39606
39607
39608
39609
39610
39611
39612
39613
39614
39615
39616
39617
39618
39619
39620
39621
39622
39623
39624
39625
39626
39627
39628
39629
39630
39631
39632
39633
39634
39635
39636
39637
39638
39639
39640
39641
39642
39643
39644
39645
39646
39647
39648
39649
39650
39651
39652
39653
39654
39655
39656
39657
39658
39659
39660
39661
39662
39663
39664
39665
39666
39667
39668
39669
39670
39671
39672
39673
39674
39675
39676
39677
39678
39679
39680
39681
39682
39683
39684
39685
39686
39687
39688
39689
39690
39691
39692
39693
39694
39695
39696
39697
39698
39699
39700
39701
39702
39703
39704
39705
39706
39707
39708
39709
39710
39711
39712
39713
39714
39715
39716
39717
39718
39719
39720
39721
39722
39723
39724
39725
39726
39727
39728
39729
39730
39731
39732
39733
39734
39735
39736
39737
39738
39739
39740
39741
39742
39743
39744
39745
39746
39747
39748
39749
39750
39751
39752
39753
39754
39755
39756
39757
39758
39759
39760
39761
39762
39763
39764
39765
39766
39767
39768
39769
39770
39771
39772
39773
39774
39775
39776
39777
39778
39779
39780
39781
39782
39783
39784
39785
39786
39787
39788
39789
39790
39791
39792
39793
39794
39795
39796
39797
39798
39799
39800
39801
39802
39803
39804
39805
39806
39807
39808
39809
39810
39811
39812
39813
39814
39815
39816
39817
39818
39819
39820
39821
39822
39823
39824
39825
39826
39827
39828
39829
39830
39831
39832
39833
39834
39835
39836
39837
39838
39839
39840
39841
39842
39843
39844
39845
39846
39847
39848
39849
39850
39851
39852
39853
39854
39855
39856
39857
39858
39859
39860
39861
39862
39863
39864
39865
39866
39867
39868
39869
39870
39871
39872
39873
39874
39875
39876
39877
39878
39879
39880
39881
39882
39883
39884
39885
39886
39887
39888
39889
39890
39891
39892
39893
39894
39895
39896
39897
39898
39899
39900
39901
39902
39903
39904
39905
39906
39907
39908
39909
39910
39911
39912
39913
39914
39915
39916
39917
39918
39919
39920
39921
39922
39923
39924
39925
39926
39927
39928
39929
39930
39931
39932
39933
39934
39935
39936
39937
39938
39939
39940
39941
39942
39943
39944
39945
39946
39947
39948
39949
39950
39951
39952
39953
39954
39955
39956
39957
39958
39959
39960
39961
39962
39963
39964
39965
39966
39967
39968
39969
39970
39971
39972
39973
39974
39975
39976
39977
39978
39979
39980
39981
39982
39983
39984
39985
39986
39987
39988
39989
39990
39991
39992
39993
39994
39995
39996
39997
39998
39999
40000
40001
40002
40003
40004
40005
40006
40007
40008
40009
40010
40011
40012
40013
40014
40015
40016
40017
40018
40019
40020
40021
40022
40023
40024
40025
40026
40027
40028
40029
40030
40031
40032
40033
40034
40035
40036
40037
40038
40039
40040
40041
40042
40043
40044
40045
40046
40047
40048
40049
40050
40051
40052
40053
40054
40055
40056
40057
40058
40059
40060
40061
40062
40063
40064
40065
40066
40067
40068
40069
40070
40071
40072
40073
40074
40075
40076
40077
40078
40079
40080
40081
40082
40083
40084
40085
40086
40087
40088
40089
40090
40091
40092
40093
40094
40095
40096
40097
40098
40099
40100
40101
40102
40103
40104
40105
40106
40107
40108
40109
40110
40111
40112
40113
40114
40115
40116
40117
40118
40119
40120
40121
40122
40123
40124
40125
40126
40127
40128
40129
40130
40131
40132
40133
40134
40135
40136
40137
40138
40139
40140
40141
40142
40143
40144
40145
40146
40147
40148
40149
40150
40151
40152
40153
40154
40155
40156
40157
40158
40159
40160
40161
40162
40163
40164
40165
40166
40167
40168
40169
40170
40171
40172
40173
40174
40175
40176
40177
40178
40179
40180
40181
40182
40183
40184
40185
40186
40187
40188
40189
40190
40191
40192
40193
40194
40195
40196
40197
40198
40199
40200
40201
40202
40203
40204
40205
40206
40207
40208
40209
40210
40211
40212
40213
40214
40215
40216
40217
40218
40219
40220
40221
40222
40223
40224
40225
40226
40227
40228
40229
40230
40231
40232
40233
40234
40235
40236
40237
40238
40239
40240
40241
40242
40243
40244
40245
40246
40247
40248
40249
40250
40251
40252
40253
40254
40255
40256
40257
40258
40259
40260
40261
40262
40263
40264
40265
40266
40267
40268
40269
40270
40271
40272
40273
40274
40275
40276
40277
40278
40279
40280
40281
40282
40283
40284
40285
40286
40287
40288
40289
40290
40291
40292
40293
40294
40295
40296
40297
40298
40299
40300
40301
40302
40303
40304
40305
40306
40307
40308
40309
40310
40311
40312
40313
40314
40315
40316
40317
40318
40319
40320
40321
40322
40323
40324
40325
40326
40327
40328
40329
40330
40331
40332
40333
40334
40335
40336
40337
40338
40339
40340
40341
40342
40343
40344
40345
40346
40347
40348
40349
40350
40351
40352
40353
40354
40355
40356
40357
40358
40359
40360
40361
40362
40363
40364
40365
40366
40367
40368
40369
40370
40371
40372
40373
40374
40375
40376
40377
40378
40379
40380
40381
40382
40383
40384
40385
40386
40387
40388
40389
40390
40391
40392
40393
40394
40395
40396
40397
40398
40399
40400
40401
40402
40403
40404
40405
40406
40407
40408
40409
40410
40411
40412
40413
40414
40415
40416
40417
40418
40419
40420
40421
40422
40423
40424
40425
40426
40427
40428
40429
40430
40431
40432
40433
40434
40435
40436
40437
40438
40439
40440
40441
40442
40443
40444
40445
40446
40447
40448
40449
40450
40451
40452
40453
40454
40455
40456
40457
40458
40459
40460
40461
40462
40463
40464
40465
40466
40467
40468
40469
40470
40471
40472
40473
40474
40475
40476
40477
40478
40479
40480
40481
40482
40483
40484
40485
40486
40487
40488
40489
40490
40491
40492
40493
40494
40495
40496
40497
40498
40499
40500
40501
40502
40503
40504
40505
40506
40507
40508
40509
40510
40511
40512
40513
40514
40515
40516
40517
40518
40519
40520
40521
40522
40523
40524
40525
40526
40527
40528
40529
40530
40531
40532
40533
40534
40535
40536
40537
40538
40539
40540
40541
40542
40543
40544
40545
40546
40547
40548
40549
40550
40551
40552
40553
40554
40555
40556
40557
40558
40559
40560
40561
40562
40563
40564
40565
40566
40567
40568
40569
40570
40571
40572
40573
40574
40575
40576
40577
40578
40579
40580
40581
40582
40583
40584
40585
40586
40587
40588
40589
40590
40591
40592
40593
40594
40595
40596
40597
40598
40599
40600
40601
40602
40603
40604
40605
40606
40607
40608
40609
40610
40611
40612
40613
40614
40615
40616
40617
40618
40619
40620
40621
40622
40623
40624
40625
40626
40627
40628
40629
40630
40631
40632
40633
40634
40635
40636
40637
40638
40639
40640
40641
40642
40643
40644
40645
40646
40647
40648
40649
40650
40651
40652
40653
40654
40655
40656
40657
40658
40659
40660
40661
40662
40663
40664
40665
40666
40667
40668
40669
40670
40671
40672
40673
40674
40675
40676
40677
40678
40679
40680
40681
40682
40683
40684
40685
40686
40687
40688
40689
40690
40691
40692
40693
40694
40695
40696
40697
40698
40699
40700
40701
40702
40703
40704
40705
40706
40707
40708
40709
40710
40711
40712
40713
40714
40715
40716
40717
40718
40719
40720
40721
40722
40723
40724
40725
40726
40727
40728
40729
40730
40731
40732
40733
40734
40735
40736
40737
40738
40739
40740
40741
40742
40743
40744
40745
40746
40747
40748
40749
40750
40751
40752
40753
40754
40755
40756
40757
40758
40759
40760
40761
40762
40763
40764
40765
40766
40767
40768
40769
40770
40771
40772
40773
40774
40775
40776
40777
40778
40779
40780
40781
40782
40783
40784
40785
40786
40787
40788
40789
40790
40791
40792
40793
40794
40795
40796
40797
40798
40799
40800
40801
40802
40803
40804
40805
40806
40807
40808
40809
40810
40811
40812
40813
40814
40815
40816
40817
40818
40819
40820
40821
40822
40823
40824
40825
40826
40827
40828
40829
40830
40831
40832
40833
40834
40835
40836
40837
40838
40839
40840
40841
40842
40843
40844
40845
40846
40847
40848
40849
40850
40851
40852
40853
40854
40855
40856
40857
40858
40859
40860
40861
40862
40863
40864
40865
40866
40867
40868
40869
40870
40871
40872
40873
40874
40875
40876
40877
40878
40879
40880
40881
40882
40883
40884
40885
40886
40887
40888
40889
40890
40891
40892
40893
40894
40895
40896
40897
40898
40899
40900
40901
40902
40903
40904
40905
40906
40907
40908
40909
40910
40911
40912
40913
40914
40915
40916
40917
40918
40919
40920
40921
40922
40923
40924
40925
40926
40927
40928
40929
40930
40931
40932
40933
40934
40935
40936
40937
40938
40939
40940
40941
40942
40943
40944
40945
40946
40947
40948
40949
40950
40951
40952
40953
40954
40955
40956
40957
40958
40959
40960
40961
40962
40963
40964
40965
40966
40967
40968
40969
40970
40971
40972
40973
40974
40975
40976
40977
40978
40979
40980
40981
40982
40983
40984
40985
40986
40987
40988
40989
40990
40991
40992
40993
40994
40995
40996
40997
40998
40999
41000
41001
41002
41003
41004
41005
41006
41007
41008
41009
41010
41011
41012
41013
41014
41015
41016
41017
41018
41019
41020
41021
41022
41023
41024
41025
41026
41027
41028
41029
41030
41031
41032
41033
41034
41035
41036
41037
41038
41039
41040
41041
41042
41043
41044
41045
41046
41047
41048
41049
41050
41051
41052
41053
41054
41055
41056
41057
41058
41059
41060
41061
41062
41063
41064
41065
41066
41067
41068
41069
41070
41071
41072
41073
41074
41075
41076
41077
41078
41079
41080
41081
41082
41083
41084
41085
41086
41087
41088
41089
41090
41091
41092
41093
41094
41095
41096
41097
41098
41099
41100
41101
41102
41103
41104
41105
41106
41107
41108
41109
41110
41111
41112
41113
41114
41115
41116
41117
41118
41119
41120
41121
41122
41123
41124
41125
41126
41127
41128
41129
41130
41131
41132
41133
41134
41135
41136
41137
41138
41139
41140
41141
41142
41143
41144
41145
41146
41147
41148
41149
41150
41151
41152
41153
41154
41155
41156
41157
41158
41159
41160
41161
41162
41163
41164
41165
41166
41167
41168
41169
41170
41171
41172
41173
41174
41175
41176
41177
41178
41179
41180
41181
41182
41183
41184
41185
41186
41187
41188
41189
41190
41191
41192
41193
41194
41195
41196
41197
41198
41199
41200
41201
41202
41203
41204
41205
41206
41207
41208
41209
41210
41211
41212
41213
41214
41215
41216
41217
41218
41219
41220
41221
41222
41223
41224
41225
41226
41227
41228
41229
41230
41231
41232
41233
41234
41235
41236
41237
41238
41239
41240
41241
41242
41243
41244
41245
41246
41247
41248
41249
41250
41251
41252
41253
41254
41255
41256
41257
41258
41259
41260
41261
41262
41263
41264
41265
41266
41267
41268
41269
41270
41271
41272
41273
41274
41275
41276
41277
41278
41279
41280
41281
41282
41283
41284
41285
41286
41287
41288
41289
41290
41291
41292
41293
41294
41295
41296
41297
41298
41299
41300
41301
41302
41303
41304
41305
41306
41307
41308
41309
41310
41311
41312
41313
41314
41315
41316
41317
41318
41319
41320
41321
41322
41323
41324
41325
41326
41327
41328
41329
41330
41331
41332
41333
41334
41335
41336
41337
41338
41339
41340
41341
41342
41343
41344
41345
41346
41347
41348
41349
41350
41351
41352
41353
41354
41355
41356
41357
41358
41359
41360
41361
41362
41363
41364
41365
41366
41367
41368
41369
41370
41371
41372
41373
41374
41375
41376
41377
41378
41379
41380
41381
41382
41383
41384
41385
41386
41387
41388
41389
41390
41391
41392
41393
41394
41395
41396
41397
41398
41399
41400
41401
41402
41403
41404
41405
41406
41407
41408
41409
41410
41411
41412
41413
41414
41415
41416
41417
41418
41419
41420
41421
41422
41423
41424
41425
41426
41427
41428
41429
41430
41431
41432
41433
41434
41435
41436
41437
41438
41439
41440
41441
41442
41443
41444
41445
41446
41447
41448
41449
41450
41451
41452
41453
41454
41455
41456
41457
41458
41459
41460
41461
41462
41463
41464
41465
41466
41467
41468
41469
41470
41471
41472
41473
41474
41475
41476
41477
41478
41479
41480
41481
41482
41483
41484
41485
41486
41487
41488
41489
41490
41491
41492
41493
41494
41495
41496
41497
41498
41499
41500
41501
41502
41503
41504
41505
41506
41507
41508
41509
41510
41511
41512
41513
41514
41515
41516
41517
41518
41519
41520
41521
41522
41523
41524
41525
41526
41527
41528
41529
41530
41531
41532
41533
41534
41535
41536
41537
41538
41539
41540
41541
41542
41543
41544
41545
41546
41547
41548
41549
41550
41551
41552
41553
41554
41555
41556
41557
41558
41559
41560
41561
41562
41563
41564
41565
41566
41567
41568
41569
41570
41571
41572
41573
41574
41575
41576
41577
41578
41579
41580
41581
41582
41583
41584
41585
41586
41587
41588
41589
41590
41591
41592
41593
41594
41595
41596
41597
41598
41599
41600
41601
41602
41603
41604
41605
41606
41607
41608
41609
41610
41611
41612
41613
41614
41615
41616
41617
41618
41619
41620
41621
41622
41623
41624
41625
41626
41627
41628
41629
41630
41631
41632
41633
41634
41635
41636
41637
41638
41639
41640
41641
41642
41643
41644
41645
41646
41647
41648
41649
41650
41651
41652
41653
41654
41655
41656
41657
41658
41659
41660
41661
41662
41663
41664
41665
41666
41667
41668
41669
41670
41671
41672
41673
41674
41675
41676
41677
41678
41679
41680
41681
41682
41683
41684
41685
41686
41687
41688
41689
41690
41691
41692
41693
41694
41695
41696
41697
41698
41699
41700
41701
41702
41703
41704
41705
41706
41707
41708
41709
41710
41711
41712
41713
41714
41715
41716
41717
41718
41719
41720
41721
41722
41723
41724
41725
41726
41727
41728
41729
41730
41731
41732
41733
41734
41735
41736
41737
41738
41739
41740
41741
41742
41743
41744
41745
41746
41747
41748
41749
41750
41751
41752
41753
41754
41755
41756
41757
41758
41759
41760
41761
41762
41763
41764
41765
41766
41767
41768
41769
41770
41771
41772
41773
41774
41775
41776
41777
41778
41779
41780
41781
41782
41783
41784
41785
41786
41787
41788
41789
41790
41791
41792
41793
41794
41795
41796
41797
41798
41799
41800
41801
41802
41803
41804
41805
41806
41807
41808
41809
41810
41811
41812
41813
41814
41815
41816
41817
41818
41819
41820
41821
41822
41823
41824
41825
41826
41827
41828
41829
41830
41831
41832
41833
41834
41835
41836
41837
41838
41839
41840
41841
41842
41843
41844
41845
41846
41847
41848
41849
41850
41851
41852
41853
41854
41855
41856
41857
41858
41859
41860
41861
41862
41863
41864
41865
41866
41867
41868
41869
41870
41871
41872
41873
41874
41875
41876
41877
41878
41879
41880
41881
41882
41883
41884
41885
41886
41887
41888
41889
41890
41891
41892
41893
41894
41895
41896
41897
41898
41899
41900
41901
41902
41903
41904
41905
41906
41907
41908
41909
41910
41911
41912
41913
41914
41915
41916
41917
41918
41919
41920
41921
41922
41923
41924
41925
41926
41927
41928
41929
41930
41931
41932
41933
41934
41935
41936
41937
41938
41939
41940
41941
41942
41943
41944
41945
41946
41947
41948
41949
41950
41951
41952
41953
41954
41955
41956
41957
41958
41959
41960
41961
41962
41963
41964
41965
41966
41967
41968
41969
41970
41971
41972
41973
41974
41975
41976
41977
41978
41979
41980
41981
41982
41983
41984
41985
41986
41987
41988
41989
41990
41991
41992
41993
41994
41995
41996
41997
41998
41999
42000
42001
42002
42003
42004
42005
42006
42007
42008
42009
42010
42011
42012
42013
42014
42015
42016
42017
42018
42019
42020
42021
42022
42023
42024
42025
42026
42027
42028
42029
42030
42031
42032
42033
42034
42035
42036
42037
42038
42039
42040
42041
42042
42043
42044
42045
42046
42047
42048
42049
42050
42051
42052
42053
42054
42055
42056
42057
42058
42059
42060
42061
42062
42063
42064
42065
42066
42067
42068
42069
42070
42071
42072
42073
42074
42075
42076
42077
42078
42079
42080
42081
42082
42083
42084
42085
42086
42087
42088
42089
42090
42091
42092
42093
42094
42095
42096
42097
42098
42099
42100
42101
42102
42103
42104
42105
42106
42107
42108
42109
42110
42111
42112
42113
42114
42115
42116
42117
42118
42119
42120
42121
42122
42123
42124
42125
42126
42127
42128
42129
42130
42131
42132
42133
42134
42135
42136
42137
42138
42139
42140
42141
42142
42143
42144
42145
42146
42147
42148
42149
42150
42151
42152
42153
42154
42155
42156
42157
42158
42159
42160
42161
42162
42163
42164
42165
42166
42167
42168
42169
42170
42171
42172
42173
42174
42175
42176
42177
42178
42179
42180
42181
42182
42183
42184
42185
42186
42187
42188
42189
42190
42191
42192
42193
42194
42195
42196
42197
42198
42199
42200
42201
42202
42203
42204
42205
42206
42207
42208
42209
42210
42211
42212
42213
42214
42215
42216
42217
42218
42219
42220
42221
42222
42223
42224
42225
42226
42227
42228
42229
42230
42231
42232
42233
42234
42235
42236
42237
42238
42239
42240
42241
42242
42243
42244
42245
42246
42247
42248
42249
42250
42251
42252
42253
42254
42255
42256
42257
42258
42259
42260
42261
42262
42263
42264
42265
42266
42267
42268
42269
42270
42271
42272
42273
42274
42275
42276
42277
42278
42279
42280
42281
42282
42283
42284
42285
42286
42287
42288
42289
42290
42291
42292
42293
42294
42295
42296
42297
42298
42299
42300
42301
42302
42303
42304
42305
42306
42307
42308
42309
42310
42311
42312
42313
42314
42315
42316
42317
42318
42319
42320
42321
42322
42323
42324
42325
42326
42327
42328
42329
42330
42331
42332
42333
42334
42335
42336
42337
42338
42339
42340
42341
42342
42343
42344
42345
42346
42347
42348
42349
42350
42351
42352
42353
42354
42355
42356
42357
42358
42359
42360
42361
42362
42363
42364
42365
42366
42367
42368
42369
42370
42371
42372
42373
42374
42375
42376
42377
42378
42379
42380
42381
42382
42383
42384
42385
42386
42387
42388
42389
42390
42391
42392
42393
42394
42395
42396
42397
42398
42399
42400
42401
42402
42403
42404
42405
42406
42407
42408
42409
42410
42411
42412
42413
42414
42415
42416
42417
42418
42419
42420
42421
42422
42423
42424
42425
42426
42427
42428
42429
42430
42431
42432
42433
42434
42435
42436
42437
42438
42439
42440
42441
42442
42443
42444
42445
42446
42447
42448
42449
42450
42451
42452
42453
42454
42455
42456
42457
42458
42459
42460
42461
42462
42463
42464
42465
42466
42467
42468
42469
42470
42471
42472
42473
42474
42475
42476
42477
42478
42479
42480
42481
42482
42483
42484
42485
42486
42487
42488
42489
42490
42491
42492
42493
42494
42495
42496
42497
42498
42499
42500
42501
42502
42503
42504
42505
42506
42507
42508
42509
42510
42511
42512
42513
42514
42515
42516
42517
42518
42519
42520
42521
42522
42523
42524
42525
42526
42527
42528
42529
42530
42531
42532
42533
42534
42535
42536
42537
42538
42539
42540
42541
42542
42543
42544
42545
42546
42547
42548
42549
42550
42551
42552
42553
42554
42555
42556
42557
42558
42559
42560
42561
42562
42563
42564
42565
42566
42567
42568
42569
42570
42571
42572
42573
42574
42575
42576
42577
42578
42579
42580
42581
42582
42583
42584
42585
42586
42587
42588
42589
42590
42591
42592
42593
42594
42595
42596
42597
42598
42599
42600
42601
42602
42603
42604
42605
42606
42607
42608
42609
42610
42611
42612
42613
42614
42615
42616
42617
42618
42619
42620
42621
42622
42623
42624
42625
42626
42627
42628
42629
42630
42631
42632
42633
42634
42635
42636
42637
42638
42639
42640
42641
42642
42643
42644
42645
42646
42647
42648
42649
42650
42651
42652
42653
42654
42655
42656
42657
42658
42659
42660
42661
42662
42663
42664
42665
42666
42667
42668
42669
42670
42671
42672
42673
42674
42675
42676
42677
42678
42679
42680
42681
42682
42683
42684
42685
42686
42687
42688
42689
42690
42691
42692
42693
42694
42695
42696
42697
42698
42699
42700
42701
42702
42703
42704
42705
42706
42707
42708
42709
42710
42711
42712
42713
42714
42715
42716
42717
42718
42719
42720
42721
42722
42723
42724
42725
42726
42727
42728
42729
42730
42731
42732
42733
42734
42735
42736
42737
42738
42739
42740
42741
42742
42743
42744
42745
42746
42747
42748
42749
42750
42751
42752
42753
42754
42755
42756
42757
42758
42759
42760
42761
42762
42763
42764
42765
42766
42767
42768
42769
42770
42771
42772
42773
42774
42775
42776
42777
42778
42779
42780
42781
42782
42783
42784
42785
42786
42787
42788
42789
42790
42791
42792
42793
42794
42795
42796
42797
42798
42799
42800
42801
42802
42803
42804
42805
42806
42807
42808
42809
42810
42811
42812
42813
42814
42815
42816
42817
42818
42819
42820
42821
42822
42823
42824
42825
42826
42827
42828
42829
42830
42831
42832
42833
42834
42835
42836
42837
42838
42839
42840
42841
42842
42843
42844
42845
42846
42847
42848
42849
42850
42851
42852
42853
42854
42855
42856
42857
42858
42859
42860
42861
42862
42863
42864
42865
42866
42867
42868
42869
42870
42871
42872
42873
42874
42875
42876
42877
42878
42879
42880
42881
42882
42883
42884
42885
42886
42887
42888
42889
42890
42891
42892
42893
42894
42895
42896
42897
42898
42899
42900
42901
42902
42903
42904
42905
42906
42907
42908
42909
42910
42911
42912
42913
42914
42915
42916
42917
42918
42919
42920
42921
42922
42923
42924
42925
42926
42927
42928
42929
42930
42931
42932
42933
42934
42935
42936
42937
42938
42939
42940
42941
42942
42943
42944
42945
42946
42947
42948
42949
42950
42951
42952
42953
42954
42955
42956
42957
42958
42959
42960
42961
42962
42963
42964
42965
42966
42967
42968
42969
42970
42971
42972
42973
42974
42975
42976
42977
42978
42979
42980
42981
42982
42983
42984
42985
42986
42987
42988
42989
42990
42991
42992
42993
42994
42995
42996
42997
42998
42999
43000
43001
43002
43003
43004
43005
43006
43007
43008
43009
43010
43011
43012
43013
43014
43015
43016
43017
43018
43019
43020
43021
43022
43023
43024
43025
43026
43027
43028
43029
43030
43031
43032
43033
43034
43035
43036
43037
43038
43039
43040
43041
43042
43043
43044
43045
43046
43047
43048
43049
43050
43051
43052
43053
43054
43055
43056
43057
43058
43059
43060
43061
43062
43063
43064
43065
43066
43067
43068
43069
43070
43071
43072
43073
43074
43075
43076
43077
43078
43079
43080
43081
43082
43083
43084
43085
43086
43087
43088
43089
43090
43091
43092
43093
43094
43095
43096
43097
43098
43099
43100
43101
43102
43103
43104
43105
43106
43107
43108
43109
43110
43111
43112
43113
43114
43115
43116
43117
43118
43119
43120
43121
43122
43123
43124
43125
43126
43127
43128
43129
43130
43131
43132
43133
43134
43135
43136
43137
43138
43139
43140
43141
43142
43143
43144
43145
43146
43147
43148
43149
43150
43151
43152
43153
43154
43155
43156
43157
43158
43159
43160
43161
43162
43163
43164
43165
43166
43167
43168
43169
43170
43171
43172
43173
43174
43175
43176
43177
43178
43179
43180
43181
43182
43183
43184
43185
43186
43187
43188
43189
43190
43191
43192
43193
43194
43195
43196
43197
43198
43199
43200
43201
43202
43203
43204
43205
43206
43207
43208
43209
43210
43211
43212
43213
43214
43215
43216
43217
43218
43219
43220
43221
43222
43223
43224
43225
43226
43227
43228
43229
43230
43231
43232
43233
43234
43235
43236
43237
43238
43239
43240
43241
43242
43243
43244
43245
43246
43247
43248
43249
43250
43251
43252
43253
43254
43255
43256
43257
43258
43259
43260
43261
43262
43263
43264
43265
43266
43267
43268
43269
43270
43271
43272
43273
43274
43275
43276
43277
43278
43279
43280
43281
43282
43283
43284
43285
43286
43287
43288
43289
43290
43291
43292
43293
43294
43295
43296
43297
43298
43299
43300
43301
43302
43303
43304
43305
43306
43307
43308
43309
43310
43311
43312
43313
43314
43315
43316
43317
43318
43319
43320
43321
43322
43323
43324
43325
43326
43327
43328
43329
43330
43331
43332
43333
43334
43335
43336
43337
43338
43339
43340
43341
43342
43343
43344
43345
43346
43347
43348
43349
43350
43351
43352
43353
43354
43355
43356
43357
43358
43359
43360
43361
43362
43363
43364
43365
43366
43367
43368
43369
43370
43371
43372
43373
43374
43375
43376
43377
43378
43379
43380
43381
43382
43383
43384
43385
43386
43387
43388
43389
43390
43391
43392
43393
43394
43395
43396
43397
43398
43399
43400
43401
43402
43403
43404
43405
43406
43407
43408
43409
43410
43411
43412
43413
43414
43415
43416
43417
43418
43419
43420
43421
43422
43423
43424
43425
43426
43427
43428
43429
43430
43431
43432
43433
43434
43435
43436
43437
43438
43439
43440
43441
43442
43443
43444
43445
43446
43447
43448
43449
43450
43451
43452
43453
43454
43455
43456
43457
43458
43459
43460
43461
43462
43463
43464
43465
43466
43467
43468
43469
43470
43471
43472
43473
43474
43475
43476
43477
43478
43479
43480
43481
43482
43483
43484
43485
43486
43487
43488
43489
43490
43491
43492
43493
43494
43495
43496
43497
43498
43499
43500
43501
43502
43503
43504
43505
43506
43507
43508
43509
43510
43511
43512
43513
43514
43515
43516
43517
43518
43519
43520
43521
43522
43523
43524
43525
43526
43527
43528
43529
43530
43531
43532
43533
43534
43535
43536
43537
43538
43539
43540
43541
43542
43543
43544
43545
43546
43547
43548
43549
43550
43551
43552
43553
43554
43555
43556
43557
43558
43559
43560
43561
43562
43563
43564
43565
43566
43567
43568
43569
43570
43571
43572
43573
43574
43575
43576
43577
43578
43579
43580
43581
43582
43583
43584
43585
43586
43587
43588
43589
43590
43591
43592
43593
43594
43595
43596
43597
43598
43599
43600
43601
43602
43603
43604
43605
43606
43607
43608
43609
43610
43611
43612
43613
43614
43615
43616
43617
43618
43619
43620
43621
43622
43623
43624
43625
43626
43627
43628
43629
43630
43631
43632
43633
43634
43635
43636
43637
43638
43639
43640
43641
43642
43643
43644
43645
43646
43647
43648
43649
43650
43651
43652
43653
43654
43655
43656
43657
43658
43659
43660
43661
43662
43663
43664
43665
43666
43667
43668
43669
43670
43671
43672
43673
43674
43675
43676
43677
43678
43679
43680
43681
43682
43683
43684
43685
43686
43687
43688
43689
43690
43691
43692
43693
43694
43695
43696
43697
43698
43699
43700
43701
43702
43703
43704
43705
43706
43707
43708
43709
43710
43711
43712
43713
43714
43715
43716
43717
43718
43719
43720
43721
43722
43723
43724
43725
43726
43727
43728
43729
43730
43731
43732
43733
43734
43735
43736
43737
43738
43739
43740
43741
43742
43743
43744
43745
43746
43747
43748
43749
43750
43751
43752
43753
43754
43755
43756
43757
43758
43759
43760
43761
43762
43763
43764
43765
43766
43767
43768
43769
43770
43771
43772
43773
43774
43775
43776
43777
43778
43779
43780
43781
43782
43783
43784
43785
43786
43787
43788
43789
43790
43791
43792
43793
43794
43795
43796
43797
43798
43799
43800
43801
43802
43803
43804
43805
43806
43807
43808
43809
43810
43811
43812
43813
43814
43815
43816
43817
43818
43819
43820
43821
43822
43823
43824
43825
43826
43827
43828
43829
43830
43831
43832
43833
43834
43835
43836
43837
43838
43839
43840
43841
43842
43843
43844
43845
43846
43847
43848
43849
43850
43851
43852
43853
43854
43855
43856
43857
43858
43859
43860
43861
43862
43863
43864
43865
43866
43867
43868
43869
43870
43871
43872
43873
43874
43875
43876
43877
43878
43879
43880
43881
43882
43883
43884
43885
43886
43887
43888
43889
43890
43891
43892
43893
43894
43895
43896
43897
43898
43899
43900
43901
43902
43903
43904
43905
43906
43907
43908
43909
43910
43911
43912
43913
43914
43915
43916
43917
43918
43919
43920
43921
43922
43923
43924
43925
43926
43927
43928
43929
43930
43931
43932
43933
43934
43935
43936
43937
43938
43939
43940
43941
43942
43943
43944
43945
43946
43947
43948
43949
43950
43951
43952
43953
43954
43955
43956
43957
43958
43959
43960
43961
43962
43963
43964
43965
43966
43967
43968
43969
43970
43971
43972
43973
43974
43975
43976
43977
43978
43979
43980
43981
43982
43983
43984
43985
43986
43987
43988
43989
43990
43991
43992
43993
43994
43995
43996
43997
43998
43999
44000
44001
44002
44003
44004
44005
44006
44007
44008
44009
44010
44011
44012
44013
44014
44015
44016
44017
44018
44019
44020
44021
44022
44023
44024
44025
44026
44027
44028
44029
44030
44031
44032
44033
44034
44035
44036
44037
44038
44039
44040
44041
44042
44043
44044
44045
44046
44047
44048
44049
44050
44051
44052
44053
44054
44055
44056
44057
44058
44059
44060
44061
44062
44063
44064
44065
44066
44067
44068
44069
44070
44071
44072
44073
44074
44075
44076
44077
44078
44079
44080
44081
44082
44083
44084
44085
44086
44087
44088
44089
44090
44091
44092
44093
44094
44095
44096
44097
44098
44099
44100
44101
44102
44103
44104
44105
44106
44107
44108
44109
44110
44111
44112
44113
44114
44115
44116
44117
44118
44119
44120
44121
44122
44123
44124
44125
44126
44127
44128
44129
44130
44131
44132
44133
44134
44135
44136
44137
44138
44139
44140
44141
44142
44143
44144
44145
44146
44147
44148
44149
44150
44151
44152
44153
44154
44155
44156
44157
44158
44159
44160
44161
44162
44163
44164
44165
44166
44167
44168
44169
44170
44171
44172
44173
44174
44175
44176
44177
44178
44179
44180
44181
44182
44183
44184
44185
44186
44187
44188
44189
44190
44191
44192
44193
44194
44195
44196
44197
44198
44199
44200
44201
44202
44203
44204
44205
44206
44207
44208
44209
44210
44211
44212
44213
44214
44215
44216
44217
44218
44219
44220
44221
44222
44223
44224
44225
44226
44227
44228
44229
44230
44231
44232
44233
44234
44235
44236
44237
44238
44239
44240
44241
44242
44243
44244
44245
44246
44247
44248
44249
44250
44251
44252
44253
44254
44255
44256
44257
44258
44259
44260
44261
44262
44263
44264
44265
44266
44267
44268
44269
44270
44271
44272
44273
44274
44275
44276
44277
44278
44279
44280
44281
44282
44283
44284
44285
44286
44287
44288
44289
44290
44291
44292
44293
44294
44295
44296
44297
44298
44299
44300
44301
44302
44303
44304
44305
44306
44307
44308
44309
44310
44311
44312
44313
44314
44315
44316
44317
44318
44319
44320
44321
44322
44323
44324
44325
44326
44327
44328
44329
44330
44331
44332
44333
44334
44335
44336
44337
44338
44339
44340
44341
44342
44343
44344
44345
44346
44347
44348
44349
44350
44351
44352
44353
44354
44355
44356
44357
44358
44359
44360
44361
44362
44363
44364
44365
44366
44367
44368
44369
44370
44371
44372
44373
44374
44375
44376
44377
44378
44379
44380
44381
44382
44383
44384
44385
44386
44387
44388
44389
44390
44391
44392
44393
44394
44395
44396
44397
44398
44399
44400
44401
44402
44403
44404
44405
44406
44407
44408
44409
44410
44411
44412
44413
44414
44415
44416
44417
44418
44419
44420
44421
44422
44423
44424
44425
44426
44427
44428
44429
44430
44431
44432
44433
44434
44435
44436
44437
44438
44439
44440
44441
44442
44443
44444
44445
44446
44447
44448
44449
44450
44451
44452
44453
44454
44455
44456
44457
44458
44459
44460
44461
44462
44463
44464
44465
44466
44467
44468
44469
44470
44471
44472
44473
44474
44475
44476
44477
44478
44479
44480
44481
44482
44483
44484
44485
44486
44487
44488
44489
44490
44491
44492
44493
44494
44495
44496
44497
44498
44499
44500
44501
44502
44503
44504
44505
44506
44507
44508
44509
44510
44511
44512
44513
44514
44515
44516
44517
44518
44519
44520
44521
44522
44523
44524
44525
44526
44527
44528
44529
44530
44531
44532
44533
44534
44535
44536
44537
44538
44539
44540
44541
44542
44543
44544
44545
44546
44547
44548
44549
44550
44551
44552
44553
44554
44555
44556
44557
44558
44559
44560
44561
44562
44563
44564
44565
44566
44567
44568
44569
44570
44571
44572
44573
44574
44575
44576
44577
44578
44579
44580
44581
44582
44583
44584
44585
44586
44587
44588
44589
44590
44591
44592
44593
44594
44595
44596
44597
44598
44599
44600
44601
44602
44603
44604
44605
44606
44607
44608
44609
44610
44611
44612
44613
44614
44615
44616
44617
44618
44619
44620
44621
44622
44623
44624
44625
44626
44627
44628
44629
44630
44631
44632
44633
44634
44635
44636
44637
44638
44639
44640
44641
44642
44643
44644
44645
44646
44647
44648
44649
44650
44651
44652
44653
44654
44655
44656
44657
44658
44659
44660
44661
44662
44663
44664
44665
44666
44667
44668
44669
44670
44671
44672
44673
44674
44675
44676
44677
44678
44679
44680
44681
44682
44683
44684
44685
44686
44687
44688
44689
44690
44691
44692
44693
44694
44695
44696
44697
44698
44699
44700
44701
44702
44703
44704
44705
44706
44707
44708
44709
44710
44711
44712
44713
44714
44715
44716
44717
44718
44719
44720
44721
44722
44723
44724
44725
44726
44727
44728
44729
44730
44731
44732
44733
44734
44735
44736
44737
44738
44739
44740
44741
44742
44743
44744
44745
44746
44747
44748
44749
44750
44751
44752
44753
44754
44755
44756
44757
44758
44759
44760
44761
44762
44763
44764
44765
44766
44767
44768
44769
44770
44771
44772
44773
44774
44775
44776
44777
44778
44779
44780
44781
44782
44783
44784
44785
44786
44787
44788
44789
44790
44791
44792
44793
44794
44795
44796
44797
44798
44799
44800
44801
44802
44803
44804
44805
44806
44807
44808
44809
44810
44811
44812
44813
44814
44815
44816
44817
44818
44819
44820
44821
44822
44823
44824
44825
44826
44827
44828
44829
44830
44831
44832
44833
44834
44835
44836
44837
44838
44839
44840
44841
44842
44843
44844
44845
44846
44847
44848
44849
44850
44851
44852
44853
44854
44855
44856
44857
44858
44859
44860
44861
44862
44863
44864
44865
44866
44867
44868
44869
44870
44871
44872
44873
44874
44875
44876
44877
44878
44879
44880
44881
44882
44883
44884
44885
44886
44887
44888
44889
44890
44891
44892
44893
44894
44895
44896
44897
44898
44899
44900
44901
44902
44903
44904
44905
44906
44907
44908
44909
44910
44911
44912
44913
44914
44915
44916
44917
44918
44919
44920
44921
44922
44923
44924
44925
44926
44927
44928
44929
44930
44931
44932
44933
44934
44935
44936
44937
44938
44939
44940
44941
44942
44943
44944
44945
44946
44947
44948
44949
44950
44951
44952
44953
44954
44955
44956
44957
44958
44959
44960
44961
44962
44963
44964
44965
44966
44967
44968
44969
44970
44971
44972
44973
44974
44975
44976
44977
44978
44979
44980
44981
44982
44983
44984
44985
44986
44987
44988
44989
44990
44991
44992
44993
44994
44995
44996
44997
44998
44999
45000
45001
45002
45003
45004
45005
45006
45007
45008
45009
45010
45011
45012
45013
45014
45015
45016
45017
45018
45019
45020
45021
45022
45023
45024
45025
45026
45027
45028
45029
45030
45031
45032
45033
45034
45035
45036
45037
45038
45039
45040
45041
45042
45043
45044
45045
45046
45047
45048
45049
45050
45051
45052
45053
45054
45055
45056
45057
45058
45059
45060
45061
45062
45063
45064
45065
45066
45067
45068
45069
45070
45071
45072
45073
45074
45075
45076
45077
45078
45079
45080
45081
45082
45083
45084
45085
45086
45087
45088
45089
45090
45091
45092
45093
45094
45095
45096
45097
45098
45099
45100
45101
45102
45103
45104
45105
45106
45107
45108
45109
45110
45111
45112
45113
45114
45115
45116
45117
45118
45119
45120
45121
45122
45123
45124
45125
45126
45127
45128
45129
45130
45131
45132
45133
45134
45135
45136
45137
45138
45139
45140
45141
45142
45143
45144
45145
45146
45147
45148
45149
45150
45151
45152
45153
45154
45155
45156
45157
45158
45159
45160
45161
45162
45163
45164
45165
45166
45167
45168
45169
45170
45171
45172
45173
45174
45175
45176
45177
45178
45179
45180
45181
45182
45183
45184
45185
45186
45187
45188
45189
45190
45191
45192
45193
45194
45195
45196
45197
45198
45199
45200
45201
45202
45203
45204
45205
45206
45207
45208
45209
45210
45211
45212
45213
45214
45215
45216
45217
45218
45219
45220
45221
45222
45223
45224
45225
45226
45227
45228
45229
45230
45231
45232
45233
45234
45235
45236
45237
45238
45239
45240
45241
45242
45243
45244
45245
45246
45247
45248
45249
45250
45251
45252
45253
45254
45255
45256
45257
45258
45259
45260
45261
45262
45263
45264
45265
45266
45267
45268
45269
45270
45271
45272
45273
45274
45275
45276
45277
45278
45279
45280
45281
45282
45283
45284
45285
45286
45287
45288
45289
45290
45291
45292
45293
45294
45295
45296
45297
45298
45299
45300
45301
45302
45303
45304
45305
45306
45307
45308
45309
45310
45311
45312
45313
45314
45315
45316
45317
45318
45319
45320
45321
45322
45323
45324
45325
45326
45327
45328
45329
45330
45331
45332
45333
45334
45335
45336
45337
45338
45339
45340
45341
45342
45343
45344
45345
45346
45347
45348
45349
45350
45351
45352
45353
45354
45355
45356
45357
45358
45359
45360
45361
45362
45363
45364
45365
45366
45367
45368
45369
45370
45371
45372
45373
45374
45375
45376
45377
45378
45379
45380
45381
45382
45383
45384
45385
45386
45387
45388
45389
45390
45391
45392
45393
45394
45395
45396
45397
45398
45399
45400
45401
45402
45403
45404
45405
45406
45407
45408
45409
45410
45411
45412
45413
45414
45415
45416
45417
45418
45419
45420
45421
45422
45423
45424
45425
45426
45427
45428
45429
45430
45431
45432
45433
45434
45435
45436
45437
45438
45439
45440
45441
45442
45443
45444
45445
45446
45447
45448
45449
45450
45451
45452
45453
45454
45455
45456
45457
45458
45459
45460
45461
45462
45463
45464
45465
45466
45467
45468
45469
45470
45471
45472
45473
45474
45475
45476
45477
45478
45479
45480
45481
45482
45483
45484
45485
45486
45487
45488
45489
45490
45491
45492
45493
45494
45495
45496
45497
45498
45499
45500
45501
45502
45503
45504
45505
45506
45507
45508
45509
45510
45511
45512
45513
45514
45515
45516
45517
45518
45519
45520
45521
45522
45523
45524
45525
45526
45527
45528
45529
45530
45531
45532
45533
45534
45535
45536
45537
45538
45539
45540
45541
45542
45543
45544
45545
45546
45547
45548
45549
45550
45551
45552
45553
45554
45555
45556
45557
45558
45559
45560
45561
45562
45563
45564
45565
45566
45567
45568
45569
45570
45571
45572
45573
45574
45575
45576
45577
45578
45579
45580
45581
45582
45583
45584
45585
45586
45587
45588
45589
45590
45591
45592
45593
45594
45595
45596
45597
45598
45599
45600
45601
45602
45603
45604
45605
45606
45607
45608
45609
45610
45611
45612
45613
45614
45615
45616
45617
45618
45619
45620
45621
45622
45623
45624
45625
45626
45627
45628
45629
45630
45631
45632
45633
45634
45635
45636
45637
45638
45639
45640
45641
45642
45643
45644
45645
45646
45647
45648
45649
45650
45651
45652
45653
45654
45655
45656
45657
45658
45659
45660
45661
45662
45663
45664
45665
45666
45667
45668
45669
45670
45671
45672
45673
45674
45675
45676
45677
45678
45679
45680
45681
45682
45683
45684
45685
45686
45687
45688
45689
45690
45691
45692
45693
45694
45695
45696
45697
45698
45699
45700
45701
45702
45703
45704
45705
45706
45707
45708
45709
45710
45711
45712
45713
45714
45715
45716
45717
45718
45719
45720
45721
45722
45723
45724
45725
45726
45727
45728
45729
45730
45731
45732
45733
45734
45735
45736
45737
45738
45739
45740
45741
45742
45743
45744
45745
45746
45747
45748
45749
45750
45751
45752
45753
45754
45755
45756
45757
45758
45759
45760
45761
45762
45763
45764
45765
45766
45767
45768
45769
45770
45771
45772
45773
45774
45775
45776
45777
45778
45779
45780
45781
45782
45783
45784
45785
45786
45787
45788
45789
45790
45791
45792
45793
45794
45795
45796
45797
45798
45799
45800
45801
45802
45803
45804
45805
45806
45807
45808
45809
45810
45811
45812
45813
45814
45815
45816
45817
45818
45819
45820
45821
45822
45823
45824
45825
45826
45827
45828
45829
45830
45831
45832
45833
45834
45835
45836
45837
45838
45839
45840
45841
45842
45843
45844
45845
45846
45847
45848
45849
45850
45851
45852
45853
45854
45855
45856
45857
45858
45859
45860
45861
45862
45863
45864
45865
45866
45867
45868
45869
45870
45871
45872
45873
45874
45875
45876
45877
45878
45879
45880
45881
45882
45883
45884
45885
45886
45887
45888
45889
45890
45891
45892
45893
45894
45895
45896
45897
45898
45899
45900
45901
45902
45903
45904
45905
45906
45907
45908
45909
45910
45911
45912
45913
45914
45915
45916
45917
45918
45919
45920
45921
45922
45923
45924
45925
45926
45927
45928
45929
45930
45931
45932
45933
45934
45935
45936
45937
45938
45939
45940
45941
45942
45943
45944
45945
45946
45947
45948
45949
45950
45951
45952
45953
45954
45955
45956
45957
45958
45959
45960
45961
45962
45963
45964
45965
45966
45967
45968
45969
45970
45971
45972
45973
45974
45975
45976
45977
45978
45979
45980
45981
45982
45983
45984
45985
45986
45987
45988
45989
45990
45991
45992
45993
45994
45995
45996
45997
45998
45999
46000
46001
46002
46003
46004
46005
46006
46007
46008
46009
46010
46011
46012
46013
46014
46015
46016
46017
46018
46019
46020
46021
46022
46023
46024
46025
46026
46027
46028
46029
46030
46031
46032
46033
46034
46035
46036
46037
46038
46039
46040
46041
46042
46043
46044
46045
46046
46047
46048
46049
46050
46051
46052
46053
46054
46055
46056
46057
46058
46059
46060
46061
46062
46063
46064
46065
46066
46067
46068
46069
46070
46071
46072
46073
46074
46075
46076
46077
46078
46079
46080
46081
46082
46083
46084
46085
46086
46087
46088
46089
46090
46091
46092
46093
46094
46095
46096
46097
46098
46099
46100
46101
46102
46103
46104
46105
46106
46107
46108
46109
46110
46111
46112
46113
46114
46115
46116
46117
46118
46119
46120
46121
46122
46123
46124
46125
46126
46127
46128
46129
46130
46131
46132
46133
46134
46135
46136
46137
46138
46139
46140
46141
46142
46143
46144
46145
46146
46147
46148
46149
46150
46151
46152
46153
46154
46155
46156
46157
46158
46159
46160
46161
46162
46163
46164
46165
46166
46167
46168
46169
46170
46171
46172
46173
46174
46175
46176
46177
46178
46179
46180
46181
46182
46183
46184
46185
46186
46187
46188
46189
46190
46191
46192
46193
46194
46195
46196
46197
46198
46199
46200
46201
46202
46203
46204
46205
46206
46207
46208
46209
46210
46211
46212
46213
46214
46215
46216
46217
46218
46219
46220
46221
46222
46223
46224
46225
46226
46227
46228
46229
46230
46231
46232
46233
46234
46235
46236
46237
46238
46239
46240
46241
46242
46243
46244
46245
46246
46247
46248
46249
46250
46251
46252
46253
46254
46255
46256
46257
46258
46259
46260
46261
46262
46263
46264
46265
46266
46267
46268
46269
46270
46271
46272
46273
46274
46275
46276
46277
46278
46279
46280
46281
46282
46283
46284
46285
46286
46287
46288
46289
46290
46291
46292
46293
46294
46295
46296
46297
46298
46299
46300
46301
46302
46303
46304
46305
46306
46307
46308
46309
46310
46311
46312
46313
46314
46315
46316
46317
46318
46319
46320
46321
46322
46323
46324
46325
46326
46327
46328
46329
46330
46331
46332
46333
46334
46335
46336
46337
46338
46339
46340
46341
46342
46343
46344
46345
46346
46347
46348
46349
46350
46351
46352
46353
46354
46355
46356
46357
46358
46359
46360
46361
46362
46363
46364
46365
46366
46367
46368
46369
46370
46371
46372
46373
46374
46375
46376
46377
46378
46379
46380
46381
46382
46383
46384
46385
46386
46387
46388
46389
46390
46391
46392
46393
46394
46395
46396
46397
46398
46399
46400
46401
46402
46403
46404
46405
46406
46407
46408
46409
46410
46411
46412
46413
46414
46415
46416
46417
46418
46419
46420
46421
46422
46423
46424
46425
46426
46427
46428
46429
46430
46431
46432
46433
46434
46435
46436
46437
46438
46439
46440
46441
46442
46443
46444
46445
46446
46447
46448
46449
46450
46451
46452
46453
46454
46455
46456
46457
46458
46459
46460
46461
46462
46463
46464
46465
46466
46467
46468
46469
46470
46471
46472
46473
46474
46475
46476
46477
46478
46479
46480
46481
46482
46483
46484
46485
46486
46487
46488
46489
46490
46491
46492
46493
46494
46495
46496
46497
46498
46499
46500
46501
46502
46503
46504
46505
46506
46507
46508
46509
46510
46511
46512
46513
46514
46515
46516
46517
46518
46519
46520
46521
46522
46523
46524
46525
46526
46527
46528
46529
46530
46531
46532
46533
46534
46535
46536
46537
46538
46539
46540
46541
46542
46543
46544
46545
46546
46547
46548
46549
46550
46551
46552
46553
46554
46555
46556
46557
46558
46559
46560
46561
46562
46563
46564
46565
46566
46567
46568
46569
46570
46571
46572
46573
46574
46575
46576
46577
46578
46579
46580
46581
46582
46583
46584
46585
46586
46587
46588
46589
46590
46591
46592
46593
46594
46595
46596
46597
46598
46599
46600
46601
46602
46603
46604
46605
46606
46607
46608
46609
46610
46611
46612
46613
46614
46615
46616
46617
46618
46619
46620
46621
46622
46623
46624
46625
46626
46627
46628
46629
46630
46631
46632
46633
46634
46635
46636
46637
46638
46639
46640
46641
46642
46643
46644
46645
46646
46647
46648
46649
46650
46651
46652
46653
46654
46655
46656
46657
46658
46659
46660
46661
46662
46663
46664
46665
46666
46667
46668
46669
46670
46671
46672
46673
46674
46675
46676
46677
46678
46679
46680
46681
46682
46683
46684
46685
46686
46687
46688
46689
46690
46691
46692
46693
46694
46695
46696
46697
46698
46699
46700
46701
46702
46703
46704
46705
46706
46707
46708
46709
46710
46711
46712
46713
46714
46715
46716
46717
46718
46719
46720
46721
46722
46723
46724
46725
46726
46727
46728
46729
46730
46731
46732
46733
46734
46735
46736
46737
46738
46739
46740
46741
46742
46743
46744
46745
46746
46747
46748
46749
46750
46751
46752
46753
46754
46755
46756
46757
46758
46759
46760
46761
46762
46763
46764
46765
46766
46767
46768
46769
46770
46771
46772
46773
46774
46775
46776
46777
46778
46779
46780
46781
46782
46783
46784
46785
46786
46787
46788
46789
46790
46791
46792
46793
46794
46795
46796
46797
46798
46799
46800
46801
46802
46803
46804
46805
46806
46807
46808
46809
46810
46811
46812
46813
46814
46815
46816
46817
46818
46819
46820
46821
46822
46823
46824
46825
46826
46827
46828
46829
46830
46831
46832
46833
46834
46835
46836
46837
46838
46839
46840
46841
46842
46843
46844
46845
46846
46847
46848
46849
46850
46851
46852
46853
46854
46855
46856
46857
46858
46859
46860
46861
46862
46863
46864
46865
46866
46867
46868
46869
46870
46871
46872
46873
46874
46875
46876
46877
46878
46879
46880
46881
46882
46883
46884
46885
46886
46887
46888
46889
46890
46891
46892
46893
46894
46895
46896
46897
46898
46899
46900
46901
46902
46903
46904
46905
46906
46907
46908
46909
46910
46911
46912
46913
46914
46915
46916
46917
46918
46919
46920
46921
46922
46923
46924
46925
46926
46927
46928
46929
46930
46931
46932
46933
46934
46935
46936
46937
46938
46939
46940
46941
46942
46943
46944
46945
46946
46947
46948
46949
46950
46951
46952
46953
46954
46955
46956
46957
46958
46959
46960
46961
46962
46963
46964
46965
46966
46967
46968
46969
46970
46971
46972
46973
46974
46975
46976
46977
46978
46979
46980
46981
46982
46983
46984
46985
46986
46987
46988
46989
46990
46991
46992
46993
46994
46995
46996
46997
46998
46999
47000
47001
47002
47003
47004
47005
47006
47007
47008
47009
47010
47011
47012
47013
47014
47015
47016
47017
47018
47019
47020
47021
47022
47023
47024
47025
47026
47027
47028
47029
47030
47031
47032
47033
47034
47035
47036
47037
47038
47039
47040
47041
47042
47043
47044
47045
47046
47047
47048
47049
47050
47051
47052
47053
47054
47055
47056
47057
47058
47059
47060
47061
47062
47063
47064
47065
47066
47067
47068
47069
47070
47071
47072
47073
47074
47075
47076
47077
47078
47079
47080
47081
47082
47083
47084
47085
47086
47087
47088
47089
47090
47091
47092
47093
47094
47095
47096
47097
47098
47099
47100
47101
47102
47103
47104
47105
47106
47107
47108
47109
47110
47111
47112
47113
47114
47115
47116
47117
47118
47119
47120
47121
47122
47123
47124
47125
47126
47127
47128
47129
47130
47131
47132
47133
47134
47135
47136
47137
47138
47139
47140
47141
47142
47143
47144
47145
47146
47147
47148
47149
47150
47151
47152
47153
47154
47155
47156
47157
47158
47159
47160
47161
47162
47163
47164
47165
47166
47167
47168
47169
47170
47171
47172
47173
47174
47175
47176
47177
47178
47179
47180
47181
47182
47183
47184
47185
47186
47187
47188
47189
47190
47191
47192
47193
47194
47195
47196
47197
47198
47199
47200
47201
47202
47203
47204
47205
47206
47207
47208
47209
47210
47211
47212
47213
47214
47215
47216
47217
47218
47219
47220
47221
47222
47223
47224
47225
47226
47227
47228
47229
47230
47231
47232
47233
47234
47235
47236
47237
47238
47239
47240
47241
47242
47243
47244
47245
47246
47247
47248
47249
47250
47251
47252
47253
47254
47255
47256
47257
47258
47259
47260
47261
47262
47263
47264
47265
47266
47267
47268
47269
47270
47271
47272
47273
47274
47275
47276
47277
47278
47279
47280
47281
47282
47283
47284
47285
47286
47287
47288
47289
47290
47291
47292
47293
47294
47295
47296
47297
47298
47299
47300
47301
47302
47303
47304
47305
47306
47307
47308
47309
47310
47311
47312
47313
47314
47315
47316
47317
47318
47319
47320
47321
47322
47323
47324
47325
47326
47327
47328
47329
47330
47331
47332
47333
47334
47335
47336
47337
47338
47339
47340
47341
47342
47343
47344
47345
47346
47347
47348
47349
47350
47351
47352
47353
47354
47355
47356
47357
47358
47359
47360
47361
47362
47363
47364
47365
47366
47367
47368
47369
47370
47371
47372
47373
47374
47375
47376
47377
47378
47379
47380
47381
47382
47383
47384
47385
47386
47387
47388
47389
47390
47391
47392
47393
47394
47395
47396
47397
47398
47399
47400
47401
47402
47403
47404
47405
47406
47407
47408
47409
47410
47411
47412
47413
47414
47415
47416
47417
47418
47419
47420
47421
47422
47423
47424
47425
47426
47427
47428
47429
47430
47431
47432
47433
47434
47435
47436
47437
47438
47439
47440
47441
47442
47443
47444
47445
47446
47447
47448
47449
47450
47451
47452
47453
47454
47455
47456
47457
47458
47459
47460
47461
47462
47463
47464
47465
47466
47467
47468
47469
47470
47471
47472
47473
47474
47475
47476
47477
47478
47479
47480
47481
47482
47483
47484
47485
47486
47487
47488
47489
47490
47491
47492
47493
47494
47495
47496
47497
47498
47499
47500
47501
47502
47503
47504
47505
47506
47507
47508
47509
47510
47511
47512
47513
47514
47515
47516
47517
47518
47519
47520
47521
47522
47523
47524
47525
47526
47527
47528
47529
47530
47531
47532
47533
47534
47535
47536
47537
47538
47539
47540
47541
47542
47543
47544
47545
47546
47547
47548
47549
47550
47551
47552
47553
47554
47555
47556
47557
47558
47559
47560
47561
47562
47563
47564
47565
47566
47567
47568
47569
47570
47571
47572
47573
47574
47575
47576
47577
47578
47579
47580
47581
47582
47583
47584
47585
47586
47587
47588
47589
47590
47591
47592
47593
47594
47595
47596
47597
47598
47599
47600
47601
47602
47603
47604
47605
47606
47607
47608
47609
47610
47611
47612
47613
47614
47615
47616
47617
47618
47619
47620
47621
47622
47623
47624
47625
47626
47627
47628
47629
47630
47631
47632
47633
47634
47635
47636
47637
47638
47639
47640
47641
47642
47643
47644
47645
47646
47647
47648
47649
47650
47651
47652
47653
47654
47655
47656
47657
47658
47659
47660
47661
47662
47663
47664
47665
47666
47667
47668
47669
47670
47671
47672
47673
47674
47675
47676
47677
47678
47679
47680
47681
47682
47683
47684
47685
47686
47687
47688
47689
47690
47691
47692
47693
47694
47695
47696
47697
47698
47699
47700
47701
47702
47703
47704
47705
47706
47707
47708
47709
47710
47711
47712
47713
47714
47715
47716
47717
47718
47719
47720
47721
47722
47723
47724
47725
47726
47727
47728
47729
47730
47731
47732
47733
47734
47735
47736
47737
47738
47739
47740
47741
47742
47743
47744
47745
47746
47747
47748
47749
47750
47751
47752
47753
47754
47755
47756
47757
47758
47759
47760
47761
47762
47763
47764
47765
47766
47767
47768
47769
47770
47771
47772
47773
47774
47775
47776
47777
47778
47779
47780
47781
47782
47783
47784
47785
47786
47787
47788
47789
47790
47791
47792
47793
47794
47795
47796
47797
47798
47799
47800
47801
47802
47803
47804
47805
47806
47807
47808
47809
47810
47811
47812
47813
47814
47815
47816
47817
47818
47819
47820
47821
47822
47823
47824
47825
47826
47827
47828
47829
47830
47831
47832
47833
47834
47835
47836
47837
47838
47839
47840
47841
47842
47843
47844
47845
47846
47847
47848
47849
47850
47851
47852
47853
47854
47855
47856
47857
47858
47859
47860
47861
47862
47863
47864
47865
47866
47867
47868
47869
47870
47871
47872
47873
47874
47875
47876
47877
47878
47879
47880
47881
47882
47883
47884
47885
47886
47887
47888
47889
47890
47891
47892
47893
47894
47895
47896
47897
47898
47899
47900
47901
47902
47903
47904
47905
47906
47907
47908
47909
47910
47911
47912
47913
47914
47915
47916
47917
47918
47919
47920
47921
47922
47923
47924
47925
47926
47927
47928
47929
47930
47931
47932
47933
47934
47935
47936
47937
47938
47939
47940
47941
47942
47943
47944
47945
47946
47947
47948
47949
47950
47951
47952
47953
47954
47955
47956
47957
47958
47959
47960
47961
47962
47963
47964
47965
47966
47967
47968
47969
47970
47971
47972
47973
47974
47975
47976
47977
47978
47979
47980
47981
47982
47983
47984
47985
47986
47987
47988
47989
47990
47991
47992
47993
47994
47995
47996
47997
47998
47999
48000
48001
48002
48003
48004
48005
48006
48007
48008
48009
48010
48011
48012
48013
48014
48015
48016
48017
48018
48019
48020
48021
48022
48023
48024
48025
48026
48027
48028
48029
48030
48031
48032
48033
48034
48035
48036
48037
48038
48039
48040
48041
48042
48043
48044
48045
48046
48047
48048
48049
48050
48051
48052
48053
48054
48055
48056
48057
48058
48059
48060
48061
48062
48063
48064
48065
48066
48067
48068
48069
48070
48071
48072
48073
48074
48075
48076
48077
48078
48079
48080
48081
48082
48083
48084
48085
48086
48087
48088
48089
48090
48091
48092
48093
48094
48095
48096
48097
48098
48099
48100
48101
48102
48103
48104
48105
48106
48107
48108
48109
48110
48111
48112
48113
48114
48115
48116
48117
48118
48119
48120
48121
48122
48123
48124
48125
48126
48127
48128
48129
48130
48131
48132
48133
48134
48135
48136
48137
48138
48139
48140
48141
48142
48143
48144
48145
48146
48147
48148
48149
48150
48151
48152
48153
48154
48155
48156
48157
48158
48159
48160
48161
48162
48163
48164
48165
48166
48167
48168
48169
48170
48171
48172
48173
48174
48175
48176
48177
48178
48179
48180
48181
48182
48183
48184
48185
48186
48187
48188
48189
48190
48191
48192
48193
48194
48195
48196
48197
48198
48199
48200
48201
48202
48203
48204
48205
48206
48207
48208
48209
48210
48211
48212
48213
48214
48215
48216
48217
48218
48219
48220
48221
48222
48223
48224
48225
48226
48227
48228
48229
48230
48231
48232
48233
48234
48235
48236
48237
48238
48239
48240
48241
48242
48243
48244
48245
48246
48247
48248
48249
48250
48251
48252
48253
48254
48255
48256
48257
48258
48259
48260
48261
48262
48263
48264
48265
48266
48267
48268
48269
48270
48271
48272
48273
48274
48275
48276
48277
48278
48279
48280
48281
48282
48283
48284
48285
48286
48287
48288
48289
48290
48291
48292
48293
48294
48295
48296
48297
48298
48299
48300
48301
48302
48303
48304
48305
48306
48307
48308
48309
48310
48311
48312
48313
48314
48315
48316
48317
48318
48319
48320
48321
48322
48323
48324
48325
48326
48327
48328
48329
48330
48331
48332
48333
48334
48335
48336
48337
48338
48339
48340
48341
48342
48343
48344
48345
48346
48347
48348
48349
48350
48351
48352
48353
48354
48355
48356
48357
48358
48359
48360
48361
48362
48363
48364
48365
48366
48367
48368
48369
48370
48371
48372
48373
48374
48375
48376
48377
48378
48379
48380
48381
48382
48383
48384
48385
48386
48387
48388
48389
48390
48391
48392
48393
48394
48395
48396
48397
48398
48399
48400
48401
48402
48403
48404
48405
48406
48407
48408
48409
48410
48411
48412
48413
48414
48415
48416
48417
48418
48419
48420
48421
48422
48423
48424
48425
48426
48427
48428
48429
48430
48431
48432
48433
48434
48435
48436
48437
48438
48439
48440
48441
48442
48443
48444
48445
48446
48447
48448
48449
48450
48451
48452
48453
48454
48455
48456
48457
48458
48459
48460
48461
48462
48463
48464
48465
48466
48467
48468
48469
48470
48471
48472
48473
48474
48475
48476
48477
48478
48479
48480
48481
48482
48483
48484
48485
48486
48487
48488
48489
48490
48491
48492
48493
48494
48495
48496
48497
48498
48499
48500
48501
48502
48503
48504
48505
48506
48507
48508
48509
48510
48511
48512
48513
48514
48515
48516
48517
48518
48519
48520
48521
48522
48523
48524
48525
48526
48527
48528
48529
48530
48531
48532
48533
48534
48535
48536
48537
48538
48539
48540
48541
48542
48543
48544
48545
48546
48547
48548
48549
48550
48551
48552
48553
48554
48555
48556
48557
48558
48559
48560
48561
48562
48563
48564
48565
48566
48567
48568
48569
48570
48571
48572
48573
48574
48575
48576
48577
48578
48579
48580
48581
48582
48583
48584
48585
48586
48587
48588
48589
48590
48591
48592
48593
48594
48595
48596
48597
48598
48599
48600
48601
48602
48603
48604
48605
48606
48607
48608
48609
48610
48611
48612
48613
48614
48615
48616
48617
48618
48619
48620
48621
48622
48623
48624
48625
48626
48627
48628
48629
48630
48631
48632
48633
48634
48635
48636
48637
48638
48639
48640
48641
48642
48643
48644
48645
48646
48647
48648
48649
48650
48651
48652
48653
48654
48655
48656
48657
48658
48659
48660
48661
48662
48663
48664
48665
48666
48667
48668
48669
48670
48671
48672
48673
48674
48675
48676
48677
48678
48679
48680
48681
48682
48683
48684
48685
48686
48687
48688
48689
48690
48691
48692
48693
48694
48695
48696
48697
48698
48699
48700
48701
48702
48703
48704
48705
48706
48707
48708
48709
48710
48711
48712
48713
48714
48715
48716
48717
48718
48719
48720
48721
48722
48723
48724
48725
48726
48727
48728
48729
48730
48731
48732
48733
48734
48735
48736
48737
48738
48739
48740
48741
48742
48743
48744
48745
48746
48747
48748
48749
48750
48751
48752
48753
48754
48755
48756
48757
48758
48759
48760
48761
48762
48763
48764
48765
48766
48767
48768
48769
48770
48771
48772
48773
48774
48775
48776
48777
48778
48779
48780
48781
48782
48783
48784
48785
48786
48787
48788
48789
48790
48791
48792
48793
48794
48795
48796
48797
48798
48799
48800
48801
48802
48803
48804
48805
48806
48807
48808
48809
48810
48811
48812
48813
48814
48815
48816
48817
48818
48819
48820
48821
48822
48823
48824
48825
48826
48827
48828
48829
48830
48831
48832
48833
48834
48835
48836
48837
48838
48839
48840
48841
48842
48843
48844
48845
48846
48847
48848
48849
48850
48851
48852
48853
48854
48855
48856
48857
48858
48859
48860
48861
48862
48863
48864
48865
48866
48867
48868
48869
48870
48871
48872
48873
48874
48875
48876
48877
48878
48879
48880
48881
48882
48883
48884
48885
48886
48887
48888
48889
48890
48891
48892
48893
48894
48895
48896
48897
48898
48899
48900
48901
48902
48903
48904
48905
48906
48907
48908
48909
48910
48911
48912
48913
48914
48915
48916
48917
48918
48919
48920
48921
48922
48923
48924
48925
48926
48927
48928
48929
48930
48931
48932
48933
48934
48935
48936
48937
48938
48939
48940
48941
48942
48943
48944
48945
48946
48947
48948
48949
48950
48951
48952
48953
48954
48955
48956
48957
48958
48959
48960
48961
48962
48963
48964
48965
48966
48967
48968
48969
48970
48971
48972
48973
48974
48975
48976
48977
48978
48979
48980
48981
48982
48983
48984
48985
48986
48987
48988
48989
48990
48991
48992
48993
48994
48995
48996
48997
48998
48999
49000
49001
49002
49003
49004
49005
49006
49007
49008
49009
49010
49011
49012
49013
49014
49015
49016
49017
49018
49019
49020
49021
49022
49023
49024
49025
49026
49027
49028
49029
49030
49031
49032
49033
49034
49035
49036
49037
49038
49039
49040
49041
49042
49043
49044
49045
49046
49047
49048
49049
49050
49051
49052
49053
49054
49055
49056
49057
49058
49059
49060
49061
49062
49063
49064
49065
49066
49067
49068
49069
49070
49071
49072
49073
49074
49075
49076
49077
49078
49079
49080
49081
49082
49083
49084
49085
49086
49087
49088
49089
49090
49091
49092
49093
49094
49095
49096
49097
49098
49099
49100
49101
49102
49103
49104
49105
49106
49107
49108
49109
49110
49111
49112
49113
49114
49115
49116
49117
49118
49119
49120
49121
49122
49123
49124
49125
49126
49127
49128
49129
49130
49131
49132
49133
49134
49135
49136
49137
49138
49139
49140
49141
49142
49143
49144
49145
49146
49147
49148
49149
49150
49151
49152
49153
49154
49155
49156
49157
49158
49159
49160
49161
49162
49163
49164
49165
49166
49167
49168
49169
49170
49171
49172
49173
49174
49175
49176
49177
49178
49179
49180
49181
49182
49183
49184
49185
49186
49187
49188
49189
49190
49191
49192
49193
49194
49195
49196
49197
49198
49199
49200
49201
49202
49203
49204
49205
49206
49207
49208
49209
49210
49211
49212
49213
49214
49215
49216
49217
49218
49219
49220
49221
49222
49223
49224
49225
49226
49227
49228
49229
49230
49231
49232
49233
49234
49235
49236
49237
49238
49239
49240
49241
49242
49243
49244
49245
49246
49247
49248
49249
49250
49251
49252
49253
49254
49255
49256
49257
49258
49259
49260
49261
49262
49263
49264
49265
49266
49267
49268
49269
49270
49271
49272
49273
49274
49275
49276
49277
49278
49279
49280
49281
49282
49283
49284
49285
49286
49287
49288
49289
49290
49291
49292
49293
49294
49295
49296
49297
49298
49299
49300
49301
49302
49303
49304
49305
49306
49307
49308
49309
49310
49311
49312
49313
49314
49315
49316
49317
49318
49319
49320
49321
49322
49323
49324
49325
49326
49327
49328
49329
49330
49331
49332
49333
49334
49335
49336
49337
49338
49339
49340
49341
49342
49343
49344
49345
49346
49347
49348
49349
49350
49351
49352
49353
49354
49355
49356
49357
49358
49359
49360
49361
49362
49363
49364
49365
49366
49367
49368
49369
49370
49371
49372
49373
49374
49375
49376
49377
49378
49379
49380
49381
49382
49383
49384
49385
49386
49387
49388
49389
49390
49391
49392
49393
49394
49395
49396
49397
49398
49399
49400
49401
49402
49403
49404
49405
49406
49407
49408
49409
49410
49411
49412
49413
49414
49415
49416
49417
49418
49419
49420
49421
49422
49423
49424
49425
49426
49427
49428
49429
49430
49431
49432
49433
49434
49435
49436
49437
49438
49439
49440
49441
49442
49443
49444
49445
49446
49447
49448
49449
49450
49451
49452
49453
49454
49455
49456
49457
49458
49459
49460
49461
49462
49463
49464
49465
49466
49467
49468
49469
49470
49471
49472
49473
49474
49475
49476
49477
49478
49479
49480
49481
49482
49483
49484
49485
49486
49487
49488
49489
49490
49491
49492
49493
49494
49495
49496
49497
49498
49499
49500
49501
49502
49503
49504
49505
49506
49507
49508
49509
49510
49511
49512
49513
49514
49515
49516
49517
49518
49519
49520
49521
49522
49523
49524
49525
49526
49527
49528
49529
49530
49531
49532
49533
49534
49535
49536
49537
49538
49539
49540
49541
49542
49543
49544
49545
49546
49547
49548
49549
49550
49551
49552
49553
49554
49555
49556
49557
49558
49559
49560
49561
49562
49563
49564
49565
49566
49567
49568
49569
49570
49571
49572
49573
49574
49575
49576
49577
49578
49579
49580
49581
49582
49583
49584
49585
49586
49587
49588
49589
49590
49591
49592
49593
49594
49595
49596
49597
49598
49599
49600
49601
49602
49603
49604
49605
49606
49607
49608
49609
49610
49611
49612
49613
49614
49615
49616
49617
49618
49619
49620
49621
49622
49623
49624
49625
49626
49627
49628
49629
49630
49631
49632
49633
49634
49635
49636
49637
49638
49639
49640
49641
49642
49643
49644
49645
49646
49647
49648
49649
49650
49651
49652
49653
49654
49655
49656
49657
49658
49659
49660
49661
49662
49663
49664
49665
49666
49667
49668
49669
49670
49671
49672
49673
49674
49675
49676
49677
49678
49679
49680
49681
49682
49683
49684
49685
49686
49687
49688
49689
49690
49691
49692
49693
49694
49695
49696
49697
49698
49699
49700
49701
49702
49703
49704
49705
49706
49707
49708
49709
49710
49711
49712
49713
49714
49715
49716
49717
49718
49719
49720
49721
49722
49723
49724
49725
49726
49727
49728
49729
49730
49731
49732
49733
49734
49735
49736
49737
49738
49739
49740
49741
49742
49743
49744
49745
49746
49747
49748
49749
49750
49751
49752
49753
49754
49755
49756
49757
49758
49759
49760
49761
49762
49763
49764
49765
49766
49767
49768
49769
49770
49771
49772
49773
49774
49775
49776
49777
49778
49779
49780
49781
49782
49783
49784
49785
49786
49787
49788
49789
49790
49791
49792
49793
49794
49795
49796
49797
49798
49799
49800
49801
49802
49803
49804
49805
49806
49807
49808
49809
49810
49811
49812
49813
49814
49815
49816
49817
49818
49819
49820
49821
49822
49823
49824
49825
49826
49827
49828
49829
49830
49831
49832
49833
49834
49835
49836
49837
49838
49839
49840
49841
49842
49843
49844
49845
49846
49847
49848
49849
49850
49851
49852
49853
49854
49855
49856
49857
49858
49859
49860
49861
49862
49863
49864
49865
49866
49867
49868
49869
49870
49871
49872
49873
49874
49875
49876
49877
49878
49879
49880
49881
49882
49883
49884
49885
49886
49887
49888
49889
49890
49891
49892
49893
49894
49895
49896
49897
49898
49899
49900
49901
49902
49903
49904
49905
49906
49907
49908
49909
49910
49911
49912
49913
49914
49915
49916
49917
49918
49919
49920
49921
49922
49923
49924
49925
49926
49927
49928
49929
49930
49931
49932
49933
49934
49935
49936
49937
49938
49939
49940
49941
49942
49943
49944
49945
49946
49947
49948
49949
49950
49951
49952
49953
49954
49955
49956
49957
49958
49959
49960
49961
49962
49963
49964
49965
49966
49967
49968
49969
49970
49971
49972
49973
49974
49975
49976
49977
49978
49979
49980
49981
49982
49983
49984
49985
49986
49987
49988
49989
49990
49991
49992
49993
49994
49995
49996
49997
49998
49999
50000
50001
50002
50003
50004
50005
50006
50007
50008
50009
50010
50011
50012
50013
50014
50015
50016
50017
50018
50019
50020
50021
50022
50023
50024
50025
50026
50027
50028
50029
50030
50031
50032
50033
50034
50035
50036
50037
50038
50039
50040
50041
50042
50043
50044
50045
50046
50047
50048
50049
50050
50051
50052
50053
50054
50055
50056
50057
50058
50059
50060
50061
50062
50063
50064
50065
50066
50067
50068
50069
50070
50071
50072
50073
50074
50075
50076
50077
50078
50079
50080
50081
50082
50083
50084
50085
50086
50087
50088
50089
50090
50091
50092
50093
50094
50095
50096
50097
50098
50099
50100
50101
50102
50103
50104
50105
50106
50107
50108
50109
50110
50111
50112
50113
50114
50115
50116
50117
50118
50119
50120
50121
50122
50123
50124
50125
50126
50127
50128
50129
50130
50131
50132
50133
50134
50135
50136
50137
50138
50139
50140
50141
50142
50143
50144
50145
50146
50147
50148
50149
50150
50151
50152
50153
50154
50155
50156
50157
50158
50159
50160
50161
50162
50163
50164
50165
50166
50167
50168
50169
50170
50171
50172
50173
50174
50175
50176
50177
50178
50179
50180
50181
50182
50183
50184
50185
50186
50187
50188
50189
50190
50191
50192
50193
50194
50195
50196
50197
50198
50199
50200
50201
50202
50203
50204
50205
50206
50207
50208
50209
50210
50211
50212
50213
50214
50215
50216
50217
50218
50219
50220
50221
50222
50223
50224
50225
50226
50227
50228
50229
50230
50231
50232
50233
50234
50235
50236
50237
50238
50239
50240
50241
50242
50243
50244
50245
50246
50247
50248
50249
50250
50251
50252
50253
50254
50255
50256
50257
50258
50259
50260
50261
50262
50263
50264
50265
50266
50267
50268
50269
50270
50271
50272
50273
50274
50275
50276
50277
50278
50279
50280
50281
50282
50283
50284
50285
50286
50287
50288
50289
50290
50291
50292
50293
50294
50295
50296
50297
50298
50299
50300
50301
50302
50303
50304
50305
50306
50307
50308
50309
50310
50311
50312
50313
50314
50315
50316
50317
50318
50319
50320
50321
50322
50323
50324
50325
50326
50327
50328
50329
50330
50331
50332
50333
50334
50335
50336
50337
50338
50339
50340
50341
50342
50343
50344
50345
50346
50347
50348
50349
50350
50351
50352
50353
50354
50355
50356
50357
50358
50359
50360
50361
50362
50363
50364
50365
50366
50367
50368
50369
50370
50371
50372
50373
50374
50375
50376
50377
50378
50379
50380
50381
50382
50383
50384
50385
50386
50387
50388
50389
50390
50391
50392
50393
50394
50395
50396
50397
50398
50399
50400
50401
50402
50403
50404
50405
50406
50407
50408
50409
50410
50411
50412
50413
50414
50415
50416
50417
50418
50419
50420
50421
50422
50423
50424
50425
50426
50427
50428
50429
50430
50431
50432
50433
50434
50435
50436
50437
50438
50439
50440
50441
50442
50443
50444
50445
50446
50447
50448
50449
50450
50451
50452
50453
50454
50455
50456
50457
50458
50459
50460
50461
50462
50463
50464
50465
50466
50467
50468
50469
50470
50471
50472
50473
50474
50475
50476
50477
50478
50479
50480
50481
50482
50483
50484
50485
50486
50487
50488
50489
50490
50491
50492
50493
50494
50495
50496
50497
50498
50499
50500
50501
50502
50503
50504
50505
50506
50507
50508
50509
50510
50511
50512
50513
50514
50515
50516
50517
50518
50519
50520
50521
50522
50523
50524
50525
50526
50527
50528
50529
50530
50531
50532
50533
50534
50535
50536
50537
50538
50539
50540
50541
50542
50543
50544
50545
50546
50547
50548
50549
50550
50551
50552
50553
50554
50555
50556
50557
50558
50559
50560
50561
50562
50563
50564
50565
50566
50567
50568
50569
50570
50571
50572
50573
50574
50575
50576
50577
50578
50579
50580
50581
50582
50583
50584
50585
50586
50587
50588
50589
50590
50591
50592
50593
50594
50595
50596
50597
50598
50599
50600
50601
50602
50603
50604
50605
50606
50607
50608
50609
50610
50611
50612
50613
50614
50615
50616
50617
50618
50619
50620
50621
50622
50623
50624
50625
50626
50627
50628
50629
50630
50631
50632
50633
50634
50635
50636
50637
50638
50639
50640
50641
50642
50643
50644
50645
50646
50647
50648
50649
50650
50651
50652
50653
50654
50655
50656
50657
50658
50659
50660
50661
50662
50663
50664
50665
50666
50667
50668
50669
50670
50671
50672
50673
50674
50675
50676
50677
50678
50679
50680
50681
50682
50683
50684
50685
50686
50687
50688
50689
50690
50691
50692
50693
50694
50695
50696
50697
50698
50699
50700
50701
50702
50703
50704
50705
50706
50707
50708
50709
50710
50711
50712
50713
50714
50715
50716
50717
50718
50719
50720
50721
50722
50723
50724
50725
50726
50727
50728
50729
50730
50731
50732
50733
50734
50735
50736
50737
50738
50739
50740
50741
50742
50743
50744
50745
50746
50747
50748
50749
50750
50751
50752
50753
50754
50755
50756
50757
50758
50759
50760
50761
50762
50763
50764
50765
50766
50767
50768
50769
50770
50771
50772
50773
50774
50775
50776
50777
50778
50779
50780
50781
50782
50783
50784
50785
50786
50787
50788
50789
50790
50791
50792
50793
50794
50795
50796
50797
50798
50799
50800
50801
50802
50803
50804
50805
50806
50807
50808
50809
50810
50811
50812
50813
50814
50815
50816
50817
50818
50819
50820
50821
50822
50823
50824
50825
50826
50827
50828
50829
50830
50831
50832
50833
50834
50835
50836
50837
50838
50839
50840
50841
50842
50843
50844
50845
50846
50847
50848
50849
50850
50851
50852
50853
50854
50855
50856
50857
50858
50859
50860
50861
50862
50863
50864
50865
50866
50867
50868
50869
50870
50871
50872
50873
50874
50875
50876
50877
50878
50879
50880
50881
50882
50883
50884
50885
50886
50887
50888
50889
50890
50891
50892
50893
50894
50895
50896
50897
50898
50899
50900
50901
50902
50903
50904
50905
50906
50907
50908
50909
50910
50911
50912
50913
50914
50915
50916
50917
50918
50919
50920
50921
50922
50923
50924
50925
50926
50927
50928
50929
50930
50931
50932
50933
50934
50935
50936
50937
50938
50939
50940
50941
50942
50943
50944
50945
50946
50947
50948
50949
50950
50951
50952
50953
50954
50955
50956
50957
50958
50959
50960
50961
50962
50963
50964
50965
50966
50967
50968
50969
50970
50971
50972
50973
50974
50975
50976
50977
50978
50979
50980
50981
50982
50983
50984
50985
50986
50987
50988
50989
50990
50991
50992
50993
50994
50995
50996
50997
50998
50999
51000
51001
51002
51003
51004
51005
51006
51007
51008
51009
51010
51011
51012
51013
51014
51015
51016
51017
51018
51019
51020
51021
51022
51023
51024
51025
51026
51027
51028
51029
51030
51031
51032
51033
51034
51035
51036
51037
51038
51039
51040
51041
51042
51043
51044
51045
51046
51047
51048
51049
51050
51051
51052
51053
51054
51055
51056
51057
51058
51059
51060
51061
51062
51063
51064
51065
51066
51067
51068
51069
51070
51071
51072
51073
51074
51075
51076
51077
51078
51079
51080
51081
51082
51083
51084
51085
51086
51087
51088
51089
51090
51091
51092
51093
51094
51095
51096
51097
51098
51099
51100
51101
51102
51103
51104
51105
51106
51107
51108
51109
51110
51111
51112
51113
51114
51115
51116
51117
51118
51119
51120
51121
51122
51123
51124
51125
51126
51127
51128
51129
51130
51131
51132
51133
51134
51135
51136
51137
51138
51139
51140
51141
51142
51143
51144
51145
51146
51147
51148
51149
51150
51151
51152
51153
51154
51155
51156
51157
51158
51159
51160
51161
51162
51163
51164
51165
51166
51167
51168
51169
51170
51171
51172
51173
51174
51175
51176
51177
51178
51179
51180
51181
51182
51183
51184
51185
51186
51187
51188
51189
51190
51191
51192
51193
51194
51195
51196
51197
51198
51199
51200
51201
51202
51203
51204
51205
51206
51207
51208
51209
51210
51211
51212
51213
51214
51215
51216
51217
51218
51219
51220
51221
51222
51223
51224
51225
51226
51227
51228
51229
51230
51231
51232
51233
51234
51235
51236
51237
51238
51239
51240
51241
51242
51243
51244
51245
51246
51247
51248
51249
51250
51251
51252
51253
51254
51255
51256
51257
51258
51259
51260
51261
51262
51263
51264
51265
51266
51267
51268
51269
51270
51271
51272
51273
51274
51275
51276
51277
51278
51279
51280
51281
51282
51283
51284
51285
51286
51287
51288
51289
51290
51291
51292
51293
51294
51295
51296
51297
51298
51299
51300
51301
51302
51303
51304
51305
51306
51307
51308
51309
51310
51311
51312
51313
51314
51315
51316
51317
51318
51319
51320
51321
51322
51323
51324
51325
51326
51327
51328
51329
51330
51331
51332
51333
51334
51335
51336
51337
51338
51339
51340
51341
51342
51343
51344
51345
51346
51347
51348
51349
51350
51351
51352
51353
51354
51355
51356
51357
51358
51359
51360
51361
51362
51363
51364
51365
51366
51367
51368
51369
51370
51371
51372
51373
51374
51375
51376
51377
51378
51379
51380
51381
51382
51383
51384
51385
51386
51387
51388
51389
51390
51391
51392
51393
51394
51395
51396
51397
51398
51399
51400
51401
51402
51403
51404
51405
51406
51407
51408
51409
51410
51411
51412
51413
51414
51415
51416
51417
51418
51419
51420
51421
51422
51423
51424
51425
51426
51427
51428
51429
51430
51431
51432
51433
51434
51435
51436
51437
51438
51439
51440
51441
51442
51443
51444
51445
51446
51447
51448
51449
51450
51451
51452
51453
51454
51455
51456
51457
51458
51459
51460
51461
51462
51463
51464
51465
51466
51467
51468
51469
51470
51471
51472
51473
51474
51475
51476
51477
51478
51479
51480
51481
51482
51483
51484
51485
51486
51487
51488
51489
51490
51491
51492
51493
51494
51495
51496
51497
51498
51499
51500
51501
51502
51503
51504
51505
51506
51507
51508
51509
51510
51511
51512
51513
51514
51515
51516
51517
51518
51519
51520
51521
51522
51523
51524
51525
51526
51527
51528
51529
51530
51531
51532
51533
51534
51535
51536
51537
51538
51539
51540
51541
51542
51543
51544
51545
51546
51547
51548
51549
51550
51551
51552
51553
51554
51555
51556
51557
51558
51559
51560
51561
51562
51563
51564
51565
51566
51567
51568
51569
51570
51571
51572
51573
51574
51575
51576
51577
51578
51579
51580
51581
51582
51583
51584
51585
51586
51587
51588
51589
51590
51591
51592
51593
51594
51595
51596
51597
51598
51599
51600
51601
51602
51603
51604
51605
51606
51607
51608
51609
51610
51611
51612
51613
51614
51615
51616
51617
51618
51619
51620
51621
51622
51623
51624
51625
51626
51627
51628
51629
51630
51631
51632
51633
51634
51635
51636
51637
51638
51639
51640
51641
51642
51643
51644
51645
51646
51647
51648
51649
51650
51651
51652
51653
51654
51655
51656
51657
51658
51659
51660
51661
51662
51663
51664
51665
51666
51667
51668
51669
51670
51671
51672
51673
51674
51675
51676
51677
51678
51679
51680
51681
51682
51683
51684
51685
51686
51687
51688
51689
51690
51691
51692
51693
51694
51695
51696
51697
51698
51699
51700
51701
51702
51703
51704
51705
51706
51707
51708
51709
51710
51711
51712
51713
51714
51715
51716
51717
51718
51719
51720
51721
51722
51723
51724
51725
51726
51727
51728
51729
51730
51731
51732
51733
51734
51735
51736
51737
51738
51739
51740
51741
51742
51743
51744
51745
51746
51747
51748
51749
51750
51751
51752
51753
51754
51755
51756
51757
51758
51759
51760
51761
51762
51763
51764
51765
51766
51767
51768
51769
51770
51771
51772
51773
51774
51775
51776
51777
51778
51779
51780
51781
51782
51783
51784
51785
51786
51787
51788
51789
51790
51791
51792
51793
51794
51795
51796
51797
51798
51799
51800
51801
51802
51803
51804
51805
51806
51807
51808
51809
51810
51811
51812
51813
51814
51815
51816
51817
51818
51819
51820
51821
51822
51823
51824
51825
51826
51827
51828
51829
51830
51831
51832
51833
51834
51835
51836
51837
51838
51839
51840
51841
51842
51843
51844
51845
51846
51847
51848
51849
51850
51851
51852
51853
51854
51855
51856
51857
51858
51859
51860
51861
51862
51863
51864
51865
51866
51867
51868
51869
51870
51871
51872
51873
51874
51875
51876
51877
51878
51879
51880
51881
51882
51883
51884
51885
51886
51887
51888
51889
51890
51891
51892
51893
51894
51895
51896
51897
51898
51899
51900
51901
51902
51903
51904
51905
51906
51907
51908
51909
51910
51911
51912
51913
51914
51915
51916
51917
51918
51919
51920
51921
51922
51923
51924
51925
51926
51927
51928
51929
51930
51931
51932
51933
51934
51935
51936
51937
51938
51939
51940
51941
51942
51943
51944
51945
51946
51947
51948
51949
51950
51951
51952
51953
51954
51955
51956
51957
51958
51959
51960
51961
51962
51963
51964
51965
51966
51967
51968
51969
51970
51971
51972
51973
51974
51975
51976
51977
51978
51979
51980
51981
51982
51983
51984
51985
51986
51987
51988
51989
51990
51991
51992
51993
51994
51995
51996
51997
51998
51999
52000
52001
52002
52003
52004
52005
52006
52007
52008
52009
52010
52011
52012
52013
52014
52015
52016
52017
52018
52019
52020
52021
52022
52023
52024
52025
52026
52027
52028
52029
52030
52031
52032
52033
52034
52035
52036
52037
52038
52039
52040
52041
52042
52043
52044
52045
52046
52047
52048
52049
52050
52051
52052
52053
52054
52055
52056
52057
52058
52059
52060
52061
52062
52063
52064
52065
52066
52067
52068
52069
52070
52071
52072
52073
52074
52075
52076
52077
52078
52079
52080
52081
52082
52083
52084
52085
52086
52087
52088
52089
52090
52091
52092
52093
52094
52095
52096
52097
52098
52099
52100
52101
52102
52103
52104
52105
52106
52107
52108
52109
52110
52111
52112
52113
52114
52115
52116
52117
52118
52119
52120
52121
52122
52123
52124
52125
52126
52127
52128
52129
52130
52131
52132
52133
52134
52135
52136
52137
52138
52139
52140
52141
52142
52143
52144
52145
52146
52147
52148
52149
52150
52151
52152
52153
52154
52155
52156
52157
52158
52159
52160
52161
52162
52163
52164
52165
52166
52167
52168
52169
52170
52171
52172
52173
52174
52175
52176
52177
52178
52179
52180
52181
52182
52183
52184
52185
52186
52187
52188
52189
52190
52191
52192
52193
52194
52195
52196
52197
52198
52199
52200
52201
52202
52203
52204
52205
52206
52207
52208
52209
52210
52211
52212
52213
52214
52215
52216
52217
52218
52219
52220
52221
52222
52223
52224
52225
52226
52227
52228
52229
52230
52231
52232
52233
52234
52235
52236
52237
52238
52239
52240
52241
52242
52243
52244
52245
52246
52247
52248
52249
52250
52251
52252
52253
52254
52255
52256
52257
52258
52259
52260
52261
52262
52263
52264
52265
52266
52267
52268
52269
52270
52271
52272
52273
52274
52275
52276
52277
52278
52279
52280
52281
52282
52283
52284
52285
52286
52287
52288
52289
52290
52291
52292
52293
52294
52295
52296
52297
52298
52299
52300
52301
52302
52303
52304
52305
52306
52307
52308
52309
52310
52311
52312
52313
52314
52315
52316
52317
52318
52319
52320
52321
52322
52323
52324
52325
52326
52327
52328
52329
52330
52331
52332
52333
52334
52335
52336
52337
52338
52339
52340
52341
52342
52343
52344
52345
52346
52347
52348
52349
52350
52351
52352
52353
52354
52355
52356
52357
52358
52359
52360
52361
52362
52363
52364
52365
52366
52367
52368
52369
52370
52371
52372
52373
52374
52375
52376
52377
52378
52379
52380
52381
52382
52383
52384
52385
52386
52387
52388
52389
52390
52391
52392
52393
52394
52395
52396
52397
52398
52399
52400
52401
52402
52403
52404
52405
52406
52407
52408
52409
52410
52411
52412
52413
52414
52415
52416
52417
52418
52419
52420
52421
52422
52423
52424
52425
52426
52427
52428
52429
52430
52431
52432
52433
52434
52435
52436
52437
52438
52439
52440
52441
52442
52443
52444
52445
52446
52447
52448
52449
52450
52451
52452
52453
52454
52455
52456
52457
52458
52459
52460
52461
52462
52463
52464
52465
52466
52467
52468
52469
52470
52471
52472
52473
52474
52475
52476
52477
52478
52479
52480
52481
52482
52483
52484
52485
52486
52487
52488
52489
52490
52491
52492
52493
52494
52495
52496
52497
52498
52499
52500
52501
52502
52503
52504
52505
52506
52507
52508
52509
52510
52511
52512
52513
52514
52515
52516
52517
52518
52519
52520
52521
52522
52523
52524
52525
52526
52527
52528
52529
52530
52531
52532
52533
52534
52535
52536
52537
52538
52539
52540
52541
52542
52543
52544
52545
52546
52547
52548
52549
52550
52551
52552
52553
52554
52555
52556
52557
52558
52559
52560
52561
52562
52563
52564
52565
52566
52567
52568
52569
52570
52571
52572
52573
52574
52575
52576
52577
52578
52579
52580
52581
52582
52583
52584
52585
52586
52587
52588
52589
52590
52591
52592
52593
52594
52595
52596
52597
52598
52599
52600
52601
52602
52603
52604
52605
52606
52607
52608
52609
52610
52611
52612
52613
52614
52615
52616
52617
52618
52619
52620
52621
52622
52623
52624
52625
52626
52627
52628
52629
52630
52631
52632
52633
52634
52635
52636
52637
52638
52639
52640
52641
52642
52643
52644
52645
52646
52647
52648
52649
52650
52651
52652
52653
52654
52655
52656
52657
52658
52659
52660
52661
52662
52663
52664
52665
52666
52667
52668
52669
52670
52671
52672
52673
52674
52675
52676
52677
52678
52679
52680
52681
52682
52683
52684
52685
52686
52687
52688
52689
52690
52691
52692
52693
52694
52695
52696
52697
52698
52699
52700
52701
52702
52703
52704
52705
52706
52707
52708
52709
52710
52711
52712
52713
52714
52715
52716
52717
52718
52719
52720
52721
52722
52723
52724
52725
52726
52727
52728
52729
52730
52731
52732
52733
52734
52735
52736
52737
52738
52739
52740
52741
52742
52743
52744
52745
52746
52747
52748
52749
52750
52751
52752
52753
52754
52755
52756
52757
52758
52759
52760
52761
52762
52763
52764
52765
52766
52767
52768
52769
52770
52771
52772
52773
52774
52775
52776
52777
52778
52779
52780
52781
52782
52783
52784
52785
52786
52787
52788
52789
52790
52791
52792
52793
52794
52795
52796
52797
52798
52799
52800
52801
52802
52803
52804
52805
52806
52807
52808
52809
52810
52811
52812
52813
52814
52815
52816
52817
52818
52819
52820
52821
52822
52823
52824
52825
52826
52827
52828
52829
52830
52831
52832
52833
52834
52835
52836
52837
52838
52839
52840
52841
52842
52843
52844
52845
52846
52847
52848
52849
52850
52851
52852
52853
52854
52855
52856
52857
52858
52859
52860
52861
52862
52863
52864
52865
52866
52867
52868
52869
52870
52871
52872
52873
52874
52875
52876
52877
52878
52879
52880
52881
52882
52883
52884
52885
52886
52887
52888
52889
52890
52891
52892
52893
52894
52895
52896
52897
52898
52899
52900
52901
52902
52903
52904
52905
52906
52907
52908
52909
52910
52911
52912
52913
52914
52915
52916
52917
52918
52919
52920
52921
52922
52923
52924
52925
52926
52927
52928
52929
52930
52931
52932
52933
52934
52935
52936
52937
52938
52939
52940
52941
52942
52943
52944
52945
52946
52947
52948
52949
52950
52951
52952
52953
52954
52955
52956
52957
52958
52959
52960
52961
52962
52963
52964
52965
52966
52967
52968
52969
52970
52971
52972
52973
52974
52975
52976
52977
52978
52979
52980
52981
52982
52983
52984
52985
52986
52987
52988
52989
52990
52991
52992
52993
52994
52995
52996
52997
52998
52999
53000
53001
53002
53003
53004
53005
53006
53007
53008
53009
53010
53011
53012
53013
53014
53015
53016
53017
53018
53019
53020
53021
53022
53023
53024
53025
53026
53027
53028
53029
53030
53031
53032
53033
53034
53035
53036
53037
53038
53039
53040
53041
53042
53043
53044
53045
53046
53047
53048
53049
53050
53051
53052
53053
53054
53055
53056
53057
53058
53059
53060
53061
53062
53063
53064
53065
53066
53067
53068
53069
53070
53071
53072
53073
53074
53075
53076
53077
53078
53079
53080
53081
53082
53083
53084
53085
53086
53087
53088
53089
53090
53091
53092
53093
53094
53095
53096
53097
53098
53099
53100
53101
53102
53103
53104
53105
53106
53107
53108
53109
53110
53111
53112
53113
53114
53115
53116
53117
53118
53119
53120
53121
53122
53123
53124
53125
53126
53127
53128
53129
53130
53131
53132
53133
53134
53135
53136
53137
53138
53139
53140
53141
53142
53143
53144
53145
53146
53147
53148
53149
53150
53151
53152
53153
53154
53155
53156
53157
53158
53159
53160
53161
53162
53163
53164
53165
53166
53167
53168
53169
53170
53171
53172
53173
53174
53175
53176
53177
53178
53179
53180
53181
53182
53183
53184
53185
53186
53187
53188
53189
53190
53191
53192
53193
53194
53195
53196
53197
53198
53199
53200
53201
53202
53203
53204
53205
53206
53207
53208
53209
53210
53211
53212
53213
53214
53215
53216
53217
53218
53219
53220
53221
53222
53223
53224
53225
53226
53227
53228
53229
53230
53231
53232
53233
53234
53235
53236
53237
53238
53239
53240
53241
53242
53243
53244
53245
53246
53247
53248
53249
53250
53251
53252
53253
53254
53255
53256
53257
53258
53259
53260
53261
53262
53263
53264
53265
53266
53267
53268
53269
53270
53271
53272
53273
53274
53275
53276
53277
53278
53279
53280
53281
53282
53283
53284
53285
53286
53287
53288
53289
53290
53291
53292
53293
53294
53295
53296
53297
53298
53299
53300
53301
53302
53303
53304
53305
53306
53307
53308
53309
53310
53311
53312
53313
53314
53315
53316
53317
53318
53319
53320
53321
53322
53323
53324
53325
53326
53327
53328
53329
53330
53331
53332
53333
53334
53335
53336
53337
53338
53339
53340
53341
53342
53343
53344
53345
53346
53347
53348
53349
53350
53351
53352
53353
53354
53355
53356
53357
53358
53359
53360
53361
53362
53363
53364
53365
53366
53367
53368
53369
53370
53371
53372
53373
53374
53375
53376
53377
53378
53379
53380
53381
53382
53383
53384
53385
53386
53387
53388
53389
53390
53391
53392
53393
53394
53395
53396
53397
53398
53399
53400
53401
53402
53403
53404
53405
53406
53407
53408
53409
53410
53411
53412
53413
53414
53415
53416
53417
53418
53419
53420
53421
53422
53423
53424
53425
53426
53427
53428
53429
53430
53431
53432
53433
53434
53435
53436
53437
53438
53439
53440
53441
53442
53443
53444
53445
53446
53447
53448
53449
53450
53451
53452
53453
53454
53455
53456
53457
53458
53459
53460
53461
53462
53463
53464
53465
53466
53467
53468
53469
53470
53471
53472
53473
53474
53475
53476
53477
53478
53479
53480
53481
53482
53483
53484
53485
53486
53487
53488
53489
53490
53491
53492
53493
53494
53495
53496
53497
53498
53499
53500
53501
53502
53503
53504
53505
53506
53507
53508
53509
53510
53511
53512
53513
53514
53515
53516
53517
53518
53519
53520
53521
53522
53523
53524
53525
53526
53527
53528
53529
53530
53531
53532
53533
53534
53535
53536
53537
53538
53539
53540
53541
53542
53543
53544
53545
53546
53547
53548
53549
53550
53551
53552
53553
53554
53555
53556
53557
53558
53559
53560
53561
53562
53563
53564
53565
53566
53567
53568
53569
53570
53571
53572
53573
53574
53575
53576
53577
53578
53579
53580
53581
53582
53583
53584
53585
53586
53587
53588
53589
53590
53591
53592
53593
53594
53595
53596
53597
53598
53599
53600
53601
53602
53603
53604
53605
53606
53607
53608
53609
53610
53611
53612
53613
53614
53615
53616
53617
53618
53619
53620
53621
53622
53623
53624
53625
53626
53627
53628
53629
53630
53631
53632
53633
53634
53635
53636
53637
53638
53639
53640
53641
53642
53643
53644
53645
53646
53647
53648
53649
53650
53651
53652
53653
53654
53655
53656
53657
53658
53659
53660
53661
53662
53663
53664
53665
53666
53667
53668
53669
53670
53671
53672
53673
53674
53675
53676
53677
53678
53679
53680
53681
53682
53683
53684
53685
53686
53687
53688
53689
53690
53691
53692
53693
53694
53695
53696
53697
53698
53699
53700
53701
53702
53703
53704
53705
53706
53707
53708
53709
53710
53711
53712
53713
53714
53715
53716
53717
53718
53719
53720
53721
53722
53723
53724
53725
53726
53727
53728
53729
53730
53731
53732
53733
53734
53735
53736
53737
53738
53739
53740
53741
53742
53743
53744
53745
53746
53747
53748
53749
53750
53751
53752
53753
53754
53755
53756
53757
53758
53759
53760
53761
53762
53763
53764
53765
53766
53767
53768
53769
53770
53771
53772
53773
53774
53775
53776
53777
53778
53779
53780
53781
53782
53783
53784
53785
53786
53787
53788
53789
53790
53791
53792
53793
53794
53795
53796
53797
53798
53799
53800
53801
53802
53803
53804
53805
53806
53807
53808
53809
53810
53811
53812
53813
53814
53815
53816
53817
53818
53819
53820
53821
53822
53823
53824
53825
53826
53827
53828
53829
53830
53831
53832
53833
53834
53835
53836
53837
53838
53839
53840
53841
53842
53843
53844
53845
53846
53847
53848
53849
53850
53851
53852
53853
53854
53855
53856
53857
53858
53859
53860
53861
53862
53863
53864
53865
53866
53867
53868
53869
53870
53871
53872
53873
53874
53875
53876
53877
53878
53879
53880
53881
53882
53883
53884
53885
53886
53887
53888
53889
53890
53891
53892
53893
53894
53895
53896
53897
53898
53899
53900
53901
53902
53903
53904
53905
53906
53907
53908
53909
53910
53911
53912
53913
53914
53915
53916
53917
53918
53919
53920
53921
53922
53923
53924
53925
53926
53927
53928
53929
53930
53931
53932
53933
53934
53935
53936
53937
53938
53939
53940
53941
53942
53943
53944
53945
53946
53947
53948
53949
53950
53951
53952
53953
53954
53955
53956
53957
53958
53959
53960
53961
53962
53963
53964
53965
53966
53967
53968
53969
53970
53971
53972
53973
53974
53975
53976
53977
53978
53979
53980
53981
53982
53983
53984
53985
53986
53987
53988
53989
53990
53991
53992
53993
53994
53995
53996
53997
53998
53999
54000
54001
54002
54003
54004
54005
54006
54007
54008
54009
54010
54011
54012
54013
54014
54015
54016
54017
54018
54019
54020
54021
54022
54023
54024
54025
54026
54027
54028
54029
54030
54031
54032
54033
54034
54035
54036
54037
54038
54039
54040
54041
54042
54043
54044
54045
54046
54047
54048
54049
54050
54051
54052
54053
54054
54055
54056
54057
54058
54059
54060
54061
54062
54063
54064
54065
54066
54067
54068
54069
54070
54071
54072
54073
54074
54075
54076
54077
54078
54079
54080
54081
54082
54083
54084
54085
54086
54087
54088
54089
54090
54091
54092
54093
54094
54095
54096
54097
54098
54099
54100
54101
54102
54103
54104
54105
54106
54107
54108
54109
54110
54111
54112
54113
54114
54115
54116
54117
54118
54119
54120
54121
54122
54123
54124
54125
54126
54127
54128
54129
54130
54131
54132
54133
54134
54135
54136
54137
54138
54139
54140
54141
54142
54143
54144
54145
54146
54147
54148
54149
54150
54151
54152
54153
54154
54155
54156
54157
54158
54159
54160
54161
54162
54163
54164
54165
54166
54167
54168
54169
54170
54171
54172
54173
54174
54175
54176
54177
54178
54179
54180
54181
54182
54183
54184
54185
54186
54187
54188
54189
54190
54191
54192
54193
54194
54195
54196
54197
54198
54199
54200
54201
54202
54203
54204
54205
54206
54207
54208
54209
54210
54211
54212
54213
54214
54215
54216
54217
54218
54219
54220
54221
54222
54223
54224
54225
54226
54227
54228
54229
54230
54231
54232
54233
54234
54235
54236
54237
54238
54239
54240
54241
54242
54243
54244
54245
54246
54247
54248
54249
54250
54251
54252
54253
54254
54255
54256
54257
54258
54259
54260
54261
54262
54263
54264
54265
54266
54267
54268
54269
54270
54271
54272
54273
54274
54275
54276
54277
54278
54279
54280
54281
54282
54283
54284
54285
54286
54287
54288
54289
54290
54291
54292
54293
54294
54295
54296
54297
54298
54299
54300
54301
54302
54303
54304
54305
54306
54307
54308
54309
54310
54311
54312
54313
54314
54315
54316
54317
54318
54319
54320
54321
54322
54323
54324
54325
54326
54327
54328
54329
54330
54331
54332
54333
54334
54335
54336
54337
54338
54339
54340
54341
54342
54343
54344
54345
54346
54347
54348
54349
54350
54351
54352
54353
54354
54355
54356
54357
54358
54359
54360
54361
54362
54363
54364
54365
54366
54367
54368
54369
54370
54371
54372
54373
54374
54375
54376
54377
54378
54379
54380
54381
54382
54383
54384
54385
54386
54387
54388
54389
54390
54391
54392
54393
54394
54395
54396
54397
54398
54399
54400
54401
54402
54403
54404
54405
54406
54407
54408
54409
54410
54411
54412
54413
54414
54415
54416
54417
54418
54419
54420
54421
54422
54423
54424
54425
54426
54427
54428
54429
54430
54431
54432
54433
54434
54435
54436
54437
54438
54439
54440
54441
54442
54443
54444
54445
54446
54447
54448
54449
54450
54451
54452
54453
54454
54455
54456
54457
54458
54459
54460
54461
54462
54463
54464
54465
54466
54467
54468
54469
54470
54471
54472
54473
54474
54475
54476
54477
54478
54479
54480
54481
54482
54483
54484
54485
54486
54487
54488
54489
54490
54491
54492
54493
54494
54495
54496
54497
54498
54499
54500
54501
54502
54503
54504
54505
54506
54507
54508
54509
54510
54511
54512
54513
54514
54515
54516
54517
54518
54519
54520
54521
54522
54523
54524
54525
54526
54527
54528
54529
54530
54531
54532
54533
54534
54535
54536
54537
54538
54539
54540
54541
54542
54543
54544
54545
54546
54547
54548
54549
54550
54551
54552
54553
54554
54555
54556
54557
54558
54559
54560
54561
54562
54563
54564
54565
54566
54567
54568
54569
54570
54571
54572
54573
54574
54575
54576
54577
54578
54579
54580
54581
54582
54583
54584
54585
54586
54587
54588
54589
54590
54591
54592
54593
54594
54595
54596
54597
54598
54599
54600
54601
54602
54603
54604
54605
54606
54607
54608
54609
54610
54611
54612
54613
54614
54615
54616
54617
54618
54619
54620
54621
54622
54623
54624
54625
54626
54627
54628
54629
54630
54631
54632
54633
54634
54635
54636
54637
54638
54639
54640
54641
54642
54643
54644
54645
54646
54647
54648
54649
54650
54651
54652
54653
54654
54655
54656
54657
54658
54659
54660
54661
54662
54663
54664
54665
54666
54667
54668
54669
54670
54671
54672
54673
54674
54675
54676
54677
54678
54679
54680
54681
54682
54683
54684
54685
54686
54687
54688
54689
54690
54691
54692
54693
54694
54695
54696
54697
54698
54699
54700
54701
54702
54703
54704
54705
54706
54707
54708
54709
54710
54711
54712
54713
54714
54715
54716
54717
54718
54719
54720
54721
54722
54723
54724
54725
54726
54727
54728
54729
54730
54731
54732
54733
54734
54735
54736
54737
54738
54739
54740
54741
54742
54743
54744
54745
54746
54747
54748
54749
54750
54751
54752
54753
54754
54755
54756
54757
54758
54759
54760
54761
54762
54763
54764
54765
54766
54767
54768
54769
54770
54771
54772
54773
54774
54775
54776
54777
54778
54779
54780
54781
54782
54783
54784
54785
54786
54787
54788
54789
54790
54791
54792
54793
54794
54795
54796
54797
54798
54799
54800
54801
54802
54803
54804
54805
54806
54807
54808
54809
54810
54811
54812
54813
54814
54815
54816
54817
54818
54819
54820
54821
54822
54823
54824
54825
54826
54827
54828
54829
54830
54831
54832
54833
54834
54835
54836
54837
54838
54839
54840
54841
54842
54843
54844
54845
54846
54847
54848
54849
54850
54851
54852
54853
54854
54855
54856
54857
54858
54859
54860
54861
54862
54863
54864
54865
54866
54867
54868
54869
54870
54871
54872
54873
54874
54875
54876
54877
54878
54879
54880
54881
54882
54883
54884
54885
54886
54887
54888
54889
54890
54891
54892
54893
54894
54895
54896
54897
54898
54899
54900
54901
54902
54903
54904
54905
54906
54907
54908
54909
54910
54911
54912
54913
54914
54915
54916
54917
54918
54919
54920
54921
54922
54923
54924
54925
54926
54927
54928
54929
54930
54931
54932
54933
54934
54935
54936
54937
54938
54939
54940
54941
54942
54943
54944
54945
54946
54947
54948
54949
54950
54951
54952
54953
54954
54955
54956
54957
54958
54959
54960
54961
54962
54963
54964
54965
54966
54967
54968
54969
54970
54971
54972
54973
54974
54975
54976
54977
54978
54979
54980
54981
54982
54983
54984
54985
54986
54987
54988
54989
54990
54991
54992
54993
54994
54995
54996
54997
54998
54999
55000
55001
55002
55003
55004
55005
55006
55007
55008
55009
55010
55011
55012
55013
55014
55015
55016
55017
55018
55019
55020
55021
55022
55023
55024
55025
55026
55027
55028
55029
55030
55031
55032
55033
55034
55035
55036
55037
55038
55039
55040
55041
55042
55043
55044
55045
55046
55047
55048
55049
55050
55051
55052
55053
55054
55055
55056
55057
55058
55059
55060
55061
55062
55063
55064
55065
55066
55067
55068
55069
55070
55071
55072
55073
55074
55075
55076
55077
55078
55079
55080
55081
55082
55083
55084
55085
55086
55087
55088
55089
55090
55091
55092
55093
55094
55095
55096
55097
55098
55099
55100
55101
55102
55103
55104
55105
55106
55107
55108
55109
55110
55111
55112
55113
55114
55115
55116
55117
55118
55119
55120
55121
55122
55123
55124
55125
55126
55127
55128
55129
55130
55131
55132
55133
55134
55135
55136
55137
55138
55139
55140
55141
55142
55143
55144
55145
55146
55147
55148
55149
55150
55151
55152
55153
55154
55155
55156
55157
55158
55159
55160
55161
55162
55163
55164
55165
55166
55167
55168
55169
55170
55171
55172
55173
55174
55175
55176
55177
55178
55179
55180
55181
55182
55183
55184
55185
55186
55187
55188
55189
55190
55191
55192
55193
55194
55195
55196
55197
55198
55199
55200
55201
55202
55203
55204
55205
55206
55207
55208
55209
55210
55211
55212
55213
55214
55215
55216
55217
55218
55219
55220
55221
55222
55223
55224
55225
55226
55227
55228
55229
55230
55231
55232
55233
55234
55235
55236
55237
55238
55239
55240
55241
55242
55243
55244
55245
55246
55247
55248
55249
55250
55251
55252
55253
55254
55255
55256
55257
55258
55259
55260
55261
55262
55263
55264
55265
55266
55267
55268
55269
55270
55271
55272
55273
55274
55275
55276
55277
55278
55279
55280
55281
55282
55283
55284
55285
55286
55287
55288
55289
55290
55291
55292
55293
55294
55295
55296
55297
55298
55299
55300
55301
55302
55303
55304
55305
55306
55307
55308
55309
55310
55311
55312
55313
55314
55315
55316
55317
55318
55319
55320
55321
55322
55323
55324
55325
55326
55327
55328
55329
55330
55331
55332
55333
55334
55335
55336
55337
55338
55339
55340
55341
55342
55343
55344
55345
55346
55347
55348
55349
55350
55351
55352
55353
55354
55355
55356
55357
55358
55359
55360
55361
55362
55363
55364
55365
55366
55367
55368
55369
55370
55371
55372
55373
55374
55375
55376
55377
55378
55379
55380
55381
55382
55383
55384
55385
55386
55387
55388
55389
55390
55391
55392
55393
55394
55395
55396
55397
55398
55399
55400
55401
55402
55403
55404
55405
55406
55407
55408
55409
55410
55411
55412
55413
55414
55415
55416
55417
55418
55419
55420
55421
55422
55423
55424
55425
55426
55427
55428
55429
55430
55431
55432
55433
55434
55435
55436
55437
55438
55439
55440
55441
55442
55443
55444
55445
55446
55447
55448
55449
55450
55451
55452
55453
55454
55455
55456
55457
55458
55459
55460
55461
55462
55463
55464
55465
55466
55467
55468
55469
55470
55471
55472
55473
55474
55475
55476
55477
55478
55479
55480
55481
55482
55483
55484
55485
55486
55487
55488
55489
55490
55491
55492
55493
55494
55495
55496
55497
55498
55499
55500
55501
55502
55503
55504
55505
55506
55507
55508
55509
55510
55511
55512
55513
55514
55515
55516
55517
55518
55519
55520
55521
55522
55523
55524
55525
55526
55527
55528
55529
55530
55531
55532
55533
55534
55535
55536
55537
55538
55539
55540
55541
55542
55543
55544
55545
55546
55547
55548
55549
55550
55551
55552
55553
55554
55555
55556
55557
55558
55559
55560
55561
55562
55563
55564
55565
55566
55567
55568
55569
55570
55571
55572
55573
55574
55575
55576
55577
55578
55579
55580
55581
55582
55583
55584
55585
55586
55587
55588
55589
55590
55591
55592
55593
55594
55595
55596
55597
55598
55599
55600
55601
55602
55603
55604
55605
55606
55607
55608
55609
55610
55611
55612
55613
55614
55615
55616
55617
55618
55619
55620
55621
55622
55623
55624
55625
55626
55627
55628
55629
55630
55631
55632
55633
55634
55635
55636
55637
55638
55639
55640
55641
55642
55643
55644
55645
55646
55647
55648
55649
55650
55651
55652
55653
55654
55655
55656
55657
55658
55659
55660
55661
55662
55663
55664
55665
55666
55667
55668
55669
55670
55671
55672
55673
55674
55675
55676
55677
55678
55679
55680
55681
55682
55683
55684
55685
55686
55687
55688
55689
55690
55691
55692
55693
55694
55695
55696
55697
55698
55699
55700
55701
55702
55703
55704
55705
55706
55707
55708
55709
55710
55711
55712
55713
55714
55715
55716
55717
55718
55719
55720
55721
55722
55723
55724
55725
55726
55727
55728
55729
55730
55731
55732
55733
55734
55735
55736
55737
55738
55739
55740
55741
55742
55743
55744
55745
55746
55747
55748
55749
55750
55751
55752
55753
55754
55755
55756
55757
55758
55759
55760
55761
55762
55763
55764
55765
55766
55767
55768
55769
55770
55771
55772
55773
55774
55775
55776
55777
55778
55779
55780
55781
55782
55783
55784
55785
55786
55787
55788
55789
55790
55791
55792
55793
55794
55795
55796
55797
55798
55799
55800
55801
55802
55803
55804
55805
55806
55807
55808
55809
55810
55811
55812
55813
55814
55815
55816
55817
55818
55819
55820
55821
55822
55823
55824
55825
55826
55827
55828
55829
55830
55831
55832
55833
55834
55835
55836
55837
55838
55839
55840
55841
55842
55843
55844
55845
55846
55847
55848
55849
55850
55851
55852
55853
55854
55855
55856
55857
55858
55859
55860
55861
55862
55863
55864
55865
55866
55867
55868
55869
55870
55871
55872
55873
55874
55875
55876
55877
55878
55879
55880
55881
55882
55883
55884
55885
55886
55887
55888
55889
55890
55891
55892
55893
55894
55895
55896
55897
55898
55899
55900
55901
55902
55903
55904
55905
55906
55907
55908
55909
55910
55911
55912
55913
55914
55915
55916
55917
55918
55919
55920
55921
55922
55923
55924
55925
55926
55927
55928
55929
55930
55931
55932
55933
55934
55935
55936
55937
55938
55939
55940
55941
55942
55943
55944
55945
55946
55947
55948
55949
55950
55951
55952
55953
55954
55955
55956
55957
55958
55959
55960
55961
55962
55963
55964
55965
55966
55967
55968
55969
55970
55971
55972
55973
55974
55975
55976
55977
55978
55979
55980
55981
55982
55983
55984
55985
55986
55987
55988
55989
55990
55991
55992
55993
55994
55995
55996
55997
55998
55999
56000
56001
56002
56003
56004
56005
56006
56007
56008
56009
56010
56011
56012
56013
56014
56015
56016
56017
56018
56019
56020
56021
56022
56023
56024
56025
56026
56027
56028
56029
56030
56031
56032
56033
56034
56035
56036
56037
56038
56039
56040
56041
56042
56043
56044
56045
56046
56047
56048
56049
56050
56051
56052
56053
56054
56055
56056
56057
56058
56059
56060
56061
56062
56063
56064
56065
56066
56067
56068
56069
56070
56071
56072
56073
56074
56075
56076
56077
56078
56079
56080
56081
56082
56083
56084
56085
56086
56087
56088
56089
56090
56091
56092
56093
56094
56095
56096
56097
56098
56099
56100
56101
56102
56103
56104
56105
56106
56107
56108
56109
56110
56111
56112
56113
56114
56115
56116
56117
56118
56119
56120
56121
56122
56123
56124
56125
56126
56127
56128
56129
56130
56131
56132
56133
56134
56135
56136
56137
56138
56139
56140
56141
56142
56143
56144
56145
56146
56147
56148
56149
56150
56151
56152
56153
56154
56155
56156
56157
56158
56159
56160
56161
56162
56163
56164
56165
56166
56167
56168
56169
56170
56171
56172
56173
56174
56175
56176
56177
56178
56179
56180
56181
56182
56183
56184
56185
56186
56187
56188
56189
56190
56191
56192
56193
56194
56195
56196
56197
56198
56199
56200
56201
56202
56203
56204
56205
56206
56207
56208
56209
56210
56211
56212
56213
56214
56215
56216
56217
56218
56219
56220
56221
56222
56223
56224
56225
56226
56227
56228
56229
56230
56231
56232
56233
56234
56235
56236
56237
56238
56239
56240
56241
56242
56243
56244
56245
56246
56247
56248
56249
56250
56251
56252
56253
56254
56255
56256
56257
56258
56259
56260
56261
56262
56263
56264
56265
56266
56267
56268
56269
56270
56271
56272
56273
56274
56275
56276
56277
56278
56279
56280
56281
56282
56283
56284
56285
56286
56287
56288
56289
56290
56291
56292
56293
56294
56295
56296
56297
56298
56299
56300
56301
56302
56303
56304
56305
56306
56307
56308
56309
56310
56311
56312
56313
56314
56315
56316
56317
56318
56319
56320
56321
56322
56323
56324
56325
56326
56327
56328
56329
56330
56331
56332
56333
56334
56335
56336
56337
56338
56339
56340
56341
56342
56343
56344
56345
56346
56347
56348
56349
56350
56351
56352
56353
56354
56355
56356
56357
56358
56359
56360
56361
56362
56363
56364
56365
56366
56367
56368
56369
56370
56371
56372
56373
56374
56375
56376
56377
56378
56379
56380
56381
56382
56383
56384
56385
56386
56387
56388
56389
56390
56391
56392
56393
56394
56395
56396
56397
56398
56399
56400
56401
56402
56403
56404
56405
56406
56407
56408
56409
56410
56411
56412
56413
56414
56415
56416
56417
56418
56419
56420
56421
56422
56423
56424
56425
56426
56427
56428
56429
56430
56431
56432
56433
56434
56435
56436
56437
56438
56439
56440
56441
56442
56443
56444
56445
56446
56447
56448
56449
56450
56451
56452
56453
56454
56455
56456
56457
56458
56459
56460
56461
56462
56463
56464
56465
56466
56467
56468
56469
56470
56471
56472
56473
56474
56475
56476
56477
56478
56479
56480
56481
56482
56483
56484
56485
56486
56487
56488
56489
56490
56491
56492
56493
56494
56495
56496
56497
56498
56499
56500
56501
56502
56503
56504
56505
56506
56507
56508
56509
56510
56511
56512
56513
56514
56515
56516
56517
56518
56519
56520
56521
56522
56523
56524
56525
56526
56527
56528
56529
56530
56531
56532
56533
56534
56535
56536
56537
56538
56539
56540
56541
56542
56543
56544
56545
56546
56547
56548
56549
56550
56551
56552
56553
56554
56555
56556
56557
56558
56559
56560
56561
56562
56563
56564
56565
56566
56567
56568
56569
56570
56571
56572
56573
56574
56575
56576
56577
56578
56579
56580
56581
56582
56583
56584
56585
56586
56587
56588
56589
56590
56591
56592
56593
56594
56595
56596
56597
56598
56599
56600
56601
56602
56603
56604
56605
56606
56607
56608
56609
56610
56611
56612
56613
56614
56615
56616
56617
56618
56619
56620
56621
56622
56623
56624
56625
56626
56627
56628
56629
56630
56631
56632
56633
56634
56635
56636
56637
56638
56639
56640
56641
56642
56643
56644
56645
56646
56647
56648
56649
56650
56651
56652
56653
56654
56655
56656
56657
56658
56659
56660
56661
56662
56663
56664
56665
56666
56667
56668
56669
56670
56671
56672
56673
56674
56675
56676
56677
56678
56679
56680
56681
56682
56683
56684
56685
56686
56687
56688
56689
56690
56691
56692
56693
56694
56695
56696
56697
56698
56699
56700
56701
56702
56703
56704
56705
56706
56707
56708
56709
56710
56711
56712
56713
56714
56715
56716
56717
56718
56719
56720
56721
56722
56723
56724
56725
56726
56727
56728
56729
56730
56731
56732
56733
56734
56735
56736
56737
56738
56739
56740
56741
56742
56743
56744
56745
56746
56747
56748
56749
56750
56751
56752
56753
56754
56755
56756
56757
56758
56759
56760
56761
56762
56763
56764
56765
56766
56767
56768
56769
56770
56771
56772
56773
56774
56775
56776
56777
56778
56779
56780
56781
56782
56783
56784
56785
56786
56787
56788
56789
56790
56791
56792
56793
56794
56795
56796
56797
56798
56799
56800
56801
56802
56803
56804
56805
56806
56807
56808
56809
56810
56811
56812
56813
56814
56815
56816
56817
56818
56819
56820
56821
56822
56823
56824
56825
56826
56827
56828
56829
56830
56831
56832
56833
56834
56835
56836
56837
56838
56839
56840
56841
56842
56843
56844
56845
56846
56847
56848
56849
56850
56851
56852
56853
56854
56855
56856
56857
56858
56859
56860
56861
56862
56863
56864
56865
56866
56867
56868
56869
56870
56871
56872
56873
56874
56875
56876
56877
56878
56879
56880
56881
56882
56883
56884
56885
56886
56887
56888
56889
56890
56891
56892
56893
56894
56895
56896
56897
56898
56899
56900
56901
56902
56903
56904
56905
56906
56907
56908
56909
56910
56911
56912
56913
56914
56915
56916
56917
56918
56919
56920
56921
56922
56923
56924
56925
56926
56927
56928
56929
56930
56931
56932
56933
56934
56935
56936
56937
56938
56939
56940
56941
56942
56943
56944
56945
56946
56947
56948
56949
56950
56951
56952
56953
56954
56955
56956
56957
56958
56959
56960
56961
56962
56963
56964
56965
56966
56967
56968
56969
56970
56971
56972
56973
56974
56975
56976
56977
56978
56979
56980
56981
56982
56983
56984
56985
56986
56987
56988
56989
56990
56991
56992
56993
56994
56995
56996
56997
56998
56999
57000
57001
57002
57003
57004
57005
57006
57007
57008
57009
57010
57011
57012
57013
57014
57015
57016
57017
57018
57019
57020
57021
57022
57023
57024
57025
57026
57027
57028
57029
57030
57031
57032
57033
57034
57035
57036
57037
57038
57039
57040
57041
57042
57043
57044
57045
57046
57047
57048
57049
57050
57051
57052
57053
57054
57055
57056
57057
57058
57059
57060
57061
57062
57063
57064
57065
57066
57067
57068
57069
57070
57071
57072
57073
57074
57075
57076
57077
57078
57079
57080
57081
57082
57083
57084
57085
57086
57087
57088
57089
57090
57091
57092
57093
57094
57095
57096
57097
57098
57099
57100
57101
57102
57103
57104
57105
57106
57107
57108
57109
57110
57111
57112
57113
57114
57115
57116
57117
57118
57119
57120
57121
57122
57123
57124
57125
57126
57127
57128
57129
57130
57131
57132
57133
57134
57135
57136
57137
57138
57139
57140
57141
57142
57143
57144
57145
57146
57147
57148
57149
57150
57151
57152
57153
57154
57155
57156
57157
57158
57159
57160
57161
57162
57163
57164
57165
57166
57167
57168
57169
57170
57171
57172
57173
57174
57175
57176
57177
57178
57179
57180
57181
57182
57183
57184
57185
57186
57187
57188
57189
57190
57191
57192
57193
57194
57195
57196
57197
57198
57199
57200
57201
57202
57203
57204
57205
57206
57207
57208
57209
57210
57211
57212
57213
57214
57215
57216
57217
57218
57219
57220
57221
57222
57223
57224
57225
57226
57227
57228
57229
57230
57231
57232
57233
57234
57235
57236
57237
57238
57239
57240
57241
57242
57243
57244
57245
57246
57247
57248
57249
57250
57251
57252
57253
57254
57255
57256
57257
57258
57259
57260
57261
57262
57263
57264
57265
57266
57267
57268
57269
57270
57271
57272
57273
57274
57275
57276
57277
57278
57279
57280
57281
57282
57283
57284
57285
57286
57287
57288
57289
57290
57291
57292
57293
57294
57295
57296
57297
57298
57299
57300
57301
57302
57303
57304
57305
57306
57307
57308
57309
57310
57311
57312
57313
57314
57315
57316
57317
57318
57319
57320
57321
57322
57323
57324
57325
57326
57327
57328
57329
57330
57331
57332
57333
57334
57335
57336
57337
57338
57339
57340
57341
57342
57343
57344
57345
57346
57347
57348
57349
57350
57351
57352
57353
57354
57355
57356
57357
57358
57359
57360
57361
57362
57363
57364
57365
57366
57367
57368
57369
57370
57371
57372
57373
57374
57375
57376
57377
57378
57379
57380
57381
57382
57383
57384
57385
57386
57387
57388
57389
57390
57391
57392
57393
57394
57395
57396
57397
57398
57399
57400
57401
57402
57403
57404
57405
57406
57407
57408
57409
57410
57411
57412
57413
57414
57415
57416
57417
57418
57419
57420
57421
57422
57423
57424
57425
57426
57427
57428
57429
57430
57431
57432
57433
57434
57435
57436
57437
57438
57439
57440
57441
57442
57443
57444
57445
57446
57447
57448
57449
57450
57451
57452
57453
57454
57455
57456
57457
57458
57459
57460
57461
57462
57463
57464
57465
57466
57467
57468
57469
57470
57471
57472
57473
57474
57475
57476
57477
57478
57479
57480
57481
57482
57483
57484
57485
57486
57487
57488
57489
57490
57491
57492
57493
57494
57495
57496
57497
57498
57499
57500
57501
57502
57503
57504
57505
57506
57507
57508
57509
57510
57511
57512
57513
57514
57515
57516
57517
57518
57519
57520
57521
57522
57523
57524
57525
57526
57527
57528
57529
57530
57531
57532
57533
57534
57535
57536
57537
57538
57539
57540
57541
57542
57543
57544
57545
57546
57547
57548
57549
57550
57551
57552
57553
57554
57555
57556
57557
57558
57559
57560
57561
57562
57563
57564
57565
57566
57567
57568
57569
57570
57571
57572
57573
57574
57575
57576
57577
57578
57579
57580
57581
57582
57583
57584
57585
57586
57587
57588
57589
57590
57591
57592
57593
57594
57595
57596
57597
57598
57599
57600
57601
57602
57603
57604
57605
57606
57607
57608
57609
57610
57611
57612
57613
57614
57615
57616
57617
57618
57619
57620
57621
57622
57623
57624
57625
57626
57627
57628
57629
57630
57631
57632
57633
57634
57635
57636
57637
57638
57639
57640
57641
57642
57643
57644
57645
57646
57647
57648
57649
57650
57651
57652
57653
57654
57655
57656
57657
57658
57659
57660
57661
57662
57663
57664
57665
57666
57667
57668
57669
57670
57671
57672
57673
57674
57675
57676
57677
57678
57679
57680
57681
57682
57683
57684
57685
57686
57687
57688
57689
57690
57691
57692
57693
57694
57695
57696
57697
57698
57699
57700
57701
57702
57703
57704
57705
57706
57707
57708
57709
57710
57711
57712
57713
57714
57715
57716
57717
57718
57719
57720
57721
57722
57723
57724
57725
57726
57727
57728
57729
57730
57731
57732
57733
57734
57735
57736
57737
57738
57739
57740
57741
57742
57743
57744
57745
57746
57747
57748
57749
57750
57751
57752
57753
57754
57755
57756
57757
57758
57759
57760
57761
57762
57763
57764
57765
57766
57767
57768
57769
57770
57771
57772
57773
57774
57775
57776
57777
57778
57779
57780
57781
57782
57783
57784
57785
57786
57787
57788
57789
57790
57791
57792
57793
57794
57795
57796
57797
57798
57799
57800
57801
57802
57803
57804
57805
57806
57807
57808
57809
57810
57811
57812
57813
57814
57815
57816
57817
57818
57819
57820
57821
57822
57823
57824
57825
57826
57827
57828
57829
57830
57831
57832
57833
57834
57835
57836
57837
57838
57839
57840
57841
57842
57843
57844
57845
57846
57847
57848
57849
57850
57851
57852
57853
57854
57855
57856
57857
57858
57859
57860
57861
57862
57863
57864
57865
57866
57867
57868
57869
57870
57871
57872
57873
57874
57875
57876
57877
57878
57879
57880
57881
57882
57883
57884
57885
57886
57887
57888
57889
57890
57891
57892
57893
57894
57895
57896
57897
57898
57899
57900
57901
57902
57903
57904
57905
57906
57907
57908
57909
57910
57911
57912
57913
57914
57915
57916
57917
57918
57919
57920
57921
57922
57923
57924
57925
57926
57927
57928
57929
57930
57931
57932
57933
57934
57935
57936
57937
57938
57939
57940
57941
57942
57943
57944
57945
57946
57947
57948
57949
57950
57951
57952
57953
57954
57955
57956
57957
57958
57959
57960
57961
57962
57963
57964
57965
57966
57967
57968
57969
57970
57971
57972
57973
57974
57975
57976
57977
57978
57979
57980
57981
57982
57983
57984
57985
57986
57987
57988
57989
57990
57991
57992
57993
57994
57995
57996
57997
57998
57999
58000
58001
58002
58003
58004
58005
58006
58007
58008
58009
58010
58011
58012
58013
58014
58015
58016
58017
58018
58019
58020
58021
58022
58023
58024
58025
58026
58027
58028
58029
58030
58031
58032
58033
58034
58035
58036
58037
58038
58039
58040
58041
58042
58043
58044
58045
58046
58047
58048
58049
58050
58051
58052
58053
58054
58055
58056
58057
58058
58059
58060
58061
58062
58063
58064
58065
58066
58067
58068
58069
58070
58071
58072
58073
58074
58075
58076
58077
58078
58079
58080
58081
58082
58083
58084
58085
58086
58087
58088
58089
58090
58091
58092
58093
58094
58095
58096
58097
58098
58099
58100
58101
58102
58103
58104
58105
58106
58107
58108
58109
58110
58111
58112
58113
58114
58115
58116
58117
58118
58119
58120
58121
58122
58123
58124
58125
58126
58127
58128
58129
58130
58131
58132
58133
58134
58135
58136
58137
58138
58139
58140
58141
58142
58143
58144
58145
58146
58147
58148
58149
58150
58151
58152
58153
58154
58155
58156
58157
58158
58159
58160
58161
58162
58163
58164
58165
58166
58167
58168
58169
58170
58171
58172
58173
58174
58175
58176
58177
58178
58179
58180
58181
58182
58183
58184
58185
58186
58187
58188
58189
58190
58191
58192
58193
58194
58195
58196
58197
58198
58199
58200
58201
58202
58203
58204
58205
58206
58207
58208
58209
58210
58211
58212
58213
58214
58215
58216
58217
58218
58219
58220
58221
58222
58223
58224
58225
58226
58227
58228
58229
58230
58231
58232
58233
58234
58235
58236
58237
58238
58239
58240
58241
58242
58243
58244
58245
58246
58247
58248
58249
58250
58251
58252
58253
58254
58255
58256
58257
58258
58259
58260
58261
58262
58263
58264
58265
58266
58267
58268
58269
58270
58271
58272
58273
58274
58275
58276
58277
58278
58279
58280
58281
58282
58283
58284
58285
58286
58287
58288
58289
58290
58291
58292
58293
58294
58295
58296
58297
58298
58299
58300
58301
58302
58303
58304
58305
58306
58307
58308
58309
58310
58311
58312
58313
58314
58315
58316
58317
58318
58319
58320
58321
58322
58323
58324
58325
58326
58327
58328
58329
58330
58331
58332
58333
58334
58335
58336
58337
58338
58339
58340
58341
58342
58343
58344
58345
58346
58347
58348
58349
58350
58351
58352
58353
58354
58355
58356
58357
58358
58359
58360
58361
58362
58363
58364
58365
58366
58367
58368
58369
58370
58371
58372
58373
58374
58375
58376
58377
58378
58379
58380
58381
58382
58383
58384
58385
58386
58387
58388
58389
58390
58391
58392
58393
58394
58395
58396
58397
58398
58399
58400
58401
58402
58403
58404
58405
58406
58407
58408
58409
58410
58411
58412
58413
58414
58415
58416
58417
58418
58419
58420
58421
58422
58423
58424
58425
58426
58427
58428
58429
58430
58431
58432
58433
58434
58435
58436
58437
58438
58439
58440
58441
58442
58443
58444
58445
58446
58447
58448
58449
58450
58451
58452
58453
58454
58455
58456
58457
58458
58459
58460
58461
58462
58463
58464
58465
58466
58467
58468
58469
58470
58471
58472
58473
58474
58475
58476
58477
58478
58479
58480
58481
58482
58483
58484
58485
58486
58487
58488
58489
58490
58491
58492
58493
58494
58495
58496
58497
58498
58499
58500
58501
58502
58503
58504
58505
58506
58507
58508
58509
58510
58511
58512
58513
58514
58515
58516
58517
58518
58519
58520
58521
58522
58523
58524
58525
58526
58527
58528
58529
58530
58531
58532
58533
58534
58535
58536
58537
58538
58539
58540
58541
58542
58543
58544
58545
58546
58547
58548
58549
58550
58551
58552
58553
58554
58555
58556
58557
58558
58559
58560
58561
58562
58563
58564
58565
58566
58567
58568
58569
58570
58571
58572
58573
58574
58575
58576
58577
58578
58579
58580
58581
58582
58583
58584
58585
58586
58587
58588
58589
58590
58591
58592
58593
58594
58595
58596
58597
58598
58599
58600
58601
58602
58603
58604
58605
58606
58607
58608
58609
58610
58611
58612
58613
58614
58615
58616
58617
58618
58619
58620
58621
58622
58623
58624
58625
58626
58627
58628
58629
58630
58631
58632
58633
58634
58635
58636
58637
58638
58639
58640
58641
58642
58643
58644
58645
58646
58647
58648
58649
58650
58651
58652
58653
58654
58655
58656
58657
58658
58659
58660
58661
58662
58663
58664
58665
58666
58667
58668
58669
58670
58671
58672
58673
58674
58675
58676
58677
58678
58679
58680
58681
58682
58683
58684
58685
58686
58687
58688
58689
58690
58691
58692
58693
58694
58695
58696
58697
58698
58699
58700
58701
58702
58703
58704
58705
58706
58707
58708
58709
58710
58711
58712
58713
58714
58715
58716
58717
58718
58719
58720
58721
58722
58723
58724
58725
58726
58727
58728
58729
58730
58731
58732
58733
58734
58735
58736
58737
58738
58739
58740
58741
58742
58743
58744
58745
58746
58747
58748
58749
58750
58751
58752
58753
58754
58755
58756
58757
58758
58759
58760
58761
58762
58763
58764
58765
58766
58767
58768
58769
58770
58771
58772
58773
58774
58775
58776
58777
58778
58779
58780
58781
58782
58783
58784
58785
58786
58787
58788
58789
58790
58791
58792
58793
58794
58795
58796
58797
58798
58799
58800
58801
58802
58803
58804
58805
58806
58807
58808
58809
58810
58811
58812
58813
58814
58815
58816
58817
58818
58819
58820
58821
58822
58823
58824
58825
58826
58827
58828
58829
58830
58831
58832
58833
58834
58835
58836
58837
58838
58839
58840
58841
58842
58843
58844
58845
58846
58847
58848
58849
58850
58851
58852
58853
58854
58855
58856
58857
58858
58859
58860
58861
58862
58863
58864
58865
58866
58867
58868
58869
58870
58871
58872
58873
58874
58875
58876
58877
58878
58879
58880
58881
58882
58883
58884
58885
58886
58887
58888
58889
58890
58891
58892
58893
58894
58895
58896
58897
58898
58899
58900
58901
58902
58903
58904
58905
58906
58907
58908
58909
58910
58911
58912
58913
58914
58915
58916
58917
58918
58919
58920
58921
58922
58923
58924
58925
58926
58927
58928
58929
58930
58931
58932
58933
58934
58935
58936
58937
58938
58939
58940
58941
58942
58943
58944
58945
58946
58947
58948
58949
58950
58951
58952
58953
58954
58955
58956
58957
58958
58959
58960
58961
58962
58963
58964
58965
58966
58967
58968
58969
58970
58971
58972
58973
58974
58975
58976
58977
58978
58979
58980
58981
58982
58983
58984
58985
58986
58987
58988
58989
58990
58991
58992
58993
58994
58995
58996
58997
58998
58999
59000
59001
59002
59003
59004
59005
59006
59007
59008
59009
59010
59011
59012
59013
59014
59015
59016
59017
59018
59019
59020
59021
59022
59023
59024
59025
59026
59027
59028
59029
59030
59031
59032
59033
59034
59035
59036
59037
59038
59039
59040
59041
59042
59043
59044
59045
59046
59047
59048
59049
59050
59051
59052
59053
59054
59055
59056
59057
59058
59059
59060
59061
59062
59063
59064
59065
59066
59067
59068
59069
59070
59071
59072
59073
59074
59075
59076
59077
59078
59079
59080
59081
59082
59083
59084
59085
59086
59087
59088
59089
59090
59091
59092
59093
59094
59095
59096
59097
59098
59099
59100
59101
59102
59103
59104
59105
59106
59107
59108
59109
59110
59111
59112
59113
59114
59115
59116
59117
59118
59119
59120
59121
59122
59123
59124
59125
59126
59127
59128
59129
59130
59131
59132
59133
59134
59135
59136
59137
59138
59139
59140
59141
59142
59143
59144
59145
59146
59147
59148
59149
59150
59151
59152
59153
59154
59155
59156
59157
59158
59159
59160
59161
59162
59163
59164
59165
59166
59167
59168
59169
59170
59171
59172
59173
59174
59175
59176
59177
59178
59179
59180
59181
59182
59183
59184
59185
59186
59187
59188
59189
59190
59191
59192
59193
59194
59195
59196
59197
59198
59199
59200
59201
59202
59203
59204
59205
59206
59207
59208
59209
59210
59211
59212
59213
59214
59215
59216
59217
59218
59219
59220
59221
59222
59223
59224
59225
59226
59227
59228
59229
59230
59231
59232
59233
59234
59235
59236
59237
59238
59239
59240
59241
59242
59243
59244
59245
59246
59247
59248
59249
59250
59251
59252
59253
59254
59255
59256
59257
59258
59259
59260
59261
59262
59263
59264
59265
59266
59267
59268
59269
59270
59271
59272
59273
59274
59275
59276
59277
59278
59279
59280
59281
59282
59283
59284
59285
59286
59287
59288
59289
59290
59291
59292
59293
59294
59295
59296
59297
59298
59299
59300
59301
59302
59303
59304
59305
59306
59307
59308
59309
59310
59311
59312
59313
59314
59315
59316
59317
59318
59319
59320
59321
59322
59323
59324
59325
59326
59327
59328
59329
59330
59331
59332
59333
59334
59335
59336
59337
59338
59339
59340
59341
59342
59343
59344
59345
59346
59347
59348
59349
59350
59351
59352
59353
59354
59355
59356
59357
59358
59359
59360
59361
59362
59363
59364
59365
59366
59367
59368
59369
59370
59371
59372
59373
59374
59375
59376
59377
59378
59379
59380
59381
59382
59383
59384
59385
59386
59387
59388
59389
59390
59391
59392
59393
59394
59395
59396
59397
59398
59399
59400
59401
59402
59403
59404
59405
59406
59407
59408
59409
59410
59411
59412
59413
59414
59415
59416
59417
59418
59419
59420
59421
59422
59423
59424
59425
59426
59427
59428
59429
59430
59431
59432
59433
59434
59435
59436
59437
59438
59439
59440
59441
59442
59443
59444
59445
59446
59447
59448
59449
59450
59451
59452
59453
59454
59455
59456
59457
59458
59459
59460
59461
59462
59463
59464
59465
59466
59467
59468
59469
59470
59471
59472
59473
59474
59475
59476
59477
59478
59479
59480
59481
59482
59483
59484
59485
59486
59487
59488
59489
59490
59491
59492
59493
59494
59495
59496
59497
59498
59499
59500
59501
59502
59503
59504
59505
59506
59507
59508
59509
59510
59511
59512
59513
59514
59515
59516
59517
59518
59519
59520
59521
59522
59523
59524
59525
59526
59527
59528
59529
59530
59531
59532
59533
59534
59535
59536
59537
59538
59539
59540
59541
59542
59543
59544
59545
59546
59547
59548
59549
59550
59551
59552
59553
59554
59555
59556
59557
59558
59559
59560
59561
59562
59563
59564
59565
59566
59567
59568
59569
59570
59571
59572
59573
59574
59575
59576
59577
59578
59579
59580
59581
59582
59583
59584
59585
59586
59587
59588
59589
59590
59591
59592
59593
59594
59595
59596
59597
59598
59599
59600
59601
59602
59603
59604
59605
59606
59607
59608
59609
59610
59611
59612
59613
59614
59615
59616
59617
59618
59619
59620
59621
59622
59623
59624
59625
59626
59627
59628
59629
59630
59631
59632
59633
59634
59635
59636
59637
59638
59639
59640
59641
59642
59643
59644
59645
59646
59647
59648
59649
59650
59651
59652
59653
59654
59655
59656
59657
59658
59659
59660
59661
59662
59663
59664
59665
59666
59667
59668
59669
59670
59671
59672
59673
59674
59675
59676
59677
59678
59679
59680
59681
59682
59683
59684
59685
59686
59687
59688
59689
59690
59691
59692
59693
59694
59695
59696
59697
59698
59699
59700
59701
59702
59703
59704
59705
59706
59707
59708
59709
59710
59711
59712
59713
59714
59715
59716
59717
59718
59719
59720
59721
59722
59723
59724
59725
59726
59727
59728
59729
59730
59731
59732
59733
59734
59735
59736
59737
59738
59739
59740
59741
59742
59743
59744
59745
59746
59747
59748
59749
59750
59751
59752
59753
59754
59755
59756
59757
59758
59759
59760
59761
59762
59763
59764
59765
59766
59767
59768
59769
59770
59771
59772
59773
59774
59775
59776
59777
59778
59779
59780
59781
59782
59783
59784
59785
59786
59787
59788
59789
59790
59791
59792
59793
59794
59795
59796
59797
59798
59799
59800
59801
59802
59803
59804
59805
59806
59807
59808
59809
59810
59811
59812
59813
59814
59815
59816
59817
59818
59819
59820
59821
59822
59823
59824
59825
59826
59827
59828
59829
59830
59831
59832
59833
59834
59835
59836
59837
59838
59839
59840
59841
59842
59843
59844
59845
59846
59847
59848
59849
59850
59851
59852
59853
59854
59855
59856
59857
59858
59859
59860
59861
59862
59863
59864
59865
59866
59867
59868
59869
59870
59871
59872
59873
59874
59875
59876
59877
59878
59879
59880
59881
59882
59883
59884
59885
59886
59887
59888
59889
59890
59891
59892
59893
59894
59895
59896
59897
59898
59899
59900
59901
59902
59903
59904
59905
59906
59907
59908
59909
59910
59911
59912
59913
59914
59915
59916
59917
59918
59919
59920
59921
59922
59923
59924
59925
59926
59927
59928
59929
59930
59931
59932
59933
59934
59935
59936
59937
59938
59939
59940
59941
59942
59943
59944
59945
59946
59947
59948
59949
59950
59951
59952
59953
59954
59955
59956
59957
59958
59959
59960
59961
59962
59963
59964
59965
59966
59967
59968
59969
59970
59971
59972
59973
59974
59975
59976
59977
59978
59979
59980
59981
59982
59983
59984
59985
59986
59987
59988
59989
59990
59991
59992
59993
59994
59995
59996
59997
59998
59999
60000
60001
60002
60003
60004
60005
60006
60007
60008
60009
60010
60011
60012
60013
60014
60015
60016
60017
60018
60019
60020
60021
60022
60023
60024
60025
60026
60027
60028
60029
60030
60031
60032
60033
60034
60035
60036
60037
60038
60039
60040
60041
60042
60043
60044
60045
60046
60047
60048
60049
60050
60051
60052
60053
60054
60055
60056
60057
60058
60059
60060
60061
60062
60063
60064
60065
60066
60067
60068
60069
60070
60071
60072
60073
60074
60075
60076
60077
60078
60079
60080
60081
60082
60083
60084
60085
60086
60087
60088
60089
60090
60091
60092
60093
60094
60095
60096
60097
60098
60099
60100
60101
60102
60103
60104
60105
60106
60107
60108
60109
60110
60111
60112
60113
60114
60115
60116
60117
60118
60119
60120
60121
60122
60123
60124
60125
60126
60127
60128
60129
60130
60131
60132
60133
60134
60135
60136
60137
60138
60139
60140
60141
60142
60143
60144
60145
60146
60147
60148
60149
60150
60151
60152
60153
60154
60155
60156
60157
60158
60159
60160
60161
60162
60163
60164
60165
60166
60167
60168
60169
60170
60171
60172
60173
60174
60175
60176
60177
60178
60179
60180
60181
60182
60183
60184
60185
60186
60187
60188
60189
60190
60191
60192
60193
60194
60195
60196
60197
60198
60199
60200
60201
60202
60203
60204
60205
60206
60207
60208
60209
60210
60211
60212
60213
60214
60215
60216
60217
60218
60219
60220
60221
60222
60223
60224
60225
60226
60227
60228
60229
60230
60231
60232
60233
60234
60235
60236
60237
60238
60239
60240
60241
60242
60243
60244
60245
60246
60247
60248
60249
60250
60251
60252
60253
60254
60255
60256
60257
60258
60259
60260
60261
60262
60263
60264
60265
60266
60267
60268
60269
60270
60271
60272
60273
60274
60275
60276
60277
60278
60279
60280
60281
60282
60283
60284
60285
60286
60287
60288
60289
60290
60291
60292
60293
60294
60295
60296
60297
60298
60299
60300
60301
60302
60303
60304
60305
60306
60307
60308
60309
60310
60311
60312
60313
60314
60315
60316
60317
60318
60319
60320
60321
60322
60323
60324
60325
60326
60327
60328
60329
60330
60331
60332
60333
60334
60335
60336
60337
60338
60339
60340
60341
60342
60343
60344
60345
60346
60347
60348
60349
60350
60351
60352
60353
60354
60355
60356
60357
60358
60359
60360
60361
60362
60363
60364
60365
60366
60367
60368
60369
60370
60371
60372
60373
60374
60375
60376
60377
60378
60379
60380
60381
60382
60383
60384
60385
60386
60387
60388
60389
60390
60391
60392
60393
60394
60395
60396
60397
60398
60399
60400
60401
60402
60403
60404
60405
60406
60407
60408
60409
60410
60411
60412
60413
60414
60415
60416
60417
60418
60419
60420
60421
60422
60423
60424
60425
60426
60427
60428
60429
60430
60431
60432
60433
60434
60435
60436
60437
60438
60439
60440
60441
60442
60443
60444
60445
60446
60447
60448
60449
60450
60451
60452
60453
60454
60455
60456
60457
60458
60459
60460
60461
60462
60463
60464
60465
60466
60467
60468
60469
60470
60471
60472
60473
60474
60475
60476
60477
60478
60479
60480
60481
60482
60483
60484
60485
60486
60487
60488
60489
60490
60491
60492
60493
60494
60495
60496
60497
60498
60499
60500
60501
60502
60503
60504
60505
60506
60507
60508
60509
60510
60511
60512
60513
60514
60515
60516
60517
60518
60519
60520
60521
60522
60523
60524
60525
60526
60527
60528
60529
60530
60531
60532
60533
60534
60535
60536
60537
60538
60539
60540
60541
60542
60543
60544
60545
60546
60547
60548
60549
60550
60551
60552
60553
60554
60555
60556
60557
60558
60559
60560
60561
60562
60563
60564
60565
60566
60567
60568
60569
60570
60571
60572
60573
60574
60575
60576
60577
60578
60579
60580
60581
60582
60583
60584
60585
60586
60587
60588
60589
60590
60591
60592
60593
60594
60595
60596
60597
60598
60599
60600
60601
60602
60603
60604
60605
60606
60607
60608
60609
60610
60611
60612
60613
60614
60615
60616
60617
60618
60619
60620
60621
60622
60623
60624
60625
60626
60627
60628
60629
60630
60631
60632
60633
60634
60635
60636
60637
60638
60639
60640
60641
60642
60643
60644
60645
60646
60647
60648
60649
60650
60651
60652
60653
60654
60655
60656
60657
60658
60659
60660
60661
60662
60663
60664
60665
60666
60667
60668
60669
60670
60671
60672
60673
60674
60675
60676
60677
60678
60679
60680
60681
60682
60683
60684
60685
60686
60687
60688
60689
60690
60691
60692
60693
60694
60695
60696
60697
60698
60699
60700
60701
60702
60703
60704
60705
60706
60707
60708
60709
60710
60711
60712
60713
60714
60715
60716
60717
60718
60719
60720
60721
60722
60723
60724
60725
60726
60727
60728
60729
60730
60731
60732
60733
60734
60735
60736
60737
60738
60739
60740
60741
60742
60743
60744
60745
60746
60747
60748
60749
60750
60751
60752
60753
60754
60755
60756
60757
60758
60759
60760
60761
60762
60763
60764
60765
60766
60767
60768
60769
60770
60771
60772
60773
60774
60775
60776
60777
60778
60779
60780
60781
60782
60783
60784
60785
60786
60787
60788
60789
60790
60791
60792
60793
60794
60795
60796
60797
60798
60799
60800
60801
60802
60803
60804
60805
60806
60807
60808
60809
60810
60811
60812
60813
60814
60815
60816
60817
60818
60819
60820
60821
60822
60823
60824
60825
60826
60827
60828
60829
60830
60831
60832
60833
60834
60835
60836
60837
60838
60839
60840
60841
60842
60843
60844
60845
60846
60847
60848
60849
60850
60851
60852
60853
60854
60855
60856
60857
60858
60859
60860
60861
60862
60863
60864
60865
60866
60867
60868
60869
60870
60871
60872
60873
60874
60875
60876
60877
60878
60879
60880
60881
60882
60883
60884
60885
60886
60887
60888
60889
60890
60891
60892
60893
60894
60895
60896
60897
60898
60899
60900
60901
60902
60903
60904
60905
60906
60907
60908
60909
60910
60911
60912
60913
60914
60915
60916
60917
60918
60919
60920
60921
60922
60923
60924
60925
60926
60927
60928
60929
60930
60931
60932
60933
60934
60935
60936
60937
60938
60939
60940
60941
60942
60943
60944
60945
60946
60947
60948
60949
60950
60951
60952
60953
60954
60955
60956
60957
60958
60959
60960
60961
60962
60963
60964
60965
60966
60967
60968
60969
60970
60971
60972
60973
60974
60975
60976
60977
60978
60979
60980
60981
60982
60983
60984
60985
60986
60987
60988
60989
60990
60991
60992
60993
60994
60995
60996
60997
60998
60999
61000
61001
61002
61003
61004
61005
61006
61007
61008
61009
61010
61011
61012
61013
61014
61015
61016
61017
61018
61019
61020
61021
61022
61023
61024
61025
61026
61027
61028
61029
61030
61031
61032
61033
61034
61035
61036
61037
61038
61039
61040
61041
61042
61043
61044
61045
61046
61047
61048
61049
61050
61051
61052
61053
61054
61055
61056
61057
61058
61059
61060
61061
61062
61063
61064
61065
61066
61067
61068
61069
61070
61071
61072
61073
61074
61075
61076
61077
61078
61079
61080
61081
61082
61083
61084
61085
61086
61087
61088
61089
61090
61091
61092
61093
61094
61095
61096
61097
61098
61099
61100
61101
61102
61103
61104
61105
61106
61107
61108
61109
61110
61111
61112
61113
61114
61115
61116
61117
61118
61119
61120
61121
61122
61123
61124
61125
61126
61127
61128
61129
61130
61131
61132
61133
61134
61135
61136
61137
61138
61139
61140
61141
61142
61143
61144
61145
61146
61147
61148
61149
61150
61151
61152
61153
61154
61155
61156
61157
61158
61159
61160
61161
61162
61163
61164
61165
61166
61167
61168
61169
61170
61171
61172
61173
61174
61175
61176
61177
61178
61179
61180
61181
61182
61183
61184
61185
61186
61187
61188
61189
61190
61191
61192
61193
61194
61195
61196
61197
61198
61199
61200
61201
61202
61203
61204
61205
61206
61207
61208
61209
61210
61211
61212
61213
61214
61215
61216
61217
61218
61219
61220
61221
61222
61223
61224
61225
61226
61227
61228
61229
61230
61231
61232
61233
61234
61235
61236
61237
61238
61239
61240
61241
61242
61243
61244
61245
61246
61247
61248
61249
61250
61251
61252
61253
61254
61255
61256
61257
61258
61259
61260
61261
61262
61263
61264
61265
61266
61267
61268
61269
61270
61271
61272
61273
61274
61275
61276
61277
61278
61279
61280
61281
61282
61283
61284
61285
61286
61287
61288
61289
61290
61291
61292
61293
61294
61295
61296
61297
61298
61299
61300
61301
61302
61303
61304
61305
61306
61307
61308
61309
61310
61311
61312
61313
61314
61315
61316
61317
61318
61319
61320
61321
61322
61323
61324
61325
61326
61327
61328
61329
61330
61331
61332
61333
61334
61335
61336
61337
61338
61339
61340
61341
61342
61343
61344
61345
61346
61347
61348
61349
61350
61351
61352
61353
61354
61355
61356
61357
61358
61359
61360
61361
61362
61363
61364
61365
61366
61367
61368
61369
61370
61371
61372
61373
61374
61375
61376
61377
61378
61379
61380
61381
61382
61383
61384
61385
61386
61387
61388
61389
61390
61391
61392
61393
61394
61395
61396
61397
61398
61399
61400
61401
61402
61403
61404
61405
61406
61407
61408
61409
61410
61411
61412
61413
61414
61415
61416
61417
61418
61419
61420
61421
61422
61423
61424
61425
61426
61427
61428
61429
61430
61431
61432
61433
61434
61435
61436
61437
61438
61439
61440
61441
61442
61443
61444
61445
61446
61447
61448
61449
61450
61451
61452
61453
61454
61455
61456
61457
61458
61459
61460
61461
61462
61463
61464
61465
61466
61467
61468
61469
61470
61471
61472
61473
61474
61475
61476
61477
61478
61479
61480
61481
61482
61483
61484
61485
61486
61487
61488
61489
61490
61491
61492
61493
61494
61495
61496
61497
61498
61499
61500
61501
61502
61503
61504
61505
61506
61507
61508
61509
61510
61511
61512
61513
61514
61515
61516
61517
61518
61519
61520
61521
61522
61523
61524
61525
61526
61527
61528
61529
61530
61531
61532
61533
61534
61535
61536
61537
61538
61539
61540
61541
61542
61543
61544
61545
61546
61547
61548
61549
61550
61551
61552
61553
61554
61555
61556
61557
61558
61559
61560
61561
61562
61563
61564
61565
61566
61567
61568
61569
61570
61571
61572
61573
61574
61575
61576
61577
61578
61579
61580
61581
61582
61583
61584
61585
61586
61587
61588
61589
61590
61591
61592
61593
61594
61595
61596
61597
61598
61599
61600
61601
61602
61603
61604
61605
61606
61607
61608
61609
61610
61611
61612
61613
61614
61615
61616
61617
61618
61619
61620
61621
61622
61623
61624
61625
61626
61627
61628
61629
61630
61631
61632
61633
61634
61635
61636
61637
61638
61639
61640
61641
61642
61643
61644
61645
61646
61647
61648
61649
61650
61651
61652
61653
61654
61655
61656
61657
61658
61659
61660
61661
61662
61663
61664
61665
61666
61667
61668
61669
61670
61671
61672
61673
61674
61675
61676
61677
61678
61679
61680
61681
61682
61683
61684
61685
61686
61687
61688
61689
61690
61691
61692
61693
61694
61695
61696
61697
61698
61699
61700
61701
61702
61703
61704
61705
61706
61707
61708
61709
61710
61711
61712
61713
61714
61715
61716
61717
61718
61719
61720
61721
61722
61723
61724
61725
61726
61727
61728
61729
61730
61731
61732
61733
61734
61735
61736
61737
61738
61739
61740
61741
61742
61743
61744
61745
61746
61747
61748
61749
61750
61751
61752
61753
61754
61755
61756
61757
61758
61759
61760
61761
61762
61763
61764
61765
61766
61767
61768
61769
61770
61771
61772
61773
61774
61775
61776
61777
61778
61779
61780
61781
61782
61783
61784
61785
61786
61787
61788
61789
61790
61791
61792
61793
61794
61795
61796
61797
61798
61799
61800
61801
61802
61803
61804
61805
61806
61807
61808
61809
61810
61811
61812
61813
61814
61815
61816
61817
61818
61819
61820
61821
61822
61823
61824
61825
61826
61827
61828
61829
61830
61831
61832
61833
61834
61835
61836
61837
61838
61839
61840
61841
61842
61843
61844
61845
61846
61847
61848
61849
61850
61851
61852
61853
61854
61855
61856
61857
61858
61859
61860
61861
61862
61863
61864
61865
61866
61867
61868
61869
61870
61871
61872
61873
61874
61875
61876
61877
61878
61879
61880
61881
61882
61883
61884
61885
61886
61887
61888
61889
61890
61891
61892
61893
61894
61895
61896
61897
61898
61899
61900
61901
61902
61903
61904
61905
61906
61907
61908
61909
61910
61911
61912
61913
61914
61915
61916
61917
61918
61919
61920
61921
61922
61923
61924
61925
61926
61927
61928
61929
61930
61931
61932
61933
61934
61935
61936
61937
61938
61939
61940
61941
61942
61943
61944
61945
61946
61947
61948
61949
61950
61951
61952
61953
61954
61955
61956
61957
61958
61959
61960
61961
61962
61963
61964
61965
61966
61967
61968
61969
61970
61971
61972
61973
61974
61975
61976
61977
61978
61979
61980
61981
61982
61983
61984
61985
61986
61987
61988
61989
61990
61991
61992
61993
61994
61995
61996
61997
61998
61999
62000
62001
62002
62003
62004
62005
62006
62007
62008
62009
62010
62011
62012
62013
62014
62015
62016
62017
62018
62019
62020
62021
62022
62023
62024
62025
62026
62027
62028
62029
62030
62031
62032
62033
62034
62035
62036
62037
62038
62039
62040
62041
62042
62043
62044
62045
62046
62047
62048
62049
62050
62051
62052
62053
62054
62055
62056
62057
62058
62059
62060
62061
62062
62063
62064
62065
62066
62067
62068
62069
62070
62071
62072
62073
62074
62075
62076
62077
62078
62079
62080
62081
62082
62083
62084
62085
62086
62087
62088
62089
62090
62091
62092
62093
62094
62095
62096
62097
62098
62099
62100
62101
62102
62103
62104
62105
62106
62107
62108
62109
62110
62111
62112
62113
62114
62115
62116
62117
62118
62119
62120
62121
62122
62123
62124
62125
62126
62127
62128
62129
62130
62131
62132
62133
62134
62135
62136
62137
62138
62139
62140
62141
62142
62143
62144
62145
62146
62147
62148
62149
62150
62151
62152
62153
62154
62155
62156
62157
62158
62159
62160
62161
62162
62163
62164
62165
62166
62167
62168
62169
62170
62171
62172
62173
62174
62175
62176
62177
62178
62179
62180
62181
62182
62183
62184
62185
62186
62187
62188
62189
62190
62191
62192
62193
62194
62195
62196
62197
62198
62199
62200
62201
62202
62203
62204
62205
62206
62207
62208
62209
62210
62211
62212
62213
62214
62215
62216
62217
62218
62219
62220
62221
62222
62223
62224
62225
62226
62227
62228
62229
62230
62231
62232
62233
62234
62235
62236
62237
62238
62239
62240
62241
62242
62243
62244
62245
62246
62247
62248
62249
62250
62251
62252
62253
62254
62255
62256
62257
62258
62259
62260
62261
62262
62263
62264
62265
62266
62267
62268
62269
62270
62271
62272
62273
62274
62275
62276
62277
62278
62279
62280
62281
62282
62283
62284
62285
62286
62287
62288
62289
62290
62291
62292
62293
62294
62295
62296
62297
62298
62299
62300
62301
62302
62303
62304
62305
62306
62307
62308
62309
62310
62311
62312
62313
62314
62315
62316
62317
62318
62319
62320
62321
62322
62323
62324
62325
62326
62327
62328
62329
62330
62331
62332
62333
62334
62335
62336
62337
62338
62339
62340
62341
62342
62343
62344
62345
62346
62347
62348
62349
62350
62351
62352
62353
62354
62355
62356
62357
62358
62359
62360
62361
62362
62363
62364
62365
62366
62367
62368
62369
62370
62371
62372
62373
62374
62375
62376
62377
62378
62379
62380
62381
62382
62383
62384
62385
62386
62387
62388
62389
62390
62391
62392
62393
62394
62395
62396
62397
62398
62399
62400
62401
62402
62403
62404
62405
62406
62407
62408
62409
62410
62411
62412
62413
62414
62415
62416
62417
62418
62419
62420
62421
62422
62423
62424
62425
62426
62427
62428
62429
62430
62431
62432
62433
62434
62435
62436
62437
62438
62439
62440
62441
62442
62443
62444
62445
62446
62447
62448
62449
62450
62451
62452
62453
62454
62455
62456
62457
62458
62459
62460
62461
62462
62463
62464
62465
62466
62467
62468
62469
62470
62471
62472
62473
62474
62475
62476
62477
62478
62479
62480
62481
62482
62483
62484
62485
62486
62487
62488
62489
62490
62491
62492
62493
62494
62495
62496
62497
62498
62499
62500
62501
62502
62503
62504
62505
62506
62507
62508
62509
62510
62511
62512
62513
62514
62515
62516
62517
62518
62519
62520
62521
62522
62523
62524
62525
62526
62527
62528
62529
62530
62531
62532
62533
62534
62535
62536
62537
62538
62539
62540
62541
62542
62543
62544
62545
62546
62547
62548
62549
62550
62551
62552
62553
62554
62555
62556
62557
62558
62559
62560
62561
62562
62563
62564
62565
62566
62567
62568
62569
62570
62571
62572
62573
62574
62575
62576
62577
62578
62579
62580
62581
62582
62583
62584
62585
62586
62587
62588
62589
62590
62591
62592
62593
62594
62595
62596
62597
62598
62599
62600
62601
62602
62603
62604
62605
62606
62607
62608
62609
62610
62611
62612
62613
62614
62615
62616
62617
62618
62619
62620
62621
62622
62623
62624
62625
62626
62627
62628
62629
62630
62631
62632
62633
62634
62635
62636
62637
62638
62639
62640
62641
62642
62643
62644
62645
62646
62647
62648
62649
62650
62651
62652
62653
62654
62655
62656
62657
62658
62659
62660
62661
62662
62663
62664
62665
62666
62667
62668
62669
62670
62671
62672
62673
62674
62675
62676
62677
62678
62679
62680
62681
62682
62683
62684
62685
62686
62687
62688
62689
62690
62691
62692
62693
62694
62695
62696
62697
62698
62699
62700
62701
62702
62703
62704
62705
62706
62707
62708
62709
62710
62711
62712
62713
62714
62715
62716
62717
62718
62719
62720
62721
62722
62723
62724
62725
62726
62727
62728
62729
62730
62731
62732
62733
62734
62735
62736
62737
62738
62739
62740
62741
62742
62743
62744
62745
62746
62747
62748
62749
62750
62751
62752
62753
62754
62755
62756
62757
62758
62759
62760
62761
62762
62763
62764
62765
62766
62767
62768
62769
62770
62771
62772
62773
62774
62775
62776
62777
62778
62779
62780
62781
62782
62783
62784
62785
62786
62787
62788
62789
62790
62791
62792
62793
62794
62795
62796
62797
62798
62799
62800
62801
62802
62803
62804
62805
62806
62807
62808
62809
62810
62811
62812
62813
62814
62815
62816
62817
62818
62819
62820
62821
62822
62823
62824
62825
62826
62827
62828
62829
62830
62831
62832
62833
62834
62835
62836
62837
62838
62839
62840
62841
62842
62843
62844
62845
62846
62847
62848
62849
62850
62851
62852
62853
62854
62855
62856
62857
62858
62859
62860
62861
62862
62863
62864
62865
62866
62867
62868
62869
62870
62871
62872
62873
62874
62875
62876
62877
62878
62879
62880
62881
62882
62883
62884
62885
62886
62887
62888
62889
62890
62891
62892
62893
62894
62895
62896
62897
62898
62899
62900
62901
62902
62903
62904
62905
62906
62907
62908
62909
62910
62911
62912
62913
62914
62915
62916
62917
62918
62919
62920
62921
62922
62923
62924
62925
62926
62927
62928
62929
62930
62931
62932
62933
62934
62935
62936
62937
62938
62939
62940
62941
62942
62943
62944
62945
62946
62947
62948
62949
62950
62951
62952
62953
62954
62955
62956
62957
62958
62959
62960
62961
62962
62963
62964
62965
62966
62967
62968
62969
62970
62971
62972
62973
62974
62975
62976
62977
62978
62979
62980
62981
62982
62983
62984
62985
62986
62987
62988
62989
62990
62991
62992
62993
62994
62995
62996
62997
62998
62999
63000
63001
63002
63003
63004
63005
63006
63007
63008
63009
63010
63011
63012
63013
63014
63015
63016
63017
63018
63019
63020
63021
63022
63023
63024
63025
63026
63027
63028
63029
63030
63031
63032
63033
63034
63035
63036
63037
63038
63039
63040
63041
63042
63043
63044
63045
63046
63047
63048
63049
63050
63051
63052
63053
63054
63055
63056
63057
63058
63059
63060
63061
63062
63063
63064
63065
63066
63067
63068
63069
63070
63071
63072
63073
63074
63075
63076
63077
63078
63079
63080
63081
63082
63083
63084
63085
63086
63087
63088
63089
63090
63091
63092
63093
63094
63095
63096
63097
63098
63099
63100
63101
63102
63103
63104
63105
63106
63107
63108
63109
63110
63111
63112
63113
63114
63115
63116
63117
63118
63119
63120
63121
63122
63123
63124
63125
63126
63127
63128
63129
63130
63131
63132
63133
63134
63135
63136
63137
63138
63139
63140
63141
63142
63143
63144
63145
63146
63147
63148
63149
63150
63151
63152
63153
63154
63155
63156
63157
63158
63159
63160
63161
63162
63163
63164
63165
63166
63167
63168
63169
63170
63171
63172
63173
63174
63175
63176
63177
63178
63179
63180
63181
63182
63183
63184
63185
63186
63187
63188
63189
63190
63191
63192
63193
63194
63195
63196
63197
63198
63199
63200
63201
63202
63203
63204
63205
63206
63207
63208
63209
63210
63211
63212
63213
63214
63215
63216
63217
63218
63219
63220
63221
63222
63223
63224
63225
63226
63227
63228
63229
63230
63231
63232
63233
63234
63235
63236
63237
63238
63239
63240
63241
63242
63243
63244
63245
63246
63247
63248
63249
63250
63251
63252
63253
63254
63255
63256
63257
63258
63259
63260
63261
63262
63263
63264
63265
63266
63267
63268
63269
63270
63271
63272
63273
63274
63275
63276
63277
63278
63279
63280
63281
63282
63283
63284
63285
63286
63287
63288
63289
63290
63291
63292
63293
63294
63295
63296
63297
63298
63299
63300
63301
63302
63303
63304
63305
63306
63307
63308
63309
63310
63311
63312
63313
63314
63315
63316
63317
63318
63319
63320
63321
63322
63323
63324
63325
63326
63327
63328
63329
63330
63331
63332
63333
63334
63335
63336
63337
63338
63339
63340
63341
63342
63343
63344
63345
63346
63347
63348
63349
63350
63351
63352
63353
63354
63355
63356
63357
63358
63359
63360
63361
63362
63363
63364
63365
63366
63367
63368
63369
63370
63371
63372
63373
63374
63375
63376
63377
63378
63379
63380
63381
63382
63383
63384
63385
63386
63387
63388
63389
63390
63391
63392
63393
63394
63395
63396
63397
63398
63399
63400
63401
63402
63403
63404
63405
63406
63407
63408
63409
63410
63411
63412
63413
63414
63415
63416
63417
63418
63419
63420
63421
63422
63423
63424
63425
63426
63427
63428
63429
63430
63431
63432
63433
63434
63435
63436
63437
63438
63439
63440
63441
63442
63443
63444
63445
63446
63447
63448
63449
63450
63451
63452
63453
63454
63455
63456
63457
63458
63459
63460
63461
63462
63463
63464
63465
63466
63467
63468
63469
63470
63471
63472
63473
63474
63475
63476
63477
63478
63479
63480
63481
63482
63483
63484
63485
63486
63487
63488
63489
63490
63491
63492
63493
63494
63495
63496
63497
63498
63499
63500
63501
63502
63503
63504
63505
63506
63507
63508
63509
63510
63511
63512
63513
63514
63515
63516
63517
63518
63519
63520
63521
63522
63523
63524
63525
63526
63527
63528
63529
63530
63531
63532
63533
63534
63535
63536
63537
63538
63539
63540
63541
63542
63543
63544
63545
63546
63547
63548
63549
63550
63551
63552
63553
63554
63555
63556
63557
63558
63559
63560
63561
63562
63563
63564
63565
63566
63567
63568
63569
63570
63571
63572
63573
63574
63575
63576
63577
63578
63579
63580
63581
63582
63583
63584
63585
63586
63587
63588
63589
63590
63591
63592
63593
63594
63595
63596
63597
63598
63599
63600
63601
63602
63603
63604
63605
63606
63607
63608
63609
63610
63611
63612
63613
63614
63615
63616
63617
63618
63619
63620
63621
63622
63623
63624
63625
63626
63627
63628
63629
63630
63631
63632
63633
63634
63635
63636
63637
63638
63639
63640
63641
63642
63643
63644
63645
63646
63647
63648
63649
63650
63651
63652
63653
63654
63655
63656
63657
63658
63659
63660
63661
63662
63663
63664
63665
63666
63667
63668
63669
63670
63671
63672
63673
63674
63675
63676
63677
63678
63679
63680
63681
63682
63683
63684
63685
63686
63687
63688
63689
63690
63691
63692
63693
63694
63695
63696
63697
63698
63699
63700
63701
63702
63703
63704
63705
63706
63707
63708
63709
63710
63711
63712
63713
63714
63715
63716
63717
63718
63719
63720
63721
63722
63723
63724
63725
63726
63727
63728
63729
63730
63731
63732
63733
63734
63735
63736
63737
63738
63739
63740
63741
63742
63743
63744
63745
63746
63747
63748
63749
63750
63751
63752
63753
63754
63755
63756
63757
63758
63759
63760
63761
63762
63763
63764
63765
63766
63767
63768
63769
63770
63771
63772
63773
63774
63775
63776
63777
63778
63779
63780
63781
63782
63783
63784
63785
63786
63787
63788
63789
63790
63791
63792
63793
63794
63795
63796
63797
63798
63799
63800
63801
63802
63803
63804
63805
63806
63807
63808
63809
63810
63811
63812
63813
63814
63815
63816
63817
63818
63819
63820
63821
63822
63823
63824
63825
63826
63827
63828
63829
63830
63831
63832
63833
63834
63835
63836
63837
63838
63839
63840
63841
63842
63843
63844
63845
63846
63847
63848
63849
63850
63851
63852
63853
63854
63855
63856
63857
63858
63859
63860
63861
63862
63863
63864
63865
63866
63867
63868
63869
63870
63871
63872
63873
63874
63875
63876
63877
63878
63879
63880
63881
63882
63883
63884
63885
63886
63887
63888
63889
63890
63891
63892
63893
63894
63895
63896
63897
63898
63899
63900
63901
63902
63903
63904
63905
63906
63907
63908
63909
63910
63911
63912
63913
63914
63915
63916
63917
63918
63919
63920
63921
63922
63923
63924
63925
63926
63927
63928
63929
63930
63931
63932
63933
63934
63935
63936
63937
63938
63939
63940
63941
63942
63943
63944
63945
63946
63947
63948
63949
63950
63951
63952
63953
63954
63955
63956
63957
63958
63959
63960
63961
63962
63963
63964
63965
63966
63967
63968
63969
63970
63971
63972
63973
63974
63975
63976
63977
63978
63979
63980
63981
63982
63983
63984
63985
63986
63987
63988
63989
63990
63991
63992
63993
63994
63995
63996
63997
63998
63999
64000
64001
64002
64003
64004
64005
64006
64007
64008
64009
64010
64011
64012
64013
64014
64015
64016
64017
64018
64019
64020
64021
64022
64023
64024
64025
64026
64027
64028
64029
64030
64031
64032
64033
64034
64035
64036
64037
64038
64039
64040
64041
64042
64043
64044
64045
64046
64047
64048
64049
64050
64051
64052
64053
64054
64055
64056
64057
64058
64059
64060
64061
64062
64063
64064
64065
64066
64067
64068
64069
64070
64071
64072
64073
64074
64075
64076
64077
64078
64079
64080
64081
64082
64083
64084
64085
64086
64087
64088
64089
64090
64091
64092
64093
64094
64095
64096
64097
64098
64099
64100
64101
64102
64103
64104
64105
64106
64107
64108
64109
64110
64111
64112
64113
64114
64115
64116
64117
64118
64119
64120
64121
64122
64123
64124
64125
64126
64127
64128
64129
64130
64131
64132
64133
64134
64135
64136
64137
64138
64139
64140
64141
64142
64143
64144
64145
64146
64147
64148
64149
64150
64151
64152
64153
64154
64155
64156
64157
64158
64159
64160
64161
64162
64163
64164
64165
64166
64167
64168
64169
64170
64171
64172
64173
64174
64175
64176
64177
64178
64179
64180
64181
64182
64183
64184
64185
64186
64187
64188
64189
64190
64191
64192
64193
64194
64195
64196
64197
64198
64199
64200
64201
64202
64203
64204
64205
64206
64207
64208
64209
64210
64211
64212
64213
64214
64215
64216
64217
64218
64219
64220
64221
64222
64223
64224
64225
64226
64227
64228
64229
64230
64231
64232
64233
64234
64235
64236
64237
64238
64239
64240
64241
64242
64243
64244
64245
64246
64247
64248
64249
64250
64251
64252
64253
64254
64255
64256
64257
64258
64259
64260
64261
64262
64263
64264
64265
64266
64267
64268
64269
64270
64271
64272
64273
64274
64275
64276
64277
64278
64279
64280
64281
64282
64283
64284
64285
64286
64287
64288
64289
64290
64291
64292
64293
64294
64295
64296
64297
64298
64299
64300
64301
64302
64303
64304
64305
64306
64307
64308
64309
64310
64311
64312
64313
64314
64315
64316
64317
64318
64319
64320
64321
64322
64323
64324
64325
64326
64327
64328
64329
64330
64331
64332
64333
64334
64335
64336
64337
64338
64339
64340
64341
64342
64343
64344
64345
64346
64347
64348
64349
64350
64351
64352
64353
64354
64355
64356
64357
64358
64359
64360
64361
64362
64363
64364
64365
64366
64367
64368
64369
64370
64371
64372
64373
64374
64375
64376
64377
64378
64379
64380
64381
64382
64383
64384
64385
64386
64387
64388
64389
64390
64391
64392
64393
64394
64395
64396
64397
64398
64399
64400
64401
64402
64403
64404
64405
64406
64407
64408
64409
64410
64411
64412
64413
64414
64415
64416
64417
64418
64419
64420
64421
64422
64423
64424
64425
64426
64427
64428
64429
64430
64431
64432
64433
64434
64435
64436
64437
64438
64439
64440
64441
64442
64443
64444
64445
64446
64447
64448
64449
64450
64451
64452
64453
64454
64455
64456
64457
64458
64459
64460
64461
64462
64463
64464
64465
64466
64467
64468
64469
64470
64471
64472
64473
64474
64475
64476
64477
64478
64479
64480
64481
64482
64483
64484
64485
64486
64487
64488
64489
64490
64491
64492
64493
64494
64495
64496
64497
64498
64499
64500
64501
64502
64503
64504
64505
64506
64507
64508
64509
64510
64511
64512
64513
64514
64515
64516
64517
64518
64519
64520
64521
64522
64523
64524
64525
64526
64527
64528
64529
64530
64531
64532
64533
64534
64535
64536
64537
64538
64539
64540
64541
64542
64543
64544
64545
64546
64547
64548
64549
64550
64551
64552
64553
64554
64555
64556
64557
64558
64559
64560
64561
64562
64563
64564
64565
64566
64567
64568
64569
64570
64571
64572
64573
64574
64575
64576
64577
64578
64579
64580
64581
64582
64583
64584
64585
64586
64587
64588
64589
64590
64591
64592
64593
64594
64595
64596
64597
64598
64599
64600
64601
64602
64603
64604
64605
64606
64607
64608
64609
64610
64611
64612
64613
64614
64615
64616
64617
64618
64619
64620
64621
64622
64623
64624
64625
64626
64627
64628
64629
64630
64631
64632
64633
64634
64635
64636
64637
64638
64639
64640
64641
64642
64643
64644
64645
64646
64647
64648
64649
64650
64651
64652
64653
64654
64655
64656
64657
64658
64659
64660
64661
64662
64663
64664
64665
64666
64667
64668
64669
64670
64671
64672
64673
64674
64675
64676
64677
64678
64679
64680
64681
64682
64683
64684
64685
64686
64687
64688
64689
64690
64691
64692
64693
64694
64695
64696
64697
64698
64699
64700
64701
64702
64703
64704
64705
64706
64707
64708
64709
64710
64711
64712
64713
64714
64715
64716
64717
64718
64719
64720
64721
64722
64723
64724
64725
64726
64727
64728
64729
64730
64731
64732
64733
64734
64735
64736
64737
64738
64739
64740
64741
64742
64743
64744
64745
64746
64747
64748
64749
64750
64751
64752
64753
64754
64755
64756
64757
64758
64759
64760
64761
64762
64763
64764
64765
64766
64767
64768
64769
64770
64771
64772
64773
64774
64775
64776
64777
64778
64779
64780
64781
64782
64783
64784
64785
64786
64787
64788
64789
64790
64791
64792
64793
64794
64795
64796
64797
64798
64799
64800
64801
64802
64803
64804
64805
64806
64807
64808
64809
64810
64811
64812
64813
64814
64815
64816
64817
64818
64819
64820
64821
64822
64823
64824
64825
64826
64827
64828
64829
64830
64831
64832
64833
64834
64835
64836
64837
64838
64839
64840
64841
64842
64843
64844
64845
64846
64847
64848
64849
64850
64851
64852
64853
64854
64855
64856
64857
64858
64859
64860
64861
64862
64863
64864
64865
64866
64867
64868
64869
64870
64871
64872
64873
64874
64875
64876
64877
64878
64879
64880
64881
64882
64883
64884
64885
64886
64887
64888
64889
64890
64891
64892
64893
64894
64895
64896
64897
64898
64899
64900
64901
64902
64903
64904
64905
64906
64907
64908
64909
64910
64911
64912
64913
64914
64915
64916
64917
64918
64919
64920
64921
64922
64923
64924
64925
64926
64927
64928
64929
64930
64931
64932
64933
64934
64935
64936
64937
64938
64939
64940
64941
64942
64943
64944
64945
64946
64947
64948
64949
64950
64951
64952
64953
64954
64955
64956
64957
64958
64959
64960
64961
64962
64963
64964
64965
64966
64967
64968
64969
64970
64971
64972
64973
64974
64975
64976
64977
64978
64979
64980
64981
64982
64983
64984
64985
64986
64987
64988
64989
64990
64991
64992
64993
64994
64995
64996
64997
64998
64999
65000
65001
65002
65003
65004
65005
65006
65007
65008
65009
65010
65011
65012
65013
65014
65015
65016
65017
65018
65019
65020
65021
65022
65023
65024
65025
65026
65027
65028
65029
65030
65031
65032
65033
65034
65035
65036
65037
65038
65039
65040
65041
65042
65043
65044
65045
65046
65047
65048
65049
65050
65051
65052
65053
65054
65055
65056
65057
65058
65059
65060
65061
65062
65063
65064
65065
65066
65067
65068
65069
65070
65071
65072
65073
65074
65075
65076
65077
65078
65079
65080
65081
65082
65083
65084
65085
65086
65087
65088
65089
65090
65091
65092
65093
65094
65095
65096
65097
65098
65099
65100
65101
65102
65103
65104
65105
65106
65107
65108
65109
65110
65111
65112
65113
65114
65115
65116
65117
65118
65119
65120
65121
65122
65123
65124
65125
65126
65127
65128
65129
65130
65131
65132
65133
65134
65135
65136
65137
65138
65139
65140
65141
65142
65143
65144
65145
65146
65147
65148
65149
65150
65151
65152
65153
65154
65155
65156
65157
65158
65159
65160
65161
65162
65163
65164
65165
65166
65167
65168
65169
65170
65171
65172
65173
65174
65175
65176
65177
65178
65179
65180
65181
65182
65183
65184
65185
65186
65187
65188
65189
65190
65191
65192
65193
65194
65195
65196
65197
65198
65199
65200
65201
65202
65203
65204
65205
65206
65207
65208
65209
65210
65211
65212
65213
65214
65215
65216
65217
65218
65219
65220
65221
65222
65223
65224
65225
65226
65227
65228
65229
65230
65231
65232
65233
65234
65235
65236
65237
65238
65239
65240
65241
65242
65243
65244
65245
65246
65247
65248
65249
65250
65251
65252
65253
65254
65255
65256
65257
65258
65259
65260
65261
65262
65263
65264
65265
65266
65267
65268
65269
65270
65271
65272
65273
65274
65275
65276
65277
65278
65279
65280
65281
65282
65283
65284
65285
65286
65287
65288
65289
65290
65291
65292
65293
65294
65295
65296
65297
65298
65299
65300
65301
65302
65303
65304
65305
65306
65307
65308
65309
65310
65311
65312
65313
65314
65315
65316
65317
65318
65319
65320
65321
65322
65323
65324
65325
65326
65327
65328
65329
65330
65331
65332
65333
65334
65335
65336
65337
65338
65339
65340
65341
65342
65343
65344
65345
65346
65347
65348
65349
65350
65351
65352
65353
65354
65355
65356
65357
65358
65359
65360
65361
65362
65363
65364
65365
65366
65367
65368
65369
65370
65371
65372
65373
65374
65375
65376
65377
65378
65379
65380
65381
65382
65383
65384
65385
65386
65387
65388
65389
65390
65391
65392
65393
65394
65395
65396
65397
65398
65399
65400
65401
65402
65403
65404
65405
65406
65407
65408
65409
65410
65411
65412
65413
65414
65415
65416
65417
65418
65419
65420
65421
65422
65423
65424
65425
65426
65427
65428
65429
65430
65431
65432
65433
65434
65435
65436
65437
65438
65439
65440
65441
65442
65443
65444
65445
65446
65447
65448
65449
65450
65451
65452
65453
65454
65455
65456
65457
65458
65459
65460
65461
65462
65463
65464
65465
65466
65467
65468
65469
65470
65471
65472
65473
65474
65475
65476
65477
65478
65479
65480
65481
65482
65483
65484
65485
65486
65487
65488
65489
65490
65491
65492
65493
65494
65495
65496
65497
65498
65499
65500
65501
65502
65503
65504
65505
65506
65507
65508
65509
65510
65511
65512
65513
65514
65515
65516
65517
65518
65519
65520
65521
65522
65523
65524
65525
65526
65527
65528
65529
65530
65531
65532
65533
65534
65535
65536
65537
65538
65539
65540
65541
65542
65543
65544
65545
65546
65547
65548
65549
65550
65551
65552
65553
65554
65555
65556
65557
65558
65559
65560
65561
65562
65563
65564
65565
65566
65567
65568
65569
65570
65571
65572
65573
65574
65575
65576
65577
65578
65579
65580
65581
65582
65583
65584
65585
65586
65587
65588
65589
65590
65591
65592
65593
65594
65595
65596
65597
65598
65599
65600
65601
65602
65603
65604
65605
65606
65607
65608
65609
65610
65611
65612
65613
65614
65615
65616
65617
65618
65619
65620
65621
65622
65623
65624
65625
65626
65627
65628
65629
65630
65631
65632
65633
65634
65635
65636
65637
65638
65639
65640
65641
65642
65643
65644
65645
65646
65647
65648
65649
65650
65651
65652
65653
65654
65655
65656
65657
65658
65659
65660
65661
65662
65663
65664
65665
65666
65667
65668
65669
65670
65671
65672
65673
65674
65675
65676
65677
65678
65679
65680
65681
65682
65683
65684
65685
65686
65687
65688
65689
65690
65691
65692
65693
65694
65695
65696
65697
65698
65699
65700
65701
65702
65703
65704
65705
65706
65707
65708
65709
65710
65711
65712
65713
65714
65715
65716
65717
65718
65719
65720
65721
65722
65723
65724
65725
65726
65727
65728
65729
65730
65731
65732
65733
65734
65735
65736
65737
65738
65739
65740
65741
65742
65743
65744
65745
65746
65747
65748
65749
65750
65751
65752
65753
65754
65755
65756
65757
65758
65759
65760
65761
65762
65763
65764
65765
65766
65767
65768
65769
65770
65771
65772
65773
65774
65775
65776
65777
65778
65779
65780
65781
65782
65783
65784
65785
65786
65787
65788
65789
65790
65791
65792
65793
65794
65795
65796
65797
65798
65799
65800
65801
65802
65803
65804
65805
65806
65807
65808
65809
65810
65811
65812
65813
65814
65815
65816
65817
65818
65819
65820
65821
65822
65823
65824
65825
65826
65827
65828
65829
65830
65831
65832
65833
65834
65835
65836
65837
65838
65839
65840
65841
65842
65843
65844
65845
65846
65847
65848
65849
65850
65851
65852
65853
65854
65855
65856
65857
65858
65859
65860
65861
65862
65863
65864
65865
65866
65867
65868
65869
65870
65871
65872
65873
65874
65875
65876
65877
65878
65879
65880
65881
65882
65883
65884
65885
65886
65887
65888
65889
65890
65891
65892
65893
65894
65895
65896
65897
65898
65899
65900
65901
65902
65903
65904
65905
65906
65907
65908
65909
65910
65911
65912
65913
65914
65915
65916
65917
65918
65919
65920
65921
65922
65923
65924
65925
65926
65927
65928
65929
65930
65931
65932
65933
65934
65935
65936
65937
65938
65939
65940
65941
65942
65943
65944
65945
65946
65947
65948
65949
65950
65951
65952
65953
65954
65955
65956
65957
65958
65959
65960
65961
65962
65963
65964
65965
65966
65967
65968
65969
65970
65971
65972
65973
65974
65975
65976
65977
65978
65979
65980
65981
65982
65983
65984
65985
65986
65987
65988
65989
65990
65991
65992
65993
65994
65995
65996
65997
65998
65999
66000
66001
66002
66003
66004
66005
66006
66007
66008
66009
66010
66011
66012
66013
66014
66015
66016
66017
66018
66019
66020
66021
66022
66023
66024
66025
66026
66027
66028
66029
66030
66031
66032
66033
66034
66035
66036
66037
66038
66039
66040
66041
66042
66043
66044
66045
66046
66047
66048
66049
66050
66051
66052
66053
66054
66055
66056
66057
66058
66059
66060
66061
66062
66063
66064
66065
66066
66067
66068
66069
66070
66071
66072
66073
66074
66075
66076
66077
66078
66079
66080
66081
66082
66083
66084
66085
66086
66087
66088
66089
66090
66091
66092
66093
66094
66095
66096
66097
66098
66099
66100
66101
66102
66103
66104
66105
66106
66107
66108
66109
66110
66111
66112
66113
66114
66115
66116
66117
66118
66119
66120
66121
66122
66123
66124
66125
66126
66127
66128
66129
66130
66131
66132
66133
66134
66135
66136
66137
66138
66139
66140
66141
66142
66143
66144
66145
66146
66147
66148
66149
66150
66151
66152
66153
66154
66155
66156
66157
66158
66159
66160
66161
66162
66163
66164
66165
66166
66167
66168
66169
66170
66171
66172
66173
66174
66175
66176
66177
66178
66179
66180
66181
66182
66183
66184
66185
66186
66187
66188
66189
66190
66191
66192
66193
66194
66195
66196
66197
66198
66199
66200
66201
66202
66203
66204
66205
66206
66207
66208
66209
66210
66211
66212
66213
66214
66215
66216
66217
66218
66219
66220
66221
66222
66223
66224
66225
66226
66227
66228
66229
66230
66231
66232
66233
66234
66235
66236
66237
66238
66239
66240
66241
66242
66243
66244
66245
66246
66247
66248
66249
66250
66251
66252
66253
66254
66255
66256
66257
66258
66259
66260
66261
66262
66263
66264
66265
66266
66267
66268
66269
66270
66271
66272
66273
66274
66275
66276
66277
66278
66279
66280
66281
66282
66283
66284
66285
66286
66287
66288
66289
66290
66291
66292
66293
66294
66295
66296
66297
66298
66299
66300
66301
66302
66303
66304
66305
66306
66307
66308
66309
66310
66311
66312
66313
66314
66315
66316
66317
66318
66319
66320
66321
66322
66323
66324
66325
66326
66327
66328
66329
66330
66331
66332
66333
66334
66335
66336
66337
66338
66339
66340
66341
66342
66343
66344
66345
66346
66347
66348
66349
66350
66351
66352
66353
66354
66355
66356
66357
66358
66359
66360
66361
66362
66363
66364
66365
66366
66367
66368
66369
66370
66371
66372
66373
66374
66375
66376
66377
66378
66379
66380
66381
66382
66383
66384
66385
66386
66387
66388
66389
66390
66391
66392
66393
66394
66395
66396
66397
66398
66399
66400
66401
66402
66403
66404
66405
66406
66407
66408
66409
66410
66411
66412
66413
66414
66415
66416
66417
66418
66419
66420
66421
66422
66423
66424
66425
66426
66427
66428
66429
66430
66431
66432
66433
66434
66435
66436
66437
66438
66439
66440
66441
66442
66443
66444
66445
66446
66447
66448
66449
66450
66451
66452
66453
66454
66455
66456
66457
66458
66459
66460
66461
66462
66463
66464
66465
66466
66467
66468
66469
66470
66471
66472
66473
66474
66475
66476
66477
66478
66479
66480
66481
66482
66483
66484
66485
66486
66487
66488
66489
66490
66491
66492
66493
66494
66495
66496
66497
66498
66499
66500
66501
66502
66503
66504
66505
66506
66507
66508
66509
66510
66511
66512
66513
66514
66515
66516
66517
66518
66519
66520
66521
66522
66523
66524
66525
66526
66527
66528
66529
66530
66531
66532
66533
66534
66535
66536
66537
66538
66539
66540
66541
66542
66543
66544
66545
66546
66547
66548
66549
66550
66551
66552
66553
66554
66555
66556
66557
66558
66559
66560
66561
66562
66563
66564
66565
66566
66567
66568
66569
66570
66571
66572
66573
66574
66575
66576
66577
66578
66579
66580
66581
66582
66583
66584
66585
66586
66587
66588
66589
66590
66591
66592
66593
66594
66595
66596
66597
66598
66599
66600
66601
66602
66603
66604
66605
66606
66607
66608
66609
66610
66611
66612
66613
66614
66615
66616
66617
66618
66619
66620
66621
66622
66623
66624
66625
66626
66627
66628
66629
66630
66631
66632
66633
66634
66635
66636
66637
66638
66639
66640
66641
66642
66643
66644
66645
66646
66647
66648
66649
66650
66651
66652
66653
66654
66655
66656
66657
66658
66659
66660
66661
66662
66663
66664
66665
66666
66667
66668
66669
66670
66671
66672
66673
66674
66675
66676
66677
66678
66679
66680
66681
66682
66683
66684
66685
66686
66687
66688
66689
66690
66691
66692
66693
66694
66695
66696
66697
66698
66699
66700
66701
66702
66703
66704
66705
66706
66707
66708
66709
66710
66711
66712
66713
66714
66715
66716
66717
66718
66719
66720
66721
66722
66723
66724
66725
66726
66727
66728
66729
66730
66731
66732
66733
66734
66735
66736
66737
66738
66739
66740
66741
66742
66743
66744
66745
66746
66747
66748
66749
66750
66751
66752
66753
66754
66755
66756
66757
66758
66759
66760
66761
66762
66763
66764
66765
66766
66767
66768
66769
66770
66771
66772
66773
66774
66775
66776
66777
66778
66779
66780
66781
66782
66783
66784
66785
66786
66787
66788
66789
66790
66791
66792
66793
66794
66795
66796
66797
66798
66799
66800
66801
66802
66803
66804
66805
66806
66807
66808
66809
66810
66811
66812
66813
66814
66815
66816
66817
66818
66819
66820
66821
66822
66823
66824
66825
66826
66827
66828
66829
66830
66831
66832
66833
66834
66835
66836
66837
66838
66839
66840
66841
66842
66843
66844
66845
66846
66847
66848
66849
66850
66851
66852
66853
66854
66855
66856
66857
66858
66859
66860
66861
66862
66863
66864
66865
66866
66867
66868
66869
66870
66871
66872
66873
66874
66875
66876
66877
66878
66879
66880
66881
66882
66883
66884
66885
66886
66887
66888
66889
66890
66891
66892
66893
66894
66895
66896
66897
66898
66899
66900
66901
66902
66903
66904
66905
66906
66907
66908
66909
66910
66911
66912
66913
66914
66915
66916
66917
66918
66919
66920
66921
66922
66923
66924
66925
66926
66927
66928
66929
66930
66931
66932
66933
66934
66935
66936
66937
66938
66939
66940
66941
66942
66943
66944
66945
66946
66947
66948
66949
66950
66951
66952
66953
66954
66955
66956
66957
66958
66959
66960
66961
66962
66963
66964
66965
66966
66967
66968
66969
66970
66971
66972
66973
66974
66975
66976
66977
66978
66979
66980
66981
66982
66983
66984
66985
66986
66987
66988
66989
66990
66991
66992
66993
66994
66995
66996
66997
66998
66999
67000
67001
67002
67003
67004
67005
67006
67007
67008
67009
67010
67011
67012
67013
67014
67015
67016
67017
67018
67019
67020
67021
67022
67023
67024
67025
67026
67027
67028
67029
67030
67031
67032
67033
67034
67035
67036
67037
67038
67039
67040
67041
67042
67043
67044
67045
67046
67047
67048
67049
67050
67051
67052
67053
67054
67055
67056
67057
67058
67059
67060
67061
67062
67063
67064
67065
67066
67067
67068
67069
67070
67071
67072
67073
67074
67075
67076
67077
67078
67079
67080
67081
67082
67083
67084
67085
67086
67087
67088
67089
67090
67091
67092
67093
67094
67095
67096
67097
67098
67099
67100
67101
67102
67103
67104
67105
67106
67107
67108
67109
67110
67111
67112
67113
67114
67115
67116
67117
67118
67119
67120
67121
67122
67123
67124
67125
67126
67127
67128
67129
67130
67131
67132
67133
67134
67135
67136
67137
67138
67139
67140
67141
67142
67143
67144
67145
67146
67147
67148
67149
67150
67151
67152
67153
67154
67155
67156
67157
67158
67159
67160
67161
67162
67163
67164
67165
67166
67167
67168
67169
67170
67171
67172
67173
67174
67175
67176
67177
67178
67179
67180
67181
67182
67183
67184
67185
67186
67187
67188
67189
67190
67191
67192
67193
67194
67195
67196
67197
67198
67199
67200
67201
67202
67203
67204
67205
67206
67207
67208
67209
67210
67211
67212
67213
67214
67215
67216
67217
67218
67219
67220
67221
67222
67223
67224
67225
67226
67227
67228
67229
67230
67231
67232
67233
67234
67235
67236
67237
67238
67239
67240
67241
67242
67243
67244
67245
67246
67247
67248
67249
67250
67251
67252
67253
67254
67255
67256
67257
67258
67259
67260
67261
67262
67263
67264
67265
67266
67267
67268
67269
67270
67271
67272
67273
67274
67275
67276
67277
67278
67279
67280
67281
67282
67283
67284
67285
67286
67287
67288
67289
67290
67291
67292
67293
67294
67295
67296
67297
67298
67299
67300
67301
67302
67303
67304
67305
67306
67307
67308
67309
67310
67311
67312
67313
67314
67315
67316
67317
67318
67319
67320
67321
67322
67323
67324
67325
67326
67327
67328
67329
67330
67331
67332
67333
67334
67335
67336
67337
67338
67339
67340
67341
67342
67343
67344
67345
67346
67347
67348
67349
67350
67351
67352
67353
67354
67355
67356
67357
67358
67359
67360
67361
67362
67363
67364
67365
67366
67367
67368
67369
67370
67371
67372
67373
67374
67375
67376
67377
67378
67379
67380
67381
67382
67383
67384
67385
67386
67387
67388
67389
67390
67391
67392
67393
67394
67395
67396
67397
67398
67399
67400
67401
67402
67403
67404
67405
67406
67407
67408
67409
67410
67411
67412
67413
67414
67415
67416
67417
67418
67419
67420
67421
67422
67423
67424
67425
67426
67427
67428
67429
67430
67431
67432
67433
67434
67435
67436
67437
67438
67439
67440
67441
67442
67443
67444
67445
67446
67447
67448
67449
67450
67451
67452
67453
67454
67455
67456
67457
67458
67459
67460
67461
67462
67463
67464
67465
67466
67467
67468
67469
67470
67471
67472
67473
67474
67475
67476
67477
67478
67479
67480
67481
67482
67483
67484
67485
67486
67487
67488
67489
67490
67491
67492
67493
67494
67495
67496
67497
67498
67499
67500
67501
67502
67503
67504
67505
67506
67507
67508
67509
67510
67511
67512
67513
67514
67515
67516
67517
67518
67519
67520
67521
67522
67523
67524
67525
67526
67527
67528
67529
67530
67531
67532
67533
67534
67535
67536
67537
67538
67539
67540
67541
67542
67543
67544
67545
67546
67547
67548
67549
67550
67551
67552
67553
67554
67555
67556
67557
67558
67559
67560
67561
67562
67563
67564
67565
67566
67567
67568
67569
67570
67571
67572
67573
67574
67575
67576
67577
67578
67579
67580
67581
67582
67583
67584
67585
67586
67587
67588
67589
67590
67591
67592
67593
67594
67595
67596
67597
67598
67599
67600
67601
67602
67603
67604
67605
67606
67607
67608
67609
67610
67611
67612
67613
67614
67615
67616
67617
67618
67619
67620
67621
67622
67623
67624
67625
67626
67627
67628
67629
67630
67631
67632
67633
67634
67635
67636
67637
67638
67639
67640
67641
67642
67643
67644
67645
67646
67647
67648
67649
67650
67651
67652
67653
67654
67655
67656
67657
67658
67659
67660
67661
67662
67663
67664
67665
67666
67667
67668
67669
67670
67671
67672
67673
67674
67675
67676
67677
67678
67679
67680
67681
67682
67683
67684
67685
67686
67687
67688
67689
67690
67691
67692
67693
67694
67695
67696
67697
67698
67699
67700
67701
67702
67703
67704
67705
67706
67707
67708
67709
67710
67711
67712
67713
67714
67715
67716
67717
67718
67719
67720
67721
67722
67723
67724
67725
67726
67727
67728
67729
67730
67731
67732
67733
67734
67735
67736
67737
67738
67739
67740
67741
67742
67743
67744
67745
67746
67747
67748
67749
67750
67751
67752
67753
67754
67755
67756
67757
67758
67759
67760
67761
67762
67763
67764
67765
67766
67767
67768
67769
67770
67771
67772
67773
67774
67775
67776
67777
67778
67779
67780
67781
67782
67783
67784
67785
67786
67787
67788
67789
67790
67791
67792
67793
67794
67795
67796
67797
67798
67799
67800
67801
67802
67803
67804
67805
67806
67807
67808
67809
67810
67811
67812
67813
67814
67815
67816
67817
67818
67819
67820
67821
67822
67823
67824
67825
67826
67827
67828
67829
67830
67831
67832
67833
67834
67835
67836
67837
67838
67839
67840
67841
67842
67843
67844
67845
67846
67847
67848
67849
67850
67851
67852
67853
67854
67855
67856
67857
67858
67859
67860
67861
67862
67863
67864
67865
67866
67867
67868
67869
67870
67871
67872
67873
67874
67875
67876
67877
67878
67879
67880
67881
67882
67883
67884
67885
67886
67887
67888
67889
67890
67891
67892
67893
67894
67895
67896
67897
67898
67899
67900
67901
67902
67903
67904
67905
67906
67907
67908
67909
67910
67911
67912
67913
67914
67915
67916
67917
67918
67919
67920
67921
67922
67923
67924
67925
67926
67927
67928
67929
67930
67931
67932
67933
67934
67935
67936
67937
67938
67939
67940
67941
67942
67943
67944
67945
67946
67947
67948
67949
67950
67951
67952
67953
67954
67955
67956
67957
67958
67959
67960
67961
67962
67963
67964
67965
67966
67967
67968
67969
67970
67971
67972
67973
67974
67975
67976
67977
67978
67979
67980
67981
67982
67983
67984
67985
67986
67987
67988
67989
67990
67991
67992
67993
67994
67995
67996
67997
67998
67999
68000
68001
68002
68003
68004
68005
68006
68007
68008
68009
68010
68011
68012
68013
68014
68015
68016
68017
68018
68019
68020
68021
68022
68023
68024
68025
68026
68027
68028
68029
68030
68031
68032
68033
68034
68035
68036
68037
68038
68039
68040
68041
68042
68043
68044
68045
68046
68047
68048
68049
68050
68051
68052
68053
68054
68055
68056
68057
68058
68059
68060
68061
68062
68063
68064
68065
68066
68067
68068
68069
68070
68071
68072
68073
68074
68075
68076
68077
68078
68079
68080
68081
68082
68083
68084
68085
68086
68087
68088
68089
68090
68091
68092
68093
68094
68095
68096
68097
68098
68099
68100
68101
68102
68103
68104
68105
68106
68107
68108
68109
68110
68111
68112
68113
68114
68115
68116
68117
68118
68119
68120
68121
68122
68123
68124
68125
68126
68127
68128
68129
68130
68131
68132
68133
68134
68135
68136
68137
68138
68139
68140
68141
68142
68143
68144
68145
68146
68147
68148
68149
68150
68151
68152
68153
68154
68155
68156
68157
68158
68159
68160
68161
68162
68163
68164
68165
68166
68167
68168
68169
68170
68171
68172
68173
68174
68175
68176
68177
68178
68179
68180
68181
68182
68183
68184
68185
68186
68187
68188
68189
68190
68191
68192
68193
68194
68195
68196
68197
68198
68199
68200
68201
68202
68203
68204
68205
68206
68207
68208
68209
68210
68211
68212
68213
68214
68215
68216
68217
68218
68219
68220
68221
68222
68223
68224
68225
68226
68227
68228
68229
68230
68231
68232
68233
68234
68235
68236
68237
68238
68239
68240
68241
68242
68243
68244
68245
68246
68247
68248
68249
68250
68251
68252
68253
68254
68255
68256
68257
68258
68259
68260
68261
68262
68263
68264
68265
68266
68267
68268
68269
68270
68271
68272
68273
68274
68275
68276
68277
68278
68279
68280
68281
68282
68283
68284
68285
68286
68287
68288
68289
68290
68291
68292
68293
68294
68295
68296
68297
68298
68299
68300
68301
68302
68303
68304
68305
68306
68307
68308
68309
68310
68311
68312
68313
68314
68315
68316
68317
68318
68319
68320
68321
68322
68323
68324
68325
68326
68327
68328
68329
68330
68331
68332
68333
68334
68335
68336
68337
68338
68339
68340
68341
68342
68343
68344
68345
68346
68347
68348
68349
68350
68351
68352
68353
68354
68355
68356
68357
68358
68359
68360
68361
68362
68363
68364
68365
68366
68367
68368
68369
68370
68371
68372
68373
68374
68375
68376
68377
68378
68379
68380
68381
68382
68383
68384
68385
68386
68387
68388
68389
68390
68391
68392
68393
68394
68395
68396
68397
68398
68399
68400
68401
68402
68403
68404
68405
68406
68407
68408
68409
68410
68411
68412
68413
68414
68415
68416
68417
68418
68419
68420
68421
68422
68423
68424
68425
68426
68427
68428
68429
68430
68431
68432
68433
68434
68435
68436
68437
68438
68439
68440
68441
68442
68443
68444
68445
68446
68447
68448
68449
68450
68451
68452
68453
68454
68455
68456
68457
68458
68459
68460
68461
68462
68463
68464
68465
68466
68467
68468
68469
68470
68471
68472
68473
68474
68475
68476
68477
68478
68479
68480
68481
68482
68483
68484
68485
68486
68487
68488
68489
68490
68491
68492
68493
68494
68495
68496
68497
68498
68499
68500
68501
68502
68503
68504
68505
68506
68507
68508
68509
68510
68511
68512
68513
68514
68515
68516
68517
68518
68519
68520
68521
68522
68523
68524
68525
68526
68527
68528
68529
68530
68531
68532
68533
68534
68535
68536
68537
68538
68539
68540
68541
68542
68543
68544
68545
68546
68547
68548
68549
68550
68551
68552
68553
68554
68555
68556
68557
68558
68559
68560
68561
68562
68563
68564
68565
68566
68567
68568
68569
68570
68571
68572
68573
68574
68575
68576
68577
68578
68579
68580
68581
68582
68583
68584
68585
68586
68587
68588
68589
68590
68591
68592
68593
68594
68595
68596
68597
68598
68599
68600
68601
68602
68603
68604
68605
68606
68607
68608
68609
68610
68611
68612
68613
68614
68615
68616
68617
68618
68619
68620
68621
68622
68623
68624
68625
68626
68627
68628
68629
68630
68631
68632
68633
68634
68635
68636
68637
68638
68639
68640
68641
68642
68643
68644
68645
68646
68647
68648
68649
68650
68651
68652
68653
68654
68655
68656
68657
68658
68659
68660
68661
68662
68663
68664
68665
68666
68667
68668
68669
68670
68671
68672
68673
68674
68675
68676
68677
68678
68679
68680
68681
68682
68683
68684
68685
68686
68687
68688
68689
68690
68691
68692
68693
68694
68695
68696
68697
68698
68699
68700
68701
68702
68703
68704
68705
68706
68707
68708
68709
68710
68711
68712
68713
68714
68715
68716
68717
68718
68719
68720
68721
68722
68723
68724
68725
68726
68727
68728
68729
68730
68731
68732
68733
68734
68735
68736
68737
68738
68739
68740
68741
68742
68743
68744
68745
68746
68747
68748
68749
68750
68751
68752
68753
68754
68755
68756
68757
68758
68759
68760
68761
68762
68763
68764
68765
68766
68767
68768
68769
68770
68771
68772
68773
68774
68775
68776
68777
68778
68779
68780
68781
68782
68783
68784
68785
68786
68787
68788
68789
68790
68791
68792
68793
68794
68795
68796
68797
68798
68799
68800
68801
68802
68803
68804
68805
68806
68807
68808
68809
68810
68811
68812
68813
68814
68815
68816
68817
68818
68819
68820
68821
68822
68823
68824
68825
68826
68827
68828
68829
68830
68831
68832
68833
68834
68835
68836
68837
68838
68839
68840
68841
68842
68843
68844
68845
68846
68847
68848
68849
68850
68851
68852
68853
68854
68855
68856
68857
68858
68859
68860
68861
68862
68863
68864
68865
68866
68867
68868
68869
68870
68871
68872
68873
68874
68875
68876
68877
68878
68879
68880
68881
68882
68883
68884
68885
68886
68887
68888
68889
68890
68891
68892
68893
68894
68895
68896
68897
68898
68899
68900
68901
68902
68903
68904
68905
68906
68907
68908
68909
68910
68911
68912
68913
68914
68915
68916
68917
68918
68919
68920
68921
68922
68923
68924
68925
68926
68927
68928
68929
68930
68931
68932
68933
68934
68935
68936
68937
68938
68939
68940
68941
68942
68943
68944
68945
68946
68947
68948
68949
68950
68951
68952
68953
68954
68955
68956
68957
68958
68959
68960
68961
68962
68963
68964
68965
68966
68967
68968
68969
68970
68971
68972
68973
68974
68975
68976
68977
68978
68979
68980
68981
68982
68983
68984
68985
68986
68987
68988
68989
68990
68991
68992
68993
68994
68995
68996
68997
68998
68999
69000
69001
69002
69003
69004
69005
69006
69007
69008
69009
69010
69011
69012
69013
69014
69015
69016
69017
69018
69019
69020
69021
69022
69023
69024
69025
69026
69027
69028
69029
69030
69031
69032
69033
69034
69035
69036
69037
69038
69039
69040
69041
69042
69043
69044
69045
69046
69047
69048
69049
69050
69051
69052
69053
69054
69055
69056
69057
69058
69059
69060
69061
69062
69063
69064
69065
69066
69067
69068
69069
69070
69071
69072
69073
69074
69075
69076
69077
69078
69079
69080
69081
69082
69083
69084
69085
69086
69087
69088
69089
69090
69091
69092
69093
69094
69095
69096
69097
69098
69099
69100
69101
69102
69103
69104
69105
69106
69107
69108
69109
69110
69111
69112
69113
69114
69115
69116
69117
69118
69119
69120
69121
69122
69123
69124
69125
69126
69127
69128
69129
69130
69131
69132
69133
69134
69135
69136
69137
69138
69139
69140
69141
69142
69143
69144
69145
69146
69147
69148
69149
69150
69151
69152
69153
69154
69155
69156
69157
69158
69159
69160
69161
69162
69163
69164
69165
69166
69167
69168
69169
69170
69171
69172
69173
69174
69175
69176
69177
69178
69179
69180
69181
69182
69183
69184
69185
69186
69187
69188
69189
69190
69191
69192
69193
69194
69195
69196
69197
69198
69199
69200
69201
69202
69203
69204
69205
69206
69207
69208
69209
69210
69211
69212
69213
69214
69215
69216
69217
69218
69219
69220
69221
69222
69223
69224
69225
69226
69227
69228
69229
69230
69231
69232
69233
69234
69235
69236
69237
69238
69239
69240
69241
69242
69243
69244
69245
69246
69247
69248
69249
69250
69251
69252
69253
69254
69255
69256
69257
69258
69259
69260
69261
69262
69263
69264
69265
69266
69267
69268
69269
69270
69271
69272
69273
69274
69275
69276
69277
69278
69279
69280
69281
69282
69283
69284
69285
69286
69287
69288
69289
69290
69291
69292
69293
69294
69295
69296
69297
69298
69299
69300
69301
69302
69303
69304
69305
69306
69307
69308
69309
69310
69311
69312
69313
69314
69315
69316
69317
69318
69319
69320
69321
69322
69323
69324
69325
69326
69327
69328
69329
69330
69331
69332
69333
69334
69335
69336
69337
69338
69339
69340
69341
69342
69343
69344
69345
69346
69347
69348
69349
69350
69351
69352
69353
69354
69355
69356
69357
69358
69359
69360
69361
69362
69363
69364
69365
69366
69367
69368
69369
69370
69371
69372
69373
69374
69375
69376
69377
69378
69379
69380
69381
69382
69383
69384
69385
69386
69387
69388
69389
69390
69391
69392
69393
69394
69395
69396
69397
69398
69399
69400
69401
69402
69403
69404
69405
69406
69407
69408
69409
69410
69411
69412
69413
69414
69415
69416
69417
69418
69419
69420
69421
69422
69423
69424
69425
69426
69427
69428
69429
69430
69431
69432
69433
69434
69435
69436
69437
69438
69439
69440
69441
69442
69443
69444
69445
69446
69447
69448
69449
69450
69451
69452
69453
69454
69455
69456
69457
69458
69459
69460
69461
69462
69463
69464
69465
69466
69467
69468
69469
69470
69471
69472
69473
69474
69475
69476
69477
69478
69479
69480
69481
69482
69483
69484
69485
69486
69487
69488
69489
69490
69491
69492
69493
69494
69495
69496
69497
69498
69499
69500
69501
69502
69503
69504
69505
69506
69507
69508
69509
69510
69511
69512
69513
69514
69515
69516
69517
69518
69519
69520
69521
69522
69523
69524
69525
69526
69527
69528
69529
69530
69531
69532
69533
69534
69535
69536
69537
69538
69539
69540
69541
69542
69543
69544
69545
69546
69547
69548
69549
69550
69551
69552
69553
69554
69555
69556
69557
69558
69559
69560
69561
69562
69563
69564
69565
69566
69567
69568
69569
69570
69571
69572
69573
69574
69575
69576
69577
69578
69579
69580
69581
69582
69583
69584
69585
69586
69587
69588
69589
69590
69591
69592
69593
69594
69595
69596
69597
69598
69599
69600
69601
69602
69603
69604
69605
69606
69607
69608
69609
69610
69611
69612
69613
69614
69615
69616
69617
69618
69619
69620
69621
69622
69623
69624
69625
69626
69627
69628
69629
69630
69631
69632
69633
69634
69635
69636
69637
69638
69639
69640
69641
69642
69643
69644
69645
69646
69647
69648
69649
69650
69651
69652
69653
69654
69655
69656
69657
69658
69659
69660
69661
69662
69663
69664
69665
69666
69667
69668
69669
69670
69671
69672
69673
69674
69675
69676
69677
69678
69679
69680
69681
69682
69683
69684
69685
69686
69687
69688
69689
69690
69691
69692
69693
69694
69695
69696
69697
69698
69699
69700
69701
69702
69703
69704
69705
69706
69707
69708
69709
69710
69711
69712
69713
69714
69715
69716
69717
69718
69719
69720
69721
69722
69723
69724
69725
69726
69727
69728
69729
69730
69731
69732
69733
69734
69735
69736
69737
69738
69739
69740
69741
69742
69743
69744
69745
69746
69747
69748
69749
69750
69751
69752
69753
69754
69755
69756
69757
69758
69759
69760
69761
69762
69763
69764
69765
69766
69767
69768
69769
69770
69771
69772
69773
69774
69775
69776
69777
69778
69779
69780
69781
69782
69783
69784
69785
69786
69787
69788
69789
69790
69791
69792
69793
69794
69795
69796
69797
69798
69799
69800
69801
69802
69803
69804
69805
69806
69807
69808
69809
69810
69811
69812
69813
69814
69815
69816
69817
69818
69819
69820
69821
69822
69823
69824
69825
69826
69827
69828
69829
69830
69831
69832
69833
69834
69835
69836
69837
69838
69839
69840
69841
69842
69843
69844
69845
69846
69847
69848
69849
69850
69851
69852
69853
69854
69855
69856
69857
69858
69859
69860
69861
69862
69863
69864
69865
69866
69867
69868
69869
69870
69871
69872
69873
69874
69875
69876
69877
69878
69879
69880
69881
69882
69883
69884
69885
69886
69887
69888
69889
69890
69891
69892
69893
69894
69895
69896
69897
69898
69899
69900
69901
69902
69903
69904
69905
69906
69907
69908
69909
69910
69911
69912
69913
69914
69915
69916
69917
69918
69919
69920
69921
69922
69923
69924
69925
69926
69927
69928
69929
69930
69931
69932
69933
69934
69935
69936
69937
69938
69939
69940
69941
69942
69943
69944
69945
69946
69947
69948
69949
69950
69951
69952
69953
69954
69955
69956
69957
69958
69959
69960
69961
69962
69963
69964
69965
69966
69967
69968
69969
69970
69971
69972
69973
69974
69975
69976
69977
69978
69979
69980
69981
69982
69983
69984
69985
69986
69987
69988
69989
69990
69991
69992
69993
69994
69995
69996
69997
69998
69999
70000
70001
70002
70003
70004
70005
70006
70007
70008
70009
70010
70011
70012
70013
70014
70015
70016
70017
70018
70019
70020
70021
70022
70023
70024
70025
70026
70027
70028
70029
70030
70031
70032
70033
70034
70035
70036
70037
70038
70039
70040
70041
70042
70043
70044
70045
70046
70047
70048
70049
70050
70051
70052
70053
70054
70055
70056
70057
70058
70059
70060
70061
70062
70063
70064
70065
70066
70067
70068
70069
70070
70071
70072
70073
70074
70075
70076
70077
70078
70079
70080
70081
70082
70083
70084
70085
70086
70087
70088
70089
70090
70091
70092
70093
70094
70095
70096
70097
70098
70099
70100
70101
70102
70103
70104
70105
70106
70107
70108
70109
70110
70111
70112
70113
70114
70115
70116
70117
70118
70119
70120
70121
70122
70123
70124
70125
70126
70127
70128
70129
70130
70131
70132
70133
70134
70135
70136
70137
70138
70139
70140
70141
70142
70143
70144
70145
70146
70147
70148
70149
70150
70151
70152
70153
70154
70155
70156
70157
70158
70159
70160
70161
70162
70163
70164
70165
70166
70167
70168
70169
70170
70171
70172
70173
70174
70175
70176
70177
70178
70179
70180
70181
70182
70183
70184
70185
70186
70187
70188
70189
70190
70191
70192
70193
70194
70195
70196
70197
70198
70199
70200
70201
70202
70203
70204
70205
70206
70207
70208
70209
70210
70211
70212
70213
70214
70215
70216
70217
70218
70219
70220
70221
70222
70223
70224
70225
70226
70227
70228
70229
70230
70231
70232
70233
70234
70235
70236
70237
70238
70239
70240
70241
70242
70243
70244
70245
70246
70247
70248
70249
70250
70251
70252
70253
70254
70255
70256
70257
70258
70259
70260
70261
70262
70263
70264
70265
70266
70267
70268
70269
70270
70271
70272
70273
70274
70275
70276
70277
70278
70279
70280
70281
70282
70283
70284
70285
70286
70287
70288
70289
70290
70291
70292
70293
70294
70295
70296
70297
70298
70299
70300
70301
70302
70303
70304
70305
70306
70307
70308
70309
70310
70311
70312
70313
70314
70315
70316
70317
70318
70319
70320
70321
70322
70323
70324
70325
70326
70327
70328
70329
70330
70331
70332
70333
70334
70335
70336
70337
70338
70339
70340
70341
70342
70343
70344
70345
70346
70347
70348
70349
70350
70351
70352
70353
70354
70355
70356
70357
70358
70359
70360
70361
70362
70363
70364
70365
70366
70367
70368
70369
70370
70371
70372
70373
70374
70375
70376
70377
70378
70379
70380
70381
70382
70383
70384
70385
70386
70387
70388
70389
70390
70391
70392
70393
70394
70395
70396
70397
70398
70399
70400
70401
70402
70403
70404
70405
70406
70407
70408
70409
70410
70411
70412
70413
70414
70415
70416
70417
70418
70419
70420
70421
70422
70423
70424
70425
70426
70427
70428
70429
70430
70431
70432
70433
70434
70435
70436
70437
70438
70439
70440
70441
70442
70443
70444
70445
70446
70447
70448
70449
70450
70451
70452
70453
70454
70455
70456
70457
70458
70459
70460
70461
70462
70463
70464
70465
70466
70467
70468
70469
70470
70471
70472
70473
70474
70475
70476
70477
70478
70479
70480
70481
70482
70483
70484
70485
70486
70487
70488
70489
70490
70491
70492
70493
70494
70495
70496
70497
70498
70499
70500
70501
70502
70503
70504
70505
70506
70507
70508
70509
70510
70511
70512
70513
70514
70515
70516
70517
70518
70519
70520
70521
70522
70523
70524
70525
70526
70527
70528
70529
70530
70531
70532
70533
70534
70535
70536
70537
70538
70539
70540
70541
70542
70543
70544
70545
70546
70547
70548
70549
70550
70551
70552
70553
70554
70555
70556
70557
70558
70559
70560
70561
70562
70563
70564
70565
70566
70567
70568
70569
70570
70571
70572
70573
70574
70575
70576
70577
70578
70579
70580
70581
70582
70583
70584
70585
70586
70587
70588
70589
70590
70591
70592
70593
70594
70595
70596
70597
70598
70599
70600
70601
70602
70603
70604
70605
70606
70607
70608
70609
70610
70611
70612
70613
70614
70615
70616
70617
70618
70619
70620
70621
70622
70623
70624
70625
70626
70627
70628
70629
70630
70631
70632
70633
70634
70635
70636
70637
70638
70639
70640
70641
70642
70643
70644
70645
70646
70647
70648
70649
70650
70651
70652
70653
70654
70655
70656
70657
70658
70659
70660
70661
70662
70663
70664
70665
70666
70667
70668
70669
70670
70671
70672
70673
70674
70675
70676
70677
70678
70679
70680
70681
70682
70683
70684
70685
70686
70687
70688
70689
70690
70691
70692
70693
70694
70695
70696
70697
70698
70699
70700
70701
70702
70703
70704
70705
70706
70707
70708
70709
70710
70711
70712
70713
70714
70715
70716
70717
70718
70719
70720
70721
70722
70723
70724
70725
70726
70727
70728
70729
70730
70731
70732
70733
70734
70735
70736
70737
70738
70739
70740
70741
70742
70743
70744
70745
70746
70747
70748
70749
70750
70751
70752
70753
70754
70755
70756
70757
70758
70759
70760
70761
70762
70763
70764
70765
70766
70767
70768
70769
70770
70771
70772
70773
70774
70775
70776
70777
70778
70779
70780
70781
70782
70783
70784
70785
70786
70787
70788
70789
70790
70791
70792
70793
70794
70795
70796
70797
70798
70799
70800
70801
70802
70803
70804
70805
70806
70807
70808
70809
70810
70811
70812
70813
70814
70815
70816
70817
70818
70819
70820
70821
70822
70823
70824
70825
70826
70827
70828
70829
70830
70831
70832
70833
70834
70835
70836
70837
70838
70839
70840
70841
70842
70843
70844
70845
70846
70847
70848
70849
70850
70851
70852
70853
70854
70855
70856
70857
70858
70859
70860
70861
70862
70863
70864
70865
70866
70867
70868
70869
70870
70871
70872
70873
70874
70875
70876
70877
70878
70879
70880
70881
70882
70883
70884
70885
70886
70887
70888
70889
70890
70891
70892
70893
70894
70895
70896
70897
70898
70899
70900
70901
70902
70903
70904
70905
70906
70907
70908
70909
70910
70911
70912
70913
70914
70915
70916
70917
70918
70919
70920
70921
70922
70923
70924
70925
70926
70927
70928
70929
70930
70931
70932
70933
70934
70935
70936
70937
70938
70939
70940
70941
70942
70943
70944
70945
70946
70947
70948
70949
70950
70951
70952
70953
70954
70955
70956
70957
70958
70959
70960
70961
70962
70963
70964
70965
70966
70967
70968
70969
70970
70971
70972
70973
70974
70975
70976
70977
70978
70979
70980
70981
70982
70983
70984
70985
70986
70987
70988
70989
70990
70991
70992
70993
70994
70995
70996
70997
70998
70999
71000
71001
71002
71003
71004
71005
71006
71007
71008
71009
71010
71011
71012
71013
71014
71015
71016
71017
71018
71019
71020
71021
71022
71023
71024
71025
71026
71027
71028
71029
71030
71031
71032
71033
71034
71035
71036
71037
71038
71039
71040
71041
71042
71043
71044
71045
71046
71047
71048
71049
71050
71051
71052
71053
71054
71055
71056
71057
71058
71059
71060
71061
71062
71063
71064
71065
71066
71067
71068
71069
71070
71071
71072
71073
71074
71075
71076
71077
71078
71079
71080
71081
71082
71083
71084
71085
71086
71087
71088
71089
71090
71091
71092
71093
71094
71095
71096
71097
71098
71099
71100
71101
71102
71103
71104
71105
71106
71107
71108
71109
71110
71111
71112
71113
71114
71115
71116
71117
71118
71119
71120
71121
71122
71123
71124
71125
71126
71127
71128
71129
71130
71131
71132
71133
71134
71135
71136
71137
71138
71139
71140
71141
71142
71143
71144
71145
71146
71147
71148
71149
71150
71151
71152
71153
71154
71155
71156
71157
71158
71159
71160
71161
71162
71163
71164
71165
71166
71167
71168
71169
71170
71171
71172
71173
71174
71175
71176
71177
71178
71179
71180
71181
71182
71183
71184
71185
71186
71187
71188
71189
71190
71191
71192
71193
71194
71195
71196
71197
71198
71199
71200
71201
71202
71203
71204
71205
71206
71207
71208
71209
71210
71211
71212
71213
71214
71215
71216
71217
71218
71219
71220
71221
71222
71223
71224
71225
71226
71227
71228
71229
71230
71231
71232
71233
71234
71235
71236
71237
71238
71239
71240
71241
71242
71243
71244
71245
71246
71247
71248
71249
71250
71251
71252
71253
71254
71255
71256
71257
71258
71259
71260
71261
71262
71263
71264
71265
71266
71267
71268
71269
71270
71271
71272
71273
71274
71275
71276
71277
71278
71279
71280
71281
71282
71283
71284
71285
71286
71287
71288
71289
71290
71291
71292
71293
71294
71295
71296
71297
71298
71299
71300
71301
71302
71303
71304
71305
71306
71307
71308
71309
71310
71311
71312
71313
71314
71315
71316
71317
71318
71319
71320
71321
71322
71323
71324
71325
71326
71327
71328
71329
71330
71331
71332
71333
71334
71335
71336
71337
71338
71339
71340
71341
71342
71343
71344
71345
71346
71347
71348
71349
71350
71351
71352
71353
71354
71355
71356
71357
71358
71359
71360
71361
71362
71363
71364
71365
71366
71367
71368
71369
71370
71371
71372
71373
71374
71375
71376
71377
71378
71379
71380
71381
71382
71383
71384
71385
71386
71387
71388
71389
71390
71391
71392
71393
71394
71395
71396
71397
71398
71399
71400
71401
71402
71403
71404
71405
71406
71407
71408
71409
71410
71411
71412
71413
71414
71415
71416
71417
71418
71419
71420
71421
71422
71423
71424
71425
71426
71427
71428
71429
71430
71431
71432
71433
71434
71435
71436
71437
71438
71439
71440
71441
71442
71443
71444
71445
71446
71447
71448
71449
71450
71451
71452
71453
71454
71455
71456
71457
71458
71459
71460
71461
71462
71463
71464
71465
71466
71467
71468
71469
71470
71471
71472
71473
71474
71475
71476
71477
71478
71479
71480
71481
71482
71483
71484
71485
71486
71487
71488
71489
71490
71491
71492
71493
71494
71495
71496
71497
71498
71499
71500
71501
71502
71503
71504
71505
71506
71507
71508
71509
71510
71511
71512
71513
71514
71515
71516
71517
71518
71519
71520
71521
71522
71523
71524
71525
71526
71527
71528
71529
71530
71531
71532
71533
71534
71535
71536
71537
71538
71539
71540
71541
71542
71543
71544
71545
71546
71547
71548
71549
71550
71551
71552
71553
71554
71555
71556
71557
71558
71559
71560
71561
71562
71563
71564
71565
71566
71567
71568
71569
71570
71571
71572
71573
71574
71575
71576
71577
71578
71579
71580
71581
71582
71583
71584
71585
71586
71587
71588
71589
71590
71591
71592
71593
71594
71595
71596
71597
71598
71599
71600
71601
71602
71603
71604
71605
71606
71607
71608
71609
71610
71611
71612
71613
71614
71615
71616
71617
71618
71619
71620
71621
71622
71623
71624
71625
71626
71627
71628
71629
71630
71631
71632
71633
71634
71635
71636
71637
71638
71639
71640
71641
71642
71643
71644
71645
71646
71647
71648
71649
71650
71651
71652
71653
71654
71655
71656
71657
71658
71659
71660
71661
71662
71663
71664
71665
71666
71667
71668
71669
71670
71671
71672
71673
71674
71675
71676
71677
71678
71679
71680
71681
71682
71683
71684
71685
71686
71687
71688
71689
71690
71691
71692
71693
71694
71695
71696
71697
71698
71699
71700
71701
71702
71703
71704
71705
71706
71707
71708
71709
71710
71711
71712
71713
71714
71715
71716
71717
71718
71719
71720
71721
71722
71723
71724
71725
71726
71727
71728
71729
71730
71731
71732
71733
71734
71735
71736
71737
71738
71739
71740
71741
71742
71743
71744
71745
71746
71747
71748
71749
71750
71751
71752
71753
71754
71755
71756
71757
71758
71759
71760
71761
71762
71763
71764
71765
71766
71767
71768
71769
71770
71771
71772
71773
71774
71775
71776
71777
71778
71779
71780
71781
71782
71783
71784
71785
71786
71787
71788
71789
71790
71791
71792
71793
71794
71795
71796
71797
71798
71799
71800
71801
71802
71803
71804
71805
71806
71807
71808
71809
71810
71811
71812
71813
71814
71815
71816
71817
71818
71819
71820
71821
71822
71823
71824
71825
71826
71827
71828
71829
71830
71831
71832
71833
71834
71835
71836
71837
71838
71839
71840
71841
71842
71843
71844
71845
71846
71847
71848
71849
71850
71851
71852
71853
71854
71855
71856
71857
71858
71859
71860
71861
71862
71863
71864
71865
71866
71867
71868
71869
71870
71871
71872
71873
71874
71875
71876
71877
71878
71879
71880
71881
71882
71883
71884
71885
71886
71887
71888
71889
71890
71891
71892
71893
71894
71895
71896
71897
71898
71899
71900
71901
71902
71903
71904
71905
71906
71907
71908
71909
71910
71911
71912
71913
71914
71915
71916
71917
71918
71919
71920
71921
71922
71923
71924
71925
71926
71927
71928
71929
71930
71931
71932
71933
71934
71935
71936
71937
71938
71939
71940
71941
71942
71943
71944
71945
71946
71947
71948
71949
71950
71951
71952
71953
71954
71955
71956
71957
71958
71959
71960
71961
71962
71963
71964
71965
71966
71967
71968
71969
71970
71971
71972
71973
71974
71975
71976
71977
71978
71979
71980
71981
71982
71983
71984
71985
71986
71987
71988
71989
71990
71991
71992
71993
71994
71995
71996
71997
71998
71999
72000
72001
72002
72003
72004
72005
72006
72007
72008
72009
72010
72011
72012
72013
72014
72015
72016
72017
72018
72019
72020
72021
72022
72023
72024
72025
72026
72027
72028
72029
72030
72031
72032
72033
72034
72035
72036
72037
72038
72039
72040
72041
72042
72043
72044
72045
72046
72047
72048
72049
72050
72051
72052
72053
72054
72055
72056
72057
72058
72059
72060
72061
72062
72063
72064
72065
72066
72067
72068
72069
72070
72071
72072
72073
72074
72075
72076
72077
72078
72079
72080
72081
72082
72083
72084
72085
72086
72087
72088
72089
72090
72091
72092
72093
72094
72095
72096
72097
72098
72099
72100
72101
72102
72103
72104
72105
72106
72107
72108
72109
72110
72111
72112
72113
72114
72115
72116
72117
72118
72119
72120
72121
72122
72123
72124
72125
72126
72127
72128
72129
72130
72131
72132
72133
72134
72135
72136
72137
72138
72139
72140
72141
72142
72143
72144
72145
72146
72147
72148
72149
72150
72151
72152
72153
72154
72155
72156
72157
72158
72159
72160
72161
72162
72163
72164
72165
72166
72167
72168
72169
72170
72171
72172
72173
72174
72175
72176
72177
72178
72179
72180
72181
72182
72183
72184
72185
72186
72187
72188
72189
72190
72191
72192
72193
72194
72195
72196
72197
72198
72199
72200
72201
72202
72203
72204
72205
72206
72207
72208
72209
72210
72211
72212
72213
72214
72215
72216
72217
72218
72219
72220
72221
72222
72223
72224
72225
72226
72227
72228
72229
72230
72231
72232
72233
72234
72235
72236
72237
72238
72239
72240
72241
72242
72243
72244
72245
72246
72247
72248
72249
72250
72251
72252
72253
72254
72255
72256
72257
72258
72259
72260
72261
72262
72263
72264
72265
72266
72267
72268
72269
72270
72271
72272
72273
72274
72275
72276
72277
72278
72279
72280
72281
72282
72283
72284
72285
72286
72287
72288
72289
72290
72291
72292
72293
72294
72295
72296
72297
72298
72299
72300
72301
72302
72303
72304
72305
72306
72307
72308
72309
72310
72311
72312
72313
72314
72315
72316
72317
72318
72319
72320
72321
72322
72323
72324
72325
72326
72327
72328
72329
72330
72331
72332
72333
72334
72335
72336
72337
72338
72339
72340
72341
72342
72343
72344
72345
72346
72347
72348
72349
72350
72351
72352
72353
72354
72355
72356
72357
72358
72359
72360
72361
72362
72363
72364
72365
72366
72367
72368
72369
72370
72371
72372
72373
72374
72375
72376
72377
72378
72379
72380
72381
72382
72383
72384
72385
72386
72387
72388
72389
72390
72391
72392
72393
72394
72395
72396
72397
72398
72399
72400
72401
72402
72403
72404
72405
72406
72407
72408
72409
72410
72411
72412
72413
72414
72415
72416
72417
72418
72419
72420
72421
72422
72423
72424
72425
72426
72427
72428
72429
72430
72431
72432
72433
72434
72435
72436
72437
72438
72439
72440
72441
72442
72443
72444
72445
72446
72447
72448
72449
72450
72451
72452
72453
72454
72455
72456
72457
72458
72459
72460
72461
72462
72463
72464
72465
72466
72467
72468
72469
72470
72471
72472
72473
72474
72475
72476
72477
72478
72479
72480
72481
72482
72483
72484
72485
72486
72487
72488
72489
72490
72491
72492
72493
72494
72495
72496
72497
72498
72499
72500
72501
72502
72503
72504
72505
72506
72507
72508
72509
72510
72511
72512
72513
72514
72515
72516
72517
72518
72519
72520
72521
72522
72523
72524
72525
72526
72527
72528
72529
72530
72531
72532
72533
72534
72535
72536
72537
72538
72539
72540
72541
72542
72543
72544
72545
72546
72547
72548
72549
72550
72551
72552
72553
72554
72555
72556
72557
72558
72559
72560
72561
72562
72563
72564
72565
72566
72567
72568
72569
72570
72571
72572
72573
72574
72575
72576
72577
72578
72579
72580
72581
72582
72583
72584
72585
72586
72587
72588
72589
72590
72591
72592
72593
72594
72595
72596
72597
72598
72599
72600
72601
72602
72603
72604
72605
72606
72607
72608
72609
72610
72611
72612
72613
72614
72615
72616
72617
72618
72619
72620
72621
72622
72623
72624
72625
72626
72627
72628
72629
72630
72631
72632
72633
72634
72635
72636
72637
72638
72639
72640
72641
72642
72643
72644
72645
72646
72647
72648
72649
72650
72651
72652
72653
72654
72655
72656
72657
72658
72659
72660
72661
72662
72663
72664
72665
72666
72667
72668
72669
72670
72671
72672
72673
72674
72675
72676
72677
72678
72679
72680
72681
72682
72683
72684
72685
72686
72687
72688
72689
72690
72691
72692
72693
72694
72695
72696
72697
72698
72699
72700
72701
72702
72703
72704
72705
72706
72707
72708
72709
72710
72711
72712
72713
72714
72715
72716
72717
72718
72719
72720
72721
72722
72723
72724
72725
72726
72727
72728
72729
72730
72731
72732
72733
72734
72735
72736
72737
72738
72739
72740
72741
72742
72743
72744
72745
72746
72747
72748
72749
72750
72751
72752
72753
72754
72755
72756
72757
72758
72759
72760
72761
72762
72763
72764
72765
72766
72767
72768
72769
72770
72771
72772
72773
72774
72775
72776
72777
72778
72779
72780
72781
72782
72783
72784
72785
72786
72787
72788
72789
72790
72791
72792
72793
72794
72795
72796
72797
72798
72799
72800
72801
72802
72803
72804
72805
72806
72807
72808
72809
72810
72811
72812
72813
72814
72815
72816
72817
72818
72819
72820
72821
72822
72823
72824
72825
72826
72827
72828
72829
72830
72831
72832
72833
72834
72835
72836
72837
72838
72839
72840
72841
72842
72843
72844
72845
72846
72847
72848
72849
72850
72851
72852
72853
72854
72855
72856
72857
72858
72859
72860
72861
72862
72863
72864
72865
72866
72867
72868
72869
72870
72871
72872
72873
72874
72875
72876
72877
72878
72879
72880
72881
72882
72883
72884
72885
72886
72887
72888
72889
72890
72891
72892
72893
72894
72895
72896
72897
72898
72899
72900
72901
72902
72903
72904
72905
72906
72907
72908
72909
72910
72911
72912
72913
72914
72915
72916
72917
72918
72919
72920
72921
72922
72923
72924
72925
72926
72927
72928
72929
72930
72931
72932
72933
72934
72935
72936
72937
72938
72939
72940
72941
72942
72943
72944
72945
72946
72947
72948
72949
72950
72951
72952
72953
72954
72955
72956
72957
72958
72959
72960
72961
72962
72963
72964
72965
72966
72967
72968
72969
72970
72971
72972
72973
72974
72975
72976
72977
72978
72979
72980
72981
72982
72983
72984
72985
72986
72987
72988
72989
72990
72991
72992
72993
72994
72995
72996
72997
72998
72999
73000
73001
73002
73003
73004
73005
73006
73007
73008
73009
73010
73011
73012
73013
73014
73015
73016
73017
73018
73019
73020
73021
73022
73023
73024
73025
73026
73027
73028
73029
73030
73031
73032
73033
73034
73035
73036
73037
73038
73039
73040
73041
73042
73043
73044
73045
73046
73047
73048
73049
73050
73051
73052
73053
73054
73055
73056
73057
73058
73059
73060
73061
73062
73063
73064
73065
73066
73067
73068
73069
73070
73071
73072
73073
73074
73075
73076
73077
73078
73079
73080
73081
73082
73083
73084
73085
73086
73087
73088
73089
73090
73091
73092
73093
73094
73095
73096
73097
73098
73099
73100
73101
73102
73103
73104
73105
73106
73107
73108
73109
73110
73111
73112
73113
73114
73115
73116
73117
73118
73119
73120
73121
73122
73123
73124
73125
73126
73127
73128
73129
73130
73131
73132
73133
73134
73135
73136
73137
73138
73139
73140
73141
73142
73143
73144
73145
73146
73147
73148
73149
73150
73151
73152
73153
73154
73155
73156
73157
73158
73159
73160
73161
73162
73163
73164
73165
73166
73167
73168
73169
73170
73171
73172
73173
73174
73175
73176
73177
73178
73179
73180
73181
73182
73183
73184
73185
73186
73187
73188
73189
73190
73191
73192
73193
73194
73195
73196
73197
73198
73199
73200
73201
73202
73203
73204
73205
73206
73207
73208
73209
73210
73211
73212
73213
73214
73215
73216
73217
73218
73219
73220
73221
73222
73223
73224
73225
73226
73227
73228
73229
73230
73231
73232
73233
73234
73235
73236
73237
73238
73239
73240
73241
73242
73243
73244
73245
73246
73247
73248
73249
73250
73251
73252
73253
73254
73255
73256
73257
73258
73259
73260
73261
73262
73263
73264
73265
73266
73267
73268
73269
73270
73271
73272
73273
73274
73275
73276
73277
73278
73279
73280
73281
73282
73283
73284
73285
73286
73287
73288
73289
73290
73291
73292
73293
73294
73295
73296
73297
73298
73299
73300
73301
73302
73303
73304
73305
73306
73307
73308
73309
73310
73311
73312
73313
73314
73315
73316
73317
73318
73319
73320
73321
73322
73323
73324
73325
73326
73327
73328
73329
73330
73331
73332
73333
73334
73335
73336
73337
73338
73339
73340
73341
73342
73343
73344
73345
73346
73347
73348
73349
73350
73351
73352
73353
73354
73355
73356
73357
73358
73359
73360
73361
73362
73363
73364
73365
73366
73367
73368
73369
73370
73371
73372
73373
73374
73375
73376
73377
73378
73379
73380
73381
73382
73383
73384
73385
73386
73387
73388
73389
73390
73391
73392
73393
73394
73395
73396
73397
73398
73399
73400
73401
73402
73403
73404
73405
73406
73407
73408
73409
73410
73411
73412
73413
73414
73415
73416
73417
73418
73419
73420
73421
73422
73423
73424
73425
73426
73427
73428
73429
73430
73431
73432
73433
73434
73435
73436
73437
73438
73439
73440
73441
73442
73443
73444
73445
73446
73447
73448
73449
73450
73451
73452
73453
73454
73455
73456
73457
73458
73459
73460
73461
73462
73463
73464
73465
73466
73467
73468
73469
73470
73471
73472
73473
73474
73475
73476
73477
73478
73479
73480
73481
73482
73483
73484
73485
73486
73487
73488
73489
73490
73491
73492
73493
73494
73495
73496
73497
73498
73499
73500
73501
73502
73503
73504
73505
73506
73507
73508
73509
73510
73511
73512
73513
73514
73515
73516
73517
73518
73519
73520
73521
73522
73523
73524
73525
73526
73527
73528
73529
73530
73531
73532
73533
73534
73535
73536
73537
73538
73539
73540
73541
73542
73543
73544
73545
73546
73547
73548
73549
73550
73551
73552
73553
73554
73555
73556
73557
73558
73559
73560
73561
73562
73563
73564
73565
73566
73567
73568
73569
73570
73571
73572
73573
73574
73575
73576
73577
73578
73579
73580
73581
73582
73583
73584
73585
73586
73587
73588
73589
73590
73591
73592
73593
73594
73595
73596
73597
73598
73599
73600
73601
73602
73603
73604
73605
73606
73607
73608
73609
73610
73611
73612
73613
73614
73615
73616
73617
73618
73619
73620
73621
73622
73623
73624
73625
73626
73627
73628
73629
73630
73631
73632
73633
73634
73635
73636
73637
73638
73639
73640
73641
73642
73643
73644
73645
73646
73647
73648
73649
73650
73651
73652
73653
73654
73655
73656
73657
73658
73659
73660
73661
73662
73663
73664
73665
73666
73667
73668
73669
73670
73671
73672
73673
73674
73675
73676
73677
73678
73679
73680
73681
73682
73683
73684
73685
73686
73687
73688
73689
73690
73691
73692
73693
73694
73695
73696
73697
73698
73699
73700
73701
73702
73703
73704
73705
73706
73707
73708
73709
73710
73711
73712
73713
73714
73715
73716
73717
73718
73719
73720
73721
73722
73723
73724
73725
73726
73727
73728
73729
73730
73731
73732
73733
73734
73735
73736
73737
73738
73739
73740
73741
73742
73743
73744
73745
73746
73747
73748
73749
73750
73751
73752
73753
73754
73755
73756
73757
73758
73759
73760
73761
73762
73763
73764
73765
73766
73767
73768
73769
73770
73771
73772
73773
73774
73775
73776
73777
73778
73779
73780
73781
73782
73783
73784
73785
73786
73787
73788
73789
73790
73791
73792
73793
73794
73795
73796
73797
73798
73799
73800
73801
73802
73803
73804
73805
73806
73807
73808
73809
73810
73811
73812
73813
73814
73815
73816
73817
73818
73819
73820
73821
73822
73823
73824
73825
73826
73827
73828
73829
73830
73831
73832
73833
73834
73835
73836
73837
73838
73839
73840
73841
73842
73843
73844
73845
73846
73847
73848
73849
73850
73851
73852
73853
73854
73855
73856
73857
73858
73859
73860
73861
73862
73863
73864
73865
73866
73867
73868
73869
73870
73871
73872
73873
73874
73875
73876
73877
73878
73879
73880
73881
73882
73883
73884
73885
73886
73887
73888
73889
73890
73891
73892
73893
73894
73895
73896
73897
73898
73899
73900
73901
73902
73903
73904
73905
73906
73907
73908
73909
73910
73911
73912
73913
73914
73915
73916
73917
73918
73919
73920
73921
73922
73923
73924
73925
73926
73927
73928
73929
73930
73931
73932
73933
73934
73935
73936
73937
73938
73939
73940
73941
73942
73943
73944
73945
73946
73947
73948
73949
73950
73951
73952
73953
73954
73955
73956
73957
73958
73959
73960
73961
73962
73963
73964
73965
73966
73967
73968
73969
73970
73971
73972
73973
73974
73975
73976
73977
73978
73979
73980
73981
73982
73983
73984
73985
73986
73987
73988
73989
73990
73991
73992
73993
73994
73995
73996
73997
73998
73999
74000
74001
74002
74003
74004
74005
74006
74007
74008
74009
74010
74011
74012
74013
74014
74015
74016
74017
74018
74019
74020
74021
74022
74023
74024
74025
74026
74027
74028
74029
74030
74031
74032
74033
74034
74035
74036
74037
74038
74039
74040
74041
74042
74043
74044
74045
74046
74047
74048
74049
74050
74051
74052
74053
74054
74055
74056
74057
74058
74059
74060
74061
74062
74063
74064
74065
74066
74067
74068
74069
74070
74071
74072
74073
74074
74075
74076
74077
74078
74079
74080
74081
74082
74083
74084
74085
74086
74087
74088
74089
74090
74091
74092
74093
74094
74095
74096
74097
74098
74099
74100
74101
74102
74103
74104
74105
74106
74107
74108
74109
74110
74111
74112
74113
74114
74115
74116
74117
74118
74119
74120
74121
74122
74123
74124
74125
74126
74127
74128
74129
74130
74131
74132
74133
74134
74135
74136
74137
74138
74139
74140
74141
74142
74143
74144
74145
74146
74147
74148
74149
74150
74151
74152
74153
74154
74155
74156
74157
74158
74159
74160
74161
74162
74163
74164
74165
74166
74167
74168
74169
74170
74171
74172
74173
74174
74175
74176
74177
74178
74179
74180
74181
74182
74183
74184
74185
74186
74187
74188
74189
74190
74191
74192
74193
74194
74195
74196
74197
74198
74199
74200
74201
74202
74203
74204
74205
74206
74207
74208
74209
74210
74211
74212
74213
74214
74215
74216
74217
74218
74219
74220
74221
74222
74223
74224
74225
74226
74227
74228
74229
74230
74231
74232
74233
74234
74235
74236
74237
74238
74239
74240
74241
74242
74243
74244
74245
74246
74247
74248
74249
74250
74251
74252
74253
74254
74255
74256
74257
74258
74259
74260
74261
74262
74263
74264
74265
74266
74267
74268
74269
74270
74271
74272
74273
74274
74275
74276
74277
74278
74279
74280
74281
74282
74283
74284
74285
74286
74287
74288
74289
74290
74291
74292
74293
74294
74295
74296
74297
74298
74299
74300
74301
74302
74303
74304
74305
74306
74307
74308
74309
74310
74311
74312
74313
74314
74315
74316
74317
74318
74319
74320
74321
74322
74323
74324
74325
74326
74327
74328
74329
74330
74331
74332
74333
74334
74335
74336
74337
74338
74339
74340
74341
74342
74343
74344
74345
74346
74347
74348
74349
74350
74351
74352
74353
74354
74355
74356
74357
74358
74359
74360
74361
74362
74363
74364
74365
74366
74367
74368
74369
74370
74371
74372
74373
74374
74375
74376
74377
74378
74379
74380
74381
74382
74383
74384
74385
74386
74387
74388
74389
74390
74391
74392
74393
74394
74395
74396
74397
74398
74399
74400
74401
74402
74403
74404
74405
74406
74407
74408
74409
74410
74411
74412
74413
74414
74415
74416
74417
74418
74419
74420
74421
74422
74423
74424
74425
74426
74427
74428
74429
74430
74431
74432
74433
74434
74435
74436
74437
74438
74439
74440
74441
74442
74443
74444
74445
74446
74447
74448
74449
74450
74451
74452
74453
74454
74455
74456
74457
74458
74459
74460
74461
74462
74463
74464
74465
74466
74467
74468
74469
74470
74471
74472
74473
74474
74475
74476
74477
74478
74479
74480
74481
74482
74483
74484
74485
74486
74487
74488
74489
74490
74491
74492
74493
74494
74495
74496
74497
74498
74499
74500
74501
74502
74503
74504
74505
74506
74507
74508
74509
74510
74511
74512
74513
74514
74515
74516
74517
74518
74519
74520
74521
74522
74523
74524
74525
74526
74527
74528
74529
74530
74531
74532
74533
74534
74535
74536
74537
74538
74539
74540
74541
74542
74543
74544
74545
74546
74547
74548
74549
74550
74551
74552
74553
74554
74555
74556
74557
74558
74559
74560
74561
74562
74563
74564
74565
74566
74567
74568
74569
74570
74571
74572
74573
74574
74575
74576
74577
74578
74579
74580
74581
74582
74583
74584
74585
74586
74587
74588
74589
74590
74591
74592
74593
74594
74595
74596
74597
74598
74599
74600
74601
74602
74603
74604
74605
74606
74607
74608
74609
74610
74611
74612
74613
74614
74615
74616
74617
74618
74619
74620
74621
74622
74623
74624
74625
74626
74627
74628
74629
74630
74631
74632
74633
74634
74635
74636
74637
74638
74639
74640
74641
74642
74643
74644
74645
74646
74647
74648
74649
74650
74651
74652
74653
74654
74655
74656
74657
74658
74659
74660
74661
74662
74663
74664
74665
74666
74667
74668
74669
74670
74671
74672
74673
74674
74675
74676
74677
74678
74679
74680
74681
74682
74683
74684
74685
74686
74687
74688
74689
74690
74691
74692
74693
74694
74695
74696
74697
74698
74699
74700
74701
74702
74703
74704
74705
74706
74707
74708
74709
74710
74711
74712
74713
74714
74715
74716
74717
74718
74719
74720
74721
74722
74723
74724
74725
74726
74727
74728
74729
74730
74731
74732
74733
74734
74735
74736
74737
74738
74739
74740
74741
74742
74743
74744
74745
74746
74747
74748
74749
74750
74751
74752
74753
74754
74755
74756
74757
74758
74759
74760
74761
74762
74763
74764
74765
74766
74767
74768
74769
74770
74771
74772
74773
74774
74775
74776
74777
74778
74779
74780
74781
74782
74783
74784
74785
74786
74787
74788
74789
74790
74791
74792
74793
74794
74795
74796
74797
74798
74799
74800
74801
74802
74803
74804
74805
74806
74807
74808
74809
74810
74811
74812
74813
74814
74815
74816
74817
74818
74819
74820
74821
74822
74823
74824
74825
74826
74827
74828
74829
74830
74831
74832
74833
74834
74835
74836
74837
74838
74839
74840
74841
74842
74843
74844
74845
74846
74847
74848
74849
74850
74851
74852
74853
74854
74855
74856
74857
74858
74859
74860
74861
74862
74863
74864
74865
74866
74867
74868
74869
74870
74871
74872
74873
74874
74875
74876
74877
74878
74879
74880
74881
74882
74883
74884
74885
74886
74887
74888
74889
74890
74891
74892
74893
74894
74895
74896
74897
74898
74899
74900
74901
74902
74903
74904
74905
74906
74907
74908
74909
74910
74911
74912
74913
74914
74915
74916
74917
74918
74919
74920
74921
74922
74923
74924
74925
74926
74927
74928
74929
74930
74931
74932
74933
74934
74935
74936
74937
74938
74939
74940
74941
74942
74943
74944
74945
74946
74947
74948
74949
74950
74951
74952
74953
74954
74955
74956
74957
74958
74959
74960
74961
74962
74963
74964
74965
74966
74967
74968
74969
74970
74971
74972
74973
74974
74975
74976
74977
74978
74979
74980
74981
74982
74983
74984
74985
74986
74987
74988
74989
74990
74991
74992
74993
74994
74995
74996
74997
74998
74999
75000
75001
75002
75003
75004
75005
75006
75007
75008
75009
75010
75011
75012
75013
75014
75015
75016
75017
75018
75019
75020
75021
75022
75023
75024
75025
75026
75027
75028
75029
75030
75031
75032
75033
75034
75035
75036
75037
75038
75039
75040
75041
75042
75043
75044
75045
75046
75047
75048
75049
75050
75051
75052
75053
75054
75055
75056
75057
75058
75059
75060
75061
75062
75063
75064
75065
75066
75067
75068
75069
75070
75071
75072
75073
75074
75075
75076
75077
75078
75079
75080
75081
75082
75083
75084
75085
75086
75087
75088
75089
75090
75091
75092
75093
75094
75095
75096
75097
75098
75099
75100
75101
75102
75103
75104
75105
75106
75107
75108
75109
75110
75111
75112
75113
75114
75115
75116
75117
75118
75119
75120
75121
75122
75123
75124
75125
75126
75127
75128
75129
75130
75131
75132
75133
75134
75135
75136
75137
75138
75139
75140
75141
75142
75143
75144
75145
75146
75147
75148
75149
75150
75151
75152
75153
75154
75155
75156
75157
75158
75159
75160
75161
75162
75163
75164
75165
75166
75167
75168
75169
75170
75171
75172
75173
75174
75175
75176
75177
75178
75179
75180
75181
75182
75183
75184
75185
75186
75187
75188
75189
75190
75191
75192
75193
75194
75195
75196
75197
75198
75199
75200
75201
75202
75203
75204
75205
75206
75207
75208
75209
75210
75211
75212
75213
75214
75215
75216
75217
75218
75219
75220
75221
75222
75223
75224
75225
75226
75227
75228
75229
75230
75231
75232
75233
75234
75235
75236
75237
75238
75239
75240
75241
75242
75243
75244
75245
75246
75247
75248
75249
75250
75251
75252
75253
75254
75255
75256
75257
75258
75259
75260
75261
75262
75263
75264
75265
75266
75267
75268
75269
75270
75271
75272
75273
75274
75275
75276
75277
75278
75279
75280
75281
75282
75283
75284
75285
75286
75287
75288
75289
75290
75291
75292
75293
75294
75295
75296
75297
75298
75299
75300
75301
75302
75303
75304
75305
75306
75307
75308
75309
75310
75311
75312
75313
75314
75315
75316
75317
75318
75319
75320
75321
75322
75323
75324
75325
75326
75327
75328
75329
75330
75331
75332
75333
75334
75335
75336
75337
75338
75339
75340
75341
75342
75343
75344
75345
75346
75347
75348
75349
75350
75351
75352
75353
75354
75355
75356
75357
75358
75359
75360
75361
75362
75363
75364
75365
75366
75367
75368
75369
75370
75371
75372
75373
75374
75375
75376
75377
75378
75379
75380
75381
75382
75383
75384
75385
75386
75387
75388
75389
75390
75391
75392
75393
75394
75395
75396
75397
75398
75399
75400
75401
75402
75403
75404
75405
75406
75407
75408
75409
75410
75411
75412
75413
75414
75415
75416
75417
75418
75419
75420
75421
75422
75423
75424
75425
75426
75427
75428
75429
75430
75431
75432
75433
75434
75435
75436
75437
75438
75439
75440
75441
75442
75443
75444
75445
75446
75447
75448
75449
75450
75451
75452
75453
75454
75455
75456
75457
75458
75459
75460
75461
75462
75463
75464
75465
75466
75467
75468
75469
75470
75471
75472
75473
75474
75475
75476
75477
75478
75479
75480
75481
75482
75483
75484
75485
75486
75487
75488
75489
75490
75491
75492
75493
75494
75495
75496
75497
75498
75499
75500
75501
75502
75503
75504
75505
75506
75507
75508
75509
75510
75511
75512
75513
75514
75515
75516
75517
75518
75519
75520
75521
75522
75523
75524
75525
75526
75527
75528
75529
75530
75531
75532
75533
75534
75535
75536
75537
75538
75539
75540
75541
75542
75543
75544
75545
75546
75547
75548
75549
75550
75551
75552
75553
75554
75555
75556
75557
75558
75559
75560
75561
75562
75563
75564
75565
75566
75567
75568
75569
75570
75571
75572
75573
75574
75575
75576
75577
75578
75579
75580
75581
75582
75583
75584
75585
75586
75587
75588
75589
75590
75591
75592
75593
75594
75595
75596
75597
75598
75599
75600
75601
75602
75603
75604
75605
75606
75607
75608
75609
75610
75611
75612
75613
75614
75615
75616
75617
75618
75619
75620
75621
75622
75623
75624
75625
75626
75627
75628
75629
75630
75631
75632
75633
75634
75635
75636
75637
75638
75639
75640
75641
75642
75643
75644
75645
75646
75647
75648
75649
75650
75651
75652
75653
75654
75655
75656
75657
75658
75659
75660
75661
75662
75663
75664
75665
75666
75667
75668
75669
75670
75671
75672
75673
75674
75675
75676
75677
75678
75679
75680
75681
75682
75683
75684
75685
75686
75687
75688
75689
75690
75691
75692
75693
75694
75695
75696
75697
75698
75699
75700
75701
75702
75703
75704
75705
75706
75707
75708
75709
75710
75711
75712
75713
75714
75715
75716
75717
75718
75719
75720
75721
75722
75723
75724
75725
75726
75727
75728
75729
75730
75731
75732
75733
75734
75735
75736
75737
75738
75739
75740
75741
75742
75743
75744
75745
75746
75747
75748
75749
75750
75751
75752
75753
75754
75755
75756
75757
75758
75759
75760
75761
75762
75763
75764
75765
75766
75767
75768
75769
75770
75771
75772
75773
75774
75775
75776
75777
75778
75779
75780
75781
75782
75783
75784
75785
75786
75787
75788
75789
75790
75791
75792
75793
75794
75795
75796
75797
75798
75799
75800
75801
75802
75803
75804
75805
75806
75807
75808
75809
75810
75811
75812
75813
75814
75815
75816
75817
75818
75819
75820
75821
75822
75823
75824
75825
75826
75827
75828
75829
75830
75831
75832
75833
75834
75835
75836
75837
75838
75839
75840
75841
75842
75843
75844
75845
75846
75847
75848
75849
75850
75851
75852
75853
75854
75855
75856
75857
75858
75859
75860
75861
75862
75863
75864
75865
75866
75867
75868
75869
75870
75871
75872
75873
75874
75875
75876
75877
75878
75879
75880
75881
75882
75883
75884
75885
75886
75887
75888
75889
75890
75891
75892
75893
75894
75895
75896
75897
75898
75899
75900
75901
75902
75903
75904
75905
75906
75907
75908
75909
75910
75911
75912
75913
75914
75915
75916
75917
75918
75919
75920
75921
75922
75923
75924
75925
75926
75927
75928
75929
75930
75931
75932
75933
75934
75935
75936
75937
75938
75939
75940
75941
75942
75943
75944
75945
75946
75947
75948
75949
75950
75951
75952
75953
75954
75955
75956
75957
75958
75959
75960
75961
75962
75963
75964
75965
75966
75967
75968
75969
75970
75971
75972
75973
75974
75975
75976
75977
75978
75979
75980
75981
75982
75983
75984
75985
75986
75987
75988
75989
75990
75991
75992
75993
75994
75995
75996
75997
75998
75999
76000
76001
76002
76003
76004
76005
76006
76007
76008
76009
76010
76011
76012
76013
76014
76015
76016
76017
76018
76019
76020
76021
76022
76023
76024
76025
76026
76027
76028
76029
76030
76031
76032
76033
76034
76035
76036
76037
76038
76039
76040
76041
76042
76043
76044
76045
76046
76047
76048
76049
76050
76051
76052
76053
76054
76055
76056
76057
76058
76059
76060
76061
76062
76063
76064
76065
76066
76067
76068
76069
76070
76071
76072
76073
76074
76075
76076
76077
76078
76079
76080
76081
76082
76083
76084
76085
76086
76087
76088
76089
76090
76091
76092
76093
76094
76095
76096
76097
76098
76099
76100
76101
76102
76103
76104
76105
76106
76107
76108
76109
76110
76111
76112
76113
76114
76115
76116
76117
76118
76119
76120
76121
76122
76123
76124
76125
76126
76127
76128
76129
76130
76131
76132
76133
76134
76135
76136
76137
76138
76139
76140
76141
76142
76143
76144
76145
76146
76147
76148
76149
76150
76151
76152
76153
76154
76155
76156
76157
76158
76159
76160
76161
76162
76163
76164
76165
76166
76167
76168
76169
76170
76171
76172
76173
76174
76175
76176
76177
76178
76179
76180
76181
76182
76183
76184
76185
76186
76187
76188
76189
76190
76191
76192
76193
76194
76195
76196
76197
76198
76199
76200
76201
76202
76203
76204
76205
76206
76207
76208
76209
76210
76211
76212
76213
76214
76215
76216
76217
76218
76219
76220
76221
76222
76223
76224
76225
76226
76227
76228
76229
76230
76231
76232
76233
76234
76235
76236
76237
76238
76239
76240
76241
76242
76243
76244
76245
76246
76247
76248
76249
76250
76251
76252
76253
76254
76255
76256
76257
76258
76259
76260
76261
76262
76263
76264
76265
76266
76267
76268
76269
76270
76271
76272
76273
76274
76275
76276
76277
76278
76279
76280
76281
76282
76283
76284
76285
76286
76287
76288
76289
76290
76291
76292
76293
76294
76295
76296
76297
76298
76299
76300
76301
76302
76303
76304
76305
76306
76307
76308
76309
76310
76311
76312
76313
76314
76315
76316
76317
76318
76319
76320
76321
76322
76323
76324
76325
76326
76327
76328
76329
76330
76331
76332
76333
76334
76335
76336
76337
76338
76339
76340
76341
76342
76343
76344
76345
76346
76347
76348
76349
76350
76351
76352
76353
76354
76355
76356
76357
76358
76359
76360
76361
76362
76363
76364
76365
76366
76367
76368
76369
76370
76371
76372
76373
76374
76375
76376
76377
76378
76379
76380
76381
76382
76383
76384
76385
76386
76387
76388
76389
76390
76391
76392
76393
76394
76395
76396
76397
76398
76399
76400
76401
76402
76403
76404
76405
76406
76407
76408
76409
76410
76411
76412
76413
76414
76415
76416
76417
76418
76419
76420
76421
76422
76423
76424
76425
76426
76427
76428
76429
76430
76431
76432
76433
76434
76435
76436
76437
76438
76439
76440
76441
76442
76443
76444
76445
76446
76447
76448
76449
76450
76451
76452
76453
76454
76455
76456
76457
76458
76459
76460
76461
76462
76463
76464
76465
76466
76467
76468
76469
76470
76471
76472
76473
76474
76475
76476
76477
76478
76479
76480
76481
76482
76483
76484
76485
76486
76487
76488
76489
76490
76491
76492
76493
76494
76495
76496
76497
76498
76499
76500
76501
76502
76503
76504
76505
76506
76507
76508
76509
76510
76511
76512
76513
76514
76515
76516
76517
76518
76519
76520
76521
76522
76523
76524
76525
76526
76527
76528
76529
76530
76531
76532
76533
76534
76535
76536
76537
76538
76539
76540
76541
76542
76543
76544
76545
76546
76547
76548
76549
76550
76551
76552
76553
76554
76555
76556
76557
76558
76559
76560
76561
76562
76563
76564
76565
76566
76567
76568
76569
76570
76571
76572
76573
76574
76575
76576
76577
76578
76579
76580
76581
76582
76583
76584
76585
76586
76587
76588
76589
76590
76591
76592
76593
76594
76595
76596
76597
76598
76599
76600
76601
76602
76603
76604
76605
76606
76607
76608
76609
76610
76611
76612
76613
76614
76615
76616
76617
76618
76619
76620
76621
76622
76623
76624
76625
76626
76627
76628
76629
76630
76631
76632
76633
76634
76635
76636
76637
76638
76639
76640
76641
76642
76643
76644
76645
76646
76647
76648
76649
76650
76651
76652
76653
76654
76655
76656
76657
76658
76659
76660
76661
76662
76663
76664
76665
76666
76667
76668
76669
76670
76671
76672
76673
76674
76675
76676
76677
76678
76679
76680
76681
76682
76683
76684
76685
76686
76687
76688
76689
76690
76691
76692
76693
76694
76695
76696
76697
76698
76699
76700
76701
76702
76703
76704
76705
76706
76707
76708
76709
76710
76711
76712
76713
76714
76715
76716
76717
76718
76719
76720
76721
76722
76723
76724
76725
76726
76727
76728
76729
76730
76731
76732
76733
76734
76735
76736
76737
76738
76739
76740
76741
76742
76743
76744
76745
76746
76747
76748
76749
76750
76751
76752
76753
76754
76755
76756
76757
76758
76759
76760
76761
76762
76763
76764
76765
76766
76767
76768
76769
76770
76771
76772
76773
76774
76775
76776
76777
76778
76779
76780
76781
76782
76783
76784
76785
76786
76787
76788
76789
76790
76791
76792
76793
76794
76795
76796
76797
76798
76799
76800
76801
76802
76803
76804
76805
76806
76807
76808
76809
76810
76811
76812
76813
76814
76815
76816
76817
76818
76819
76820
76821
76822
76823
76824
76825
76826
76827
76828
76829
76830
76831
76832
76833
76834
76835
76836
76837
76838
76839
76840
76841
76842
76843
76844
76845
76846
76847
76848
76849
76850
76851
76852
76853
76854
76855
76856
76857
76858
76859
76860
76861
76862
76863
76864
76865
76866
76867
76868
76869
76870
76871
76872
76873
76874
76875
76876
76877
76878
76879
76880
76881
76882
76883
76884
76885
76886
76887
76888
76889
76890
76891
76892
76893
76894
76895
76896
76897
76898
76899
76900
76901
76902
76903
76904
76905
76906
76907
76908
76909
76910
76911
76912
76913
76914
76915
76916
76917
76918
76919
76920
76921
76922
76923
76924
76925
76926
76927
76928
76929
76930
76931
76932
76933
76934
76935
76936
76937
76938
76939
76940
76941
76942
76943
76944
76945
76946
76947
76948
76949
76950
76951
76952
76953
76954
76955
76956
76957
76958
|
commit 9c5bb550a2234e4bee2a144417d74c6bdf160e89
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 12 13:46:03 2010 -0800
Bump to 1.7.99.901 -- 1.8 RC1
commit 57ffeb3f2b3313dcef92a396f1f55fdbc064b2c5
Merge: c6d9bc0 c76248f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 12 13:36:32 2010 -0800
Merge remote branch 'jturney/master'
commit c6d9bc092c84ad5c68083a126aa7577baa42cef7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 10 15:36:50 2010 +1000
Add tag matching to input attributes.
Tags may be a list of comma-separated strings that match against a MatchTag
InputClass section. If any of the tags specified for a device match against
the MatchTag of the section, this match is evaluated true and passed on to
the next match condition.
Tags are specified as "input.tags" (hal) or "ID_INPUT.tags" (udev), the
value of the tags is case-sensitive and require an exact match (not a
substring match).
i.e. "quirk" will not match "QUIRK", "need_quirk" or "quirk_needed".
Example configuration:
udev:
ENV{ID_INPUT.tags}="foo,bar"
hal:
<merge key="input.tags" type="string">foo,bar</merge>
xorg.conf:
Section "InputClass"
Identifier "foobar quirks"
MatchTag "foo|foobar"
Option "Foobar" "on"
EndSection
Where the xorg.conf section matches against any device with the tag "foo"
or tag "foobar" set.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 3ac43df5d4a25d6e0058b327fa05a1c1436b4794
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 10 15:36:49 2010 +1000
Add xstrtokenize to the dix.
Move tokenize out of the parser, make it a dix util function instead.
Splitting a string into multiple substrings is useful by other places, so
let's use it across the line. Future users include config/hal, config/udev
and of course the parser.
Example usage:
char **substrings = xstrtokenize(my_string, "\n");
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 27d1b86d1b858f931b4cb1b6ddf857c76d92a6d9
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:48 2010 +1000
xfree86: Set fnmatch pathname flag for InputClass device matching
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9b369f71273fb117c982e6ce16cd4462f206d365
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:47 2010 +1000
xfree86: Allow multiple arguments to InputClass matches
In order to keep the number of InputClass sections manageable, allow
matches to contain multiple arguments. The arguments will be separated
by the '|' character. This allows a policy to apply to multiple types of
devices. For example:
Section "InputClass"
Identifier "Inverted Mice"
MatchProduct "Crazy Mouse|Silly Mouse"
Option "InvertX" "yes"
EndSection
This applies to the MatchProduct, MatchVendor and MatchDevicePath
entries. Currently there is no way to escape characters, so names or
patterns cannot contain '|'.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a378e361a5de89f0be8b68ebc3e854f56cefe666
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:46 2010 +1000
xfree86: Use "Ignore" option in InputClass to skip devices
Sometimes it is desirable to skip adding specific input devices to the
server. The "Ignore" option is used similarly to Monitor sections so
that matched devices will not be added. BadIDChoice is returned to the
config backend so that it will clean up all resources.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b1a685f00ae76be864cc188943a0874f48b8d64
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:45 2010 +1000
xfree86: Handle config files ending without newline
The config parser expects to find a newline at the end of each line, so
files ending without one would confuse it. A newline is inserted at the
end of the buffer in these situations. Additionally, switching to the
next config file is moved to the higher level to allow parsing of the
last line of the previous file to complete before shifting the index and
resetting the line number.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Stephan Raue<stephan.raue@gmx.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 67bc278a511ca6ec42e1f8d2d5897c0109e94e2c
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:44 2010 +1000
xfree86: Make InputClass docs and comments match reality
Drivers and options specified in InputClass sections work on a "first
match wins" strategy. Let's be consistent when documenting it.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a34812b09000db2ff2a1dc6182602839123edd4e
Author: Benjamin Tissoires <tissoire@cena.fr>
Date: Mon Feb 8 13:50:43 2010 +0100
Add labels for multitouch valuators
Thoses definitions have been included in the kernel but the X server is not updated accordingly.
Without these definitions, the multitouch axes are not correctly labelled.
Signed-off-by: Benjamin Tissoires <tissoire@cena.fr>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c76248fda99c38aef0ccf0ed6b58fbe95f6fe497
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 2 20:53:44 2010 +0000
Cygwin/X: Avoid a collision between DEBUG and a token name
Rename a token to avoid a collision between DEBUG defined via AC_DEFINE
if --enable-debug is configured, and the token for the 'debug' instruction
in the XWin preferences file
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b7dbbd3cd4d28cd4939706b3bf6394ba8ecafaff
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 22 23:35:09 2009 +0000
Cygwin/X: Avoid cursor size log spam
Fedora 12 likes to use a 39x26 animated wait cursor. Avoid spamming
the log with warnings that each frame can't be completely contained
in the 32x32 native cursor
Also reformat log message so it doesn't contain a '\n\t'. I mean,
it's not like we might want to grep the log or something...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c9cbbd5d1cfa58a2d9f08e25534ea8439284322d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Nov 28 17:51:33 2009 +0000
Repair '-nolock'
commit 446fe9eecddd1337f9d5164dd7c301e1ba3dfe32 removes the AC_DEFINE for
SERVER_LOCK and conditional compilation checking it, making it always on
everywhere, except in os/utils.c where code is left under SERVER_LOCK, which
now never gets built, making the '-nolock' option non-functional...
This seems to have been broken since Xserver 1.7.0, but this option is
actually of some slight use on cygwin, as if /tmp resides on a FAT filesystem
(yes, I know...), hard links aren't supported.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7f54ccafadf99c0a1a3e788734199b306b4fa51d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jan 16 13:12:12 2009 +0000
Cygwin/X: Make transient windows resizable again
Reverts the change which makes parented windows non-resizeable
Because this was trying to do something which we should be doing, as an alternative we
try checking WM_NORMAL_HINTS for windows which shouldn't be resizable
If a window has a maximum size specified, no maximize box
If a window has a fixed size (max size == min size, per EWMH 1.3 Implementation Notes), no resizing frame
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 654d2e372dc2978ce379ab9f02137333ec224f0c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Nov 10 13:24:40 2009 +0000
Cygwin/X: Discourage other WMs in multiwindow mode
Tidying up of other WM detection code when ading SWT/Motif
fix in commit 71519a572fe15b85c0eb2b02636c9e871f2c858f
was rather over-agressive and now allows other WMs to think
they can start when the internal WM is running.
Revert to the behaviour of selecting ButtonPressMask events
as well on the root window, so other WMs will be dissuaded
from starting
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 26857b1c2003797b02e258247f63064aa1e37c10
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Oct 31 17:19:17 2009 +0000
Cygwin/X: Update XWin man page
Restructure to group similar options and offer some commentary on those groups
Review option descriptions, clarify and bring up-to-date
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6f1836bfbd80e88d4c57a32757d0a5b398504c35
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 17:37:14 2009 +0000
Cygwin/X: Update DDX specific -help text
Alphabetize options
Review option descriptions, clarify and bring up to date
Add missing option descriptions
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 22982b9e95a2339d5ba60d66263e42a0331ee41f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 29 18:50:23 2009 +0000
Cygwin/X: XSupportsLocale() failure is non-critical
Treat XSupportsLocale() returning false as non-critical to internal client
theads startup, and issue a warning, not an error
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f60b7712b3451649f138b158ee282be89a66b9ef
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Feb 1 17:13:00 2010 +0000
Cygwin/X: Report BUILDERSTRING with version information
Report BUILDERSTRING with version information
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ed2c2a68e1e6b409c198a52d99d300eb6d517e89
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Feb 1 17:12:57 2010 +0000
Define FD_SETSIZE on Cygwin regardless of XWin DDX
All DDXs segfault on Cygwin unless -DFD_SETSIZE=256 is set, so make sure
we do so whether or not we are building XWin.
FD_SETSIZE must be at least XFD_SETSIZE for uses of select() to be correct.
The Cygwin default is only 64, so it must be increased to 256
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 2f2f3da080629d410dd99e281c382b54f0dbbf5d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 19 21:14:47 2009 +0100
Cygwin/X: Copy the state of the Windows keyboard device to the Virtual Core Keyboard at startup.
Otherwise, this happens lazily after the first keypress, which can lead
to applications which are started from a shell window and inspect the
keyboard state before a character is typed getting the wrong idea about
the desired keymap (e.g. xemacs shows this behaviour)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7a440e5b7a416e582b6c3cc4c33822854ce73aed
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Oct 4 15:55:40 2009 +0100
Cygwin/X: Tidy up system.Xwinrc
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 11252ed82e1f361b99e86521ac9314f868bd1a3a
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Feb 1 17:11:54 2010 +0000
Cygwin/X: Look for system.Xwinrc in SYSCONFDIR/X11
Look for system.Xwinrc in SYSCONFDIR/X11 (usually /etc/X11)
Rename sample system.Xwinrc file not to have a X11R6 path in it's name
Add makefile install rule for system.XWinrc
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 34269a90ea2087f883f5dc8805894fc4998e4b81
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Feb 2 16:21:44 2010 +0000
Cygwin/X: Update resources file and About dialog
Use the configured vendor web address in the About dialog
Update resources file: rework About dialog, use 'MS Shell Dlg 2'
logical font for all dialogs, add ellipsis to exit option in tray
menu as it (may) trigger another dialog.
Get short vendor name from xwin-config.h, like other configuration
data presented in the About dialog box, rather than creating the
PROJECT_NAME define
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 881812438b430d2856d0494707e028e5f30d6e9a
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 2 16:22:39 2010 +0000
Xming: Use 8 point font for URL in About dialog
Use an 8 point font for URL in About dialog, to match the rest
of the text in that dialog
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c02638fd68440513b6046315547c554a910bd7e2
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 2 16:08:45 2010 +0000
Xming: Add a manifest file
Use manifests to enable XP style controls
(only effective for XP and later and when themes are enabled).
The addition of manifests shouldn't cause compatibility problems with older Windows versions.
Manifest must have execute permissions, otherwise attempts to
execute XWin.exe in the same directory will fail...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit fd8a32baba77aba8d124658a19f4f6eda79e49c6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 19 21:14:39 2009 +0100
Cygwin/X: Window placement refinement for multiwindow mode
Window placement refinement for multiwindow mode, ensure a window actually
ends up somewhere visible if it tries to create itself offscreen (which
can happen for e.g. if it has a stored position from a different sized
display)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7eb840fd42bc62d88fb4fcf6600546c9ff6e56be
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 2 15:42:12 2010 +0000
Cygwin/X: Respect the system's ownership of the clipping region
Respect the system's ownership of the clipping region used for shaped windows
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit bad41bdfd4a12f0c92fd221bffd9f3c5e40d0fe1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Feb 1 17:11:22 2010 +0000
Xming: Always update the Windows title Unicode (wide-character) in -multiwindow mode.
Apply the Windows title wide-character in -multiwindow mode. Windows should now
display correct client X Window titles for locales with wide characters.
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 901c4ebf620579c5bb951a8c003430d967ecf2ff
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 11 00:31:27 2010 +0000
main: move config_init() after InitInput()
With the udev backend, config_init() calls NewInputDeviceRequest(),
which enables devices. They can then start sending events, even though
the event queue is only initialized later in InitInput(). Oops.
Debian bug#564256 <http://bugs.debian.org/564256>
Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Tested-by: Sedat Dilek <sedat.dilek@googlemail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7f648777680b9dea31c4adb657e205fc6880d98b
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu Jan 14 16:42:16 2010 +1000
Don't use AC_CHECK_FILE for fontpath checks when cross compiling
AC_CHECK_FILE chokes when cross compiling, so instead we set the default
to the standard FONTROOTDIR directories in that case.
Signed-off-by: Dan Nicholson<dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit db687f718f760ba254ab51994769db101dc9ca3a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 10:07:38 2010 +1000
xkb: sed True -> TRUE and False -> FALSE
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 0ea2b0bd02f8683998e8b9ebc2b96d606ce45f45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 18 20:07:30 2009 +1000
xkb: Add XKM file format description.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 08b22c7faf97217ea4d497eec6624fc3dd916d9b
Author: Oldřich Jedlička <oldium.pro@seznam.cz>
Date: Sun Jan 17 17:59:03 2010 +0100
Allow driver to call DeleteInputDeviceRequest during UnInit
When the input driver (like xf86-input-wacom) removes it's devices
during a call to UnInit, the CloseDownDevices() cannot handle it. The
"next" variable can become a pointer to freed memory.
The patch introduces order-independent device freeing mechanism by
remembering the already freed device ids. The devices can reorder any
time during freeing. No device will be double-freed - if the removing
failed for any reason; some implementations of DeleteInputDeviceRequest
don't free the devices already.
Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b91cec26de367f75388e620772747b08eee34294
Author: Horst Wente <horst.wente@acm.org>
Date: Wed Dec 30 19:35:20 2009 +0100
xkb: make ctrl+alt+keypad + / ctrl+alt+keypad - work again (#25743)
Video mode switching via keypad keys did not work
Signed-off-by: Horst Wente <horst.wente@acm.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 993e78d6c433f65bd8a87890a6bb6da480b2cdc4
Author: Oldřich Jedlička <oldium.pro@seznam.cz>
Date: Tue Jan 12 19:15:06 2010 +0100
Fix typo in updateSlaveDeviceCoords
The index [0] for the second valuator looks bogus; fix it.
Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 52456c602c3cdd7d5eac677889a18fad37dfb7ae
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Jan 30 14:49:02 2010 -0800
XQuartz: Attatch a stub display when CoreGraphics reports no displays.
This is half of the required changes to address the "stuck mouse pointer"
bug that occurs when X11 launches while the displays are asleep. The
remainder of the fix is part of libXplugin which needs to be updated to
send XP_EVENT_DISPLAY_CHANGED when the display wakes up. If you don't
have a recent enough libXplugin (expected in 2.5.0_beta2 or later), you
can cause this event to be sent by changing your display resolution (or
you could just start X11.app with your screens awake).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 15f4bb6dc64313ff100aa5444a94c60922a498df
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jan 27 17:12:12 2010 -0800
XQuartz: Dead code removal
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7ba5de6e9e1e8efda9f79af601fb6269bae841ce
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jan 30 10:55:38 2010 -0800
XQuartz: Add some .gitignore magic
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 4d575b0559817258f7a0ce6c4d2d0f9e7e5bba63
Author: Robert Morell <rmorell@nvidia.com>
Date: Fri Jan 29 19:07:03 2010 -0800
RENDER: Fix gradient and solid fill pictures with Xinerama, and misc cleanup
If these aren't wrapped, then procs that are wrapped (such as
RenderChangePicture) will fail in Xinerama when they see the resource
type of a picture created through one of these interfaces is PictureType
and not XRT_PICTURE like those allocated via RenderCreatePicture.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8d6b1838330625b758ebc55bb0df1b425c5cefaf
Author: Robert Morell <rmorell@nvidia.com>
Date: Thu Jan 21 12:38:47 2010 -0800
Render: Fix request size verification
RenderSetPictureClipRectangles and the Xinerama version of
RenderChangePicture were using the wrong structure types for request
size verification.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5e81078cf56aabbf6551d96d312c7840ba9370ae
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Jan 18 14:31:12 2010 +0200
xfree86: vgaarb: remove useless debug
This is RAC's remnant. Any sane person would use a more wise method of
debugging instead.
X.Org Bug 26074 <http://bugs.freedesktop.org/show_bug.cgi?id=26074>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e38df06772965cd5099646f1e7032b7c944d16ed
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jan 28 14:33:25 2010 -0800
DRI2: Bump the dri2 module version to 1.2.0 to reflect recent API changes.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 60b6477f6dc005a1b052be8c5e5a549550a4aa88
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Jan 14 17:18:28 2010 +0200
dix/configure: remove null root cursor option
The default behavior of the server is to start with an invisible root cursor.
Be such cursor invisible or inexistent (null), in the end it doesn't matter -
for the user. The content on screen will be the same. Besides, there's no
difference, in terms of performance, whether such cursor is invisible or
simply null. The paths that both take inside the server are roughly the same.
Therefore create a null root cursor becomes irrelevant.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4baab90c0d98bef98d485682d4a69a327a380d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 8 15:18:41 2010 +1000
dix: EventToCore needs to copy the root window too.
This value isn't actually set for normal events but it saves us some work
for the record extension support.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27fc98ecfed99fefd5c14388b4c6242f87281895
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 27 14:37:32 2010 -0800
Revert "dix: EventToCore needs to copy the root window too."
This reverts commit 0f2d297dedeff8bd227df4c498cc668b0e902344.
Peter provided an updated patch which fixes the tests.
commit 711e26466ae04ae93ff4c48d377d83d68a6320e9
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Jan 25 09:21:51 2010 -0800
DRI2: handle drawable destruction properly at DRI2SwapComplete time
Simon reported an issue with kwin that turned out to be a general problem. If
a drawable goes away before its swap completes, we'll try to free it up.
However, we free it improperly, which causes a server crash in
DRI2DestroyDrawable. Fix that up by splitting the free code out and calling
it from DRI2SwapComplete.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b68f0204a2e4fa9d8884cbdd84b6a5df21d6b36e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Jan 27 09:10:41 2010 -0800
xserver: require libdri 7.8.0 to build
We depend on new DRI interfaces now, so require them in configure.ac.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 003829072853546abd973266fe9b24d803f4f5cb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jan 26 22:25:04 2010 -0800
Avoid segfaults in XF86VidMode GammaRamp functions if randr_crtc is NULL
Fixes crash when xscreensaver tries to use GammaRamp calls to fade out
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6915712
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 19d03d4f49e08442f58cf02240e3e6bab04633d2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jan 26 20:15:49 2010 -0500
doc: finish the removal of SecurityPolicy file man pages
The variable was unassigned but all the code was left in.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7962c8f78964d460c76f76dda2795b971a8c2a94
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jan 26 20:02:13 2010 -0500
man: add missing __datadir__ for Xserver XWin man pages
The man pages display __datadir__/fonts/X11/... because __datadir__
is missing in cpprules.in. Problem was introduced in commit:
b54bc14ce0ae38c4863794bc3096ca86cdb23908
when replacing __projectroot__ in the previous font path.
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d2322b6309bf15a45002b42e7e6ba3d6b5bfa932
Author: Kok, Auke <auke-jan.h.kok@intel.com>
Date: Wed Jan 27 11:34:45 2010 -0800
xserver: Add timestamps to logfile output.
Add timestamps in seconds derived from clock_monotonic to the log
file.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b21a0416b4cb2c32da5e3fda05a0682eb97d56e
Merge: 1e6fd65 837bd2b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 27 14:14:15 2010 -0800
Merge remote branch 'alanc/master'
commit 1e6fd65d0b95260253828678131885a4ec21c594
Author: Michael Vogt <mvo@ubuntu.com>
Date: Mon Jan 25 18:41:20 2010 +0100
xfree86/modes: only call gamma_set if its non NULL
I ran accross a crash with xf86-video-nv-2.1.15 [1] and xserver
1.7.3.901. It looks like the problem is that gamma_set is called even
if that is NULL.
[1] https://launchpad.net/bugs/494627
Reviewed-By: Matthias Hopf <mhopf@suse.de>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0688dca044f966abc3da667f6d4e79e7cf47f996
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 21 10:31:04 2010 -0800
dri2: Fix order of operations issue in __glXdriSwapEvent test.
Clients would have received swap events regardless of asking for it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Wed Jan 27 14:03:03 2010 -0800
Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5.
*xoff and *yoff were uninitialized for source-only pictures.x
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c3395158678aaab9dca5fc6a812cbe715ddc0e1a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 15 14:13:18 2010 -0500
packaging: provide a default README file #24206
All modules should have a README file.
The bottom URL section is found in all X.Org README files.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f311f2d047120fb816897444d2101465ff5189db
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 13 11:35:52 2010 -0800
DRI2: Allow multiple driver names.
Each driver type (e.g. DRI2DriverDRI or DRI2DriverVDPAU) can have a name in the
driverNames array in DRI2InfoRec. DRI2Connect returns the name for the driver
specified by driverType. Also print names of supported drivers in
DRI2ScreenInit.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f57bc0ede8e018c7e264b917927c42a018cd1d5a
Author: Christian Zander <chzander@nvidia.com>
Date: Mon Jan 11 12:29:07 2010 -0800
x86emu: Respect the LEA 67h address size prefix.
Signed-off-by: Christian Zander <chzander@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 837bd2bbc02b893f96861b48c1f02b7b8e7e3e48
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 16 22:32:15 2009 -0700
Remove unbalanced ( from failure to move log error
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 138d4c1670ebab435bf00627c97098a3a54b81a6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Jan 16 21:03:00 2010 -0800
glx: Sun compilers now support some gcc __attribute__ values
Sun cc 5.9 and later (__SUNPRO_C >= 0x590) support __attribute__
calls for aligned, always_inline, noinline, pure, const, and malloc.
This commit consists of the related updates to files that were
regenerated by gl_XML.py in mesa after adding the __SUNPRO_C checks to it
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
commit 79e7b0b875634d0f9e1a95232a4e38adf617bc14
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Jan 16 10:45:32 2010 -0800
Only enable kdrive input drivers on Linux by default
Fixes build on non-Linux platforms by restoring the defaults to
where they were before commit 6c2b3a4247d10a50699ffa6abb643c5e959eefa8,
to only enable the Linux kbd, mouse & evdev drivers when building
on Linux platforms.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 39ab474197bdad7d8e9ef496df2d61cbea39d370
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 15 19:07:38 2009 -0800
Move OS-specific VT key handler code from common to os-support
Adds new function xf86Activate to the OS-specific *VTsw*.c files
and calls it from xf86ProcessActionEvent
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (GNU/Linux)
commit 15ca3312c069526b7f2207de9dfb9b9e851caf95
Author: Aaron Zang <Aaron.Zang@Sun.COM>
Date: Mon Dec 14 17:55:46 2009 -0800
Solaris: Avoid switching to inactive VT's
Fix for OpenSolaris bug 6876992: "[vconsole] Ctrl+Alt+F12 switchs to blank
console screen with hotkeys property turned-off"
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6876992
Xorg needs to do sanity test for the VT it is commanded to switch to.
If the VT is not opened by any process, discard the switching request.
The changes also contain the fix for some flaws discovered when
getting the new gdm to run.
Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 2984c18eb994696927a7f3b94d86fd47907334a0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 21 14:21:07 2010 -0500
config: replace custom code with reusable macro XORG_WITH_DOXYGEN
XORG_WITH_DOXYGEN provides additional functions like a configure
option which allow platform builders to control the usage of
the doxygen program.
This is a requirement from platforms that do not have such doc tool.
A platform with a back level doxygen may use --without-doxygen
to get the rest of the documentation built.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9c20ee4191de7276a08288adffc24dff48aff8f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jan 15 19:34:29 2010 +0200
dix: move cursor realize code to its own function
The semantic remains, only code was moved: reuse chunk of code to realize
cursor on both AllocARGBCursor and AllocGlyphCursor.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f818f222362c93bcc859d997d96d8f3b447729f4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:19 2010 +1000
xkb: unexport xkbDevicePrivateKey and xkbUnwrapProc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6850ea8fb95417db9ce3a70fc17f90d6fdea1389
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:16 2010 +1000
xfree86: replace True/False with TRUE/FALSE.
xf86Xinput.c relied on xkbsrv.h's definition of True/False which seems odd
at first and weird on second glance.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 64b1372c15c3ede2696346e153bca9bd89016a20
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:15 2010 +1000
xkb: remove unused _XkbIsPressEvent and _XkbIsReleaseEvent defines
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c8bba14a390fe3fa16027e6b2433a314b3ea00c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:13 2010 +1000
xkb: remove XkbAtomGetString, replace with NameForAtom.
XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f37799c9712afb7769f369162b904d9ea2dbd608
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:12 2010 +1000
xkb: remove IsKeypadKey define, only used in two places.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c8076f317ee5044ed3cc21b097f8b1741af8e0f1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:11 2010 +1000
xkb: remove XConvertCase.
Since it's typedef'd to XkbConvertCase anyway and the headers are now split
from the client headers, simply get rid of it altogether.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d627dd9d1ef436b01f0581e40a6736ffc6b5d2c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:10 2010 +1000
xkb: remove _XkbClearElems, a memset will do.
Bonus point - it's easier to understand what's actually being done with the
memory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea1de3fcdc40d2060bb6d13775005eadd624e767
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:09 2010 +1000
xkb: remove _XkbTyped*alloc
Please no extension-specific macros for memory allocation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f2d297dedeff8bd227df4c498cc668b0e902344
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 5 16:31:37 2010 +1000
dix: EventToCore needs to copy the root window too.
This value isn't actually set for normal events but it saves us some work
for the record extension support.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6f6a99abc12ddee82898fdabfb50c17e90e094b9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jan 13 14:39:54 2010 -0800
XQuartz: Don't FatalError in x_hook_run if the list is empty
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 6bde306f7f6b9bbabeaa8bb910ea549be906cd8b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jan 13 11:20:29 2010 -0800
XQuartz: Update copyright in bundle for 2010
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 6008cc116493cb2825ad0bda0b407b7aefabb3f4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Jan 11 18:02:55 2010 -0800
XQuartz: Setup the modifier map in the quartz thread
This avoids possible doing it twice which could result in incorrect
keycodes for alt due to our loss of information about its side.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 44f9c3d16c9c9b3362306a9ba26ee52e7baafeca
Merge: 032f978 84956ca
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 13 10:19:21 2010 -0800
Merge remote branch 'jbarnes/master'
commit 84956ca43b087600d9db297cffd62e960c516d9e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Jan 11 14:56:24 2010 -0500
GLX/DRI2: add INTEL_swap_event support
This allows clients to easily check for swap completion status in their
main loop.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Adam Jackson <ajax@nwnk.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 04a54f69a8085ab3fe11a8713bd8b6b16ed1db27
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Jul 16 09:01:17 2009 -0400
DRI2: add support for new DRI2 protocol requests
Support the new DRI2 2.2 protocol requests: DRI2SwapBuffers, DRI2GetMSC,
DRI2WaitMSC, DRI2WaitSBC and DRI2SwapInterval.
These requests allow the server to support the SGI_video_sync,
SGI_swap_interval, and OML_sync_control GLX extensions if DDX support is
present. The new DDX APIs are documented in dri2.h.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Adam Jackson <ajax@nwnk.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 032f97808c65771a07bac748212cf6457a5d1660
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 17:32:24 2010 +0100
xfree86: init pointer feedback controls from options
With InputClass support, it makes more sense to cover all
aspects of acceleration in options. Previously, one could only set the
default on the command line.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0722c287a4c8a6cdedca9756192547bfcf77ade5
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 19:43:59 2010 +0100
xfree86: document pointer acceleration in xorg.conf.man
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1aca2d757534879eb55faaee421cb972a9546712
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 19:13:36 2010 +0100
whitespace fixes
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 14039b5a7982fbf8130501bb00766176a4e9bccb
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 18:16:20 2010 +0100
doc: actually document SendDragEvents
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 14e4e4a294e648e0bdcb70c34748e1b81c5bb64f
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 18:13:27 2010 +0100
os: state effect of -a and -t options more precisely
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d727ddb91a549d23f6bf323e91db4b8916c1b7a0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jan 9 16:28:32 2010 -0500
kdrive: klinux.h breaks make dist
This file is no longer part of the source code
and must be removed from distribution.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6313d2da6c6910827d68cf31fe00b46a34c5bfc7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 8 19:04:25 2010 -0500
configure: use backticks rather than $() for commands
This patch to xserver configure.ac is to increase code portability to
non POSIX system by using backticks rather than $() for command
substitution for BUILD_DATE and BUILD_TIME.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 74ab27f64a747ee45810f99cdc6e29b82cf8035e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Dec 28 18:00:28 2009 +0200
Revert "Make sys.c use unaligned access functions provided in compiler."
This reverts commit da923d0bc15e99a8ed1986bd6f5df37f7af7284b.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a2a57832709798d99d19ff4c587e22f3b3c150d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 7 15:23:34 2010 -0500
macros: use PKG_CONFIG variable rather than executable name
User can defined alternate location for pkg-config.
Once option in place, all instances of pkg-config must be converted.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1b3132f5e981b3398e08263742332cc966bebc07
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 7 14:12:34 2010 -0500
xwin: ignore intermediate .man file
Only detectable on a Cygwin build
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ab4749aaefb3727b9fc58bb37b50a2d07eb1531
Merge: 8d53d84 9437504
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 7 10:32:21 2010 -0800
Merge remote branch 'dottedmag/for-keithp'
commit 8d53d84485fdce8ea9686e6f300a69f7ddebd467
Author: Adam Tkac <atkac@redhat.com>
Date: Thu Jan 7 15:34:52 2010 +0100
Do not define members of include/eventstr.h:EventType enum conditionally.
Main problem is that EventType enumeration members can be different in
module and in server, which obviously causes problems.
Signed-off-by: Adam Tkac <atkac@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9437504b21dfdb509ab8b3a00f64403e1e4026dd
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 05:42:02 2010 +0600
kdrive: Remove unused kdNoopOps external variable declaration
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit aa6e0936be15488455e6a4236806a58496da2979
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 05:30:22 2010 +0600
kdrive: Remove unused kmap.c
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit f78ac5c6e273f575af29746e08e7c182ff7b93b3
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 02:36:30 2010 +0600
kdrive: Make internal functions static
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 37a8ddc0dbf3fb7f059b689038979bace206dccf
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 02:28:37 2010 +0600
kdrive: Remove unused 'k' variable
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit af1f1a05e1aa9ec921f1288818a66766c301f8b0
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 01:50:04 2010 +0600
kdrive: Remove bus mouse driver
Bus mice aren't used anymore, do not keep dead code around.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit a3cc3af186b55ac80abd6859ffe491f4ae936596
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 23:31:28 2010 +0600
kdrive: Adjust kdrive usage message as shadow overlay support has been dropped
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit c40b9f959175057fac726fcdfff9641ae0681cf6
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 14:07:37 2010 +0600
kdrive: Remove unused VxWorks* variable declarations
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 4e0d580d5ac00d8d87c8e0080a02868c87a31caa
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 15:04:03 2010 +0600
kdrive: Remove unused KdCardInfo::lastMarker field
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit dbaab9759ba31edf63cf73eda86ba931d88e8cce
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 16:18:29 2010 +0600
kdrive: Extract common part of fbdevPutColors and fbdevEnable
Put framebuffer colormap updating code in separate function
for brevity.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 7ee14154b230b931d294288e1291c4fc617b1354
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 15:42:53 2010 +0600
kdrive: Remove unused overlay fb support
Xfbdev, Xephyr and Xfake all use only one framebuffer, so simplify
implementation by removing overlay support.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 730f7d1c4fae8ca582a4a9998a4dc4b325f98896
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 15:06:18 2010 +0600
kdrive: Remove unused KD_MAX_CARD_ADDRESS macro
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 5337ddcfd9dc2a5b823da39df7adaad6692214f0
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 14:59:07 2010 +0600
kdrive: Move Xephyr-specific fields out of KdScreenInfo
memory_base, memory_size, off_screen_base fields in
KdScreenInfo are used only by fake EXA in Xephyr. Move
them into Xephyr, cleanup Xfake and Xfbdev.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 62883b499b72f678ab055de4d0370227ae441370
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 13:17:21 2010 +0600
kdrive: Remove unused KdCardAttr from KdCardInfo
Card attrs are unused in all current kdrive servers, so
remove it completely to avoid allocating and passing dummy
values to KdCardInfoAdd.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 6c2b3a4247d10a50699ffa6abb643c5e959eefa8
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 14:07:04 2010 +0600
kdrive: Add option to compile out input drivers
Add --without-kdrive-{kbd,mouse,evdev} configure options disabling
Linux keyboard driver, Linux mouse drivers (ps2, bus,ms),
and Linux evdev driver.
Build all drivers by default as before.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 72ba717b1d639e94fa9ab56ca026131edc020a30
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 15:03:24 2010 +0600
kdrive: Remove unused KdCardInfo::needSync field
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit d21b41cdb5e89eb428f36b19e965f0ab49e051d9
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 13:21:25 2010 +0600
kdrive: Remove .gitignore left from SDL server
SDL server is gone, no need to keep its .gitignore anymore.
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 6f265d55a61f9be323583b8acacae783be72bda9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 5 13:15:25 2010 +1000
dix: don't update the slave coordinates from the VCK.
A keyboard event from a device with both valuators and keys will be posted
through the VCK. In this case, do not update the slave device coordinates
from the VCK - they're always 0/0. Leave them as-is, for the next pointer
event will continue where it left.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 326429badfc76885e4652ddc72860810c0e8d102
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 10 14:56:36 2009 -0500
modes: Remove the ClockRanges type
ba2d39dd5428cb5922b797a1d4ea45b859412b40 introduced warnings:
xf86Mode.c: In function ‘xf86CheckModeForDriver’:
xf86Mode.c:986: warning: passing argument 1 of ‘modeInClockRange’ from incompatible pointer type
xf86Mode.c:253: note: expected ‘ClockRangePtr’ but argument is of type ‘ClockRangesPtr’
xf86Mode.c:1002: warning: passing argument 1 of ‘modeInClockRange’ from incompatible pointer type
xf86Mode.c:253: note: expected ‘ClockRangePtr’ but argument is of type ‘ClockRangesPtr’
Because I foolishly didn't notice that we had types with nearly
identical members named ClockRange and ClockRanges. The latter
contained an extra 'strategy' member at the end, which claimed to be
needed by the vidmode extension. Of course, this was a lie: the only time
we'd use it was in mode validation, for drivers using LOOKUP_CLKDIV2 with
non-programmable clocks. The only driver using LOOKUP_CLKDIV2 is
rendition, which has a programmable clock. The only driver using the
ClockRanges type was smi, which did not use it for its 'strategy' member,
so has been fixed to use ClockRange instead.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 13c8bd3fde3b0831921e59f84936022a16379d63
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jan 4 18:21:54 2010 -0800
CloseDevice: call XkbRemoveResourceClient before freeing key class struct
XkbRemoveResourceClient() returns immediately if dev->key is NULL.
CloseDevice calls XkbRemoveResourceClient until it removes all resources.
If we free dev->key and NULL it before XkbRemoveResourceClient, then
infinite loop ensues, and the server appears to hang on exit or crash.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e707612e9de4e5e1d91dc1a8152810912d7e18bb
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Jan 4 09:07:48 2010 +0100
EXA: Restore migration call in exaDoPutImage().
Turns out this is still necessary if the driver PrepareAccess hook succeeds.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Tested-by: Maarten Maathuis <madman2003@gmail.com>
Tested-by: Andrew Chant <andrew.chant+debian@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e10072b7c74a6f5e24f6dfa37e73688d1f3425e3
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 05:43:28 2010 +0600
Add Xephyr.man to .gitignore
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb26cb793c6eba189050662c566f7ea0559bd486
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 05:43:27 2010 +0600
Remove unused pShadow field from drivers' private structures
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c85d72fc7bd013af327321ad5d626dc73c3caf0
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 05:43:26 2010 +0600
Do not check xfree argument for NULL
xfree itself checks for NULL, and even this is not necessary
as passing NULL to free(3) is safe.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15bc35c6e44c65812de5c3e85ec8bbf78b032ded
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 05:43:25 2010 +0600
Remove trailing whitespace
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1763550d0181ac1c775b9ddf490114eff2fbe67e
Author: Simon Thum <simon.thum@gmx.de>
Date: Fri Jan 1 19:58:05 2010 +0100
dix: add smooth limited pointer acceleration profile
This profile is inspired by the accel code removed from the wacom driver.
It ascends from zero to acceleration, maxing out at threshold. This means you
can control the slope using threshold, which wasn't possible in wacom.
For sanity's sake, threshold should grow with acceleration.
Works best with adaptive deceleration, since otherwise it only generates
acceleration above 1, causing seldom pixel skips.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 435f27667f84269768efecde34de4af2b2d43376
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 27 14:45:47 2009 +0200
config: add libudev input-hotplug backend
Add a backend using libudev for input hotplug, and disable the hal and
dbus backends if this one is enabled.
XKB configuration happens using xkb{rules,model,layout,variant,options}
properties (case-insensitive) on the device. We fill in InputAttributes
to allow configuration through InputClass in Xorg.
Requires udev 148 for the input_id helper and ID_INPUT* properties.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b8b12e41c453c3bf94b11e7a18934d3b6e1869bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 23 16:05:16 2009 +1000
xfree86: move sanity checks below option and input classes merges.
While the identifier is likely set before the input classes are merged, the
driver may not be. Hence don't check for a driver before we've completed
configuration for this device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 9fad8f06fb89ac2ae05bea0fa24cab3df7677297
Merge: 871bbe1 42e8c92
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 30 09:28:19 2009 -0800
Merge remote branch 'dbn/inputclass'
commit 871bbe1d87fa3c7ebd075e1d1eec33e45b08493d
Merge: db2c6f7 e116563
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 30 09:16:45 2009 -0800
Merge remote branch 'dbn/xorg.conf.d'
commit db2c6f7c91289b5d49978974093a1002b3b53a56
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 15:48:44 2009 +0100
EXA: Don't use UTS/DFS directly for Put/GetImage when there's a system copy.
We want to save the result in the system memory copy, in case we'll need it
again for subsequent software fallbacks.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-By: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f28ca728e90ccbb901e8e7215a842525d8e786d3
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Dec 29 12:51:30 2009 +0100
EXA: Restrict the regions that need to be migrated for composite fallback for src / mask pictures.
[ Michel: Minor fixups to address compiler warnings ]
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0c1f43c0f3e888172f11f62a2f208af70e0183cc
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 12:51:29 2009 +0100
EXA/mixed: Handle results of software fallbacks in DamageReport hook.
This is more elegant and probably also slightly more correct than doing it
at FinishAccess time.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 08bf26c28fc8147b64f2fe8345b9581e0101571c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 12:51:28 2009 +0100
EXA: Fix migration avoidance for 1x1 pixmaps.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bd8f0cd7f3823ee17ae8c88fd3e004bfff9982d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 12:51:27 2009 +0100
EXA/classic: Fix crash with migration heuristic "smart".
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 40453bf7718f1c3d672b87e9d84991032cbef859
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Dec 29 09:34:44 2009 +0100
EXA: Limit src prepareAccess regions for a number of unaccelerated operations.
When we can trivially calculate the affected source regions,
do that before calling region bounded prepareAccess.
[ Michel: Minor fixups to address compiler warnings ]
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa9ce8ab343d51a67924757c5a43c9572248bb24
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 09:34:43 2009 +0100
EXA: Use relevant source region to minimize migration on CopyWindow fallbacks.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 39cc110caa1f6481a7213ae39f82669333ec1645
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Dec 29 09:34:42 2009 +0100
EXA: Fix bugs in exaGetImage / ExaCheckGetImage migration.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d42f3960514f1c410863ac6c09c5638b5ddeae20
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Dec 28 16:48:18 2009 +0100
EXA: Allow optimized migration to be enabled with mixed pixmaps.
This was always the intention, I only recently realized it wasn't the case
yet...
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 661630f9099f254e54c8da513aaed12f6532cc35
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Dec 28 16:48:17 2009 +0100
EXA/mixed: Don't clear deferred status of pixmaps if migration is limited.
* With optimized migration, only the pending damage region is synchronized for
destination pixmaps.
* Migration of source pixmaps can be limited to a bounding region.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 42e8c9224e6c54655c45f87999d37d0d67b3f7f5
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri Oct 2 06:29:28 2009 -0700
xfree86: Introduce InputClass configuration
Currently Xorg uses hal's fdi files to decide what configuration options
are applied to automatically added input devices. This is sub-optimal
since it requires users to use a new and different configuration store
than xorg.conf.
The InputClass section attempts to provide a system similar to hal where
configuration can be applied to all devices with certain attributes. For
now, devices can be matched to:
* A substring of the product name via a MatchProduct entry
* A substring of the vendir name via a MatchVendor entry
* A pathname pattern of the device file via a MatchDevicePath entry
* A device type via boolean entries for MatchIsKeyboard, MatchIsPointer,
MatchIsJoystick, MatchIsTablet, MatchIsTouchpad and MatchIsTouchscreen
See the INPUTCLASS section in xorg.conf(5) for more details.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0711598dd3e8366217676f462f1af7d0899656d9
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Sep 2 06:47:13 2009 -0700
config: Introduce InputAttributes in NewInputDeviceRequest
In order to give NewInputDeviceRequest more information, a new
InputAttributes type is introduced. Currently, this collects the product
and vendor name, device path, and sets booleans for attributes such as
having keys and/or a pointer. Only the HAL backend fills in the
attributes, though.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit c6e8637e29e0ca11dfb35c02da7ca6002ac8c597
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri Oct 2 06:28:03 2009 -0700
xfree86: Support non-Option boolean entries in configuration
Refactored code into the parser to allow the freeform boolean types used
in Option entries to be used in other configuration entries. This isn't
as powerful as allowing "No" to precede the option names, but it atleast
gives a common handling of "yes", "no", etc.
A type xf86TriState has been added to support an optional boolean. This
allows the boolean sense of the value to be kept while providing a means
to signal that it is unset.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit e1165632bdfbd720889ed1adf5f7ab338032c0ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 21 15:56:35 2009 +1000
xfree86: Add Option AutoServerLayout for input devices.
Any input device with this option will be automatically added to whichever
server layout is selected at startup. This removes the need to reference a
device from the ServerLayout section. The two following configuration are
identical:
CONFIG 1:
Section "ServerLayout"
InputDevice "foo"
EndSection
Section "InputDevice"
Identifier "foo"
...
EndSection
CONFIG 2:
Section "InputDevice"
Identifier "foo"
Option "AutoServerLayout" "on"
...
EndSection
The selection of the server layout affects both explicitly specified
layouts and the implicit layout.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
commit 592b20c517461d32daf44a940386ffcc11c434f8
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 21 01:13:44 2009 -0800
xfree86: Allow config directory to be specified on command line
Add a new command line parameter, -configdir, to specify the config
directory to be used. Rules are the same as -config for root vs. user
privileges.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit efa5269f23c2237eb5368bf5245ffbbf35714153
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 21 00:04:16 2009 -0800
xfree86: Use xorg.conf.d directory for multiple config files
Currently there is a single file, xorg.conf, for configuring the server.
This works fine most of the time, but it becomes a problem when packages
or system services need to adjust the configuration. Instead, allow
multiple configuration files to live in a directory. Typically this will
be /etc/X11/xorg.conf.d.
Files with a suffix of .conf will be read and added to the server
configuration after xorg.conf. The server won't fall back to using the
auto configuration unless there is no config file and there are no files
in the config directory.
Right now this uses a simpler search template than the config file
search path by not using the command line or environment variable
parameters. The matching code was refactored a bit to make this more
coherent. Any DDX wanting to read the config files will need to call
xf86initConfigFiles before opening/reading them. This is to allow
xf86openConfigFile without xf86openConfigDirFiles and vice-versa.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit f1e869aca176e9113f9d234b0ea59b4cac295cc4
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 21 00:03:11 2009 -0800
xfree86: Unexport configuration file symbols
These functions should not be used outside of DDXs, so no need to put
them in the ABI.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit 90e6d93cf9bfafd63d7849dc16ce194d6f9c9d5f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 23 12:54:14 2009 +1000
test/xi2: fail if xi2 class type is garbage. (#25492)
If the keycode range exceeds the allowable length, memory gets overwritten.
Catch this case by making sure that only allowed class types are
present.
X.Org Bug 25492 <http://bugs.freedesktop.org/show_bug.cgi?id=25492>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72286eae9f4a2f2ca6c46919ff8aa1011429e03a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 22 15:42:59 2009 +1000
xfree86: remove LAYOUT_DEBUG section.
I don't think this one has been in use since 2003.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 38b5afb0b5b46b61effa6f0e5a377b343e357e7e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 22 15:40:40 2009 +1000
xfree86: remove some 'enable this later' and if 0 ifdefs
2003 called, they want their ifdefs back.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7dc78db79edd15b971110acaf16bbe7f69e40bdb
Merge: 81a623f b44c9be
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 22 21:25:18 2009 -0800
Merge remote branch 'whot/master'
commit b44c9be244cee286835855483a69c69e80b095c0
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 22 17:14:09 2009 +0100
test/xi2: fix maximum max_keycode (bug#25492)
The number of keycodes needs to be lower than 0xFFFD so that the length
field of xXIKeyInfo doesn't overflow.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 190610e0c62170a27ab3e40c6c6210a583ae1ad4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 21 11:08:26 2009 +1000
xfree86: remove HistorySize from the xorg.conf man page.
This option isn't parsed by anything anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 094c6b9f97a9f92e5a0ef3cf5be24c09ed4d6063
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 21 10:42:32 2009 +1000
xfree86: reword InputDevice man sections, deprecate CorePointer/CoreKeyboard
Reshuffle and reword - InputDevice sections are only necessary if
hotplugging is disabled. Put more emphasis on hotplugging and less on HAL
since we'll switch backends eventually.
CorePointer, CoreKeyboard, and AlwaysCore should be listed as deprecated
since they don't do what they used to since 1.4. These days, only
SendCoreEvents matters and it's enabled for any driver calling
xf86ProcessCommonOptions (== every driver).
It only controls the startup behavior too, so document this.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 81a623f036fe56d53c4e3bdafb3eaf945502525f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 19 20:11:41 2009 -0800
Bump to 1.7.99.3 (unreleased)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3c30c5b6d321f34736c442c9cd982308d9b8b93a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 18 22:58:59 2009 -0800
Set release date for 1.7.99.2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 895f40792a14d8b88923bf3b428d31ae3bb31e46
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Dec 2 17:43:01 2009 -0800
Add type name argument to CreateNewResourceType
Convert all calls of CreateNewResourceType to pass name argument
Breaks DIX ABI.
ABI versions bumped:
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a11c58fa0c5809f918b36b84be53385cb2d8ea59
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 11 00:58:25 2009 -0800
Ensure all resource types created have names registered
Calls RegisterResourceName to record the type name for
use by X-Resource, XACE/SELinux/XTsol, and DTrace.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit eb750f8b5e14751d4c40b50499baec5d2ba79db9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 11 00:46:22 2009 -0800
Check for failures from CreateNewResourceType
Make sure to check return value before setting bitmask flags.
For most calls, just fails to init the extension. Since Xinput
already calls FatalError() on initialization failure, so does
failure to allocate Xinput's resource type.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1df4bd6011e110dcf0649b15bfffd4ab9e6961d6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 18:24:40 2009 -0800
Change default xkb model from pc104 to pc105
PC105 is a more useful default for non-American keyboard users,
not harmful for American PC101/PC104 keyboard users.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1d2e189cdc1d65c9ca2aa0a950780dc18e6c50f1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 18:24:39 2009 -0800
Change sysconfdir brackets to avoid some shells trying to run it as a command
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 48749cc21b074ee8e68c3854bd3977ec7c408225
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 18:24:38 2009 -0800
Add platform compatibility defines for Sun Studio compilers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b63912ed4c69fedd1bea92274d6cae0429a79677
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 18:24:37 2009 -0800
Convert checks for PC98 support from platform #ifdefs to configure flag
Default remains the same - on for most OS'es on i386 (except Solaris),
off for everyone else. Can be manually toggled via --enable-pc98 or
--disable-pc98.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 801bc8075aee664bd4c6b6ff842ab737c143a1de
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 14 08:43:19 2009 +1000
xfree86: update man page for special keys handling.
SpecialKeyHandling was removed from the kbd driver with version 1.4.0. Since
this is the only version that will build against server 1.7+ it's not
reasonable to mention it in the man page. Reword, point to XKB instead and
make clear that some key combinations _may_ not be available in any given
config.
Reported-by: Derek Fawcus
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 753310837cd3812882d8de67f063bb61813db675
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 14 08:41:18 2009 +1000
xfree86: DontZap has been disabled for a while now, say so in the man page.
1.7 always shipped with DontZap disabled, it's just the default keymaps that
may not include the symbol to trigger it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 0cb638dc6822e54567a1731ea1cf588475a226e9
Merge: 6a6a041 fbdf493
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 16 21:58:44 2009 -0800
Merge remote branch 'alanc/master'
commit 6a6a041c2d8d32f6355db77cd59cff371038c683
Merge: 8127465 d503195
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 16 21:57:32 2009 -0800
Merge remote branch 'jeremyhu/master'
commit 8127465f44fee99181f37a5e55dafc90bfafe3d8
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Mon Dec 14 19:19:01 2009 +0200
xf86xv: Fix off-by-one in viewport clipping
Most of the Xv Put/Get operations have an off by one error in the
viewport clipping.
Apparently PutImage was fixed at some point but the same code was
already copy-pasted all over the place, and so the other operations
still suffer from the bug.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit faca1bc582e374d32ee9d63d10e072fbef4940a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 14 11:05:20 2009 +1000
xfree86: belately init RandR12 if xinerama fails. (#24627)
On Fri, Dec 11, 2009 at 10:19:01AM -0800, Keith Packard wrote:
> On Wed, 9 Dec 2009 11:55:14 +1000, Peter Hutterer <peter.hutterer@who-t.net> wrote:
> > On Tue, Dec 08, 2009 at 05:24:06PM -0800, Aaron Plattner wrote:
> > > On Tue, Dec 08, 2009 at 03:52:27PM -0800, Peter Hutterer wrote:
> > > > Xorg +xinerama crashes immediately due to whacky dependency between Xinerama
> > > > and RandR12. The latter doesn't initialize if Xinerama is enabled, but if
> > > > only one screen is found, Xinerama is disabled again and RandR12 tries to
> > > > access data it never initialized.
>
> I'd sure like to have RandR get enabled when xinerama doesn't; is there
> an easy way of making that happen here? Perhaps having the RandR12 code
> disable Xinerama when only one screen is found? Or some other kludge?
you know the dependency better than I do so any hints are apreciated.
afaict, the screenInfo.numScreens (the check used by Xinerama) isn't
necessarily initialized at this point so we can't use the same check.
The following seems to work though:
From 670b3ebdb7312a6433a8f093d0820785db2aea20 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 14 Dec 2009 11:00:58 +1000
Subject: [PATCH] xfree86: if only one screen was found, disable Xinerama (#24627)
Xorg +xinerama crashes immediately due to whacky dependency between Xinerama
and RandR12. The latter doesn't initialize if Xinerama is enabled, but if
only one screen is found, Xinerama is disabled again and RandR12 tries to
access data it never initialized.
Dependency chain is:
- ProcessCommandLine sets noPanoramiXExtension to FALSE
- xf86RandR12Init() is a noop
- PanoramiXExtensionInit sets noPanoramiXExtension to TRUE
- xf86RandR12CreateScreenResources tries to use the devPrivates key it never
initialized.
This hack checks if there's only one screen at the time RandR12 is
initialized. If so, we expect Xinerama to fail anyhow so we disable it
ourselves and proceed as planned.
X.Org Bug 24627 <http://bugs.freedesktop.org/show_bug.cgi?id=24627>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f898ddbaa7df01d2479e40238d8c7954fc4b67a
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Dec 11 17:04:14 2009 +0200
xfree86: fix -quiet option behaviour
Previously it was trying to set the same value as the default one. Sigh.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7284e198619cdacb38d0ad715e932acff86c8367
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Dec 11 17:04:13 2009 +0200
os: print log markers only if log level is >= 0
FWIW default log verbosity is 0, so this will affect only if one start the
server with a different -verbose argument.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f57240a0a8c05e0a2589d0127f8888db140d6974
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Dec 11 17:04:12 2009 +0200
xfree86: spam output but with verbose level checked instead
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fbdf493a3e7e48039a0826531e11aa33b04bf391
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 14 18:46:00 2009 -0800
Add freetype & type1 to the LoadModules ignore list
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit c9726bbe3148c7a8adb4dfde483741545d59c3dc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 15 15:54:22 2009 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d50319550458f8127298cf8672b47f914b74ab1f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Dec 11 16:42:43 2009 -0800
Xfake: Nuke -Wl,-undefined=InitExtensions from LDFLAGS
This is not portable, and accodring to Paulo should not be required any more.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit ed7d2527190ec56aed38db19d9e958abe88441b9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Dec 11 11:53:28 2009 -0800
dtrace: Add Xserver-dtrace.h to CLEANFILES
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 44f102ed64e2552a0e04714c7574f74ca5ee66e2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 23 22:24:44 2009 -0800
COPYING: Update license preamble
Update the comment about "a modification is currently under discussion"
since there hasn't been any such discussion for some time and this is
the consensus agreed upon preferred format.
Also throw in a pointer to the OSI discussion page about the MIT license.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00a7252fe3e519e3e4d62cdd8746833ca59bce77
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 20 13:38:30 2009 -0800
Fix dtrace object builds of libos to link with SHA1_LIBS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit dd2c83d03ecedce8b546d583e436c12f92510754
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 11 14:42:20 2009 -0800
Fix builds with --with-int10=stub
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit 77221c9155a3c96cb63b210a048db1ea71a5e359
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 29 14:01:29 2009 -0400
glx: swrast can do GLX 1.4 too
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a72c65e9176c51de95db2fdbf4c5d946a4911695
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 2 08:37:20 2009 -0800
fb: Adjust transform or composite coordinates for pixman operations
Windows (or even pixmaps, in some cases) may not sit at the origin of
the containing pixmap, so any coordinates relative to the drawable
must be adjusted. For destinations and untransformed sources, the
operation coordinates are adjusted. For transformed sources, the
transform matrix is adjusted.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit bd567061c8b84b268d9bbb01bc4d8981feefb862
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 2 15:51:22 2009 -0800
Split fbGetDrawable into fbGetDrawablePixmap and fbGetPixmapBitsData
These two sub-macros each perform half of the original macro work and
the old macro is now implemented in terms of the new ones. This makes
way for new code which wants to know the underlying pixmap for a
window instead of just getting a pointer to the bits.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit 61335052972a78d67c0ba74f902273b34c63a198
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 1 11:09:32 2009 -0800
Revert "Fix clipping when windows are used as sources"
This reverts commit e9aa61e9f0d663d5b34a397b943b4d1df44e873d.
Conflicts:
fb/fbpict.c
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit 071b3c1810d9f2602173acc8578caac20e0b771e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 1 11:05:04 2009 -0800
Revert "Use IncludeInferiors when copying windows before compositing."
This reverts commit 7c7f0c2c6a04f7044d5ce69e97a615735e5831f1.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit 8e640d6b131d2865a9725d8997023865b0ef3d69
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 1 11:04:49 2009 -0800
Revert "Reserve space for two GC values in copy_drawable()."
This reverts commit 08df24555cb432eb0d90a3f63275e9485e777c4c.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit 0816c5482c25251da8af5978cc348e1c547bf731
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 1 11:04:06 2009 -0800
Revert "fb: Don't crash if copy_drawable() returns NULL."
This reverts commit 66a9616d645f5a23225251d197e00b94c79274f6.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit d3e054ac07dae12a82ad764b0622fddbef4b9ec5
Merge: 12fb318 97a6454
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 11 09:22:22 2009 -0800
Merge remote branch 'jeremyhu/master'
commit 12fb31815db9de9c01f2d4155a2b74531777c0bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 7 12:58:57 2009 +1000
xkb: don't assign garbage value to led_return.
As the comment for the function states, led_return is undefined if map is
NULL. We might as well skip writing to it then.
Found by clang.
Reported-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit ea14a418214ba4c58910f5650d8b25b3fc3a7099
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 3 11:21:31 2009 +1000
Xi: reset device properties to NULL after deleting them. (#25374)
Commit 0e6cee853d8e5bef3274e632ef034d37f14674a9 introduced cleanup code to
remove the accel properties when switching schemes. The same code is
triggered by the default closedown code but only after unconditionally
removing all device properties (as part of the cleanup). The properties,
although deleted never got reset to NULL.
X.Org Bug 25374 <http://bugs.freedesktop.org/show_bug.cgi?id=25374>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Andy Furniss <lists@andyfurniss.entadsl.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 9ac6a048efaec51f158bbc1a4a3f448cbe5658ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 9 11:43:34 2009 +1000
xfree86: remove unused variable in configureDDMonitorSection.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 3fad969a90ccab604359ec4de05e745bb4b909e1
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 6 20:27:06 2009 +0100
Move config_init() after CreateWellKnownSockets() and InitCoreDevices()
config_init() can now add devices directly instead of scheduling a
timer.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 886140787852c660978a9bb3abc7cc2702cbaed1
Author: Tomas Carnecky <tom@dbservice.com>
Date: Mon Dec 7 05:54:57 2009 +0100
Fix possible NULL dereference in XkbFlushLedEvents()
Through some code paths it is possible that NULL is being passed in the
'ed' parameter to XkbFlushLedEvents(). Make sure we don't pass it along
to bzero().
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 92d9cb7e1340b259294ba317ea3a7d18487498b5
Author: Tomas Carnecky <tom@dbservice.com>
Date: Sun Dec 6 23:52:54 2009 +0100
XkbWriteCountedString(): return early if str is NULL
This avoids NULL from being passed to memcpy() later in the code. While
that wasn't an issue before - that value being NULL implied 'size == 0'
so memcpy() wouldn't try to dereference it - it made the code harder
to read and also confused clang.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit df2635d4644d1fa2772ff58d8d34cdf788ece412
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Dec 10 00:04:53 2009 +0100
EXA/mixed: Don't consider devKind for detecting dimension change.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=25536 .
There should be no reason for the pitch to actually change when none of the
other dimensions do, and this could lead to incorrectly freeing the system
memory copy when allocating a GPU copy, resulting in loss of valid pixmap
contents.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97a6454ea57587db490873fee8ff0f899882972d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 9 18:27:31 2009 -0800
XQuartz: pbproxy: Fix building of standalone xpbproxy executable
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 1b8f90aa8b1017c74b254db2f398131b857323d4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 8 15:50:28 2009 -0800
Miscellaneous compilation warning fixes
main.c:134: warning: no previous prototype for 'dix_main'
rootlessScreen.c: In function 'RootlessMarkOverlappedWindows':
rootlessScreen.c:434: warning: function declaration isn't a prototype
backtrace.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
backtrace.c:54: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
set.c: In function 'RecordSetMemoryRequirements':
set.c:413: warning: old-style function definition
set.c: In function 'RecordCreateSet':
set.c:425: warning: old-style function definition
stub.c: In function ‘main’:
stub.c:236: warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 955b9f23a34cc79a5cd9676b45b3df4ffcc7302b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 8 20:25:02 2009 +0100
EXA: ModifyPixmapHeader_mixed fixes.
* Better detection of dimension changes.
* Make sure to re-create the system memory copy when the pixmap dimensions
change (e.g. the screen pixmap on screen resize).
* Clear the valid regions.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1503861cf75654d4f7b22e6f7f6487c47a0a395
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 8 20:25:01 2009 +0100
EXA: ExaDoPrepareAccess return value fixes.
Only return TRUE if the GPU copy is being accessed, and preserve the return
value on repeated / nested calls for the same pixmap.
exaPrepareAccessReg_mixed could get inconsistent return values e.g. when the
same pixmap is both the destination and source of an operation, potentially
resulting in a crash.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fd867387335b6175d76bbe93118bbe5e1e45ce88
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Dec 5 03:18:31 2009 +0100
exa/mixed: pixmaps that succeed prepare access have no need for a cpu copy
- When they have a gpu copy ofcource.
- Use the presence of a cpu copy as a hint to fall back instead of UTS'ing in
exaHWCopyNtoN.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bb7acfbcfbc37869c2215c26791c6175a5a6c526
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Dec 4 08:37:14 2009 +0100
EXA: Use correct coordinate system for calculating Composite fallback region.
Fixes incorrectly skipped rendering of some Composite operations to windows.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f4ef7123d3e6e09e04dc55e8edb47aecf017648
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Dec 3 19:28:13 2009 +0100
exa/mixed: setting devKind before exaCopyDirty* is not needed
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ea415d417b3ef6b8a288d10da76ff4bc334e08b
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Dec 2 20:24:02 2009 +0100
Revert "exa: a few small pitch related changes"
This reverts commit 99d88ef69d5f7dbf99ca605eceb92f42230a89f4.
- Some pixmaps under classic have a sys_pitch which is 0, no idea why. This is
causing rendering corruption.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98c8b752254a27ab1aaf881b36bfda0f74929d0a
Merge: 0e084d8 91c1bd7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 2 15:28:07 2009 -0800
Merge remote branch 'whot/master'
commit 91c1bd78f7240c92702828f8e5a6b6ce944b9e36
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Nov 28 21:32:47 2009 -0500
configure.ac: error while checking for XDMXCONFIG_DEP
Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4
The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES]
was not quoted.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 761ae22f880bd79550ccf93d321b8a28b3755956
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 1 14:38:19 2009 +1000
xfree86: tell users to disable AutoAddDevices, not AllowEmptyInput.
Technically, disabling AEI is the right suggestion. AEI off forces the
server to init the built-in defaults for input devices (or pick the first
one from the config file). At the same time, hotplugging is still available
with AEI off.
Unfortunatly, in the vast majority of cases users want to simply disable
hotplugging or have a working server while the local HAL configuration is
broken or missing. Disabling AEI will lead to duplicate events, triple
keystrokes, etc. once the configuration works again.
It's not actually required to remove AEI once hotplugging works again,
though it will in many cases lead to a setup that appears broken.
Asking users to disable AutoAddDevices instead means those users disable
hotplugging, can then fix the HAL setup and they _must_ remove the config
line again to test if hotplugging works again. Which doesn't leave them with
a broken config once everything is working nice and dandy. Less bugreports,
everybody wins.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Rémi Cardona <remi@gentoo.org>
Acked-by: James Cloos <cloos@jhcloos.com>
commit b584c224a888c9e7f92d7e49021f74232a727c7f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 30 12:11:41 2009 +1000
Set the source and deviceid for key repeat events (#24785)
X.Org Bug 24785 <http://bugs.freedesktop.org/show_bug.cgi?id=24785>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Adam Jackson <ajax@redhat.com>
commit 66bb8c6fbdfc0fc0d971aac4ec6f949bb9288c1b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 27 16:20:13 2009 +1000
dix: remove core devices when shutting down. (#25028)
NewInputDeviceRequest (and RemoveDevice) have checks in place to not allow
removal of the VCP/VCK. When shutting down, they need to be cleaned up
nonetheless to free the memory associated.
X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 83d90b90bcb71c89750f92a177361e53dd261414
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 27 16:08:44 2009 +1000
dix: remove some obsolete comment.
The "counterpart to biggest hack" included checking for the motion history
function - which is unified in 1.7. Hence the check (which is already
removed) would evaluate to true anyway, and this comment isn't needed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c20c8897272427cb3f755a3e28e80a9ad46f08a1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 27 16:01:53 2009 +1000
dix: fix memory leak, free event list on shutdown. (#25028)
X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0e084d8c71e697a5cf5d5d7c749455ae14bd6eb7
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Nov 11 15:59:27 2009 +0100
Xv: Fix AdjustFrame when driver implements ReputImage.
Should probably also be applied to stabler xserver branches too.
Luc Verhaegen.
From a22bc20721bad506d8fa9772b1258568cbffe7d2 Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <libv@skynet.be>
Date: Wed, 11 Nov 2009 15:52:39 +0100
Subject: [PATCH] Xv: Fix AdjustFrame when driver implements ReputImage.
Finally fixes fd.o #4653, filed more than 4 years ago.
Patch can be happily applied to all modular Xorg versions.
Signed-off-by: Luc Verhaegen <libv@skynet.be>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f4fc3406720410e37a2bce1b782cba0f0b734e42
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Nov 30 11:03:59 2009 -0800
XQuartz: Drop calls to alloca
This makes us more consistent with the rest of the codebase, using xalloc/xfree
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 66a9616d645f5a23225251d197e00b94c79274f6
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Nov 30 13:17:53 2009 +0100
fb: Don't crash if copy_drawable() returns NULL.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24634 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8754db77d8169e5ea506a963cebee1a651bcf094
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Nov 30 13:17:52 2009 +0100
EXA: Don't defragment offscreen memory at allocation time.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24300 .
Offscreen memory allocation can occur from various places, and apparently
doing defragmentation from at least some of them can confuse some driver
acceleration code.
There's still the regular background defragmentation in the WakeupHandler,
which should manage to keep fragmentation at a reasonable level.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e555a1033e5deed1db8582ca075455a6a2d4228
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Nov 30 13:17:51 2009 +0100
Revert "EXA: Accumulate arbitrary number of glyphs without flushing."
This reverts commit c11678cc189551f2a01eaa7a63969c16950739b4.
Not sure what I was thinking, turns out alloca() of a size derived from client
input is a bad idea.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 99d88ef69d5f7dbf99ca605eceb92f42230a89f4
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Nov 28 10:34:45 2009 +0100
exa: a few small pitch related changes
- Setting pitch before exaCopyDirty* is not needed.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a54c23fe647cb4d610d871094193ae5959606008
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Nov 28 10:34:44 2009 +0100
exa: s/PixmapIsOffscreen/PixmapHasGpuCopy and s/pExaPixmap->offscreen/pExaPixmap->use_gpu_copy
- Fixup some variable names as well.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 342f3689d17256c92cbfee079d24501d27aa1153
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Nov 28 10:34:43 2009 +0100
exa: handle pixmap create/destroy in lower layers
- Pixmaps that are created during a fallback are automatically prepared access.
- During the fallback accelerated ops are blocked to prevent new/scratch gc's
from triggering accelerated ops on mapped pixmaps.
- A few cases of incorrect wrapping (on the top level pointer instead of
between damage and (w)fb) have been removed.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b54bc14ce0ae38c4863794bc3096ca86cdb23908
Author: Ingmar Vanhassel <ingmar@exherbo.org>
Date: Wed Nov 25 20:31:48 2009 +0100
Update man-pages for new default font paths
Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c0367028ac02b3ccfbc245863dc6b7295a4014d6
Author: Ingmar Vanhassel <ingmar@exherbo.org>
Date: Wed Nov 25 20:31:47 2009 +0100
Update COMPILEDDEFAULTFONTPATH to match the new default font path
Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e6cee853d8e5bef3274e632ef034d37f14674a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 18 14:39:25 2009 +1000
dix: clean up accel old scheme data when switching schemes.
InitValuatorClassDeviceStruct always initializes with the default profile.
The default profile allocs data and adds a few properties which become
obsolete if the profile is changed lateron by the driver.
The property handlers are stored in the device's devPrivates and cleaned up.
Ideally, the property handler ID's could be stored somewhere more obvious,
but that seems to require breaking the ABI.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Simon Thum <simon.thum@gmx.de>
commit 1b127ab8429616adf9ec31ba4d8bdd9af6e104a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 24 15:31:48 2009 +1000
Xi: when deleting all properties, reset property handler to NULL.
Trying to unregister property handlers during the device closure process
leads to invalid memory accesses.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8806375ed72a3cd465fe0a49ead079a334accd6b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 17 09:25:47 2009 +1000
Move xdmxconfig modules into DMX conditionals (#25102)
xdmxconfig requires additional modules not checked for if Xdmx build is set
to auto (the default). This may lead to build errors if the Xdmx modules are
installed, but not the extra ones required for xdmxconfig.
X.Org Bug 25102 <http://bugs.freedesktop.org/show_bug.cgi?id=25102>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Remi Cardona <remi@gentoo.org>
Acked-by: Julien Cristau <jcristau@debian.org>
commit a2adda7ab3defd953cf0f48f5372efb037786a9e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 19 16:35:55 2009 +1000
Revert "Move xdmxconfig modules into DMX conditionals (#25102)"
New package dependency unnecessarily links in a few libraries that Xdmx
doesn't need. This can be fixed more elegantly.
This reverts commit 0ef15ca9d2d9c78c79a2771c550563bc6931b365.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eb967ca36cfe0409972ac987a74d498cd6f6bafb
Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Date: Tue Nov 17 17:13:43 2009 +0200
Xext: Fix a memory leak on GE client disconnect.
Add a call to dixRequestPrivate to inform dixFreePrivates that memory
allocated in GEClientCallback should be released when client
disconnects. Otherwise there is a leak of sizeof(GEClientInfoRec) for
every client connect/disconnect.
Also remove the explicit allocation and let GEGetClient /
dixLookupPrivate do it. This makes GEClientCallback similar to the
other extension callbacks.
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 55f60e192318132157d3dfdd6732f141bd9dc352
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Nov 23 22:17:43 2009 +0100
Revert "exa/mixed: be more thorough about setting fb_pitch when needed"
This reverts commit d4fc245115eb2cb323e06a82f9dd52518d9b6a16.
- This is causing crashes/problems for some.
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4677b5a80025b50ba2a3e953fd487a549586ae9f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Nov 23 16:33:00 2009 -0800
XQuartz: Allow better compatability with older versions of xinit
If we are id="org.x" and the launchd socket is ":0", we will claim
the socket to match the old behavior before we prefixed the
socket name with our id.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit ec16357edaba23694b12fd234ffa12fd58a73dfa
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Nov 23 17:00:06 2009 +0200
configure: remove unused kdrive Xvesa config variable
Xvesa was gone in commit 6d21fbf0 and this should be there as well.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a30e739a144912a68adcaa9f426d600c6ecbd529
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 23 13:07:56 2009 +1000
Xi: don't crash when deleting invalid device properties.
Deleting a property that was not set on a device leads to a null-pointer
reference. The protocol allows deleting those properties - it has to be a
noop.
Reproducible:
xinput --set-prop "My device" --type=int --format=8 "my property" 1
xinput --delete-prop "My other device" "my property"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 19f7c15e2008dab3c46ba3e14dfa353d01c74f72
Author: Zhao Yakui <yakui.zhao@intel.com>
Date: Fri Nov 20 14:43:35 2009 +0800
xfree86: Edid quirk for Philips LCD LP154W01
v1->v2: Make one condition case for one quirk instead of merging them
together. This is based on the Keithp's suggestion.
Move the EDID quirk for Philips LCD LP154W01 as the panel reports the vertical
size in cm.
https://bugs.freedesktop.org/show_bug.cgi?id=24482
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8b8db98353760738eead612fe846c2ce1c174fa
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Nov 19 10:46:30 2009 +0100
EXA: Don't use UploadToScreen for CopyNtoN with mixed pixmaps.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit d4fc245115eb2cb323e06a82f9dd52518d9b6a16
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Nov 18 21:23:09 2009 +0100
exa/mixed: be more thorough about setting fb_pitch when needed
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
commit 647b79f87a9891225678dc6fc2fbda3bdef8fa9d
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Nov 18 21:23:08 2009 +0100
exa/mixed: avoid copying back pixmap data when no migration took place
- When the driver handles the prepare access no copying is needed.
- Delayed pixmap creation should be fine, because it's handled by the
first prepare access, but the exaPixmapIsOffscreen check in finish access
will return FALSE without a driver pixmap.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
commit 30be7ceaf228497ac1ff0a1123c1b35e3aa1fc73
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 14 18:39:00 2009 +0100
xfree86: set a sane umask before opening the log
Xorg creates its log file following the umask of the user running
startx, which may result in a world-writable log. Set umask to 022 to
prevent this.
Debian bug#555308 <http://bugs.debian.org/555308>
See also http://thread.gmane.org/gmane.comp.security.oss.general/2299
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb95090730360b6b7f5429c40937e8fc9dfe5c14
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Nov 9 03:33:45 2009 +0000
Use glibc's in/out routines
Let's let glibc do the right thing for dense/sparse selection.
The _alpha_iobase code has been unused since the switch to libpciaccess. It
really should have been killed by fba700f1f6a8976.
Signed-off-by: Matt Turner <mattst88@gmail.com>
Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0ef15ca9d2d9c78c79a2771c550563bc6931b365
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 17 11:48:35 2009 +1000
Move xdmxconfig modules into DMX conditionals (#25102)
xdmxconfig requires additional modules not checked for if Xdmx build is set
to auto (the default). This may lead to build errors if the Xdmx modules are
installed, but not the extra ones required for xdmxconfig.
X.Org Bug 25102 <http://bugs.freedesktop.org/show_bug.cgi?id=25102>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df95be4d3d9a744720e37a16fd89d9569bf6e188
Author: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
Date: Thu Nov 12 11:27:34 2009 -0200
configure: change 'sigio-default' to 'use-sigio-by-default'
This was discussed in this thread:
http://lists.x.org/archives/xorg-devel/2009-September/002025.html
The patch sent fixed the help string but not the configure option.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 801f0e59800ea4a3f6c85b22dea6f2c400bda703
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:11 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c93f516e850c2ef2b47cc2e282f9081ae7165ac7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:26 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f38159cdd154a29caab0342aee41378e9921929
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Nov 10 09:12:27 2009 -0500
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c739beb439bb813e4c82b3216daee7e89aa96f2f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Nov 10 08:56:21 2009 -0500
.gitignore: use common defaults with custom section #24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9071b0d69748cfa7ecca17b4cb0e431bbb0ef2a4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Nov 9 13:09:55 2009 -0800
XQuartz: Explicitly pass a bellProc to make XBell() work again.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit e87a03fd531ce7974877688680d3bf9b85c2d835
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 27 17:16:57 2009 -0700
XQuartz: pbproxy: Wait for the server to finish starting up, so display is valid.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 15fc56addcc906592af7c0f4c0a5ac906fa5c389
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 8 20:25:42 2009 -0800
XQuartz: Buildfix for Leopard and older
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit b5aa2e0a5fe233dc883084a5026013472e85bca4
Author: Chase Douglas <chasedouglas@gmail.com>
Date: Mon Nov 9 22:54:39 2009 -0500
Move FD_CLR above pInfo->read_input
The event fd may be invalidated by the pInfo->read_input call. If it is
invalidated, the subsequent FD_CLR call will segfault. Thus, the FD_CLR
call must precede the pInfo->read_input call.
Signed-off-by: Chase Douglas <chasedouglas@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 982f6648fd29d085265bf6035c1bf4d1b2499316
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 10 09:50:50 2009 +1000
dix: increase default number of buttons to 10.
Currently the XTEST device is limited to the same number of buttons the core
device has. This breaks if a user has a mouse with more than 3 buttons
connected and is using a core client to fake button 8+ presses.
Rather than expecting all clients to fix themselves, just increase the
default number of buttons to 10, which is somewhat a compromise. Ideally,
the XTEST devices should adjust themselves to the highest number of buttons
available on the slave devices (like the master pointers already do), but
that's a taks for another day.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ec5417b965616e60b51466fe9fd2b44cb5abb349
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 12 23:58:32 2009 +0100
Cygwin/X: Ensure WM_STATE atom exists in multiwindow mode
Workaround a bug in iiimxcf (assuming the WM_STATE atom exists),
which can cause many Solaris clients to simply fail with a BadAtom
error
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit aa860552fd7e2888258a7b48b8c3bd4af527dc6c
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Nov 1 18:19:08 2009 +0000
Cygwin/X: Enable clipboard integration by default
Enable clipboard integration by default, can be turned off with -noclipboard.
We still accept -clipboard for backwards compatibility. If both are passed,
the last one is accepted (just as other arguments are handled).
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 87b00ced3d308a9168828c0e38ecffa0640621a0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 1 18:18:48 2009 +0000
Cygwin/X: Setup screen layout in Xinerama mode
Setup screen layout according to the screen window native window
positions in Xinerama mode
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0fe2e8c64e7a5a9140c77b88b266d7ae58b0bca2
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Nov 1 18:18:31 2009 +0000
Cygwin/X: Allow composite to be enabled for Xwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 26a69bbd9b6f415c443d6d6f8f450329f348edc3
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Nov 1 18:19:04 2009 +0000
Cygwin/X: Mount options have changed in cygwin-1.7
Mount options have changed in cygwin-1.7
Also fix a typo in the warning issued if /tmp is a textmode mount
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 35901ece6a49e5f8e245364c27723da2f9009a1d
Author: Paul Loewenstein <paul.loewenstein@gmail.com>
Date: Sun Nov 1 18:18:45 2009 +0000
Cygwin/X: Handle fake keypresses generated by speech recognizers
Apparently, fake keypresses generated by speech recognizers may not bother
with a scan code, so look up what scan code corresponds to the virtual key
code if this occurs.
Patch by Paul Loewenstein <paul.loewenstein@gmail.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0866322b574b1f3695467535ed5fa8f9e629ad1d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jul 13 13:46:45 2009 +0100
Cygwin/X: Always use an authorization cookie for internal clients
Don't conditionalize use of an authorization cookie for internal client
threads on XCSECURITY, always use one (this avoids certain problems
with XDMCP setups where the XDMCP host removes localhost from the access
list etc.)
Conditionalize the use of a XCSECURITY authorization descriptor on XCSECURITY
Consolidate the various places where the authorization cookie is set
for internal threads into a new function, winSetAuthorization()
Use authorization cookie for multiwindow WM X message thread as well
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 72f81f4e449defb0654e9bdb2c9ec014475a3977
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Nov 6 17:46:58 2009 +0000
Xming: Make -auth option work in with -multiwindow
Use an internally generated cookie for authentication of the internal
window manager client when using the -auth option in -multiwindow mode.
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6dbf8f27c885ea3a761548183fb00ba3df2df553
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Jul 21 01:15:25 2009 +0100
Xming: Tidy up code for initial native window positioning
Tidy up code for initial native window positioning and avoid a
duplicate call to winMultiWindowGetTransientFor()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 28eb61fc04811bb9bbb523e0a252933313bb16ce
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 1 18:19:14 2009 +0000
Avoid a null dereference if IFF_BROADCAST is set but there is no broadcast address
It seems that the getifaddrs() function can return interfaces with
IFF_BROADCAST & IFF_UP set, but no broadcast address (at least
under Cygwin 1.7, this seems to happen for v6 mapped v4 addresses)
Avoid a null dereference if this ever happens
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 091cbbaed7aafab6f9839a40fe977ab067d1ace1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Oct 12 13:40:11 2009 +0100
Xming: Fix UT8String and CompoundText clipboard text sharing with windows clipboard
XConvertSelection() in libX11 always returns 1, so there is no point in
testing it incorrectly against Success. This is possibly a bug in
XConvertSelection()
This should fix UTF8String and CompoundText selection via the clipboard.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9657eae5d65eff289089afc46dfb629758ebbdf7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 1 18:18:51 2009 +0000
Cygwin/X: Clearly diagnose a timeout while waiting for SelectionNotify event
Clearly diagnose a timeout while waiting for SelectionNotify event
in the clipboard integration internal client.
(which seems to be behind some of the reported failures)
Turn useless #if 0/ErrorF()/#endif into useful winDebug()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 062f49a8e0d1afb4dd32e9451a47ab2792639e7f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Nov 4 17:36:54 2009 +0000
Cygwin/X: Add a workaround for a SWT/Motif bug to internal window manager
SWT/Motif expects all top-level windows to get reparented, and waits until they
do. So workaround that in our internal WM by forcing a reparent event to
occur, even though we don't actually need to reparent the window to
frame it (as the frame is a native window, not an X window)
http://sourceware.org/bugzilla/show_bug.cgi?id=9848
https://bugs.eclipse.org/bugs/show_bug.cgi?id=36806
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 71519a572fe15b85c0eb2b02636c9e871f2c858f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Nov 4 17:34:40 2009 +0000
Cygwin/X: Fix typo in g_fAnotherWMRunning and tidy up WM detection code
Tidy up code for detecting another WM is already running
Fix typo g_fAnotherWMRunnig -> g_fAnotherWMRunning
Remove some unused event mask macros
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f3fad371cce0f3836514ad5b29e59fa1ca0627a7
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Nov 4 15:33:53 2009 +0000
Xming: Add FORCEEXIT option to configuration file
Add a new option to configuration file: FORCEEXIT, like SILENTEXIT
but ignores the client count. Unsaved client work may be lost with
this option but it is useful if you want no dialogs.
Add description of this new keyword to XWinrc man page
Also fix grammar of the exit confirmation dialog warning to be correct
when there is only one(1) client connected.
Also rearrange yacc tokens to one per line to make future merges
easier
Also amend default system.XWinrc so that SILENTEXIT is on by default
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 019a601de6a8ae083852c2d384c814dcc7aeeb72
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Nov 4 15:16:03 2009 +0000
Xming: Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion()
Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion(), as
they are in screen coordindates and may need to be scaled to the axis range
appropriately
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7af1240b57daa4ec55512276a9fda499d923eaa0
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Nov 4 14:20:17 2009 +0000
Xming: Replace all the uses of deprecated functions in hw/xwin with current ones
Replace uses of LookupIDByType() and SecurityLookupIDByType()
with dixLookupResourceByType()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 2a38f7c0dbc890e6408eee143d77719f265d583d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 19 21:12:55 2009 +0100
Cygwin/X: Remove a couple of extraneous '\n' in logged version info
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 56658fc06cb773ed20ef1b23a3fe918c0d3b36bb
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 22:40:02 2009 -0500
Set default font path with fontutil 1.1 and fontpath.d
Look for $sysconfdir/X11/fontpath.d and, if it exists, set it to the
default font path as a catalogue: entry. Based on app/xfs commit
c66a46e35ae40a23ad9acee838ab42300eddbd67.
Otherwise, use the font-util 1.1 macros to determine the system
fontrootdir and standard subdirectories, or let the user configure it
and the subdirectories themselves.
This adds a build-time (or at least an autoconf/autogen time) dependency
on font-util, and changes the --with-fontdir argument to --with-fontrootdir.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith-xsfywfwIY+M@public.gmane.org>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c7d1319872e0ae0b7d945e9af8c4027ee5aa2055
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 9 11:12:22 2009 -0500
randr: Fill in errorValue when verifying outputs/crtcs/modes
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d85ab6b6483d6ca7d9d22298d05ed1fa3076b042
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 13 10:15:00 2009 +1000
loader: actually stat something that has some chance of existing. (v2)
FindModuleInSubdir seems to expect a / at the end of the subdir its
finding for, so we add the / early, the stat will fail if its
not a subdir, I'm leaving the S_ISDIR in just in case there is another
reason it could return 0. This does look a bit silly in strace
but it seems to work fine.
I have a very intermittent issue where drivers loses its / that
I've been seeing on/off for a while, this may or may not fix it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a5e59230de3abafda9cd9d571cea192897155a14
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 5 13:44:30 2009 -0800
randr: Turn on ModeDebug during server setup
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c61e77c77ca309f3676370992f41867807ed0c67
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Nov 5 22:40:03 2009 -0800
Remove lnx_font.c and lnx.h
I couldn't find any version of the X xserver that ever used lnx_font.c
so let's delete it. I tried contacting its author, Egbert, multiple
times on IRC and email [*] but never got any response. It also hasn't
been seriously touched since January 2005.
[*] http://lists.x.org/archives/xorg-devel/2009-October/002855.html
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15ffe9f51b122494a2b292b3ab1f199d3e81600c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 5 18:28:28 2009 -0800
configure.ac: Notify user about which SHA1 implementation is being used
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 6b109919f6e1593b27b0760bb56a65b43fb86ea4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 5 18:13:07 2009 -0800
SHA1: Add support for Common Crypto
libSystem on darwin can handle SHA1 computation without needing to pull in
OpenSSL. See CC_crypto(3)
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 840a68dc5e3b4d285894f86df2a8c41fca5a4bec
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 4 18:39:16 2009 -0800
XQuartz: Cleanup X11Controller.m compilation warnings.
Declare X11Controller as implementing NSTableViewDataSource.
Use selectRowIndexes:byExtendingSelection instead of selectRow:byExtendingSelection
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 0e3ad44c3b05cbe7b1d8f5ce7949fec3c7ae2e7c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 4 18:15:08 2009 -0800
XQuartz: Use dixLookupResourceByType instead of LookupIDByType
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 069fc6ce0a0e7f2c418e11941568ffcc52b6b331
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 4 16:18:06 2009 -0800
XQuartz: Don't weed out duplicates in generated keymap
There seems to be an issue in the 1.5+ server where shift-space does not
produce a space when 'keycode 57 = space' but it does when 'keycode 57 = space
space'
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 6d6e8fb27f00f0c3128cef624b39a60aa754fdc8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 4 13:34:20 2009 -0800
XQuartz: Controller thread launches clients
This avoids a memory leak due to no active auto-release pool on the server thread.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit f7b375bd141d0cf1e3add5443a5838dd8f554ef6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 5 11:42:34 2009 -0800
Enable XF86PM on all Solaris platforms, not just x86/x64
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f77262513ea17401092479e17ad20fc0eb91ffb5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 5 11:42:33 2009 -0800
Use $(MAKE) instead of "make" to build Solaris inline assembly
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 964040764387d89ef64324cfbee31872ee6ce41c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Nov 4 15:35:37 2009 +0200
EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_driver
It crash the server when the drawable is 32 bit and the framebuffer is 16.
This is pretty much a copy-past from commit 8e873185.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7442f3355ab8f0bb2b1a270da18c65d8d315d4dd
Merge: 0573042 7897b6c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 4 08:55:20 2009 -0800
Merge remote branch 'jeremyhu/master'
commit 0573042cddb6f9942e408687a16c6842e62a8bfa
Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Date: Wed Nov 4 15:59:30 2009 +0200
dix: Fixes a memory leak when a cursor resource is released.
Just open and close a client that creates cursors in order to
reproduce. In the problem case bits->refcnt is -1 and therefore
bits->devPrivates is never released.
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7897b6c2d41bccb72c19418674c3526ecce29515
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 27 18:00:48 2009 -0700
dix: Properly detect if the other device is frozen
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 5e79976c13c5b94b12392b493846ca26be11750b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 3 16:35:27 2009 -0800
XQuartz: Run xmodmap after programatically updating the keymap.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Martin Otte <otte@duke.edu>
commit 412c56ef3332d09efbd861e41c3e985f44729729
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Nov 1 22:08:40 2009 +0100
exa: remove some outdated comment
- This comment is still in exa_driver.c and there it makes sense.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 48b8c076a7b7dbbddfc472e8c6e5251a0b174cbc
Author: Matthieu Herrb <matthieu@laas.fr>
Date: Mon Nov 2 11:11:24 2009 +0100
add libc as a choice for SHA1 implementation
On Sun, Nov 01, 2009 at 02:54:13PM -0800, Keith Packard wrote:
> Excerpts from Matthieu Herrb's message of Sun Nov 01 09:34:35 -0800 2009:
>
> > +AC_CHECK_FUNCS([SHA1Init], [HAVE_LIBC_SHA1=yes])
>
> I'd suggest AC_CHECK_FUNC instead; as far as I can tell, AC_CHECK_FUNCS
> will also define HAVE_SHA1INIT. Also, can you use HAVE_LIBC_SHA1
> consistently rather than having two separate names (HAVE_LIBC_SHA1 and
> HAVE_SHA1_IN_LIBC)? Yes, I know one is a preprocessor symbol and the
> other is a cpp shell variable, but I think that will work anyway.
>
New version taking you comments into account.
From: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun, 1 Nov 2009 18:19:27 +0100
Subject: [PATCH] Add a probe for SHA1 functions in libc in *BSD.
The interface is the same as the one in libmd.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da923d0bc15e99a8ed1986bd6f5df37f7af7284b
Author: Matt Turner <mattst88@gmail.com>
Date: Sun Nov 1 14:30:48 2009 -0500
Make sys.c use unaligned access functions provided in compiler.
Favorite deleted line was definitely
/* to cope with broken egcs-1.1.2 :-(((( */
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d30637339963950910e5f5fb755b8465ac7dddb4
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu Oct 29 11:46:22 2009 -0700
Supply all code using dl*() with DLOPEN_LIBS
Previously DLOPEN_LIBS was managed in top-level configure.ac.
Instead bundle it with the code using dl*() functions to
avoid breakages in uncommon configurations.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ec98d7fc78efefcf9fc61492529157c0d289c3f2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 21 10:23:16 2009 -0400
EDID: Extend the HDTV hack to handle "1368x769"
Hate televisions so much.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7c0803f555782dbf451b7c79112d7deae02e5c9f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 28 15:44:37 2009 -0400
modes: Fix duplicate detection, and do it more consistently
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ba2d39dd5428cb5922b797a1d4ea45b859412b40
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 26 15:10:30 2009 -0400
modes: De-duplicate a clock range check.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 25236d19e6ef07fcb2c71569f1b7b0c12810834a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 26 14:49:57 2009 -0400
EDID: Fix interlaced detailed timings to be frame size, not field size
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fb86433d897c116315cc7994390d11ac2f577511
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 26 14:04:23 2009 -0400
modes: Decorate interlaced mode names with a trailing 'i'
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fc2ec95664d55f45f77f1ebb039a7c17a1fcdaa3
Author: Ma Ling <ling.ma@intel.com>
Date: Wed Feb 18 17:41:26 2009 +0800
EDID: CEA extension support
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fab74d1081270fb8f1d231e6e10d10aa33e164da
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 17:48:19 2009 -0700
Suppress certain GCC warnings in auto-generated code.
- Don't warn for references to deprecated functions in xorg_symbols.
- Ignore functions generated by gl_apitemp.py that are never used.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 239435875d6a92ed31731b500a992a3af0943594
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 17:48:18 2009 -0700
Don't cast double to int: use default conversions or explicitly round.
GCC warns about casting a double return value to int.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e8c48fd8f7aab54327b0091cd17c60235ae27168
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 17:48:17 2009 -0700
Suppress GCC warnings like "the address of `u1' will always evaluate as `true'".
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 662594aeff9d1767316f08600949c73ac5060d18
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu Oct 29 00:40:48 2009 +0600
kdrive: Grab evdev mouse/keyboard devices when X server is active
Input events are directed to both vt and input devices by default.
Unless input devices are grabbed, keyboard events fill it vt buffers
and cause spontaneous wakeups in kernel tty layer when buffers are full.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 83d520d86c888f2c8a4abb18b7a8858d568aa18f
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 16:45:44 2009 -0700
Add video driver flag to indicate that console access is not needed.
Existing video drivers will get the console enabled by default.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 25979c46b467847ccb54f5c86a1be6b9c303c99a
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 16:35:28 2009 -0700
Alloc/free drawables array for each ProcPanoramiXShmGetImage call.
Updates my previous patch, b422b532f3dcab54c53f61a66f2ad76059d1874a.
keithp recommended against allocating the drawables array globally, but my
updated patch with that fixed isn't the patch that landed.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 757c11630d5999ad13dcac79191429badc92a3a6
Author: Tormod Volden <lists.tormod@gmail.com>
Date: Wed Oct 28 23:10:43 2009 +0100
xfree86: Fix description of DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE
The message ending up in the log is misleading as to what the quirk
actually does: It ignores the sizes in the detailed timings and
replaces them with the display "Max Image Size".
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ccf4a69db747b000aee09072aac0a2891bde139a
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu Oct 29 01:54:00 2009 +0600
os: Add libsha1 as a choice of SHA1 implementation
There are small systems which don't need OpenSSL or gcrypt.
Add libsha1 (http://github.com/dottedmag/libsha1) as an alternative
small SHA1 implementation.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8613e4b0eb04150b1e377871f02b164be5d001e9
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Wed Oct 28 11:44:27 2009 -0700
Add missing DLOPEN_LIBS to kdrive compilation flags
Xfbdev failed to build due to dladdr being used by xorg_backtrace.
Explicitly add DLOPEN_LIBS to KDRIVE_LIBS as there does not
seem to be a better place for it.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit deb72fc61464250af8185dab2da8ee09f13c55d8
Merge: 55f4c80 a60e676
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 28 10:54:13 2009 -0700
Merge remote branch 'jcristau/sha1'
commit 55f4c80a4c891b355a99e6a05978ca945397c5cc
Author: Hans Nieser <hnsr@xs4all.nl>
Date: Wed Oct 28 06:59:40 2009 +0100
Xinput: allow non-integer values again for Constant- and AdaptiveDeceleration
This was initially fixed by commit 3932a848572f4eaf8b7f1d91d9b74aeafab069a2
but then (presumably not intentionally) undone by commit
1d54479cb3c8b4f75b7564f8b5e1c5da940b20f4 .
Signed-off-by: Hans Nieser <hnsr@xs4all.nl>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 50a5c32430a5267f2a05656d2417f9a8a44d8b97
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Oct 23 19:32:42 2009 +0100
dmx: Correctly compute DMXGetScreenAttributes reply length
Correctly allow for excess length of DMXGetScreenAttributes reply
over standard 32 byte reply in addition to the displayName string
when computing the length of reply
http://bugs.freedesktop.org/show_bug.cgi?id=24685
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a2f6135bfb0f12ec28f304c97917d2f7c64db05
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 23 10:04:57 2009 +0900
DRI2: Report the correct extension minor version
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d886008c96cd16f735f54dace070cb00b23c6f44
Author: Marcin Baczyński <marbacz@gmail.com>
Date: Thu Oct 22 14:43:25 2009 +0200
Kill compilation warnings.
Signed-off-by: Marcin Baczyński <marbacz@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15b30fde179cba3877182cd51b0f870ef29ffaee
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 22 17:29:01 2009 -0400
dix: Fix up colormap fixup.
FindClientResourcesByType() will walk all colormaps on all screens; we
only want to fix up the current screen. Otherwise, screens > 0 will
have the visual pointers for their colormaps pointing off into space.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3785475a78636eb6547ef9e46be9e009c7cf7800
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 23 09:03:39 2009 +0900
Bump to 1.7.99.2 (unreleased)
commit 909df9beb3ddd02632f36ae682537280a6a8e5b4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 20 12:57:05 2009 +0100
Resolve an inconsistency between libX11 and Xserver over GetModifierMapping
libX11 ModMap.c believes that GetModifierMapping can never return an error
Xserver devices.c believes that GetModifierMapping can return an error if
the ModMap couldn't be generated
According to the protocol document I have, libX11 is right, so adjust the
server to send back an empty modmap if one couldn't be made...
http://bugs.freedesktop.org/show_bug.cgi?id=24621
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9c48862ac1ac119b6cfb7e376533f53af6a857f4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 01:12:03 2009 +0900
Bump version to 1.7.99.1
This is a development snapshot for 1.8.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26f4d8a2c12ff06c4beb06842cd8d9c0d9ddd4aa
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 01:04:42 2009 +0900
Make sure dmx docs are built for distribution.
Ok, dmx docs are driving me slightly nuts. We probably shouldn't
include the built versions in the tarball, but we do, so this is an
attempt to make that work by having both the 'all' and 'dist' targets
depends on the doxygen output.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4114854893ff57a1be525ec099a4b33e5f9963b1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 00:17:37 2009 +0900
Don't attempt to build hw/kdrive/sdl/Makefile anymore
With sdl removed, there's no way to build the sdl Makefile.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4d333c5121818754356853724333eadec2dcd18c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 00:16:12 2009 +0900
Always check for doxygen so that distcheck gets dmx docs
make distcheck wants the built dmx documentation so that users don't
have to install doxygen. This means that even if dmx isn't built, the
docs need to be so that the tarball can include them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e92bac5f769aca99bd20e21fe2811f0480b647b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 00:00:35 2009 +0900
Make sure HAVE_DOXYGEN is defined when not building dmx
The DMX docs are build using doxygen if present, so configure.ac
checks to see if that is available. However, when not building dmx
(the default), this conditional must still be defined to make automake
happy.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1228e2d052f0bb98175c55c194340773b5fedb40
Merge: 08e7f62 52bc6d9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 21 22:46:53 2009 +0900
Merge remote branch 'whot/master'
commit 08e7f62faf72540cb3a6f1023024c145f7fa1a23
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 21 16:46:55 2009 +0900
Fix 'distcheck' to use host xkb files but install to build dir
'make distcheck' needs to read xkb files and write out compiled
versions as a part of the 'make check' phase. This patch passes
suitable options to the configure stage of the distcheck process to
read xkb files from the system location and write them to the
distcheck _inst directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 52bc6d944946e66ea2cc685feaeea40bb496ea83
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 16 11:03:09 2009 +1000
kdrive: Purge Xsdl
From the original Xsdl commit:
"sdl x server so that we can x-on-x the fb stuff for ease of debugging. if
anyone uses this in production, a big scary monster will eat them.
hrm, perhaps i should make it have a --i-know-what-i'm-doing
param that it doens't start without, heh"
That should be reason enough to not spend time maintaing it. Also, no more
elephants.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f713f447a2110718dfc091380699362d76f0cd6c
Author: Lee Leahu <freedesktop-bugs@dyweni.com>
Date: Mon Oct 19 15:43:59 2009 -0500
dmxDestroyWindow() - must call the X's native DetroyWindow()
Don't really know why this section was disabled, but without it,
certain pPicture resources do not get free'd until later in the
FreeClientResources() process after the screen has been free'd -
resulting in seg fault.
With this patch, all resources normally free'd using vanilla X are
now also being freed correctly by Xdmx.
https://bugs.freedesktop.org/show_bug.cgi?id=24576
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 664a8e37fd83141974b772980f680b94e48b4f87
Author: Lee Leahu <freedesktop-bugs@dyweni.com>
Date: Sat Oct 17 00:45:44 2009 -0500
dmx: when setting up device axis, use the correct counter number
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 010d5e28655d619693632938e9e4325eef938295
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 16 10:01:13 2009 +1000
dmx: remove doxygen-generated files.
These can be recreated by simply running 'doxygen doxygen.conf' in
hw/dmx/doc. Some of the files do not exist anymore, these have been removed.
Some other files have a different naming scheme.
Doxygen warnings about missing links fixed, two warnings remain:
/home/whot/xorg/xserver/hw/dmx/dmxwindow.c:142: Warning: explicit link
request to 'dmxConfigureRootWindow' could not be resolved
/home/whot/xorg/xserver/hw/dmx/dmxwindow.c:119: Warning: explicit link
request to 'dmxConfigureScreenWindow()' could not be resolved
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ff3e171568c8b604fc5eacd5f7e9b7ee9417f172
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 16 10:26:21 2009 +1000
xkb: don't conditionally include xkb-config.h.
If HAVE_XKB_CONFIG_H is ever undefined, we fail to build anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b9dbd4bf2d1061514bebd28648538a5fc0b60e6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 16 08:24:37 2009 +1000
Use the default XKB settings for dmx and kdrive.
Drop the dmx-specific defines, there's no reason to have separate ones
considering they're about as hardcoded as the default rules anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e08d8a2b043e5be821c5e8b2dbf37b09102b5d01
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 24 11:25:28 2009 +1000
kdrive: silence tslib compiler warnings
tslib.c: In function 'TslibInit':
tslib.c:157: warning: unused variable 'tsDev'
tslib.c:156: warning: unused variable 'inputent'
tslib.c:155: warning: unused variable 'inputdir'
tslib.c:154: warning: unused variable 'i'
tslib.c:154: warning: unused variable 'fd'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 522ca8179ad2b2b935993f08c9382cd5ad1d8b2f
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Tue Oct 20 04:18:01 2009 +0700
Remove unused LinuxFindPci and LinuxGetPciCfg
These two functions are not referenced from inside xserver.
Remove now-empty klinux.h too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Oct 19 13:07:26 2009 +1000
Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2bd71a6db241924bd17ac9dd4aa38e7e563ee5c1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 16 22:29:26 2009 -0700
Fix segfault when -extension XKEYBOARD is passed on the command line
Users should be told they can't disable XKB or XInput via error messages,
not core dumps.
Reported by T`2 on #xorg irc
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a32b2420d85f076282721afe005e85fff7d9837e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 15 13:50:36 2009 +1000
kdrive: fix Xfake build by removing the old keysym stuff
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c31dd5db8b43c7796bf97a07e08213af5afd2ae
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 04:24:25 2009 -0500
Remove CopyISOLatin1Lowered
This function was moved verbatim into libXfont-1.4, and it is not used
by the server or any drivers. Exporting it in both places leads to
multiple definition linking errors on Cygwin, where we need to use a
static libXfont due to poor weak-symbol handling.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9bc4e88d84daf0f4faf0599b575675e74c75f4b8
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 01:53:43 2009 -0500
Define ddxBeforeReset stubs in platform-neutral DDXs
XWin uses ddxBeforeReset, which is called in DIX. Other DDXs need to
define these in order to avoid an undefined symbol error at link time
when building alongside XWin. Xnest and Xvfb already provide empty stubs;
this does the same for Xdmx and the platform-neutral KDrive servers.
Also add a prototype to avoid a warning in all DDXs.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 01:53:42 2009 -0500
Remove duplicates from Xfake_LDADD
KDRIVE_LIBS already contains the libs in XSERVER_LIBS, so linking against
both leads to multiple-definition errors when linking on Cygwin.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ed4c6bc79a797830895ad6c3601318b2d1c4bdcb
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 01:53:41 2009 -0500
Fix XWIN_LIBS definition
Move XWIN_LIBS from XWIN=auto conditional to XWIN=yes conditional,
otherwise the build breaks if an explicit --enable-xwin is passed to
configure.
Also remove obsolete library values from the definition.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bcd0c02cfd0707b5f8b1ca91dfbe4412df2c643e
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 01:53:40 2009 -0500
Install SDK pkg-config and aclocal files only if XORG
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 264ce9e8360374b3a43442c8bdea08abde705446
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 14 20:33:53 2009 -0400
xselinux: Use the now-exported IsPointerDevice() instead of a copy.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 0ae1632be045bfbb288bb57190c830f94247460f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 14 20:32:28 2009 -0400
dix: Export IsPointerDevice() and IsKeyboardDevice().
Makes the functions available to extmod for extensions to call.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 6c2ae5fec552366e11ad64a27626eb5dec4becf0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 22 13:31:49 2009 -0700
xselinux: switch from x_device to separate x_pointer and x_keyboard classes.
This will allow separate controls over pointer and keyboard without having
to relabel the devices to separate types.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 4be354c4c2da5168b302601b91bd80cfaca7e193
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 22 13:18:44 2009 -0700
Remove some debug messages that trigger on XACE event delivery failure.
It is normal for XACE to deny an event delivery, so these log messages
shouldn't trigger when that happens. Just drop them for now.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit c4ffce4dc84a0a9d134a59b7e7765c99ed767e53
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 22 13:13:03 2009 -0700
xace: Relax permissions on XkbGetState from Read to Getattr.
This request is used to get the current keyboard group and is called from
GTK. It does not return an actual keymap (aside from modifiers) so it
should be safe to relax the permission on it. However it does return
button state information which should be controlled through a separate
pointer Read check.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 0ff28319906eeb3f236acd72201c416ce01f2c6e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 15 19:41:04 2009 -0400
xselinux: Stop special-casing QueryPointer access checks.
XACE has been changed to not return BadAccess on device read failures.
Thus, no need for this workaround code.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 8502c06e19a4c00bf1311f54f9a365ee9e026e97
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 15 19:29:34 2009 -0400
xace: Fake return values on denials in input polling requests.
Instead of returning BadAccess when "read" permission is denied
on a device, falsify the device state (buttons down, keys pressed).
This is nicer to applications, but may still have undesired side
effects. The long-term solution is not to use these requests in
event-driven code!
Requests affected: QueryPointer, QueryKeymap, XiQueryDevice.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 0493935691e925ae137af7636fa15befa76c8b45
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 31 21:20:53 2009 -0400
xselinux: Factor out some dynamic array code into common helpers.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit ae8891ba0b63bfe6941a324e201d9ab7c645c0f3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 31 18:46:23 2009 -0400
xselinux: refactor extension code into smaller files.
New files:
xselinux_ext.c: Extension init and request handlers.
xselinux_hooks.c: XACE hook functions and other callbacks.
xselinux_label.c: Object security-labeling code.
xselinuxint.h: Shared internal functions.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit a60e676f1fd243c78859440b87652f523d3f2ec1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 14 23:51:22 2009 +0200
Add libgcrypt as an option for SHA1
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
commit d2a6a395435919aff8943285f9cbfe6569a9728f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 14 23:30:55 2009 +0200
configure: add --with-sha1={libmd,libcrypto} option
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
commit 55516094947dd78ad2734bb784a2fb109b64c990
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 14 23:20:44 2009 +0200
Move SHA1 computation from render/glyph.c to os/
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
commit 22b38f513c93c2f2aea5909878c3c9acae7d35c1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Oct 3 12:44:50 2009 +0100
Cygwin/X: Avoid a potential null pointer dereference before input initialization
Avoid a null pointer dereference if WM_MOUSEMOVE occurred before
the input device had been initialized (a timing sensitive bug
occassionally seen during initialization)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 1b0dfd8dee639870725d3bd9b70c3bd589d09e5a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jul 21 02:23:21 2009 +0100
Cygwin/X: Make -logverbose affect the verbosity of logging to the log file
Make -logverbose affect the verbosity of logging to the log file, not just the
verbosity of logging to the console
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 83d120b90482d356be730f63aead0f8e44a4e846
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Oct 1 14:47:22 2009 +0100
Xming: Fix various 'ISO C90 forbids mixed declarations and code' warnings
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 78c87bdad1feab91c2a39e01513b4b0826665f06
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Sep 25 17:49:59 2009 +0100
Xming: Remove unused X-boxed icon resource
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit fdf7f7e95c852734c620f58df408a324902172cf
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Sep 25 17:46:40 2009 +0100
Xming: update .rc file
Remove the obsolete DISCARDABLE flag in the .rc file
Replace the obsolete DIALOG resource with DIALOGEX in the .rc file
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5ddfd9d0898629627e8ab10e65ea2e082be3af37
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Oct 3 13:07:23 2009 +0100
Cygwin/X: Don't build rootless extension code unless we need it
Only try to build rootless extension code if we really need it (i.e. mwextwm mode is enabled)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 25344ba7f7845654364d62bf15322b3b79465bd9
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 13 20:14:58 2009 -0500
dolt: add Cygwin to supported platforms
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6e158003e80534ce007290f75c89d698aec1d00b
Merge: 2b14e14 5e762f0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 13 18:40:42 2009 -0700
Merge remote branch 'mattst88/master'
* mattst88/master:
[alpha] assume we have __NR_pciconfig_iobase
[alpha] don't return from void functions
Fix undefined symbols on alpha
Fix breakage on alpha caused by c7680befe5ae
Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
commit 5e762f0e2f203b5121a3de3b9af3c8981b31a77f
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Oct 13 20:42:14 2009 -0400
[alpha] assume we have __NR_pciconfig_iobase
The code path if we didn't have support has been broken since before we
switched to git.
The pciconfig_iobase syscall has been supported since 2000.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 46785c04bca16f495af3ed8d685aee939a1a8f39
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Oct 13 20:40:59 2009 -0400
[alpha] don't return from void functions
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 2b14e142039193ea854a02706662204f4f5f6db8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 13 12:54:56 2009 -0700
Rootless: src drawable window can now be NULL
Fix a possible crash when pSrc->pDrawable is NULL.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5b91dfac6fbdf35288a4558638d4923e230ab8d3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 13 12:54:11 2009 -0700
Rootless: Abstract some of the Xplugin specific stuff which has crept into rootlessWindow.c
The rootless extension now directly calls some Xplugin functions, and relies
on types defined in Xplugin.h, which isn't very abstracted :-)
This patch is a start at abstracting some of the Xplugin specific stuff which
has crept into rootlessWindow.c. This has been done in a pretty mindless fashion,
without much thought as to if the additions to the generic rootless interface are
the correct ones
There is some confusion as to if RootlesscolormapCallback() returns a Bool or
xp_error_enum value (not so abstact), but I have no way of checking, of finding
out if Xplugin actually checks the result :-)
Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72f5874434c0c015b671c492c1318f35f1793668
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 13 13:15:05 2009 +1000
dix: extend IsPointerDevice check to valuator-only devices.
A device with valuators but no keys is definitely a pointer device and needs
to be attached to the VCP. Otherwise, the class copying happens on the VCK
and the VCP isn't updated with the events that are to be sent through it.
This addresses the trigger for #24441, not the actual issue.
Jury is still out on valuator+key devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1088073b11ed488c0df45af3867b900ef93c6fe1
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Oct 9 11:31:44 2009 +0200
EXA: Fix exaTryDriverSolidFill() for solid source pictures.
Solid pictures have a NULL pFormat field, but their format is always
PICT_a8r8g8b8.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 55305cf8db7787883bc80b7348eb626e609626f8
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Fri Oct 9 16:08:15 2009 -0700
EXA: fix exaGetRGBAFromPixel to not loop forever on PICT_a8 picture
Easily reproducible by running "rendercheck -t fill".
It should be safe to just test against rbits for all colour components
as we should always have values for r/g/bbits for PICT_FORMAT_COLOR
formats.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Michel Dänzer <daenzer@vmware
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b375be9285c40467578fac2f1360c29a75306ab4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Oct 9 11:31:46 2009 +0200
composite: Revert changes from adding support for BGRA picture formats.
They were aimed towards a since abandoned approach for making radeon KMS work
on big endian machines, and Aaron Plattner pointed out that they break the
Composite extension when the X server runs in 16bpp.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 7 22:10:55 2009 -0700
Fix make warning: overriding commands for target `dix.O'
Not only does automake generate unnecessary rules for dix.O on platforms
for which SPECIAL_DTRACE_OBJECTS is false, it generates duplicate sets
when "if SPECIAL_DTRACE_OBJECTS" is nested inside "if XSERVER_DTRACE"
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b0dd6be2c8703f7062d45ac9fd646550c7d54e3b
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Oct 8 13:38:44 2009 +1100
Cast small-int values through intptr_t when passed as pointers
On 64-bit systems, int and pointers don't have the same size, so GCC gives
warnings about casts between int and pointer types. However, in the cases
covered by this patch, it's always a value that fits in int being stored
temporarily as a pointer and then converted back later, which is safe.
Casting through the pointer-sized integer type intptr_t convinces the
compiler that this is OK.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit b680a89262efcfef4644adb4a61ae42ea0db0c93
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Oct 8 13:38:01 2009 +1100
Fix GCC warnings in xorg_backtrace
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 9bf2ff4faf730913de3073f346646a8727be41d4
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Oct 8 13:36:44 2009 +1100
Fix "possibly uninitialized" warnings in glx
In both functions, "answer" was uninitialized if "compsize" was 0, but in
that case __GLX_SEND_VOID_ARRAY(compsize) results in a call to
WriteToClient for 0 bytes, which returns immediately without examining the
"answer" argument. So initializing to a null pointer is as good as
anything else.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit b422b532f3dcab54c53f61a66f2ad76059d1874a
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Oct 8 13:29:27 2009 +1100
Remove static MAXSCREENS limit from Xext/shm.c
Dynamically allocate per-screen data in the SHM extension, instead of
having a single static-sized array.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4df3e8c8053d9d4b3043f339a73d0de97020d884
Author: Martin Ettl <ettl.martin@gmx.de>
Date: Thu Oct 8 13:27:30 2009 +1100
Resource leakage: 0 is a valid file descriptor
When testing if an fd is valid, the required construct is >= 0, not > 0.
[Daniel: Fixed up the Linux MTRR case as well.]
Signed-off-by: Martin Ettl <ettl.martin@gmx.de>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4151a13c80f3afa43f88afcf19a7aeb16dace93a
Author: Francisco Jerez <currojerez@riseup.net>
Date: Mon Oct 5 02:39:03 2009 +0200
dix: Fix a double free in dixFreePrivates.
It can be reproduced when the server is regenerated and for some
reason the private keys are reassigned in a different order: a
manually allocated private may get an index formerly used by a
preallocated private. In that case it will first be manually freed and
then again by dixFreePrivates, as items[i].size was never zeroed
out. Do it in dixResetPrivates.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 34eddbbb73bb16395dba0818247909c1b4bee4c2
Author: Michael Cree <mcree@orcon.net.nz>
Date: Wed Oct 7 18:33:29 2009 -0400
Fix undefined symbols on alpha
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 44efcdde501d54ca9c3e33ab5b1f699956fc3f9f
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 7 09:07:03 2009 -0700
Fix overlay detection when matching Xv adaptors across screens.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68304215e25876ee639015969b4f07e1c9c515e0
Merge: 6676f49 315aaef
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 6 22:41:42 2009 -0700
Merge remote branch 'alanc/master'
Conflicts:
configure.ac
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 315aaef55750a863c08a16ad9120ffb76f9b48e0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 21:54:53 2009 -0700
Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is active
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2e294380b64b6362173d0590c4292f290e50af50
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 16:51:24 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4b0911565d18b1aefca564315d0f1b9b4a17aa65
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 5 16:52:19 2009 -0700
Add platform tests for Dtrace linker magic
Replaces special handling for Xquartz DDX and scales better to handling
the multiple platforms that now have some level of Dtrace support available.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 8c51b886400c5962b31ff565771be1b01a3ca8fb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 6 16:08:42 2009 +0200
configure: quote argument to m4_pattern_forbid
Without this, configure spits out
../configure: line 15460: ac_fn_c_check_member: command not found
Also anchor the pattern to make it stricter.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6ee61578ddb9f880ef12bbe9c3671d7dd53f2809
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 5 17:27:27 2009 -0700
Remove shave now that automake-1.11 has AM_SILENT_RULES
Revert "Add shave so that we can see the steaming piles of warnings generated."
This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b.
shave was left in the xserver 1.7 release/branch to allow developers &
distros time to transition to automake-1.11. xserver 1.8 series will
require automake-1.11 for silencing build noise.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5d960f57834f16164457dab2e80290717dbf2cd
Author: Kim Woelders <kim@woelders.dk>
Date: Fri Oct 2 19:31:15 2009 +0200
render: Fix clip region translation in miClipPictureSrc().
Signed-off-by: Kim Woelders <kim@woelders.dk>
Reviewed-by: Soren Sandmann Pedersen <sandmann@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d2118c8ca94fc7bcb8e0de547e63cf022f53a8a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 15:31:54 2009 +1000
xfree86: remove log-spamming DebugF
All input drivers use xf86PostKeyEventP indirectly now and have been since
it exists. I guess that qualifies it as tested - no need to spam the logs.
Reported-by: Felix Wenk
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit bf116057c7efd43c247c93f2f5d733a5db857cc9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 10:44:43 2009 +1000
Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1
libXtst requirement is already implicit since we require xextproto 7.1 and
that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless,
list it explicitly.
Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1.
Complementing that is libdmx 1.0.99.1 with the dmxext.h header file.
Reported-by: Mark Rosenstand
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9625f6d328d6f516520930227b218979309938bc
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Oct 6 20:58:30 2009 -0400
Fix breakage on alpha caused by c7680befe5ae
Pinpointed by by Michael Cree.
Commit c7680befe5ae removed Jensen support, but at the same time broke
support for dense memory systems.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit aa07957373fd7cbe67458a001e4afd6a7f1ea37f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 28 12:20:03 2009 +1000
Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus.
This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6676f49e34f8db7ef5767a6dbf6c2a4d2087f79c
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 6 16:08:42 2009 +0200
configure: quote argument to m4_pattern_forbid
Without this, configure spits out
../configure: line 15460: ac_fn_c_check_member: command not found
Also anchor the pattern to make it stricter.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0363bf7b135d816e73849c91fa53d98fd6072d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 5 17:27:27 2009 -0700
Remove shave now that automake-1.11 has AM_SILENT_RULES
Revert "Add shave so that we can see the steaming piles of warnings generated."
This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b.
shave was left in the xserver 1.7 release/branch to allow developers &
distros time to transition to automake-1.11. xserver 1.8 series will
require automake-1.11 for silencing build noise.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbc886a3513079c084fb7ce47b87c3e5bba19f3f
Author: Kim Woelders <kim@woelders.dk>
Date: Fri Oct 2 19:31:15 2009 +0200
render: Fix clip region translation in miClipPictureSrc().
Signed-off-by: Kim Woelders <kim@woelders.dk>
Reviewed-by: Soren Sandmann Pedersen <sandmann@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bd7430a32e63df8cd60352764744076448ee623f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 15:31:54 2009 +1000
xfree86: remove log-spamming DebugF
All input drivers use xf86PostKeyEventP indirectly now and have been since
it exists. I guess that qualifies it as tested - no need to spam the logs.
Reported-by: Felix Wenk
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 1a2dde3335864abfbbc133dbc709f564272dd540
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 20:44:19 2009 -0700
Set XQUARTZ to no on non-Darwin OS'es
Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c629e0fc50dfaffaa40a56709da7f035c289fed2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 10:44:43 2009 +1000
Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1
libXtst requirement is already implicit since we require xextproto 7.1 and
that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless,
list it explicitly.
Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1.
Complementing that is libdmx 1.0.99.1 with the dmxext.h header file.
Reported-by: Mark Rosenstand
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 2 19:20:24 2009 -0700
XQuartz: Fix a possible minor memory leak
commit c4886fbabc1d8b4054654b227fcad83f58e8e798
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 2 18:58:35 2009 -0700
XQuartz: Send mouse location with scroll events.
This fixes the problem where (0, 0) was sent as the mouse location with scroll
button events causing the event to not reach the client.
commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Oct 1 10:39:19 2009 -0700
GLX: More clearly document the GLX protocol version handling
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 21:19:11 2009 +1000
dix: force a minimum of 0 for screen coordinates.
Currently the root coordinates may fall into ]-1..0] if the subpixel
remainder is less than 0. Screen coordinates mustn't go below 0, so use
miPointerSetPosition to cap off the remainder if the coordinates are below
0.
This is cheating a bit, a more comprehensive solution to deal with subpixels
correctly when crossing screens is needed. For now, this'll do.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Simon Thum <simon.thum@gmx.de>
commit 64fe5784b49347e1fd27b0c463be5c16557594c9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 09:34:24 2009 +1000
configure: if xnest was requested but modules weren't found, fail.
Tested-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Julien Cristau <jcristau@debian.org>
commit 3ebb82d61c2b56e8f7145443a552a4e913bbfc80
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Oct 1 15:25:55 2009 +1000
rotate: drop unwrapping inside block handler.
Keith has shown half the block handlers wrappers are wrong, also
dynamic wrapping/unwrapping from what I can see will happen after
the drivers, so its really accidental ABI, that we can't change
now without modifing drivers. So be safe for 1.7.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Declared-as-sane-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cb54cf1b3e8c4109541cfb698542c00f2473e731
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Sep 30 11:33:16 2009 +1000
glx: fixup deref of null pointer when glx screen init fails.
I think this is what the original author wanted.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
commit 3d7cf468df96c0130a862f0d93fec990b9110c2f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 1 11:58:18 2009 -0700
XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0
Is fink really _still_ relying on this X11R7.x version string?
commit 85b831f701d085e514afcf8a5ce9b11f8a57984e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Oct 1 17:27:11 2009 +0200
xfree86: fix xorg.conf manpage formatting error
commit 9bc7cbf9c02656982c2525836b5498993f708e02
Author: Nirbheek Chauhan <nirbheek@gentoo.org>
Date: Tue Sep 29 22:35:06 2009 +0530
xkb: check permissions on XKM_OUTPUT_DIR
Checking just for root is insufficient since that does not guarantee write/read
permissions in XKM_OUTPUT_DIR (for example with sandbox).
Check if we can write a file, as well as read it later. Otherwise, invoke the
fallback to /tmp
Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org>
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 622fc98fd08aba98369e6933c3ab8c9ff85385d5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 10:03:42 2009 +1000
render: Fix crash in RenderAddGlyphs (#23645)
This patch fixes two bugs:
size is calculated as glyph height * padded_width. If the client submits
garbage, this may get above INT_MAX, resulting in a negative size if size is
unsigned. The sanity checks don't trigger for negative sizes and the server
goes and writes into random memory locations.
If the client submits glyphs with a width or height 0, the destination
pixmap is NULL, causing a null-pointer dereference. Since there's nothing to
composite if the width/height is 0, we might as well skip the whole thing
anyway.
Tested with Xvfb, Xephyr and Xorg.
X.Org Bug 23645 <http://bugs.freedesktop.org/show_bug.cgi?id=23645>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 758ab55d2defc78d0169fd61a7036eb9f889e9e7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 15:22:19 2009 +1000
render: set the glyph picture to NULL by default.
In a follow-up patch we may have glyphs with a NULL picture. To cope with
that, always set the pictures for glyphs to NULL at creation time and cope
with cleaning up such glyphs. Also, since compositing a NULL source doesn't
do a lot anyway, skip trying to do so.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b5fcc5553eb784c9f4826936e839079c0cdee55a
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Oct 1 15:17:11 2009 +1000
exa: avoid infinite loops if UTS sw fallbacks.
The upload in finish access can cause an infinite loop if
UTS returns FALSE in here.
Fixes fd.o bug #24246.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 30 11:40:19 2009 -0700
Re-fix DGA removal.
Removing DGA ended up breaking any drivers calling into the old
xf86DiDGAInit function as it tried to see if DGA was already enabled
and ended up crashing if the VT wasn't completely initialized. Oops.
Also, if the driver initializes DGA itself, have the DiDGA
initialization overwrite that information as the DiDGA code will call
ReInit on mode detect.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 873467adad479be02cd9cc6b43685919f5612d91
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 30 00:22:02 2009 -0700
XQuartz: Set the proper bitmap for key repeats...
XkbSetRepeatKeys lies and doesn't do what it says it will...
commit 7bef78e199a4e4f7916be506807513efcd8fd4cb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Sep 29 23:40:47 2009 -0700
xkb: Use XkbPerKeyBitArraySize instead of hardcoded value of 32
commit 4970666827e65424ee17ccf6341ff84aac974383
Author: Kim Woelders <kim@woelders.dk>
Date: Tue Sep 29 20:31:45 2009 +0200
dix: Fix potential memory corruption in doListFontsWithInfo.
Signed-off-by: Kim Woelders <kim@woelders.dk>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6ffda5aae75272fabdc27d6f693ae827be119e95
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Sep 29 11:49:09 2009 +1000
dix/glx/composite: consolidate visual resize in one place.
The previous code was copied and in both cases incorrectly fixed
up the colormaps after resizing the visuals, this patch consolidates
the visual resize + colormaps fixups in one place. This version
also consolidates the vid allocation for the DepthPtr inside the
function.
I'm not 100% sure colormap.[ch] is the correct place for this but
visuals are mostly created in fb and I know thats not the place to
be resizing them.
Fixes fd.o bug #19470.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ad5c0d9efa47476ed5cf75c82265c73919e468b4
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 29 16:43:43 2009 -0700
GLX: Enable GLX 1.4 on DRI2
Return the minimum GLX version supported by all screens. Assume that
DRI2 screens have all the required features for GLX 1.4. Assume that
everyone else can only support GLX 1.2.
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit f11a356bcef1bc0a6440325019d5967b745a42dd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 28 17:05:29 2009 -0700
XQuartz: Cleaned up keymap setting for easier maintenance
(cherry picked from commit b9dfed9e88389cbd29406a20d38ee4297638649b)
commit f3223c71cfc638e695981e527517d48ea00d124d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 28 23:01:59 2009 -0700
XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
commit 9b98b883227ed23d5470e8de689afeec4a0fd742
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 28 17:47:31 2009 -0700
XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
(cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671)
commit 11817a881cb93a89788105d1e575a468f2a8d27c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Sep 29 08:56:59 2009 +0200
Fix ShmPutImage non-ZPixmap case.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23298 .
commit 19be992d9dc542b61fa3f4fd32a09071c9e64880
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 28 14:18:45 2009 +1000
ephyr: if -parent is given, check for a trailing -screen. (#24144)
If -parent is given, don't open up a new window if -screen is given as well.
The commandline option -screen allows to set the depth of the embedded
Xephry instance, even though width and height are autoscaled on -parent.
This patch checks for a -screen parameter after -parent and - if one is
found - delays initializing the screen. The parent window id is stored
temporarily but re-set after a -screen argument.
The following command is thus valid:
Xephyr -parent 1234 -screen 640x480@8 -screen 1024x768
It embeds the first 8-bit screen into window 1234 and opens up a new window
for the second screen. Multiple parent arguments are possible, the screens
are embedded in-order.
X.Org Bug 24144 <http://bugs.freedesktop.org/show_bug.cgi?id=24144>
Tested-by: Vic Lee
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe
Author: Ben Byer <bbyer@freedesktop.org>
Date: Sun Sep 27 10:35:53 2009 -0700
Add (ok, fix) support for DTrace under OS X
(cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)
commit b3415187e92960cbff784108b5a3a8d130dc34c5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 23:09:51 2009 -0700
Rootless: Correct border rendering on parent-relative windows
Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow
(cherry picked from commit cf2e3312cff3f341e9edba8c321a4ca7ffd8748e)
commit 6df00917cab5c1096070625385fd76ee6c52e0f1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 23:00:59 2009 -0700
XQuartz: Fix QuartzSetCursor to match the expected prototype.
(cherry picked from commit dadab5a2279a19dcf709402d7f22f0cd48670db0)
commit 67a51cd9ef60b4c9f25fdde84f9eb352936c8c67
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 22:57:25 2009 -0700
XQuartz: Fix a bunch of compilation warnings about style
(cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
commit 96780eaf32636c94a9cf33f22eb9f01d984ff754
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 22:29:49 2009 -0700
XQuartz: Nuke TSM
It's deprecated in SnowLeopard. Ben and I both have no idea what it is for. It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye.
(cherry picked from commit 29cb904e4de2411a9b6dbe68694954788f0525f7)
commit 15e15816a2f011d0aeeaff9e394d30a147c973ce
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 22:26:22 2009 -0700
XQuartz: Fix inverse map from mode_switch to alt
(cherry picked from commit de6cee11e1c335a0e5f708e7641e81d3cfe52529)
commit 558d803b2966c2e44345a80e635e091dc3e49f02
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 18:25:57 2009 -0700
XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
We need to find a better way to work with XKB on this.
(cherry picked from commit ceaa5c779ceed3de5ea53727649613be3133b24e)
commit 226b1033b48807fd6871ba626e20ef1411904939
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 17:08:12 2009 -0700
XQuartz: Transition from xEvent based mieq to InternalEvent
(cherry picked from commit a3dbde2de87ee4f577748a8c447501a3ea462559)
commit 0c2731596f27f2cdf5000ba41de37e7eb86ad6f9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 28 15:07:48 2009 +1000
Put tests for zero-sized strings in quotes (#24060)
X.Org Bug 24060 <http://bugs.freedesktop.org/show_bug.cgi?id=24060>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 83023ffd09a84ff48e6b99f57ebad101a00478db
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 28 13:59:25 2009 +1000
xfree86: use the DDC size if either width or height of DisplaySize is bogus.
If either width or height of DisplaySize is invalid, assume that the
configuration is invalid and use the DDC-reported values instead.
See Comment 9, Bug 9758.
http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dave Airlie <airlied@redhat.com>
commit f772014c435f56db56520ca13ffa39431684f122
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 10:53:51 2009 +1000
render: Plug a memory leak in AddGlyph. (#23286)
AddGlyph was missing the FreePicture() call that DeleteGlyph used, resulting
in a memory leak when more than one Glyph was added in a RenderAddGlyphs
request.
Since the code in AddGlyph and DeleteGlyph is identical, move into a static
function to avoid such mistakes in the future.
X.Org Bug 23286 <http://bugs.freedesktop.org/show_bug.cgi?id=23286>
commit 3db28f92b0c810b452506abbed299a204c90ba0b
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu Sep 24 12:57:02 2009 +0200
configure: make XNEST default to auto.
When we're checking whether to build Xnest, we're comparing the
variable to auto but before it never was assigned that.
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
[Xnest was enabled to yes to increase build exposure and catch compiler
errors early. The requirements to Xnest are quite low and I expect most
developers have them, so Xnext will be enabled on most boxes. Anyone
missing those requires probably doesn't want to build Xnest anyway.]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 78ad6ca9a97440b74019c00a28144ea7d1e03431
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Sep 27 17:30:23 2009 +0200
xfree86: Hurd fix
I hadn't paid attention that the parameters order had changed, here is a
trivial patch, please apply.
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit fb7938315bed9d4cb5641ee9acebf78a13bc109e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 09:48:43 2009 -0700
Xi: Make CopyKeyClass X_HIDDEN to avoid ugly ifdef-fu
(cherry picked from commit 6d436e17a9ae7f4ce8537f3fabc052d4f07ca75f)
commit a2cd21177859eb45320a94c96dde7d9058ab7650
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 23:41:45 2009 -0700
XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
(cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8)
commit fbfbf93405222322571e15e78dea57c8f2755eae
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 22:52:39 2009 -0700
XQuartz: Add pressure/tilt property labels
(cherry picked from commit 84ea67130ef6b4086042aad6036ce66f93ea3e56)
commit 65f14840898dd7e9d61d8c966f3ff11ae3e82d4f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 22:48:49 2009 -0700
XQuartz: Fix a brain-o array indexing problem
/bop Peter
(cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb)
commit 7159381881e5da33a49e8735811b93cbfe4f681e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 22:17:09 2009 -0700
XQuartz: Nuke duplicate locks that make painful headaches
(cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
commit fba8c702ba6aa8fac27682e0838fd744e197d54f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 22:13:49 2009 -0700
Xi: CopyKeyClass is not static for XQuartz
(cherry picked from commit 85d6402354cdf143c6490f2725744c2f08b5605b)
commit dc1e1bebff8b9d1eb6196dfd4b2f52f1e4200efa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 7 00:02:21 2009 -0700
XQuartz: Use internal xshm header for new xextproto
(cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be)
(cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)
commit 73ae547d5e687ef10dea45801fc627e10ac4b659
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sun Sep 27 02:08:10 2009 +0200
EXA: Fix mixed pixmaps crash with missing / failing UploadToScreen hook.
For the recent mixed pixmaps changes, I failed to realize (or hit in my
testing) a problem which can occur if the driver doesn't provide an
UploadToScreen hook or provides one which can fail: There can be a crash
in exaMemcpyBox() because exaCopyDirtyToFb() passes pExaPixmap->fb_ptr to
exaCopyDirty(), but that's normally NULL with driver allocated pixmaps.
The solution is to make exaCopyDirty*() no longer rely on pExaPixmap->fb_ptr
but use pPixmap->devPrivate.ptr after PrepareAccess instead.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24167 .
commit c9ec2bab2f258798fd6e6676698c732f09571a60
Author: Kevin E Martin <kem@redhat.com>
Date: Sat Sep 26 13:10:54 2009 +1000
dmx: undefine MITSHM, move undefs to miinitext.c.
This patch undefines MITSHM for dmx - we don't support the required
screen->ModifyPixmapHeaders. All undefines are moved from dmx-config to
miinitext.c, where they belong.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc9d733bab3ff0e4e51b19c73b66196dca563a70
Author: Kevin E Martin <kem@redhat.com>
Date: Sat Sep 26 13:09:52 2009 +1000
dmx: reshuffle linker order to avoid errors when MITSHM is undefined.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e7c2598f565e8252dd66ee3e6212b310856476cb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 25 14:53:33 2009 +1000
dmx: core events are always in screen coordinates when passed to GPE.
This fixes input in dmx, the pointer appears at the right positions to the
clients now.
Also mark the spot where we pass in the button state as valuator to GPE
with a FIXME. (??)
Tested-by: Kevin Martin
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 43a2eb794f19a2ba56d653f465fc5f6b2ff0d3d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 21:49:11 2009 +1000
configure: Unify all library defines that require a specific version.
This patch moves all libraries that require a specific version into a single
location instead or duplicating them across the configure.ac file.
Libraries that do not require specific versions are left where they are.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9bd08c690fc687c4d69bb70536f3079a9184476d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 24 14:07:26 2009 +1000
Xi: update axisVals with the right subpixel data.
Subpixel data in data_frac is stored as FP32.32, hence we need to get that
down again before adding it to the current value.
Reported-by: Thomas Jaeger
Tested-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit abb8108fb44cc9b08fe4ae7d805a0a22564ca6bb
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sat Sep 26 02:05:24 2009 +0200
EXA: Only calculate cache position once for each glyph.
commit c11678cc189551f2a01eaa7a63969c16950739b4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sat Sep 26 02:05:06 2009 +0200
EXA: Accumulate arbitrary number of glyphs without flushing.
commit 0369eeeb6bf8a808fa2df503fc8b8df81e6e07b8
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sat Sep 26 02:04:48 2009 +0200
EXA: Try to minimize UploadToScreen calls for mixed pixmaps.
If there are several software fallbacks affecting the system memory copy of the
same pixmap, only copy the results back to the driver pixmap when it's used for
acceleration again, or in the BlockHandler, whichever happens first.
commit 1818cbd70fc1f2e1487b4c678e67e28f1265c0ef
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sat Sep 26 01:59:39 2009 +0200
EXA: Extend mixed pixmaps scheme to allow driver PrepareAccess hook to fail.
If the PrepareAccess hook fails, use the DownloadFromScreen hook to retrieve
driver pixmap contents to a system RAM copy, perform software rendering on that
and copy the results back using the UploadToScreen hook. Use the classic
migration logic to minimize transfers (which as a bonus allows slightly
cleaning up some of the existing mixed pixmap code).
This enables things that weren't possible before with driver-allocated pixmap
storage: If some (or all) GPU pixmap storage can't be mapped directly by the
CPU, this can be handled between the PrepareAccess and
DownloadFrom/UploadToScreen hooks, e.g.:
* Radeon KMS on big endian machines can fail PrepareAccess if the pixmap
requires byte-swapping and swap bytes in DownloadFrom/UploadToScreen.
* Environments where GPU and CPU don't have a shared address space at all.
Here the driver PrepareAccess hook will always fail and leave all transfers
between GPU / CPU storage to the Download/From/UploadToScreen hooks.
Drivers which can handle all pixmaps in the PrepareAccess hook should notice
little if any difference.
commit e23bffc41b007f1bc2b8f5cd4ac54213062c95cc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 19:17:48 2009 -0700
Fix build of unit tests when dtrace probes are enabled
ar loses the dtrace probe magic when building static libraries, so we
have to link with the .O files in order to resolve the dtrace probe symbols.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 9fa73be9fa543a686ea35c861084f5af37d44caa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 20:34:54 2009 +1000
Require libXext >= 1.0.99.4
Reported-by: Tilman Sauerbeck
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a9c274df5c37cb4ece6449e934342d8ff8e61705
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 11:43:27 2009 +1000
kdrive: plug two memory leaks when freeing the KdKeyboard/Pointer.
xkbRules, xkbModel and xkbLayout are strdup'd in KdNewKeyboard, need to be
freed.
The ephyr driver strdups the name on top of the already allocated
kdrive-assigned name. Memory must be freed beforehand.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fd913136732ff14a0484ca28f60ac1fbf49be81d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 11:44:12 2009 +1000
dix: plug memory leak in DeviceEnterLeaveEvents.
'event' must be freed before exiting.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6ee796e9bb4e46782b50a69c7b4fa5b49576f139
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 24 14:05:52 2009 +1000
Xi: fix length calculation for ValuatorState in QueryDeviceState reply.
The length field needs to include the bytes required for the valuators
(INT32) as well.
The reply length has the right value and since the valuator state is always
last, clients didn't notice the wrong offset.
Tested-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 12:32:44 2009 +1000
configure: fix up tslib check once again.
This patch addresses two issues:
The check for HAVE_TSLIB = xauto can never be true, the check has been
corrected to TSLIB = xauto.
Pre-pkgconfig versions of tslib fail to be found, this patch restores the
additional AC_CHECK_LIB. However, the pgk-config check must happen before
AC_CHECK_LIB, as AC_CHECK_LIB does not seem to honour the LD_LIBRARY_PATH.
Thus, if tslib is installed outside of the default paths, AC_CHECK_LIB
fails.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked--by: Daniel Stone <daniel@fooishbar.org>
commit 5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551
Author: Thomas Jaeger <thjaeger@gmail.com>
Date: Tue Sep 22 20:16:21 2009 -0400
dix: report XI1 axis values correctly if first_valuator != 0
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33bf9cb69dccbb6889b2f83e6db61f40dc644e17
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 23 17:41:28 2009 -0700
XQuartz: GLX capabilities: Allow 16bit accumulation buffers
http://xquartz.macosforge.org/trac/ticket/308
(cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22)
commit ce1fe8ddb4a4dbe6cfd909e5b1b73b459d742bec
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Sep 23 13:10:05 2009 +0200
render: Don't add b8g8r8x8 format for depth 24.
The components are required to be packed in the bottom of the pixel, so this
format can't fit in depth 24.
Also fix up a comment for the addition of BGRA formats.
commit 096f21bb7a1217443d8a03529b1a2938518eb24f
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Sep 23 08:24:06 2009 +0200
EXA: Fix some issues pointed out by clang.
Remove dead variables, fix use of uninitialized values, that kind of thing.
commit 824a09d856a5f750694e11d2fd2faaa3de705eaa
Author: Simon Thum <simon.thum@gmx.de>
Date: Mon Sep 21 15:23:27 2009 +0200
dix: move bounds check before access
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9edb9e9b4dde6f73dc5241d078425a7a70699ec9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 12:56:17 2009 +1000
Bump to 1.7.99.1
X Server 1.7 has branched off.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 66ece3bfb19642bf0f1ef73c3caa8a99c3dfb5a9
Author: Kevin E Martin <kem@redhat.com>
Date: Tue Sep 22 11:42:24 2009 +1000
dmx: only free the default pixmaps that we actually allocated.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20fb8c2e2fccb28c1b89e6e2a5c685e1287baedb
Author: Kevin E Martin <kem@redhat.com>
Date: Tue Sep 22 11:41:33 2009 +1000
dmx: disable Get/SetWindowPixmap, we don't support composite/redirected windows
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fcdc1d78cca3b8bb6b77d53eda7e21d649df6943
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 21 19:16:59 2009 +0200
Fix sporadic segfault on resume due to accidentally freeing cursor.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 91e1fe5863a180b2d70a6943e83b98bbd4c9ebce
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Sep 21 19:13:31 2009 +0200
Revert fe31f9c + 977953b to fix issue for good.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 90aa0e4a49cdd637178a771365e1e8dab8bceb87
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 18 10:03:02 2009 +1000
input: don't use typecasts to access members of InternalEvent.
To avoid confusion, the member names are now postfixed with _event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 693d4fdb1c7b7c789a812790122454e718602449
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 11:13:58 2009 +1000
Xext: switch mbuf.c to dixLookupResourceByType
Resolves a linker error caused by LookupIDByType.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 493d2f9c2fc56dd3b4c03451c07cd25e3012142e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 11:05:07 2009 +1000
Xext: remove DisplayImageBuffers from mbuf.c
Not referenced by anything.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fff40b3353c7025c1d1e3dd14b5c78f7c9f5de7c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 10:53:47 2009 +1000
Xext: fix up multibuffer compiler errors.
Triggered by the xextproto 7.1 change, fixed by moving the matching
declarations from the header file to here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4c8f834da6c8c84849313453fe223a8165c6afc0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 21 14:52:31 2009 +1000
configure: fix up check for tslib.
Reduce the tslib-check to the pkg-config check only instead of the previous
library symbol check followd by a pkg-config check.
This patch also reduces the required version of tslib back down to
tslib-0.0. Unfortunately, the 1.0 tarball available through
http://tslib.berlios.de/ still announces itself as 0.0.2.
Reported-by: Werner Landgraf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 977953bf14858d17c22208c848854ddbe7e86527
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Sep 21 15:44:00 2009 +0200
Less intrusive workaround for sporadic segfault on resume.
Hopefully fixes fdo #24010 (memleak).
commit 55747d256d759850141e4a9c4dec965616a31dc8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 18 16:27:54 2009 +1000
input: define server-supported protocol versions in one single file.
include/protocol-versions.h specifies each extension version as supported by
the server and sent back on the wire to the client.
This fixes up several issues with the server potentially reporting a higher
version of the protocol if recompiled against a newer version of the
protocol.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Julien Cristau <jcristau@debian.org>
commit 0b7c6c728c2e2d8433a188315cc591308a89cd85
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 18 21:12:17 2009 -0700
xfree86/modes: Remove all framebuffer support from DGA
This removes all rendering and mapping code from xf86DiDGA, leaving
just mode setting and raw input device access. The mapping code didn't
have the offset within /dev/mem for the frame buffer and the pixmap
support assumed that the framebuffer was never reallocated.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3a3c904e5e3b5e8bb3c51ca6a563880ff589bf3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 21 09:41:46 2009 +1000
configure: resourceproto is optional.
Although a --disable-xres flag is provided, resourceproto was listed in
REQUIRED_MODULES since 2005 (5b218617fa8ba52bf65aef35da39e06c662495e6).
Remove, make conditional on the xres flag only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b9ae1b91f316a98eb3bbefe1fc61f3e0faa861e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 21 09:22:53 2009 +1000
dmx: silence 'implicit declaration of function ‘XFixesSetPictureClipRegion’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa71e268f55ac39351814ab6840196c4f58bad39
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 18 11:35:47 2009 +1000
Xext: silence 'warning: no previous prototype' for sync, bigreq and xcmisc.
xcmisc and bigreq don't have their own header so just declare it here to
shut up the compiler.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00dfe69aab786ea650b41dfefc031f0e0fc72b0c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 17 14:48:51 2009 +1000
randr: reply with the server or client version, whichever is lower.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b75d0f9d347d7c3aad1e53809e0a2bed03b92fc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 17 14:17:54 2009 +1000
render: reply with the server or client version, whichever is lower.
Protocol requires that the lower of [server version, client version] is
returned to the client.
The other part of the issue discussed in reply to [1] remains.
[1] http://lists.freedesktop.org/archives/xorg-devel/2009-September/001990.html
Reported-by: Julien Cristau
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20ccc66708bcd55372bff03fa0d78a7846e8c82d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Sep 20 21:12:31 2009 +1000
xfree86: silence warning: ‘ramplen’ may be used uninitialized
'ramplen' is only set and used if stuff->size > 0 but the compiler doesn't
pick that up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2df10a49867635c341b1d1a9faadf4dbae043a0f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:38 2009 -0700
RRDestroyOutputProperty: Free randr property valid values
These were leaked when the property was destroyed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3a84906c00b8fe4a4e33fa89bff3ed66ceafdec
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:37 2009 -0700
Free randr crtc and output pointer arrays
All of the crts and outputs were freed, but not the arrays full of
pointers to them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6086a6065666fb9ded5d99919ddfa51c66b76246
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:36 2009 -0700
xf8CrtcSetModeTransform: free adjusted_mode name too
The adjusted mode was freed, but any name allocated for that was leaked.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 088107827347cee05a6e5317bcebdbc282b9a3bc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:35 2009 -0700
LoaderSortExtensions: free graph nodes
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5959d37cd36895898786e4ea5bf72c480b79832
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:34 2009 -0700
Free libpciaccess iterator in xf86PciProbe
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ded35b7bf7a5ad27de152476c657a56a4f232800
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:33 2009 -0700
xf86Xinput.c: get DIX event queue pointer once at InitInput time
The DIX event queue is allocated before InitInput is called, so fetch
the pointer there and not randomly at other times. This avoids failing
to fetch the pointer sometimes during server regen and then smashing
memory through the stale pointer from the previous server generation.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 54f15a414130f89832b5c2604b0b44e7e4c6709f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:32 2009 -0700
probe_devices_from_device_sections: don't leak list of devices
xf86MatchDevice returned malloc'd storage containing the list of
devices to look at; make sure that gets freed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b5086250aa5dae8de8b763408ff480d7beac819
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:31 2009 -0700
Eliminate bogus event resizing.
Now that all event queues hold internal events only, they never need
to be resized. Resizing them led to memory corruption as they would
get sized for an appropriate xEvent, not an internal event.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c7987660fd665f32406b14db7078a3f5f7b76e9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 17 15:33:19 2009 +1000
xfree86: fix up wrong use of OptionRec for AutoAddDevices andAutoEnableDevices
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 971d4eac1274db78efa546ea50ca5e01a80bbd81
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Sep 19 15:48:30 2009 -0400
Xext: include security protocol header instead of client header
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a62664bc07b35aedb6b11b984c94341deb4486ca
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Sep 19 16:01:52 2009 -0400
Bump fixesproto requirement to 4.1
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2a890d85e923e1da0331b02e58e95f98b11f5de0
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sun Sep 20 01:31:59 2009 -0400
fixes: Make sure invisible cursor is inialized with zero src/mask
This fixes a regression introduced in 9040dab76182d1a019ca7fef7b29733d2c199e61.
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2bb3f0c87119e73157141431d7c00ab104d4b34b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 18 10:27:14 2009 +1000
xfree86: remove now unused variable
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1888d7d3e3ae81b5cb23e3a0852317362c8e215a
Author: Carl Worth <cworth@cworth.org>
Date: Fri Sep 18 10:39:19 2009 -0700
configure: Fix broken quoting for initialization of REQUIRED_MODULES
A recent change switched to C-style automatic string concatenation,
(presumably for better readability and maintainability), but this
doesn't actually work for the shell. So we revert to the previously
working initialization.
This commit reverts one hunk of c947605eda082fbca0821efc0cc14fec8f958fd0
commit 4982bbc3b49b1b61e63a8461ea803e41318c8187
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Sep 18 12:36:11 2009 +0300
xfree86: vgaarb: missing wrapping macro
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit af1af50de621bc451e6413fa5602ae5db2dc9809
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 18 09:33:37 2009 +0300
xserver: added more Geode oddities to xf86AutoConfig.c
commit ec0ad408ef8d5a2cf7a2bd65d13de3ef3147308c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 17 16:01:29 2009 +1000
xfree86: use SendDevicePresenceEvents instead of manual event handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d0440275108920f5cb5d630f55fc9a3320c496d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 16 10:58:52 2009 +1000
Require dmxproto 2.2.99.1
This requirement was introduced in code with commit
e85775aa64d1e9322c82090a26256af5e1fede0a.
Reported-by: Marvin Schmidt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c947605eda082fbca0821efc0cc14fec8f958fd0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 15 15:05:27 2009 +1000
configure.ac: move all protocol requirements to a single location.
Protocol requirements were spread throughout configure.ac, leaving us with a
few locations where one DDX asked for a different version of the package
than another.
For each protocol, define <NAME>PROTO="[<name>proto >= version]" and
assemble REQUIRED_MODULES based on these.
Future changes to protocol versions need to only be done in a single place.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4d6b20c25af5f590f19530b6c007e3648a8037c3
Author: Shunichi Fuji <palglowr@gmail.com>
Date: Wed Sep 16 12:02:00 2009 +1000
dri: use noPanoramiXExtension directly.
xf86LoaderCheckSymbol() is never useful if using externed variable directly.
noPanoramiXExtension will be just used through dlopen() like other extension modules.
Signed-off-by: Shunichi Fuji <palglowr@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3853314d13b503684c9922715323f8033febe5de
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Sep 17 08:11:27 2009 -0700
Fix typo in Xephyr man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 2edf967b00963559552d061bb98b15243d978279
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 17 15:24:01 2009 +1000
xserver: SIGIO option handling was incorrect.
reported by a user on #radeon when DRI1 broke.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 715953bf5c00b4605dd6ab45c92140c0e81174ee
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 21:13:00 2009 -0700
Check for -wrap support in the linker
Allows unit tests to be built with non-gnu-linkers that
also have -wrap support
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2c64551808988657069006f74c6780973ec0557
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 21:13:48 2009 -0700
Add configuration option for use of SIGIO handlers for input events
Boolean option to enable/disable SIGIO handlers is set by the first
of these found:
- UseSIGIO option is set in xorg.conf ServerFlags
- Default set at build time by ./configure --enable-use-sigio-by-default
- Platform default value: Solaris = no, all others = yes
This matches the current settings on all platforms except Solaris.
This reverts Solaris (for now) to the settings used in Xorg 1.6, before
SIGIO support for Solaris was added, due to some system level bugs that
won't be resolved in time for Xorg 1.7 release, but allows us to enable
when those are resolved (or when we need to test if they're resolved).
See http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6879897
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3bdf36476179257561b9409c3f49a77640fbb9f9
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Sep 16 16:03:46 2009 +0200
Work around sporadic segfault on resume with intel/KMS due to cursor->bits == NULL.
Apparently SavedCursor is sometime tried to be set while already being set.
commit fe31f9c646bc26163497f29c3b833c090df0b3f9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Sep 14 19:51:23 2009 -0700
Change xf86dristr.h includes to use xf86driproto.h instead
Clears warnings about obsolete headers, but raises minimum
required version of xf86driproto to 2.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 159e03204093991ccd4133133c50c0cae88c828f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 15 11:39:09 2009 +1000
dmx: don't include panoramiXsrv.h if building w/o Xinerama
Reported-by: Marvin Schmidt
Tested-by: Marvin Schmidt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52
Author: Rémi Cardona <remi@gentoo.org>
Date: Mon Sep 14 17:09:59 2009 +0200
dix: append "built-ins" to the font path in SetDefaultFontPath
49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on
a "fixed" font go away but only Xorg could use the built-ins fonts by
default.
With this commit, all DDXs get "built-ins" appended to their FontPath, not
just Xorg.
Tested with Xorg, Xvfb and Xnest.
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 139368f7ae192b592e24d013e8ca5ce4175effe1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 17:53:50 2009 -0700
Fix num_masks/length overflow test for XiSelectEvents
Have to set windowid to a valid value first, since that check
appears earlier in the code than the masks/length check.
Also have to have data[] set large enough so that reading mask
data for 0xFFFF masks doesn't overflow past the end of the array
into uninitialized data.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 13decf5efe76e735a003227c951e58a41e36a8b5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 13:54:51 2009 -0700
test_convert_XIRawEvent: Don't write more data than the struct holds
sizeof(in.valuators.mask) * 8 == 40, but the valuators arrays only
holds 36 entries, so the test was smashing the stack when 36 < i < 40
(leading to core dumps on Solaris x86, since the return address was
overwritten with an invalid pointer).
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38a61e9a7cf616e26a79dba815bf67737317d1eb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 13:54:50 2009 -0700
Remove stray semi-colon in protocol-common.c
Caused Sun compilers to issue warning:
"protocol-common.c", line 141: warning: syntax error: empty declaration
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e320736c457ea7b2f19a4c7c2dfc0c461d0dd405
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Sep 14 19:51:22 2009 -0700
Fix module path in xorg.conf man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 49b98d092ec3d032e657eeff62c22fce243b1e8b
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Sep 10 17:52:33 2009 +0300
xfree86: vgaarb: rework wrapping function
No semantical changes.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 422cd7a674e6831f40be14ee853bd946cb62eadc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 14 13:52:53 2009 -0700
XQuartz: pbproxy: Remove debugging XBell()
(cherry picked from commit 1fd7c1fd4740393a32e261af33e64c19be48ca9a)
commit 663807ce0e65b51537540bb95fbf3c18988c04c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 14 16:44:52 2009 +1000
xserver 1.6.99.901 (xserver 1.7 RC1)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f450be999268d118b384c04ea070c87ad48c4c59
Author: Soeren Sandmann <sandmann@daimi.au.dk>
Date: Fri Sep 11 04:03:06 2009 +0200
Add xoff and yoff to drawable->x and drawable->y in create_bits_picture().
These are 0, except when the drawable is a redirected window.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2b00afec4b5b51851aee4cb0fba7baff3e10ef3f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Sep 14 15:59:41 2009 +1000
Update xorg.conf man page & sample for changes in Xorg 1.7
AllowMouseOpenFail description changed to reflect actual behaviour
and point to AllowEmptyInput for previously described behaviour.
Update default DPMS mode timeouts to match new defaults set
in April 2009 by commit d52fddefaeb43f15b677eefbea4a288a9948373b
Update autoloaded module list to match ModuleDefaults in xf86Config.c
Update module subdir list to match stdSubdirs in loadmod.c
Add xorg.conf options that were added to the code:
- XkbDir option added in February 2009
by commit 76f18b94bd2719a8199334742d021c4d0806187d
- DRI2 option added in April 2008
by 35982bc109d424c464551ab22ec90af69908c884
Remove xorg.conf options that were removed from the code:
- XkbDisable option was removed in January 2009
by commit 40877c6680863bd6a8475f2bb0c54df55bcf0b0e
- PciProbe/Config options were removed in August 2008
by commit fdf7c747a8e1bc59dfb31b7f90dd5eab2687315b
- EstimateSizesAggressively was removed in August 2008
by commit cd1e8f26147919227e7624ac4c6b313d972a4d35
- loadable font modules were removed in July 2008
by commit affec10635343668839994ea2bac16c1d4524200
- ModInDev options were removed in December 2008
by commit 6de6ffff35ac03d49fa61de195d4a0605e0ef8bf
(Also strips some trailing whitespaces to make git happier.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b6f5c54fc61588c638b987bde914b0e5ff9b655e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Sep 14 15:49:01 2009 +1000
xfree86: Change default font path to match configure.ac's --default-font-path.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 23dc4678e9333ba0ee1a5374521905fa3f4f309c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 14 14:14:27 2009 +1000
dmx: use top_builddir, not top_srcdir to get libxfixes.la
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Byeong-ryeol Kim <brofkims@gmail.com>
commit 4650e6ebe6e3ea48a026ace60b25daa165580467
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 14 12:00:18 2009 +1000
xkb: drop key presses for already repeating keys. (#23889)
The event sequence for continuously pressed keys with the keyboard driver is
PRESS - PRESS - PRESS - ... - RELEASE.
The first press sets the repeatKey to the keycode and the matching timer.
The second press (on the same keycode) can be silently dropped instead of
overwriting the timer again.
X.Org Bug 23889 <http://bugs.freedesktop.org/show_bug.cgi?id=23889>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit c626a5578aa16c17ef68c1b15ed53828080d9d90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Sep 13 17:35:51 2009 +1000
xfree86: fix VT_WAITACTIVE control flow (#11477)
Move misplaced } to get the flow of
if (!ShareVTs) {
VT_ACTIVATE
VT_WAITACTIVE
}
X.Org Bug 11477 <http://bugs.freedesktop.org/show_bug.cgi?id=11477>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit d3c66d6b69c04466b8388586090dc48a0aad7684
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 14 08:03:17 2009 +1000
dix: FindChildForEvent needs init child to None.
silences compiler warning:
events.c: In function 'FixUpEventFromWindow':
events.c:2262: warning: 'child' may be used uninitialized in this function
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e85775aa64d1e9322c82090a26256af5e1fede0a
Author: Kevin E Martin <kem@redhat.com>
Date: Mon Sep 14 08:01:56 2009 +1000
Include <X11/extensions/dmx.h> and remove _DMX_SERVER_ define.
Fixes build with newer dmx header files that have been split between dmx.h
and dmxext.h. _DMX_SERVER_ is no longer needed with the split headers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 232d43510e0f9f780a9f8eb857366e03acf2fcdc
Author: Kevin E Martin <kem@redhat.com>
Date: Mon Sep 14 08:00:42 2009 +1000
dmx: Make description match default option.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6389a190faa7c06bdedfd1cc3acb280ebb5cc04a
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sat Sep 12 21:47:51 2009 +0300
shave: use CC tag variable on libtool
This fix scratchbox compilation.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dfb106c846c880a06fa5caada92f45576eab7b00
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 18:09:12 2009 +1000
configure: re-enable dmx build (default=auto)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 72607960c136894c4533a54cef7a9be64246f1a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 11:02:22 2009 +1000
dmx: Remove some dead code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 88187ad889ab707fcae3f64890cdb291b567ec23
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 11:02:18 2009 +1000
dmx: purge DMX EQ leftovers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f3aaa46f27f802233e54b3c70ba827e0fcca2605
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 09:51:45 2009 +1000
dmx: formatting fix to improve readability
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7a588c833e87dd07f167b9885d5ec43dde271ebe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 18:14:43 2009 +1000
dmx: Default rules are now base, not xfree86
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33243ae971db90477a29dfb0e51cc00c95e561bc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 17:04:08 2009 +1000
dmx: include xfixes lib, reshuffle include order to resolve linker errors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2d46678762b12c9746fc8f89821c15705680ba35
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:46:06 2009 +1000
dmx: remove dmx-internal event queue.
The EQ is in the DIX now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 545f11139d600febf1c5fd46b11bea4352b82c32
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:14:53 2009 +1000
dmx: compiler warning fix (mixed declarations + code)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d703af74ced36968f4480507a7eb54d249b5edc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:13:38 2009 +1000
dmx: get the state from XKB for dmxCheckSpecialKeys
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6e52f9233176986508356f6eee4fce86ba740e71
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:10:22 2009 +1000
dmx: fix dmxKeySymToKeyCode to work with mandatory XKB.
Approach taken is inefficient, it converts the xkb symbol table to a core
symbol table first and then extracts the keycode from there.
Consider this a todo for a rainy afternoon when the beer fridge demands
emptying.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61ae0a5ca5de24590f444c405445124404ba9753
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:05:12 2009 +1000
dmx: fix up dmxKeyCodeToKeySym for XKB-only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9caba3e2abceda0a1ff4ad4bf05708f0166c2218
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:12:25 2009 +1000
dmx: fix two calls to InitKeyboardDeviceStruct.
Takes RMLVO now instead of the keysyms directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 29b9a10dad1ca780dc90f4f1f63fd11fd7d1221b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:04:45 2009 +1000
dmx: XkbComponentNamesRec doesn't have a keymap field anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a6f3f6a63ae76afbe01eb9049a63609476d2ed4d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 16:43:04 2009 +1000
dmx: switch lnx-input and usb-input over to xkb-only.
kbd*Convert are nearly identical, it just asks for merging. Not today
though.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5d81aee5f75e80ae9d3ac7cb32d293ade62d6c5c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:24:02 2009 +1000
dmx: include xkbsrv.h to silence compiler.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4da59f478686fa7e80a3837bf9fa61672c13c50b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 16:30:36 2009 +1000
xkb: split effectiveGroup calculation into separate utility function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8fb3fa28a5a1b36cdaad38055a607400828b9e1c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 11 11:21:26 2009 -0700
compiler.h: include <string.h> before using memmove()
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit d908ee6e549fd8ff653e2c58e9637df347540ef9
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Sep 10 20:56:18 2009 +0300
Revert "Make sys.c use compiler.h unaligned access functions"
This reverts commit 1b30545c04a51bfa3ff95a26d64962907a62ff15.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 281ebb453d2f5254e057a24e580dafa9abf82305
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Sep 10 17:52:32 2009 +0300
xfree86: vgaarb: close and cleanup vga arbiter
So far there are no apparently issues on not closing the fd. But let's do the
right job here.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e62549b8d61cd739adbbd04487d96fe706da1370
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 16:03:38 2009 +1000
Xext: don't try to initialize XTEST device properties if they failed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 744cdc897746dca86f5ab9e57be982621c2f0986
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 15:05:15 2009 +1000
dix: Remove two _X_EXPORT defines from the function definition.
These two are defined _X_EXPORT in their declaration anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9871f9be4e5b184b151ce93458b2578cc8c7b962
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Wed Sep 9 13:43:45 2009 +0300
Use lowercase PCI vendor ID for NSC.
commit f4350c66b493d63fa06be87caa958d7033232ea4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Sep 9 15:48:33 2009 +1000
fbdevhw: Test for graphics:fb%d as well as graphics/fb%d
Apparently the kernel can't decide on an API to expose to userspace, so
let's just try both in the hope that one will work.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Michel Dänzer <michel@daenzer.net>
commit 72f6be540840b46aa4b158b98fac11a6f90dc9d1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:13:55 2009 +1000
xfree86: remove now unused xf86CrtcShadowClear
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1f24638985ce053b696ca3359cc50b5bc26ccb03
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 09:28:46 2009 +1000
kdrive: output meaningful error message for HAL devices.
kdrive ignores all devices from hal as they don't have the 'type' option
set. Instead of "Unrecognised device identifier!" print out "Ignoring
device from HAL." to indicate that the errors surrounding the device don't
really matter.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit ae812bb79668e59cda1f851fb1fabe9db9ea705f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 13:53:26 2009 +1000
Xnest: set the default pointer accel to the host's values (#10013)
The defaultPointerControl holds compile-time defaults for pointer
acceleration. If an Xnest instance is started, it resets the hosts pointer
accel values to these built-in defaults instead of using the host values.
This patch queries the host for the values before initializing the device,
thus leaving the host values untouched.
X.Org Bug 10013 <http://bugs.freedesktop.org/show_bug.cgi?id=10013>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97e3f4316b1c917f93d324f05d3a4551c1d051a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 09:55:22 2009 +1000
dix: auto-float SD's with SendCoreEvents "false"
AlwaysCore and SendCoreEvents specify whether a device is to send core
events. A device that has either disabled is not supposed to send core
events.
With MPX/XI2, a device that is attached automatically sends core events when
the event is routed through the master device. Floating a slave device
disables core events by breaking the route.
This patch automatically floats devices that have coreEvents disabled in the
xorg.conf/HAL. This replicates the behaviour of a SendCoreEvents "false"
device in server 1.6 and earlier.
The devices may still be reattached to a master at runtime.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 447bd4ce90113037a489ce55d9878523fe5294c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 16:02:50 2009 +1000
kdrive: fix sdl build by removing old keySymsRec references.
These are set in kinput now through InitKeyboardDeviceStruct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d8aadfa5af85ce6613289efe119e592aa687ab03
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 15:04:33 2009 +1000
dix: remove unused and half-broken code to restore original classes.
In theory, the MD should change back to its old, original classes when the
last SD is detached. Thanks to the XTEST devices, we'll always have an SD
attached until the MD is removed. So let's not worry about that and do
nothing instead of having some code that's essentially untested.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e9a507acca01234de189f0f64da63bac32dc13fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 15:59:37 2009 +1000
kdrive: remove xkb member from KdKeyboardInfo
Wasn't being used by anyone.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cafa7c5f9017efdc33c348b6a55d80d44df0fe17
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Tue Sep 8 23:52:52 2009 +0300
Added comment with the PCI device ID of Geode SCx200 series.
commit d3ad1804a5216487b5837a80f3e53b81212dcf84
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Sep 8 15:25:19 2009 +0200
EXA: Only take special code path for 1x1 fill for pixmaps.
It doesn't make sense for windows.
Also double-check that the data pointer is valid.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23461 (not sure that could
happen on master even without this, but just in case)
commit a9d30f6a038166052a4684308db205bd4e60799e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:43:24 2009 +1000
dix: GetKeyboardValuatorEvents doesn't recurse anymore - fix comment.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1bdc9ec617d357b076c9e69296018bc212d91c7d
Author: Eamon Walsh <efw@eamonwalsh.com>
Date: Fri Sep 4 21:49:29 2009 -0400
Fix "warning: left-hand operand of comma expression has no effect"
Signed-off-by: Eamon Walsh <efw@eamonwalsh.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9005ec4ce19d704d5055232d2a36acee3247be67
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:38:03 2009 +1000
dix: remove dixLookupResource - we don't have any users left.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
commit 1e0caf9a2ca983f171976822d9c04bacc14e9af7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 6 14:02:53 2009 -0700
XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name
(cherry picked from commit 647c871dc9f2d0adc172b401cde89ffbdfcc4d7a)
commit 081f72390a25e2244561e238f772f98289a6a581
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 5 14:04:53 2009 -0700
XQuartz: Fix "warning: function declaration isn’t a prototype" noise
(cherry picked from commit 9a77905a975e562daa4230739937bbb0b4caf087)
commit 7ece2cb220e4fe2c9a8c4c62361522a45adf22c1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 5 14:03:19 2009 -0700
XQuartz: pbproxy: 64bit fixes: Properly process an array of Atoms
(cherry picked from commit 1b659cda1af02762a31cc7875e457b08c8dc68b5)
commit 1747120043cc5b5d201b7efd06b75ef08b032922
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 5 02:51:09 2009 -0700
XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3ef76a05ccb2d7e84ccfa1b7c5d38e15)
commit be37f339a9ed90b9b5e44aeb396ca73347078027
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Sep 4 23:11:13 2009 +0200
EXA: Stop hiding solid or gradient pictures from the driver.
Add support for solid pictures in exaTryDriverSolidFill(), but otherwise just
pass solid and gradient pictures to the driver Composite hook.
While we're at it, clean up the logic to detect Composite operations which are
effectively solid fills or copies. This should also fix some false negatives
and positives.
commit 1f61bbeffdf2ad5a2c54121c75f3b049baf01708
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 4 00:38:58 2009 -0700
XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx.
(cherry picked from commit 3d5e10cce360a04bf917227615fb9b825675124f)
commit 0a361d0e5f896351b98dc9765b4a33c79efa6f02
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 3 19:40:11 2009 -0700
XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab006b2f5e03dcef385514ba4e4584bd25)
commit e6e83d81ee7366779d600cbb128034e248815339
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 14:51:08 2009 +1000
xserver 1.6.99.900
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc0841b6e87cdd752b44b17ccb021c831a3e02a5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 15:58:36 2009 +1000
shave: hack around the configure ld check for make distcheck.
configure calls $(CC) -print-prog-name=ld to get the binary for the linker.
The shave script prints " CC \nld" which can't be parsed by configure,
resulting in a fatal error.
This patch special-cases -print-prog-name and passes it though directly
without any additional output.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58d9a4c6356c98c32be2826410df027ece70d44d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 15:06:45 2009 +1000
xfree86: fix make distcheck after removal of Domain.note and RAC.Notes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8af2793a90e8e644a6a598adce3f752c15b3e37a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 11:30:48 2009 +1000
xkb: xkbGetKbdByName on the lastSlave needs to change the master (#21859)
If the layout is changed on a master's lastSlave, the master needs to change
layout immediately. Otherwise, the master stays on the same layout until the
lastSlave changes - which may not happen if only a single keyboard is
available.
X.Org Bug 21859 <http://bugs.freedesktop.org/show_bug.cgi?id=21859>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 219ae5b628f9ffe2be0876d5911cc04e52bef5f8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 16:38:53 2009 +1000
dix: hide the sequenceNumber key repeat hack behind two functions.
Just in case we figure out a better way to do it in the future.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bfb219f532f3c78ba905424365ee7c5f7b5f21a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 21 16:03:36 2009 +1000
input: allow for detectable autorepeat.
For core and XI1 events, store the key_repeat flag in the sequence number
until TryClientEvents. The sequenceNumber is unset until TryClientEvents.
[Also thrown in, some random indentation changes. Thanks]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d988e01e41e98fc5160f825a250522ba274d09f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 21 15:15:41 2009 +1000
dix: improve code flow in TryClientEvents, better debugging messages.
Instead of a massive if (blah && blah), return early where possible.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6fb01c8286c16968fd07e4a5b78da89cd8768d79
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 10:57:33 2009 +1000
require xf86vidmodeproto 2.2.99.1 or newer.
commit 2122fedb2c058dc27f9df0e856d2193fabe725e2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:37:58 2009 +1000
os: silence bigreqsproto compiler warning
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 59e731ef66095723e74a16b2e5548aed627089ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:06:37 2009 +1000
xfree86: silence some xf86dgaproto compiler warnings
We already require xf86dgaproto > 2.0.99 since 6fffcd582
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ead57a13531aa14033839112fa66e33e142f67da
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:03:55 2009 +1000
xfree86: silence 'unused variable' compiler warning
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 21f04f008e6b1ab66a63de3de668b1f261a6928a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:01:09 2009 +1000
os: don't redefine GNU_SOURCE
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09f0ee1324b046f2830bdd260f6e2a67ee8f2973
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 4 04:17:09 2009 +0300
Formatted recent Geode PCI ID changes to fit a 80-column coding style.
commit a17b50b130fe01c058a74f2696a8b97c756acb49
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 4 03:51:01 2009 +0300
Further explained what the Geode PCI ID is all about as comments.
commit afd800dae4f7491baee08509094a30160bb9c849
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 4 03:41:08 2009 +0300
Removed unnecessary curly braces for Geode LX PCI ID.
commit 842b7a47d583a7729099de3031ae20977dddf774
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 4 03:25:32 2009 +0300
Updated the PCI Vendor and Device IDs for all Geode variants.
In practice, some of the native drivers for older Geode products
have become deprecated due to lack of e.g. libpciaccess upgrade,
but that's OK, since most distributions don't ship them anymore.
In that case, we'll let X server fall back to good old VESA.
commit 8e873185f4cbfb2a36e1f43fe7da47fd9fd5aeea
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Sep 3 19:11:02 2009 +0200
EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_mixed.
Otherwise we may incorrectly clobber it to NULL on repeated PrepareAccess
calls.
commit 120286aef59dabdb7c9fa762e08457e5cc8ec3a6
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Sep 3 08:05:59 2009 +0200
glx: Add screen DestroyWindow wrapper to destroy the GLX drawable.
Fixes crashes exitting MacSlow's rgba-glx demo.
commit f04fe06ae244b851b38be824b1a80f2f8a030591
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 14:17:14 2009 +1000
dix: don't return BadMatch from GetProperty (#23562)
dixLookupWindow may return BadMatch if the window in question isn't actually
a window. In this case, GetProperty needs to return BadWindow - not
BadMatch.
X.Org Bug 23562 <http://bugs.freedesktop.org/show_bug.cgi?id=23562>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 84eb4c66a4a09c360cef260fb2f35dfb6d8a93c6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 10:00:42 2009 +1000
test: add protocol testing for XIWarpPointer.
TODO: some way to check src_x/y coordinates would be good.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1b7858e8469aea6d2031039ba41d7191a4b80f28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 10:58:00 2009 +1000
test: expose the default screen to tests, some cleanup work.
Provide common #define for invalid window IDs.
Init the sprite's hotPhys, provide a common #define for the initial sprite
position.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61a6e1f074d9ff75d61446b946aab6c04019c287
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 10:00:00 2009 +1000
Xi: return BadDevice for master kbds and attached slaves in XIWarpPointer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8939ad2b2aa0385f072d3e1169eaf99289ed737a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 09:44:11 2009 +1000
Xi: return error values to client from XIWarpPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d481720c57f558c47273bf89854fc69254319772
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 2 15:28:28 2009 +1000
Xi: standardise XI2 headers.
Adding missing dix-config.h include, adding one missing header guard.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 377a5f655ca88cd836da24ab42361df9f3ff51a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 2 11:16:15 2009 +1000
Xi: if XISetEventMask fails, return this to the client.
The only failure point can be a BadAlloc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 993ca5acbdccef9e43cd6580e7cc22cfda1a2578
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 2 10:53:40 2009 +1000
dix: when unsetting a cursor, update the sprite immediately (#23608)
Removing the device cursor while the cursor was within the window did not
update the visible sprite until the next enter/leave event.
X.Org Bug 23608 <http://bugs.freedesktop.org/show_bug.cgi?id=23608>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b41db8fe460fc0956922b79261752d1bb104684f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 2 08:57:40 2009 +1000
Xi: fix broken swap code in XISelectEvents request processing.
The pointer advanced 12 bytes too short. Rather unfortunate if both the code
and the test have the same bug.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 727de7c90de4198222e0dc58d7503b4a1672f642
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 16:33:56 2009 +1000
Xi: Unify checking for invalid bits in grab masks.
Bits above XI2LASTEVENT are invalid and cause in BadValues. These checks
must be performed anywhere where a mask_len parameter is given.
This patch also adds the missing checks to grab masks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 59a6d7d478903a8bc9c5d4cc8b2e62e2ad102dba
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 16:30:52 2009 +1000
Xi: don't overrun memory for grab masks.
A grab mask provided in the request may be larger than the one used in the
server. Cut down to size before memcopying.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 83db2b126e8623824e1303e74070375994984599
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 15:58:02 2009 +1000
Xi: don't try to set oversized or non-existing masks.
Fixes crash if the first XISelectEvents has a zero sized event mask.
Fixes crash if the mask provided is larger than others->xi2mask[].
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6fe235d3635aaf995dfa198c60ded1a43fe9dd45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 15:46:34 2009 +1000
test: fix request length calculation, add length tests for XISelectEvents
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ab1b50c545ae1a62384bedee60168e227bb2a94
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 15:27:29 2009 +1000
test: fix build after changing libxf86config.la
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58c298acc1045927e0d90be73b8dbc8837252589
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 15:16:17 2009 +1000
Xi: extra length checking for requests providing masks.
masks can be of arbitrary length. If the client did not initialize mask_len,
some sort of boundary check is needed to avoid running over memory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e4dd3b2d28d3dbbfc152d6f5030901ec063a7ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 31 09:50:36 2009 +1000
Un-export ApplyPointerMapping. This is an in-server function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a470e8426ee290046a927a17fc969235c4b1e2e7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 2 17:56:52 2009 -0400
Correct outdated e-mail address in "Author" statements.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 17545ed80ee3bb6a058a2748fc7bfb0fc5139fc1
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 2 14:40:07 2009 -0400
randr: Fix crtcs using set_mode_major()
We'd never mark the crtc as active, meaning (among other things) gamma
upload wouldn't work.
commit 291408980f33b1e541c89d958535e6fad55fdac9
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Sep 2 20:14:30 2009 +1000
vgaarb: protect fini as well just in case
commit 8aeadbff0840efc0c9a073e60d6fec0dba313060
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Sep 2 19:07:40 2009 +1000
vgaarb: if arb init fails, make sure locking doesn't occur.
pointed out by Martin Jansa on irc.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0e46066efea4e385b2874d4a62a786957e572fe5
Author: Jerome Glisse <jglisse@redhat.com>
Date: Tue Sep 1 13:59:47 2009 +0200
Xext: fix a typo for bigreqsproto.h header file
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
commit c61d8ce1507318476b75b81bf871da19cb1bf747
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Aug 31 17:57:50 2009 -0700
Xext: Require newer versions of xcmiscproto, bigreqsproto, and xf86bigfontproto for new *proto.h header file names
bigreqsproto >= 1.1.0
xcmiscproto >= 1.2.0
xf86bigfontproto >= 1.2.0
commit 1c37be80982151a5acd74fe4b960695f604f22ca
Author: Michael Witrant <mike@lepton.fr>
Date: Tue Sep 1 10:46:50 2009 +1000
XFree86: Linux: Fix 100% CPU usage with ShareVTs and kbd
Leave consoleFd open over the course of the server, even though any use
of it in this context is likely to be disastrous.
Signed-off-by: Michael Witrant <mike@lepton.fr>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 65183dc3153232943dff3cfbaacab141e7ed0e9c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 5 19:53:55 2009 +0300
Input: Mark Xi input events as critical
Note that the Xi events are critical and should thus cause a flush to
the client when an input event is pending.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit a4e614d301cfa2577de1ee6a15abf023590586d1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 16:46:10 2009 +1000
Xi: Fix harmless ButtonPress/ButtonRelease confusion
A missing break meant that ButtonPress would fall through into
ButtonRelease, but luckily it appears to have been completely harmless.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 5ef53a94ce4e48e11de26290cd677266308640c8
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 20:23:26 2009 -0400
alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus
xf86SlowBCopyToBus and xf86SlowBCopyFromBus cause segfaults on my
system.
Also remove associated slowbcopy_tobus/slowbcopy_frombus macros.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit a8e634b86d47353ef354717904fa66ebe35e1303
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Aug 31 15:53:58 2009 -0700
XQuartz: GLX: Drawable does not contain resize anymore.
(cherry picked from commit 1e642f22fbf029bb3917091cb5fa2f78b4a92f62)
commit 1b30545c04a51bfa3ff95a26d64962907a62ff15
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:16:02 2009 -0400
Make sys.c use compiler.h unaligned access functions
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 9522ab9a98e98bc394703038e34b1c12aa39a179
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:12:29 2009 -0400
Remove unused Delay.c
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 4fac13ff8848bc38654b5567170fbc0d7b2c96d6
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:11:59 2009 -0400
Remove unused BUSmemcpy.c
BUSmemcpy.c provides xf86BusToMem and xf86MemToBus, which are are memcpy
wrappers written to avoid glibc's memcpy on Alpha. glibc'c memcpy on
Alpha has improved much since this was written, so it's no longer
needed. Neither function is used inside the xserver, and no module on
my machine uses either as well.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit b65146fc8418b53b7e43dd34cc20000369475671
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:11:10 2009 -0400
Remove unused ia64_flush_cache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit f201705e29bdc3309dd611b461ec67740cb706ef
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:09:33 2009 -0400
Simplify unaligned access code
All architectures should be able to use the same unaligned access code,
regardless of whether they need special unaligned access instructions.
Let's let gcc do the heavy lifting.
In the case that we're not using a gcc-compatible compiler, use memmove.
The xserver already requires pixman, so include pixman.h for its uint*_t
types.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 3718beb69cc5b4cdb79dd97242fce9231a26a39a
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:08:52 2009 -0400
Clean up unaligned access functions on alpha
Checks for __GNUC__ are superfluous since the only other compiler for
the platform is Compaq C, and it doesn't support GCC style inline
assembly.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit e1fdd7671346ce374a2b77fe94b8c1a25c0520da
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:08:20 2009 -0400
Move unaligned access functions to common section
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 628b863bcc6a2a14fd3c0e6c2be4394833cc314c
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:53:41 2009 -0400
Remove unused arm_flush_cache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit a544139196ac7f5bc89bc642c6c5c0ea1b0bb60e
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:53:19 2009 -0400
Remove unused ppc_flush_icache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 52aa0495218dc7821a23b045b2c74b2a66e34616
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:52:39 2009 -0400
Replace 8 nops with proper sync instruction on mips
Cc: Ralf Baechle <ralf@linux-mips.org>
Acked-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 563fa1c5d762173cd6fb78f9e33cb960ef3153bb
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:52:10 2009 -0400
Use sfence and mfence instructions on amd64
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 430c4af0d6e2cad03ca5f49ec6e87f3717d0d9e2
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:51:41 2009 -0400
Add x86 barrier macros
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 0d87f77a3ff4b22729220b7edcb98c6f06d0787c
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:51:05 2009 -0400
define barrier macros as nops if not otherwise defined
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 1b43ee13b30d9e3f828e94cdf686d103ce1cac07
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:53:58 2009 -0400
Move memory barrier macros into common section
alphabetize by architecture also.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 295e598d9a83ff7162a093810ca9f546d00c0968
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Aug 31 20:04:51 2009 +0300
xfree86: remove _more_ RAC junk
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 38627b2eaf64aa8fe694fc3e1f5e4fee0c9c11c3
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Aug 31 19:36:02 2009 +0300
xfree86: shut up vgaarb warnings when server doesn't support it
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 79182538b43ecd35bf2b47eccfb2dd3bbcdc12eb
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Aug 31 19:25:13 2009 +0300
xfree86: removal of some dead code due VGA arbiter's inclusion
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 6f3cc08ec01609c7efe424ac3e30fe4ff9391007
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 27 16:21:11 2009 -0700
XQuartz: GL: Unset GL_EXT_gpu_program_parameters for Tiger/ppc
See http://trac.macports.org/ticket/20638
(cherry picked from commit 0f3a89d306838b3c75a73cd1e9e2928737222b70)
commit fdb29ebeed143fa05630966b847b05399a446ddc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 27 11:04:00 2009 -0700
XQuartz: GL: Explicitly set GL_EXT symbols to 0 if they are not in OpenGL.framework to prevent X11's glext.h from setting them to 1.
(cherry picked from commit 7fe37137d826d1b698e87a5b35050dd02f0a4d4b)
commit 3be80bd98357cf362aa9a004d1292e5167d83a17
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 16:20:59 2009 +1000
Xi: silence compiler warning "type may be used uninitialized"
GrabKey and GrabButton are only called from XI/XI2 code. Set type to -1,
just in case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24716b9254fa7d609792596723a192bb044a7d3f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 28 22:52:48 2009 -0400
xace: fix up access modes in dixLookupDrawable calls from dri2.
Referencing a screen through a drawable only requires GetAttr access.
Treat dri2 drawables as child windows (Add/Remove access).
Treat getting buffers as intent to read/write the drawable.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 0f3a64c3a5bce6cf3f00fe42cc7d1d3e69822945
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 27 15:11:12 2009 -0400
Add DRI2 requests to protocol.txt
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 3d17c4f6e1538986fe7b1f17614d76e28f2d1e11
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 28 12:12:52 2009 -0400
EDID: Vendor detailed blocks aren't worth X_WARNING about
commit 2c1a845521a31f08938b0f8d6e38835ce127c94a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 28 12:09:57 2009 -0400
EDID: Print 1152x864 in established timings, not x870
The spec says x870, but we actually use x864 because that's a real DMT
mode and x870 isn't. This might or might not be wrong, but we should at
least tell the truth.
commit 2a806d7fa372e28d039761c9b4087cf812e8e46b
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Aug 28 16:05:04 2009 +0300
os: remove unused -cursor option
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 9040dab76182d1a019ca7fef7b29733d2c199e61
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Aug 28 15:50:50 2009 +0300
xfixes: minor clean ups on createInvisibleCursor()
- unused return value
- no reason to declare static variable given the function is just called
once
- no reason to declare different type and cast it after.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 80ed8096f9b8e974b556a6c9f3b600fb71b994c3
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Aug 28 15:33:19 2009 +0300
render: delete unused headers declaration
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit f959b1e5485b93700c7da449a98182f5ce067ca2
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Aug 28 15:30:21 2009 +0300
render: AnimCurInit and AnimCursorCreate shouldn't be _X_EXPORT
Pointed by Peter Hutterer on xorg-devel ml.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit e454f106dc65ecfacc154a1fa0810935022a8fee
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 28 11:39:42 2009 +1000
xf86 ddx: add vga arbiter support.
This adds support for using the libpciaccess interface for
vga arbitration support on top of a kernel which supports it.
Currently patches are queued for kernel 2.6.32 in jbarnes
pci tree, and shipping in Fedora kernel.
Co-authors:
Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6fffcd5825454a7fe58ffbcfb219f007cf38e731
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 13:43:15 2009 +1000
xfree86: require xf86dgaproto 2.0.99.1.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2fba2eac0b4c8d07bdf7bea20ef75ff579621728
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 11:23:23 2009 +1000
test: add a few tests for xtest device initialization.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 903c3db1d1685bd855dceed9e7b92890743663e1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:48:00 2009 +1000
Xext: rename Xtst* to XTest*
This patch corrects a misnaming of XTest-related functions.
The extension itself announces itself as XTEST. Xtst is the library name
itself, but all library functions are prefixed by XTest. Same with the
naming in the server.
- Rename all *Xtst* functions to *XTest* for consistency with the library
and in-server API.
- Rename the "Xtst device" property to "XTEST device" for consistency with
the extension naming.
- Rename the device naming to "<master device name> XTEST device". The
default xtest devices become "Virtual core XTEST pointer" and "Virtual
core XTEST keyboard".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8bfd23e144e51401e3756de9260a4811fcc59e91
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:38:15 2009 +1000
input: move XTest device initialization into Xext/xtest.c
XTest devices are non-optional but nonetheless specific to the XTEST
extension.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a95f80fa914678d360f6dfd2b58926193df6ea4a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:26:56 2009 +1000
dix: use IsXtstDevice instead of the direct key lookup.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 16b7ebd7d876034edfe8f74562bd06e747879d79
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 14:34:23 2009 +1000
xfree86: Remove xf86GetMotionEvents from public API.
This function was used as the default motion event queue API until
including XINPUT_ABI 2 (server 1.5).
This API was broken with 1883485 in May 2008 (wrong casting of parameters)
and isn't in use by input drivers past ABI 3.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit af76bddd7a47092e2f0f85b2547c1cc74eb5cebc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Aug 9 16:13:32 2009 -0700
XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
(cherry picked from commit 36e02a8649c0a545084cce5fb2c5717277b9273c)
commit 07c935b72fb14cb12f1cb5afbf8cc81f97086bac
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 25 20:11:38 2009 -0700
XQuartz: Use applewmproto 1.4 updated headers.
(cherry picked from commit 203df06c0eb2dcd5adfa788a1ba9569650c15f9c)
commit 0f613007cd43545eda40825bd74ada3e6e5f36f6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 5 17:43:29 2009 -0700
CheckWindowOptionalNeed: Ensure w->optional is set to avoid SEGFAULT
If CheckWindowOptionalNeed is called consecutively (and the first removes optional), then
we will SEGFAULT. This can happen in XQuartz because ReparentWindow will call
pScreen->ReparentWindow which can DeleteProperty which will CheckWindowOptionalNeed... then
ReparentWindow will call it again later indiscriminantly.
(cherry picked from commit b608c864ccc59628bd33c033393121b61580460e)
commit e7dd1efef408effe52d0bd3d3aa0b5d4ee10ed90
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 25 18:07:00 2009 -0700
Ensure that rotation updates happen frequently
The smart scheduler is designed to minimize scheduler overhead by
increasing the interval between WaitForSomething calls when a single
client is running. However, the software rotation code depends on
its BlockHandler being invoked for screen updates; the long delays
caused by the smart scheduler optimizations means that screen updates
can be delayed a long time as well.
The change is simple -- prevent the smart scheduler from increasing
the scheduling interval while any screen is using software rotation.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1740cda7a37abc7d0a169ab4555b446adaa62211
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 25 16:58:07 2009 -0700
Perform rotation redisplay before calling driver block handler (which may flush rendering)
The rotation block handler uses regular driver rendering functions to
repaint the screen, if those functions queue commands in the driver,
it's important that the driver block handler be invoked after the
rotated image is drawn.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4aab05e3b3231f1ec9795a66a075d17a722634a7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 25 16:54:16 2009 -0700
xf86_reload_cursors: fix cursor position to eliminate jumping after mode set
xf86_reload_cursors restores the cursor to the correct position, but
that must adjust for cursor hot spot and frame before calling down to
the hardware function, otherwise the cursor jumps to the wrong
position until it is repositioned by the user.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f9ffc887ca1471e98df746253d9300e03e46a15
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 15:10:52 2009 +1000
Xi: fix XIWarpPointer up for FP3232 as input coordinates.
requires inputproto 1.9.99.902
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5e96945cf54136afdb80cc17f67611251d59205d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:15:54 2009 +1000
Xi: fix swapping for XIWarpPointer and XIChangeCursor requests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 990d204ef8074665763ad129d0b015b7ab3ae9ef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:22:16 2009 +1000
Xext: remove un-used extern of DeviceMotionNotify.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 80f18a73267bd3090e459de609a7006a21e6c649
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:21:03 2009 +1000
input: move CorePointer/KeyboardProc declarations into header.
The extern declaration in xichangehierarchy.c was broken anyway.
This fixes a crash on creating a new master device.
Reported-by: Maxim Levitsky
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b96823713129f641ee99306e3cadba8dfe21afa2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:06:29 2009 +1000
mi: include shmint.h if needed, silence compiler warning.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1b3859a49a3861517c9b34f6e8750f7ae0ff2b5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:29:39 2009 +1000
Xi: add swapping hook for XIGetFocus reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fe430d7d3b0a85fbea9e93171423688f76dc9e1e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:09:32 2009 +1000
test: add XIQueryPointer protocol tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 285c88018ba4b3819500027c9b6a05b8c27ff2ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 11:38:42 2009 +1000
Xi: correct length field for XIQueryPointer reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e4ea91a02d6fac9dad844150c5d2fbe7dc9629b1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:12:05 2009 +1000
Xi: allow XIQueryPointer requests for master pointers and floating slaves.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8e396f2b806496cdcac233cc731b0322735020c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:11:19 2009 +1000
Xi: fix swapping for XIQueryPointer request/reply handling.
buttons_size is necessary as WriteToClient swaps the buttons_len field,
resulting in the wrong number of bytes being written later.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f1c856ef9073d9d02bc84ce1472883c8441a9758
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 10:42:15 2009 +1000
test: fake initialization of a sprite trace and window locations
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58fd28f6b6bebab7f31c54e696f96d64ebb50f5a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 09:44:37 2009 +1000
Xi: return deviceid as error value in XIQueryPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b41dd4328bfb8a0981d299bb60f986a2bc55fd24
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 09:43:46 2009 +1000
record: include recordproto.h, require recordproto 1.13.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 65354e5a698a5b527db09afc431110afba0e14b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 20 10:52:52 2009 +1000
Xi: return BadDevice for changing device cursors on non-master pointers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef75301854d41c6b11dd2742fa9d17a5de8a4cfa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 20 10:52:24 2009 +1000
dix: FixUpEventFromWindow mustn't scramble non-device events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c73cd3b265c301b8a54ffe484d6c696f2abefb46
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sun Aug 16 18:07:49 2009 -0700
xfree86: Link libselinux with Xorg system libraries
Put the reference to -lselinux in XORG_SYS_LIBS so it isn't added as a
make dependency for libxorg.la. Otherwise, make goes looking for a file
-lselinux in the current directory, which it obviously won't find.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Justin P. Mattock <justinmattock@gmail.com>
commit 9d8fc33cae2fee7777edd20658dbf6a3ffb3d557
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 20 16:56:04 2009 -0400
composite: Move screen init before extension registration.
Otherwise, you'd still advertise the extension even if no screens
actually supported it, and the first Composite protocol request would
probably crash.
commit ae68708ebe24c4cdf8c5265e206f6913d9298f37
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 20 15:45:57 2009 -0400
xfree86: dump /proc/cmdline in the log on Linux
commit 0b131a5cd91cea54240777c66a9cd385029e8cb2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 20 15:28:57 2009 -0400
linux: Yet more malloc() avoidance for backtrace()
Turns out, there's an initializer at the top of backtrace() that (on
some arches) calls dlopen(). dlopen(), unsurprisingly, calls malloc().
So, call backtrace() early in signal handler setup so we can later
safely call it from the signal handler itself.
commit 792dee3854cbede64e17fdc4736831edad295706
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 19 18:20:54 2009 +0300
xfree86: remove bus state change notification callback
No one is using bus notifications now. We hope that the kernel take care of
this properly.
For other not-so-urgent-notifications (ACPI wakeups, etc) we can just register
a handler on server's scheduler (using xf86AddGeneralHandler). And for
external applications, the "trend" is to use HAL to kick notifications. So
we're already provided of enough notification schemes.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit eb031d4013d36f6aef4aba45840762ae8635cc13
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 19 15:42:34 2009 -0400
linux: hand-roll a backtrace printer instead of using backtrace_symbols
Why? Because backtrace_symbols calls malloc, which you can't do from a
signal handler. Face? Palm.
commit 75b9383d8a4c113ab3c6cfc1d5efcb5d9982a1bf
Author: Jesse Adkins <jesse_adkins7@yahoo.com>
Date: Tue Aug 18 21:13:40 2009 -0700
xserver doesn't stop all connections to localhost
X.Org Bugzilla #23329: http://bugs.freedesktop.org/show_bug.cgi?id=23329
Patch #28648: http://bugs.freedesktop.org/attachment.cgi?id=28648
I noticed in xserver at os/access.c that xorg tries to stop connections
to localhost by checking against the address 127.0.0.1. However, RFC
3330 defines the localhost network as 127.0.0.0/8. This means that any
IPv4 address that starts with 127 is just another name for localhost.
commit 2d34eace13c2016048c627c4e96c3b2399901078
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Aug 18 20:11:23 2009 -0700
Sun bug 6872917: Xorg not querying /dev/fb when no xorg.conf exists
commit 48ee5558333bd324463b6994735cabb23de262ec (OpenSolaris VT support)
broke the autoconfiguration code in xf86AutoConfig.c that uses the
Solaris-specific VIS_GETIDENTIFIER ioctl on a frame buffer device like
/dev/fb by changing xf86Info.consoleFd from /dev/fb to a /dev/vt/*
device.
This fixes it by reworking the code to split the console device
(/dev/vt/*, the vtXX CLI option) from the frame buffer device
(/dev/fb, -dev option) to allow both VT and autoconfig to work.
It also fixes the console device to use /dev/fb when VT's are not
supported instead of throwing a Fatal Error because it can't open
/dev/vt/0.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit d225230148b3cdab3b32fce3abee26b818d4bab0
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Aug 18 12:15:32 2009 -0700
xfree86/linux: don't change VT perms unless we're running as root
In non-setuid root installations, we shouldn't try to adjust VT/tty
ownership. It will fail, and shouldn't be necessary anyway (since
startup scripts or PAM should be handling perms for us in that case).
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 41884b8f4dfe4d931c64a6046adfefcc2b7646c2
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 15:47:56 2009 +0300
xfree86: remove unused code (xf86Configure.c)
The xorg.conf generator was not assigning correctly the primary device
("bootable") as screen zero. So just skip this kind of routines for now.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 097376266f256e3ae37a16b343ed1e3441a8f003
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 13:13:57 2009 +0300
xfree86: remove unaffected code (xf86Configure.c)
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit dd8960a9f37fbef65cb99e058c3772edfda7b6db
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 12:53:47 2009 +0300
xfree86: remove stupid macro (xf86Configure.c)
It was confusing more instead helping.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 4ec7667bb17839bd4ec11091c75ecfff317fc96c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 12:33:35 2009 +0300
xfree86: remove wrong commentary
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 2e8c2b8ae6a092871838b7cceaaf4a7590bce1d3
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 12:28:15 2009 +0300
xfree86: header clean up (xf86Configure.c)
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 2df414a33321ae772af1e7e52c36aec222bb3c8f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 12:14:27 2009 +0300
xfree86: reorganize xf86Configure.c
No semantical changes. Only code moved around.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 113e66a1ffe2a43c4d1c92a7d78ca43b4db58822
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun Aug 16 21:02:11 2009 +0300
xfree86: remove unused PCI header
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066
Author: Richard Hughes <richard@hughsie.com>
Date: Mon Aug 17 09:15:32 2009 +0100
Do not reset lastDeviceEventTime when we do dixSaveScreens
When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
event time else session clients using IDLETIME will be reset.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4098ad72d00e65d142fb9fe8a1194be35338508b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Sun Aug 16 00:06:10 2009 -0400
xace: fix access mode in dixLookupWindow within several RandR calls.
Referencing a screen using a window only requires GetAttr access.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 10 18:39:04 2009 -0400
xace: fix access mode in dixLookupWindow call within ProcUngrabKey.
Referencing a window (as grab-window) only requires GetAttr access.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 6d2f4e487869f10de4a62365b4d6de036c752ab8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 10 18:36:53 2009 -0400
Add XI2 requests to protocol.txt
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 73975ef3a39ce522c6206ca800ed175fbf851dcf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 10 18:34:07 2009 -0400
xselinux: Allow per-client device create contexts.
The previous behavior was to set the serverClient's value which was used globally.
This is in support of XI2, where clients can create device pairs directly.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 66e32d252cffcd4fe7d505f1c211253f23c5002c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 10 18:33:05 2009 -0400
xselinux: Add more new device permissions for XI2.
Reflects the ability of clients to create/destroy device objects.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 1f4ea22a20fdd30412a259a87eee133155e1163d
Author: Rémi Cardona <remi@gentoo.org>
Date: Mon Aug 17 11:33:24 2009 +0200
configure: fix help string after Xnest default build was changed
Signed-off-by: Rémi Cardona <remi@gentoo.org>
commit 7e37e7c50e4fdcb53296a99d90af3d90081ce9bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 14:39:50 2009 +1000
test: add protocol tests for DeviceChangedEvents
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2851f04cb2f6e5c30267f733d867c86d4e69a485
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 16:27:40 2009 +1000
dix: rework DeviceChangedEvents a bit.
DCEs are now processed when sent throught the master device, not when sent
through the slave device. This includes a removal of some un-used (or partly
used) fields in the DCE itself to something more self-explanatory.
TODO: if a device has events queued and its attachment is changed, the DCE
is silently dropped now. Instead, it should be generated as soon as the
first event after the attachment is sent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c1d901d723c3bee523736eacc15b44a7dff484fe
Author: Richard Hughes <richard@hughsie.com>
Date: Fri Aug 14 11:44:35 2009 +0100
Don't reset the lastDeviceEventTime when doing DPMS actions
When we change the DPMS mode, don't play games with the last event time as
this breaks applications using IDLETIME to turn the backlight off after a
preset time.
This patch fixes gnome-power-manager and xfce-power-manager
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dca4de72d375c4b9bcdd25b151e291a77a5b06cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Aug 15 20:17:20 2009 +1000
dix: fix potential use of unused variable 'mask'.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 978b65bce14598f2d42ca0177ea58fef71fc12c5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 15:05:42 2009 +1000
include: XInputExtensionInit doesn't need to be exported.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3989dc1d34f116f30915632cc5286937392e180a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 16:20:20 2009 +1000
dix: use the XI2 defines for class types.
Doesn't matter really, they have the same values anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fe045820f1fb33991e8bff5c6e192097caa85727
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 15:34:00 2009 +1000
input: move DeviceChangedEvent conversion into eventconvert.c
The version in eventconvert.c was half broken and for some reason we ended
up with a second version in exevents.c (which works). Move it over to where
it belongs and call EventToXI2 instad of having a custom function for it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33eb6f70816921abc5da62e434f40e78d672274e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 13:49:58 2009 +1000
include: Unexport most symbols from exevents.h.
And shuffle them around so that the part used by drivers is up the top and
commented.
Also, woo, the sdksyms script doesn't like declarations with return type and
function name on the same line...
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1373c2ea877b562076a4a3c97e8e4f999c977217
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Aug 15 12:14:26 2009 +1000
exa: clarify createpixmap2 new pitch return
commit 48ee5558333bd324463b6994735cabb23de262ec
Author: Aaron Zang <Aaron.Zang@Sun.COM>
Date: Mon Aug 3 23:21:39 2009 -0700
Add new VT support for OpenSolaris & future Solaris releases
Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 613e76ff9055d8ac2b1af1130668180646a9e14c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 3 21:38:51 2009 -0700
Remove support for Solaris x86 releases older than Solaris 8
If you want to run a pre-1999 kernel, you'll need a pre-2009 X server
[Some pre-Solaris 8 VT support is left by this patch to allow reuse by
the new Solaris VT support that follows in the next patch.]
Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 6c292d17053eb2a7e7054e51210f423dbc0cb7e8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 11:48:54 2009 +1000
dix: update the sprite trace for all masters && floating slaves (#23257)
When the windows are restructured, CheckMotion needs to be called for all
masters and floating slaves to update the spriteTrace.
X.Org Bug 23257 <http://bugs.freedesktop.org/show_bug.cgi?id=23257>
Tested-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 49046088f10cceaea7da97401d742d3fb59371f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 09:48:45 2009 +1000
config: don't shutdown the libhal ctx if it failed to initialize (#23213)
Regression introduced by b1c3dc6ae226db178420e3b5f297b94afc87c94c.
Shutting down the libhal_ctx if the init failed may cause an abort.
This can happen if hald is not yet running at server startup.
X.Org Bug 23213 <http://bugs.freedesktop.org/show_bug.cgi?id=23213>
Tested-by: Stefan Dirsch
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1545a120df6dffb5b84fe96c5a992357520b7c8d
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Aug 11 15:00:36 2009 +1000
exa: fix CreatePixmap2 to be useful for tiling.
This adds a pitch return so that the driver can align the pitch to any
value it wishes and not just the one it gave to EXA at startup.
commit db568f9eabf3450d8a023597ff007df355b13ea8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 13 16:37:00 2009 +1000
Xext: fix up wrong conditions for negative sync transitions.
If the counter had a value higher than the trigger value for a negative
transition, the trigger value did not get set.
The correct sequence of checks is:
if (positive transition)
if (counter value < trigger value)
set up trigger
if (negative transition)
if (counter value > trigger value)
set up trigger
Red Hat Bug 501601 <https://bugzilla.redhat.com/show_bug.cgi?id=501601>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a3e50b05747cab92090ae7d7f4475cd61d3fcadf
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Mon Jul 27 20:58:44 2009 +0200
Add 4 missing 10bpc picture formats to the server format list.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 36e24a6d93bd5aced4e566b80bf2d03555fab9ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 13 10:50:26 2009 +1000
Xext: add missing return code check to ProcSyncDestroyAlarm
Introduced with 57aff88c7d0761e590806d07bee1c9410680c89f.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ce69a06aff934b2dcded8606cab079ac6465007c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 16:16:54 2009 +1000
Xi: fix up broken DeviceChangedEvent swapping code
commit b44d34d5fd0d8aaacb89121e8b4afba04f1dcc80
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 15:32:59 2009 +1000
include: correct a copy/paste error in a comment.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c477ac8a151a28ba23f5c87e8f7affd6e82cfaa9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 15:15:02 2009 +1000
dix: re-name internal eventToClassesChanged to eventToDeviceChanged
DeviceClassesChangedEvents (where this name comes from) have been replaced
with DeviceChangedEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af38f6790c4c8ba1e70f5c5ba3530ded85d6e372
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 14:08:59 2009 +1000
test: add event conversion tests for XIDeviceEvents
commit 3f2e4b9867b6877ee7be32b151fcaf221ef0812f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 14:07:54 2009 +1000
Xi: add event swapping for XIRawEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f3b2f9fb734ecfff6db9ae85b0d247856ede8112
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 13:12:40 2009 +1000
Xi: fix event swapping for XIDeviceEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e46f02fa2de79261221b42ab73f9daa2ce8ac650
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 09:50:16 2009 +1000
Xext: allocate a separate event list for XTest events (#23100)
XTest event processing may be interrupted by a SIGIO. If Xtest uses the same
event list as the rest of the server, this list may be overwritten
in-flight.
X.Org Bug 23100 <http://bugs.freedesktop.org/show_bug.cgi?id=23100>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8483b08152104dc619d9e44f877d2687d866355e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 7 16:11:37 2009 +1000
test: add focus and enter conversion testing.
Doesn't actually convert anything, but verify the expected behaviour.
commit 59dc59a72ffd4cbc4df207bc688c92bb4863e8a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 7 11:23:33 2009 +1000
test: add XI2 eventconversion test for raw events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 10d7948e0360860e1e9633dca39f646d492e73bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 7 10:17:14 2009 +1000
test: fix build error introduced by new AllocDevicePair API
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3f161a0aac39fbdeef393a17269486b8dace4672
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 14:14:35 2009 +1000
Xi: un-statify XI2EventSwap, it is needed for tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 55e1ea08d03d89ecc0f2db7652a4d15567204696
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 3 16:46:11 2009 +1000
Xi: get device changed data from DeviceChangedEvents, not the device (#23100)
If a new device posts an event while the DCE is in the queue, getting the
data from the device may result in invalid memory access.
X.Org Bug 23100 <http://bugs.freedesktop.org/show_bug.cgi?id=23100>
commit 8ce4fde76fdf747fd3e00836c9c9c542e516ae9a
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Aug 12 14:45:13 2009 -0400
Fix build on Alpha
commit a400dbb38f93030d51afe806b4b20d5ef501c855
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Aug 12 17:48:36 2009 +0100
Xming: Add NET_WM_ICON to native icon conversion
fd.o bugzilla #4491
originally from a patch by Joe Krahn <jkrahn@nc.rr.com>
Convert a NET_WM_ICON to a native icon by converting to a native
bitmap and then using CreateIconIndirect()
Don't use icon alpha on Windows 2000 or if display isn't 32-bit, convert
alpha channel to a 1-bit transparency mask using a threshold value
Fix warning in winScaleXBitmapToWindows() about signedness of *iconData
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 211511f150ce189681aff176c311fa8f312517e9
Author: Soren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Aug 11 14:40:42 2009 -0400
Disable the out-of-bounds workaround in pixman.
This workaround was necessary for older X servers, but now fb should
be using correct coordinates.
Also bump pixman requirement to 0.15.20.
commit 93d9646c713336e03c135204c061f561d3654e23
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sat Aug 8 20:18:10 2009 +0300
mi: fix indentation
mieq.c looks indented-wise now. Let's see how long it will take to someone
mess it again.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit f9a2fff2248d7254958857677cabfea914ed4853
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 5 21:02:29 2009 +0300
mi: fix cursor warping screens
The server was processing ET_RawMotion type when the cursor was wrapping to
another screen and getting wrong valuator values. This fix such issue
considering only ET_Motion, ET_KeyPress, ET_KeyRelease, ET_ButtonPress and
ET_ButtonRelease types when the cursor detects a new screen, keeping the
"normal" processing of device events.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d573cc46d3106824902ab4f926617bd9959af57c
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 8 11:32:05 2009 +0200
exa: more safety
commit 8b652435cd42929e2d187b353b3b20e798569356
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 8 10:35:01 2009 +0200
exa: minor cleanup
commit a73f95aa93634cf7ba2c7c9274a046b2df2adca7
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 8 02:31:23 2009 +0200
exa: Fix the broken upload fallback for "mixed"
- Replace it with something wfb friendly while i'm at it.
commit c029678bf7883b91f3c8095e764abbee246c9bb6
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 7 20:42:30 2009 +0200
configure.ac: drop dependency on fontenc
Nothing in the server uses this anymore.
commit 3943df7f76c1b4930fb7370d9d145cee96dd562b
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 7 20:36:03 2009 +0200
exa: one can never be too careful
commit 1548e8ae5d28ed0eb6057a1a19cfc84a78ef34dc
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 7 20:04:53 2009 +0200
exa: fix a potential loophole in "mixed"
- Always free sys_ptr before setting the pixmap to pinned.
commit e94c7c42ce9d6a194b76ba7e8b3904b180f93a1b
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 7 13:36:52 2009 +1000
parser: make libxf86config_internal.la not installed.
commit 5fb188b547e0ef4e2f2c59b66a3183b004e4a1e9
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 7 12:05:51 2009 +1000
ddx: fix xf86Config.a generation
We were generating a shared library, but this lib is foobar, the parser
requires some symbols from the X server or from the program its being linked
into. If the program its being linked into (say a python .so) has symbol
visibility enabled then it will fail to dynamic link, also if this .so has
symbol visiblity enabled it will fail to dynamic link.
Screw it go back to a .a file really unless someone cleans it up properly.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3047bd067464efb9857960d3fa6324b947faa970
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Aug 5 18:39:47 2009 +0200
exa: delay malloc for "mixed"
commit e8ac2ed5dc4c2ac0a5e1e1f371f94c15b1c729dd
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Aug 5 16:12:16 2009 +0200
exa: implement exaMoveInPixmap for "mixed"
- This can be used to force creation of driver pixmap.
- Not for 1 or 4 bpp.
- Driver can still fail (driver) pixmap creation.
commit 9d2a7128d3e66b8c076a714d69f84bcad49391b9
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 2 02:35:46 2009 +0200
exa: Use damage to optimise away useless copies.
commit 03ecb164f2592c954aa408bf121e0c67b604d854
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 1 19:19:19 2009 +0200
exa: A simple 3rd backend implementation.
- Based on driver pixmaps with some changes (completely transparent to driver).
- It helps with the problem of known software fallbacks, such as trapezoids.
- exaDoMigration is now called for all cases that provide a do_migration hook.
- exa_migration.c is renamed to exa_migration_classic.c
commit ac7ac913fd98ea359c05c89968ab53a3223615b4
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Jul 22 21:35:41 2009 +0200
exa: Split out some classic and driver allocated pixmap code into seperate files
- Create a few seperate functions and a few private function pointers.
- Replace a few if conditions with a check for pExaPix->pDamage instead.
- This is in preperation of a third scheme that lies somewhere in between.
- Code clarity would have suffered (i started working on it and didn't like the mess).
commit 3abbd327f4a732408119de1f8e9ecba4812772a5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 15:47:46 2009 +1000
dix: detach SD during XI2 grabs only.
XI1 grabs on slave devices leave the device attached - just like in earlier
versions of XI.
Tested-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c29aa7da220661532b05972cacd3dbaff29408b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 15:33:07 2009 +1000
Revert "dix: Remove temporary detachment of slave devices."
This reverts commit 0c0ef42292f4c910c73b308cd75d77637312da53.
Tested-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 931160fcf378120e58849d801dbc62bed6e65a4b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 4 02:53:17 2009 -0700
XQuartz: AIGLX: Provide empty __glXAquaDrawableResize to avoid crashing in DoMakeCurrent
(cherry picked from commit 60a1d2c2764f2f02c0751940a264588717afce79)
commit 0fe639a314de397516cf00d8100da8086abdd97a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 1 22:53:45 2009 -0700
XQuartz: Only save lastpt on mouse/tablet events
(cherry picked from commit 552be074e5be6492df3e290e8b7d9daff1a2cb34)
commit 491c2d74c12d7f9bc9f31b427ece04e049ebff5a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 1 12:43:14 2009 -0700
XQuartz: Use mouseLocation rather than locationInWindow when setting lastpt
I don't understand the *why* ... I just see that it works better this way for games like Quake2 through wine. It *should* be better the other way, but somehow it's not.
I guess this will go in my list of puzzles to unravel.
(cherry picked from commit 65ae2d00e1a53f97f2ff9522406ab69d50bf3199)
commit df6c01352471c766e9f71ceac03cab8c3911faa1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 1 02:32:52 2009 -0700
XQuartz: Don't use location delta for tablets since NSEvent does not give a precise delta.
(cherry picked from commit 6c5bf756a7f5389cdfe2e43a339d7c31a3e522e9)
commit e360104880e6e2e666aa05dfd56e2ef3880f38ef
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 5 16:17:01 2009 -0700
XQuartz: Purge redundant QuartzBell
(cherry picked from commit de14a63d20095e1537fd74352850c734d900031d)
commit 8c0085c715effdc450d78eec14bc32e6214c78af
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 5 22:50:44 2009 +0300
xfree86: remove more RAC junky
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 444723273ae82fc3f6707ed1a461aaaa8fdae39c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 5 22:48:02 2009 +0300
xfree86: reorganize pci code
- xf86PciVideoInfo doesn't need to be global
- remove unused macros
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 20169414e1afd5d1d02cb1b57866b1c158b2fc6c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 5 22:44:19 2009 +0300
xfree86: remove unused functions
RAC trash.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 95b678e6dc41f2524ada4eb11289687fafce7588
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 3 23:49:56 2009 -0700
Correct modifier map built when ProcSetModifierMapping is called
Fixes xmodmap changes to modifiers to stop corrupting modifier maps
Previous code had two bugs:
- the code to increment mod was after the code to continue if no
modifier was set, so mod wouldn't be incremented for modifiers
with no keys mapped to them (such as if you called
xmodmap -e 'clear Lock')
- the value it set in the modifier map was the raw modifier number,
not the bitmask value for that modifier
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ca305956e5ea6f606b22ef62aa462186a7b95f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 09:40:56 2009 +1000
Re-enable Xnest by default.
Xnest was disabled in 82fc102568b3d6b0daeb6c5f5b3a1310a7f14fcd due do build
errors. These errors have since been fixed.
Re-enable Xnest by default to increase coverage by default builds.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5904ef2ccd6056b187ca76f104c21e2d686bfc1d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 10:40:20 2009 +1000
xnest: restore xnestUpdateModifierState
The meat of xnestUpdateModifierState was ifdef'd out in
6ef46c40e62def4841a4cff4e0b443516a2ed782. This resulted in stuck modifiers
when a modifier key release event wasn't sent to Xnest (e.g. Alt-Tab away).
See X.Org Bug 3664 <https://bugs.freedesktop.org/show_bug.cgi?id=3664> for
the original bug report.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 44afc7577ad3339f4555438388f6a4d8e220c991
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 09:51:05 2009 +1000
xnest: include exevents.h for XIGetKnownProperty.
Silences compiler warning.
Pointer.c: In function ‘xnestPointerProc’:
Pointer.c:64: warning: implicit declaration of function ‘XIGetKnownProperty’
Pointer.c:64: warning: nested extern declaration of ‘XIGetKnownProperty’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32ce5c83a504d2cafd2b19ed628b40032ef347b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 09:39:47 2009 +1000
xnest: use AllocDevicePair for Xnest device initalization
All Xnest needs is a single pointer+keyboard pair. AllocDevicePair sets them
up nicely with the name assigned etc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 26b83ad4a29dc180b336a19d9e97589814e93e37
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 09:32:50 2009 +1000
dix: require PointerProc and KeyboardProc to be passed into AllocDevicePair.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a500fdd4d717947b86f6d6844ebf9a8603eb8e2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:29:55 2009 +1000
dmx: include exglobals.h for DeviceKeyPress and friends.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 591c2f8758ef36a9bbf1625f9c207a1804f58ef4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:30:52 2009 +1000
dmx: typecast to InternalEvent* before mieqEnqueue.
Silences a few compiler warnings.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 15b425b5a6630d2ac95b490f4f4dbb9240ac9c5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:31:42 2009 +1000
dmx: move 'state' around to silence compiler warning.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e10f802c8260e034fd6c835d3f2622d9cd5085f8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:40:17 2009 +1000
dmx: include inputstr.h for inputInfo.pointer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9ffc3f280b3907a672f99101548a5eb52027b37f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:40:31 2009 +1000
dmx: don't call InitKbdFeedbackClassDeviceStruct - doesn't exist anymore.
InitKeyboardDeviceStruct does the same task now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 63155cf985ee15bf6aad95066b076ab680cf5a31
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:28:30 2009 +1000
dmx: pass button/axis labels into the init functions (currently unset)
Currently only None labels are passed in, in the future these labels should
be whatever the respective buttions/axes are.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af85973a0a80fb0ba82330ae3ec897f65d618003
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:25:06 2009 +1000
dmx: remove now-useless defines.
XI is mandatory so we can expect both to be defined.
commit 654d7a02600bbafd890f555a081aa0a2fcb5e253
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:23:01 2009 +1000
Revert "dmx: claim we support XI 2."
XQueryInputVersion doesn't exist anymore and for now XI 1 support is good
enough.
This reverts commit 8da8a0fec4b1b9d9208635dedb2f449dc99e0004.
commit e7c950c6273ff93f25c091c93d86da6e332a2277
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:15:24 2009 +1000
dmx: fix a call to XkbSetRulesDflts, takes XkbRMLVOSet now.
commit 2cde9208ff756e33d162e2324f4b99540230d743
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 14:58:25 2009 +1000
dmx: Enable/DisableDevice take a boolean variable now.
We want to send events here, so pass in TRUE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1e210d6d10ec63d22247e5801890e024826fc861
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 14:41:46 2009 +1000
xkb: remove now-unused XkbGetKeysym.
XkbGetKeysyms was only used by the now-removed Keysym grabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a6ce6c70cff5108f0751b662b8e52c83daab0722
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Aug 4 23:23:21 2009 +0200
EXA: Simplify exaGetPixmapFirstPixel using GetImage.
commit 842373104d08d47efc863cecbe30431d3faebef1
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Aug 4 23:23:21 2009 +0200
Add support for RENDER BGRA formats.
commit 0bf7eaf3052ce24066b0a7c14860b4762fb81364
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 3 23:14:50 2009 -0700
Ansify function arguments in VTsw_noop.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 736f2d64725c6df8413e627bd40ce7ecb011acc7
Author: Paul Bender <pebender@gmail.com>
Date: Tue Jun 30 15:50:46 2009 -0800
Bug 16832: XDMCP related build error when --disable-xdmcp is used
X.Org Bugzilla #16832: http://bugs.freedesktop.org/show_bug.cgi?id=16832
Patch #27279: http://bugs.freedesktop.org/attachment.cgi?id=27279
commit b159a98f7fbdb3f8b337cd1bfd2ff27312856619
Author: Lee Leahu <freedesktop-bugs@dyweni.com>
Date: Thu Oct 23 21:03:57 2008 -0500
seg fault when initializing DMX screens
X.Org Bugzilla #18086: http://bugs.freedesktop.org/show_bug.cgi?id=18086
Patch #19837: http://bugs.freedesktop.org/attachment.cgi?id=19837
commit 5da9b255a64bec7dbf5ddb392d54dac9be5b43c0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 3 19:53:27 2009 -0700
Fix blddir != srcdir builds of solaris-*.il files
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=17509
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 1e69fd4a60147287b31e53bfc61543fb17bb82c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 3 12:03:26 2009 +1000
xnest: fix up parameters to InitKeyboardDeviceStruct.
IKDS takes a DeviceIntPtr as first argument, and an RMVLO struct as second.
The keysyms stuff is long gone now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 008658049cbeea35a9f76f98037aa2f4173f3573
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 3 12:00:45 2009 +1000
xnest: silence compiler warnings by typecasing properly.
Events.c: In function ‘xnestQueueKeyEvent’:
Events.c:112: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c: In function ‘xnestCollectEvents’:
Events.c:141: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:150: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:160: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:193: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 664ac92d8bbe956dd6fd80fac5dc3161028803b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 31 14:38:35 2009 +1000
xfixes: backup the DisplayCursor/CloseScreen proc before restoring it (#23034)
The screen's DisplayCursor func is wrapped as
AnimCurDisplayCursor -> CursorDisplayCursor -> miPointerDisplayCursor.
Calling CursorDisplayCursor while an animated cursor was currently displayed
would remove AnimCurDisplayCursor from the wrap stack. Thus, the next call
to ChangeToCursor wouldn't update the animated cursor state. The block
handler for animated cursors would then continuously overwrite the actual
cursor, leaving an animated cursor everywhere on the screen.
X.Org Bug 23034 <http://bugs.freedesktop.org/show_bug.cgi?id=23034>
commit f48dfcc1b772a09428e328c72124ea0d46a73416
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 31 10:44:28 2009 +1000
xfixes: allocate CurrentCursor for all devices.
XFixes requires cursor notifies to clients when the cursor changes. This
should work on the ClientPointer and then on all master pointers. Hence
change CurrentCursor to a MAXDEVICES array.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3e5629fac224d53a972df5e2a87db02534f9b17
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 30 16:36:56 2009 +1000
dix: call SetFocusOut and LeaveWindow when disabling a device.
PointerWindows[x] would be set after removing a master pointer. Destroying
this window then crashed the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97ed946cfccec5979c47b5fabf1ad56cc7d33ef4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 30 16:36:30 2009 +1000
dix: SetFocusOut and LeaveWindow don't need parameters other than dev.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d040940efe041b57e6323921c380ceb2bb43f41e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 30 16:16:51 2009 +1000
xfixes: FixesHideCursor should work on all master pointers.
Presumably, a client calling HideCursor doesn't want any cursor displayed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b83c682e7ea4e10757eca6363de28281108591a8
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Mon Aug 3 02:46:57 2009 +0300
xf86Xinput: xf86PostButtonEventP must set POINTER_ACCELERATE for relative events.
Thanks to Peter Hutterer for spotting this bug.
commit ae65daab080c6269f0eadc6be1a48bf27866c542
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 31 15:32:07 2009 -0700
XQuartz: Unify how we set our bitmasks for visuals
(cherry picked from commit c230b52c27ce50ac6c27011ec8e88f1b263b25f9)
commit 4a53fed41d711f270c7d8a7fbeaafb4fb619e879
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 31 14:19:50 2009 -0700
XQuartz: Dead code removal for StaticColor visual
(cherry picked from commit e457a44e87950207f6c16bf82bf5af11c777ecf1)
commit da0a2747803dbecb1308181176a784e14cf02809
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 31 14:14:21 2009 -0700
XQuartz: Cleanup the bitmask setting for GLX visuals.
(cherry picked from commit d32c3df258e748958ef997c675dc4fae118c0d7b)
commit 70ac671af2f092471022590cb7a19ef9155c51b4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 30 01:30:52 2009 -0700
XQuartz: no DirectColor
(cherry picked from commit df2fbc410f2c484612f65a6539a6cb069ef4a468)
commit c0c72a866a237d3c2d9e69e1c69181ef5446e3f8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 30 00:51:55 2009 -0700
XQuartz: Define DDXRingBell
(cherry picked from commit 113347381289497cb2a79994d0ef5f427ae63ac5)
commit 949811313989809f5b58424af04b9fd8e1d0bec4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 30 21:59:40 2009 +1000
test: fix build by including eventstr.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0565f4ed4519962bed40a0bbcf0b409471f4de40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 16:46:45 2009 +1000
Xi: set the sourceid for focus devices to the device id.
Unlike Enter/Leave events generated by a device pushing the pointer around,
a device doesn't change focus all by itself. It's a result of a
SetInputFocus call, a window becoming unviewable or a grab activating. As
such, the sourceid for focus events is always the deviceid itself.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de4dd5848cab90b0f8b8243ca0b49985ef047124
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 16:45:34 2009 +1000
include: DeviceFocusEvent is not to be exported.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 46ac9f92416f3cb99b5d84a9d200237dc33a3bb7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 16:34:28 2009 +1000
dix: pass the sourceid around for enter/leave events.
The sourceid for enter/leave events as a result of pointer motion is the ID
of the slave device. The sourceid for those as a result of a grab activating
is the device itself.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c299b2228fb63c192b72851c90e14ceaceb67bbc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 16:00:19 2009 +1000
dix: remove obsolete comment, parameter described doesn't exist.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5085ac09a50721d87196bd9f2607dc76200ca399
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 13:45:32 2009 +1000
input: switch internal event types to enums.
Use enum EventType instead of ints. This requires a load of default
cases in various switch statements to silence compiler warnings.
Reported-by: Aaron Plattner
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1ae8332d643299a3ee9a9f45a8e25b8c87c751e1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 13:39:38 2009 +1000
include: fix enum EventType declaration.
Having EventType after the enum declares a variable. silly me.
Reported-by: Aaron Plattner
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 994f7a1c814a89e90f710dac5bf6b2445fb64712
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 12:11:13 2009 +1000
record: silence some compiler warnings.
warning: passing argument 4 of ‘RecordAProtocolElement’ discards qualifiers
from pointer target type
note: expected ‘pointer’ but argument is of type ‘const void *’
record.c:2745: warning: passing argument 1 of ‘SwapConnSetupInfo’ from
incompatible pointer type
../include/swaprep.h:243: note: expected ‘char *’ but argument is of type
‘struct xConnSetup *’
record.c:2745: warning: passing argument 1 of ‘SwapConnSetupInfo’ from
incompatible pointer type
../include/swaprep.h:243: note: expected ‘char *’ but argument is of type
‘struct xConnSetup *’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a863d636293cd7361639c1a8cf9c4f7f15da1e1d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 12:09:34 2009 +1000
Xi: remove FIXME and obsolete include.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fac49df08f173f091cbb77feaf373d7d465358af
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 12:07:22 2009 +1000
Xi: remove obsolete comment.
XI1 only uses 7 bits for deviceids, bit 8 is used for the MORE_EVENTS flag
on the wire (when DeviceValuator events are required).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 845e65f08059e8f4bfd37356e99b48bba9416c0c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 11:54:14 2009 +1000
xkb: move XkbFilterEvents to xkbsrv.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8da0ff2d51086666d10ca7330d428e8610a4a0e3
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Tue Jul 28 08:20:37 2009 +0300
xf86Xinput: Add the xf86Post(Proximity|Button|Key)EventP helper functions.
xf86PostKeyboardEvent also makes use of xf86PostKeyEventP to avoid code
duplication, and the valuator verification has been split into the
XI_VERIFY_VALUATORS macro.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a148d407429c7d13136b3fcafd2d279c5438df73
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 28 16:53:51 2009 +1000
xkb: restore XKB PtrBtn actions.
Ifdef'd out since the switch to internal events. PtrBtn actions now work
again. Instead of generating the event directly, GPE generates the event and
it is then posted through the usual event processing routines
(mieqProcessDeviceEvent).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d3b8babd1a5407082f1a40875ed69f62ba2153f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 28 16:51:14 2009 +1000
mi: update master event copying to InternalEvents.
This is long overdue. The device events are InternalEvents now (and only one
at a time), diminishing the need for an EventList for the master event.
Furthermore, don't make masterEvent a static since this will interfere if
mieqProcessDeviceEvent is called from somewhere else (e.g. XKB actions).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f85619b14d130ec54d42cabfaee15e55ced0c665
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 28 16:48:56 2009 +1000
dix: update GetMaximumEventsNum() to real value (3).
GPE and friends now use internal events so they may generate up to 3 events.
One (optional) DeviceChanged event and one raw event plus a device event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0217d0370c0b0bce66a9c09092eda8e820274e2e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 28 14:54:30 2009 +1000
record: ifdef out RecordExtensionInit and print a warning to the log.
The RECORD extension is currently broken. By ifdef'ing out the content of
RecordExtensionInit the extension isn't added to the server's internal list
and it does not get advertised to the client. Clients can thus fail
gracefully with a "extension not supported" instead of waiting forever for
events that never arrive.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e9b2938cd8637a5d3b0a4c9f69d6ee75faab3a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 27 16:54:33 2009 +1000
include: untangle events.h from the SDK headers.
InternalEvents shouldn't be used anywhere outside the X server itself. Split
up into events.h for opaque typedefs for the events needed by various
headers and eventstr.h for the actual struct definitions.
eventstr.h must only be included by code that requires internal events and
is not part of the SDK.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fad5f96c01811af7490a071719e4017c019a8d9b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jul 29 13:50:48 2009 +0100
Cygwin/X: Only try to build rootless extension if multiwindow extwm mode is being built
Rootless extension still needs a bit more work to build successfully for Cygwin/X
commit de2ae521abde445daaf025a07aa01563ca5ddd41
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jul 26 20:48:19 2009 +0100
Xming: Use RegisterClassEx() instead of superseded RegisterClass()
RegisterClass is supserseded by RegisterClassEx, so change to using that everywhere
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 764ce6ee683db342264bbca4df6379eb6093fb85
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Jul 28 16:16:57 2009 +0100
Xming: Use GetClassLongPtr() instead of superseded GetClassLong()
GetClassLong() is superseded by GetClassLongPtr(), so change to using that
commit a85523dc50f392a33a1c00302a0946828bc9249d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jul 28 22:52:33 2009 -0700
XQuartz: Avoid a possible spinlock in applicationWillTerminate
(cherry picked from commit f430cda0fdcc1a8fc5f4795743b40f09ff0bd869)
commit 1e49c8d340ee8d8b6f90abcc2e2e9c390cbcd622
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jul 28 13:40:15 2009 -0700
XQuartz: Avoid namespace collission for BOOL in Sparkle
(cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)
commit 442967c90dd9d8483a56bdc9237c49e33d619126
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jul 28 15:02:37 2009 -0700
Remove hardcoded gcc -Wall option from configure.ac
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 52e9ef5664a697a31102e8761eaa03cff01d14d8
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 28 19:04:59 2009 +0300
xfree86: remove some RAC junk
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit d57361bb9ac08bec470f76ca8ca602d60c339502
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 28 18:55:32 2009 +0300
doc: remove outdated PCI/RAC/Domain notes
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 7b3d05ebd5a55f88098f4a763d1fa7ca110bb780
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 28 18:45:16 2009 +0300
xfree86: remove pci debug macros
there's no effect when their are enabled.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 6089d9cfde533c6a7aec7dfc08aec9c8f2f18e27
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 28 18:29:35 2009 +0300
xfree86: remove RAC/resource doc
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit c553161e17ebc577ecb91ec6c81f0bdd0ae85e13
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 24 13:47:31 2009 +0300
xfree86: delete devices probe code (-probe and -probeonly options)
Inside a windowing system, it's not the place to probe for devices. Goodbye
-probe and -probeonly.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit c09779f95a9772c0556760222dfc570dbaf8a28e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 24 13:37:31 2009 +0300
xfree86: delete stupid video driver dump (-modalias option)
Such stupid and ugly way to dump PCI information! Oh boy... Anyway, this
doesn't belong to the X server at all. Go away!
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 0524420622df6cbdb3872917906f7b2a6ec02958
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Jul 27 15:49:41 2009 +0100
Cygwin/X: use GWLP_WNDPROC, GWLP_USERDATA with Get/SetWindowLongPtr
Missed from commit b3751454cbe02ee952bab213e8c3684d429c41b3
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b1c3dc6ae226db178420e3b5f297b94afc87c94c
Author: Rémi Cardona <remi@gentoo.org>
Date: Mon Jul 27 12:07:51 2009 +0200
config: add HAL error checks
This patch simplifies error handling in the HAL code and fixes a
segfault if libhal_find_device_by_capability() failed.
Fixes http://bugs.gentoo.org/278760
Based on a patch by Martin von Gagern <Martin.vGagern@gmx.net>
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8898203b0d0e9fa03453b2bcd9b88843cccc3230
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 19:35:37 2009 +1000
sbus: fixup for rac removal
commit 4b42448a2388d40f257774fbffdccaea87bd0347
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 14:47:42 2009 +1000
xserver: remove RAC/resource handling code.
This changes the ABI, but since the video ABI is at 6 already
it should be fine.
driver changes are in the pipeline after this.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0a168401c401727e49a12cae43a6a387b1f2928d
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 14:19:24 2009 +1000
pci: add support for pci is boot vga call.
This allows us to ask the kernel for the boot VGA device
instead of nasty guessing.
commit b3751454cbe02ee952bab213e8c3684d429c41b3
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Jul 21 16:07:56 2009 +0100
Cygwin/X: Update Get/SetWindowLong() to Get/SetWindowLongPtr() everywhere
Get/SetWindowLong() is superseded by Get/SetWindowLongPtr(), so change to
using that everywhere it remains
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c81595e23b48368dafc054f023c1dd16bbad9494
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jul 26 02:32:17 2009 -0700
XQuartz: Overhaul setting up visuals
The main change is cleanup of the visualConfigs and setting up alpha correctly there to match the visuals being added earlier (so the default visual has a corresponding GLX visual)
(cherry picked from commit 7351db5c8746be30a4047469ee9b50bc19e62a89)
commit 7f28c555b80dda2ed4f518efdb79733647dfea80
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 20:19:05 2009 -0700
XQuartz: Use CopyKeyClass to copy the keymap to the virtual core keyboard.
(cherry picked from commit 9a801d1716f005c30be076fcc9ac8dbb3e74d989)
commit 1031ac3a7306e7a82169c79c64607696c826c47f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 20:18:38 2009 -0700
Revert "XQuartz: Copy the keyboard map to the core keyboard"
This reverts commit 795de791cf18c658421d701af645718493eac51e.
commit 48703083a1cf308306f254691d7c2ecda09b3812
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 19:34:17 2009 -0700
XQuartz: Use pDev=NULL for DarwinSendDDXEvent
These events aren't really related to physical input devices anyways, so it doesn't make sense to use the pointer.
(cherry picked from commit bfe0b9cfa7af4a48dba849cab1eb152c409b4e08)
commit b8e0f740829d0c81324aeb59222fc8e3d22493cc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 20:17:25 2009 -0700
mieq: Protect from pDev=NULL in mieqEnqueue and mieqProcessInputEvents
(cherry picked from commit bf60ffb49700da367f7f88983b042a88fef7219b)
commit dab8de036808e363a8ec9be826cff7fbcd92b953
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 15:21:12 2009 -0700
XQuartz: Bump the reported version to X11R7.4
(cherry picked from commit c83f701aa75c75433b8745f5d79bca3a7516df91)
commit 9e74bb97ab6cb83dd99ec36bd3842197263b8a8c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 10:39:26 2009 -0700
XQuartz: xpr: Added missing include for RootlessHideAllWindows
(cherry picked from commit 75e104730810acbb11bf8503bac24ea25243b2ac)
commit 09b024db636f5a306c9cec3806fffde9acd3c408
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 15:22:01 2009 -0700
XQuartz: Use the master device in DarwinSendDDXEvent to avoid duplicate events.
(cherry picked from commit 6fa62192af937aa9656f64b516050bc099231c7a)
commit 795de791cf18c658421d701af645718493eac51e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 15:25:06 2009 -0700
XQuartz: Copy the keyboard map to the core keyboard
This still doesn't handle the modifier map... gotta figure out what to do now that SwitchCoreKeyboard is gone
(cherry picked from commit 427e1aab41dabb54354bfd30f2baae98ac8202c0)
commit af8047f7816b39be7015e8cbbe085c57bb354592
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 17 15:10:46 2009 -0700
Damage: Add devPrivates to DamageRec
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit c80ed4945ef6dd50473fab871211b71b3d20dc3c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 17 15:10:32 2009 -0700
Damage: Add wrappable hooks for damage create, destroy, register, & unregister.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit fb46474feb69d52d3dfdd61452ced5cfc38f6651
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 24 09:16:37 2009 -0700
XQuartz: Rever the "Set can_quit to true during a Sparkle-initiated relaunch." change
This was in place to work around the issue that was correctly solved with the
previous commit (changing the Windows menu behavior). Reverting this change
no longer causes crashing, so it's safe to show the dialog now.
(cherry picked from commit 023cef31bbb2ab80a241098d82fcfd35ada75fc0)
commit 0d73893a5795d5c1d28fd0287f2f1965f2ff1bda
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 23 20:03:29 2009 -0700
XQuartz: Change handling of Windows menu to workaround a bug triggered by mixing Sparkle and X11 windows
<rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
(cherry picked from commit 27ac5135267be9cb221329ae68461117dd43a4bf)
commit 171409cecbd848e5fec6334fc61a20e882e80fa9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jul 21 00:22:12 2009 -0700
XQuartz: Set can_quit to true during a Sparkle-initiated relaunch.
(cherry picked from commit b2e9a77111d4572402d8ca95e3368db97ba7d598)
commit 7ff84d350b44fa40669c1d0d48a715a0bf056ece
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Jul 20 22:38:25 2009 -0700
XQuartz: Added a "Check for X11 Updates..." menu item.
(cherry picked from commit 305144bfa4b59791123c44e869fab93a084792d6)
commit 1e1dbd1e462f571dad2f9684fcf4cd8ae17eedd5
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Jun 29 11:46:17 2009 +0300
xfree86: "Staticize" functions in xf86AutoConfig.c
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 7c6b5458de9bc7f6cd972a36b56888aaa3d201ee
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 23 15:16:44 2009 -0700
Fix dist.
* Makefile.am: Include the test/ subdirectory in the dist tarball.
* include/Makefile.am: Move events.h to sdk_HEADERS and eventconvert.h to
EXTRA_DIST so they're included in the tarball. events.h shouldn't be
included in the SDK either, but for now it's needed by input.h.
commit 20daa145c437c3ba67970146f6182849f87a1b43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 23 08:33:00 2009 +1000
mi: fix build error caused by missing xtest.h
xtest.h was renamed to xtestconst.h in xextproto.
Requires xextproto 7.0.99.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 587c3a2d1961834558193e8e14e8e381a077a253
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jul 22 10:55:46 2009 -0700
Bug #22804: Reject out of bounds XGetImage requests
The XGetImage man page states:
If the drawable is a window, the window must be viewable, and it must be the
case that if there were no inferiors or overlapping windows, the specified
rectangle of the window would be fully visible on the screen and wholly
contained within the outside edges of the window, or a BadMatch error
results. Note that the borders of the window can be included and read with
this request.
However, the server was only checking the requested region against the screen
bounds, allowing XGetImage requests to read pixels outside the bounds of a
window's ancestors. Normally, this would just read other pixels from the
screen, but if one of the ancestor windows is redirected, the window's backing
pixmap may be smaller than the window itself.
This change checks the region against the window's bounding drawable, which is
either the screen pixmap, a redirected window's backing pixmap, or the root
window for servers that don't support GetWindowPixmap.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ecd618957ebf01cb4137f98efec3faed35f8a9f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 22 15:19:34 2009 +1000
dix: fix null-pointer dereference on activating enter/focus grabs.
EventToXI2 returns a NULL event for enter/focus events since these events
aren't yet wrapped into internal events. This is a quickfix only, it works
thanks to the alignment of internal and XI2 event types.
Eventually, enter/leave events should be wrapped into internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 48585bd1e3e98db0f3df1ecc68022510216e00cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 22 12:09:24 2009 +1000
dix: use the event mask of the grab for TryClientEvents.
A client that grabs for button/key events may not have the
ButtonPress/KeyPress mask set and should not receive an event in that case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4dc91b3e54503a1be555bae5b18f3e52f58be307
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Tue Jul 21 17:21:28 2009 +0200
Check if new space was actually allocated before freeing.
There will be no new space allocated, if mode != PropModeReplace and
len == 0, or if mode is not one of the handled modes.
This fixes freeing data that is still in use, leading to double frees and
other memory corruption.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9a1bfa5664a80f03cedeb89b9f8a86115a08e7af
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 20 16:39:16 2009 +1000
input: remove XI2 keysym grabs, use keycode grabs instead.
Keysym grabs are tricky in the details, keycode grabs are known to work. So
for now, provide keycode grabs only.
Requires inputproto 1.9.99.15.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit afc3e3b5955ea4a49308399820cc4c499f4312da
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jul 21 16:14:21 2009 +0100
Cygwin/X: winInitMultiWindowClass() should be static
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9dc8106ba095474fea1474622b0f0162c8fd5aa4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jul 21 14:34:47 2009 +0200
randr12: Add compatibility for XF86VidMode gamma ramps.
Fixes screensaver fadeout effects.
Also make all RandR 1.2 compatibility code for XF86VidMode operate only on the
CRTC associated with the compatibility output, not all CRTCs at once.
commit 268e227ba06c027f5c56b1aaee5dcc6a2034403f
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jul 21 14:34:13 2009 +0200
EXA: Make Prepare/FinishAccess tracking resilient to repeated / nested calls.
Use reference counting and do nothing unless the reference count transitions
to/from 0.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=22822 .
As a bonus, this avoids calling the driver Prepare/FinishAccess hooks more than
once per pixmap and operation.
Also update the Doxygen documentation for the PrepareAccess driver hook to
better match current reality.
commit de7a14ca92f99ff03c8ad204aab5be8203c86a72
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jul 21 12:55:27 2009 +0200
EXA: Fix up some issues introduced by 00fe4a297744c81b40f0243fb56ad848a9be6a2b.
* Check all pixmaps involved for damage records, fixes visual corruption due to
the screen pixmap never having one.
* Fix an array size and remove a now superfluous assignment.
commit be4dd35ffecbf49aff13aa9f604a44c9b665ae92
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 18 15:51:29 2009 -0700
XQuartz: Initial support for automatic updates through Sparkle
(cherry picked from commit c45f1be36426bceeef9af67c26351114f14f5277)
commit 2415e2dce918efd49d5e6d71f705255a234a866b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Jul 20 02:08:31 2009 +0200
EXA: Bail earlier from exaDoPutImage if the driver has no UploadToScreen hook.
Also remove dead code associated with access_prepared local variable.
commit 00fe4a297744c81b40f0243fb56ad848a9be6a2b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Jul 20 02:04:40 2009 +0200
EXA: Completely eliminate exaDoMigration calls for drivers that manage pixmaps.
commit 7b9915b11ed9eedd0698b4563328504d686ac4ec
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jul 18 20:52:20 2009 -0400
dix: xserver "make dist" fails due to eventconvert.h (#27825)
This header file is not in the /dix dir, but in the /include dir.
The makefile aborted and the xserver distribution files were not created.
The fix is to remove this header file from the libdix_la_SOURCES
in the dix/Makefile.am.
X.Org Bug 27825 <http://bugs.freedesktop.org/show_bug.cgi?id=27825>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a98acb290737ac6b0776f2ea8128a4613c0f778b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 15 13:56:19 2009 -0400
s/xf86EnableOutputs/xf86CollectEnabledOutputs/ for clarity
commit 8fab7f72f2cc4ac5ca415c95ccbd05d3084f10c4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 15 14:09:08 2009 -0400
randr: Add Option "Primary" to Monitor sections
commit 053bb92145045e06f8d72c3bddb75806432faa1c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 14:29:05 2009 -0400
xfree86: Remove xf86SetPriority
GetClocks is pretty doomed to begin with, this really isn't going to
make it worse.
commit 3637945a45d55385335833197b18703379892884
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 14:10:45 2009 -0400
loader: Remove a useless check.
commit ef2bb08c76f0d1eed0c8b3e4937648f0b6ae01e5
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 13:53:00 2009 -0400
loader: remove dead LoaderCheckUnresolved
commit 06a2784232b5d0e2440ed365d272abdfa1f5d35f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 13:40:48 2009 -0400
loader: Remove useless TestFree() macro
commit 087745b809b9a834751e5c719b9d87967194369b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:51:53 2009 -0400
fbdevhw: Remove pointless OS check, this never gets built on non-Linux
commit 892c93553aa0b03aeb3f4c27d952cc4bb7120aff
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:51:27 2009 -0400
fbdevhw: Remove a #if 0
commit e5712f2926abf33b146a4ccfcf6e89c914dad37b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:49:22 2009 -0400
fbdevhw: simplify some #if 1
commit 8868bb4131be25340bf65ec61b998d353965bab6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:44:24 2009 -0400
randr: Un-duplicate the reduced blanking check.
commit 453ee39bc6a6b46e6cda11512cfcd431ba32a4b7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:39:37 2009 -0400
xfree86: Fix some misleading comments
commit 2c57a7aa07fdf52be315ecb498341776268c1a10
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:32:53 2009 -0400
xfree86: Remove some #if 0
This code all lives in xf86Modes.c now anyway
commit 1a8c89683ff40cdd1d33da89ab47e7bd240b9bb7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:15:41 2009 -0400
xfree86: Remove TargetRefresh option
This was a vestige from the days before we'd make the mode list from the
EDID data, and from CRT technology when you could reasonably assume that
higher refresh rates were better. Also it did not function as advertised,
acting as a high-pass filter instead of a band-pass.
commit b4ee3bf700e04ae1b3c4ec021373424ed6e5338f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 17 14:57:50 2009 -0400
dbe: Fix indentation
commit 0bb9a7e1650180a24246d14493a8168487cf8914
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 11:49:41 2009 -0400
displayid: Implement mode decoding.
commit 2f1a9c5baa367818bf017bdb72f20a2f6fa7ac21
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 10:13:47 2009 -0400
ddc: s/xf86DDCMonitorSet/xf86EdidMonitorSet/
Since we need a second path for DisplayID.
commit d0cb4f5a91932e901d10cac5f2a4ba12bb8a0e6f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 10:10:18 2009 -0400
ddc: Refactor root window property code
commit 14103b781201bc36896cbe9112a2e0d991fb785d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 10:05:01 2009 -0400
ddc: Don't try to publish a root window property for DisplayID
commit c302a5ff49146bff24df196fc36ed38745d42911
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 17:42:10 2009 -0400
ddc: Skeleton for xf86DoDisplayID()
commit 0b36f68efb1171fcdbe53e93064394f5609b7fb5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 15:36:15 2009 -0400
ddc: mv xf86DDC.c ddc.c
commit 8eb82168fc5c7ea958a4f63676738510647dd203
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 15:34:42 2009 -0400
ddc: Give DisplayID a place to hang its hat
commit ace0fe09aee48d57cd0079260cd8d20d041e8eb6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 14:45:47 2009 -0400
ddc: Yet more code motion
commit 3a350688bbe1257feaf1502b4009f5f701d2640e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 14:37:38 2009 -0400
ddc: Code motion to eliminate forward decls
commit 8797831f82637b0e65a08e1262d1ec57c075cc12
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 14:30:53 2009 -0400
ddc: Update a comment.
commit bb6fa39eb3aa044ffc18632288fd59909ff06344
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 17:43:31 2009 -0400
dbe: Adapt to new headers
commit 9965174f4f09a7de00a9569607e96226208bc2ce
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Thu Jul 16 12:12:48 2009 +0200
Check dev->u.master if there is a custom event handler, too
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c806162c133603a99d9cd844bb04485bb663707d
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Tue Jul 14 13:42:19 2009 +0200
Always update u.lastSlave
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4db8950b1dfc3150ee2e9f1f975e9ecb4eabb1f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 17 10:40:59 2009 +1000
Xext: include securproto.h instead of securstr.h
Reported-by: Byeong-ryeol Kim
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b5f6da1e9b37f52484948185dcf17950657cd65b
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Fri Jul 17 06:34:00 2009 +0300
Revert "Coverity Prevent: RESOURCE_LEAK in AccelSetProfileProperty:"
This reverts commit 7333dc2969f60af0abcfb28e7182a5fff9918223.
False positive.
commit f517fca31d8c341ad36f3de4863adb0bc5206176
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 16 17:28:56 2009 -0700
XQuartz: Localization updates
(cherry picked from commit 4b797fc1edf2bd963410a3133e3d2182ccfda4c3)
commit c8a35165147a9b2f747b25da80d0fdb4279a8331
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 16 17:20:16 2009 -0700
XQuartz: Cleanup getGlCapabilities to avoid hardcoding the number of displays
(cherry picked from commit 12f7365f1f58d648217b16f09c2152fa47dcd7a1)
commit e7bc9ff816c1848c700a376908a1411f1e20d29f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 16 16:59:47 2009 -0700
XQuartz: Allow more than 3 OSX displays
(cherry picked from commit 45045eb3968069a8d74ce9188890a5537dc60fec)
commit 7333dc2969f60af0abcfb28e7182a5fff9918223
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Jul 16 18:57:49 2009 +0300
Coverity Prevent: RESOURCE_LEAK in AccelSetProfileProperty:
Event alloc_arg: Called allocation function "XIPropToInt" on "ptr" [details]
167 rc = XIPropToInt(val, &nelem, &ptr);
Event leaked_storage: Variable "ptr" goes out of scope
commit 66eabbebaf1b40fed7670b7c05337ed6226dd81e
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Jul 16 18:50:22 2009 +0300
Coverity Prevent: RESOURCE_LEAK in xf86CrtcSetInitialGamma
commit 464e8ad733fa6afee028607d6e7d4663b4c273cc
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Jul 16 17:51:08 2009 +0300
Coverity Prevent: NEGATIVE_RETURNS in fbdev_open_pci:
Event var_tested_neg: Variable "fd" tested NEGATIVE
At conditional (1): "fd != -1" taking false path
335 if (fd != -1) {
Event negative_returns: Tracked variable "fd" was passed to a negative sink.
347 close(fd);
commit 53ae6b63387e04324b23b6f8311cc22a154c1fb8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jul 15 23:18:35 2009 -0700
XQuartz: Cleanup keymap locking, fix a possible synchro bug
(cherry picked from commit 33e7437a4984ee7c1b04b87d23dee7d4739d5f12)
commit 6a90c7b93724a2d26eae70b5806ca06c91e7df4c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 09:28:42 2009 +1000
xkb: cosmetic fix, use TRUE instead of True.
Rest of InitKeyboardDeviceStruct uses TRUE and FALSE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 52088d3c2d53a91b2690f9cc402f839d77769e37
Author: Éric Piel <eric.piel@trempin-utc.net>
Date: Sun Jun 21 18:11:28 2009 +0200
xserver: remove unused code in clipValuators
The axes variables was never used, remove it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3f6b43a240eb763025b3cbf546cb7ae502c94fa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 16:51:05 2009 +1000
Update to xextproto 7.0.99.1.
xextproto had Xlib client headers moved into libXext.
Protocol header files are named fooproto.h, header files with constants
foo.h or fooconst.h where foo.h was already in use for client-side headers.
commit 693babbf12cc7969c3e211c4037c7af0d41c13e9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 12:30:02 2009 +1000
xkb: Remove XKMformat.h include from xkbsrv.h into the files that need it.
xkbsrv.h is used by drivers, they don't need the XKM format and shouldn't
require it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 35ff5cd26eb7564fefebf238e30b8d43cbb4dc25
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 10:29:46 2009 +1000
dix: fix wrong raw valuator copy
internal events keep valuator data at the index for the valuator, not like
the wire events that start with first_valuator.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 975bf60a82f863e3bdc36fc3f8201b48a4d1e6f7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 10:29:19 2009 +1000
dix: use sizeof(FP3232) instead of 2 * sizeof(int32_t).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d040af7fa3c7314917414a28d723bdda3c4289c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 13 15:09:38 2009 +1000
Update to type-specific raw events - require inputproto 1.9.99.14.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 81b64f668541217c1c9518ac4a7e3fdf0a6e4002
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Jul 15 00:38:01 2009 +0200
Require renderproto >= 0.11 and pixman-1 >= 0.15.14 for the new blend modes.
commit 0ce42adbf4cff9e7f049d9fc79d588ece5936177
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Jul 15 00:37:05 2009 +0200
Render: Add support for the PDF blend mode operators.
commit 686e4867302a741f3029c4105b997d0f0ac7c13c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 14 17:11:13 2009 +0300
xfree86: remove a bunch of unused pci headers
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit cc575a3ba4a52265e410b325c2291fe900a54f33
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:38:46 2009 +1000
test: add tests for ProcXIGetClientPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 92b0065a19dcde50494d2528e19a4ee76723b3da
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:38:00 2009 +1000
test: add ProcXISetClientPointer tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 019bc9d70c5b3beb69ca20b6bca3551e00415992
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:37:17 2009 +1000
test: add ProcXIGetSelectedEvents tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8579d39c12b065d8e82fe75af4b254c8ad4f4ab8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:36:22 2009 +1000
test: add ProcXISelectEvents tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 60b7a7990003a22be5cc26ebe4d8d2d0803b97de
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:33:22 2009 +1000
test: add ProcXIQueryDevice tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 441c91be05912e2665cc1d3ee72fb70dcd32e7a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:32:15 2009 +1000
test: Add ProcXIQueryVersion tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1d635ae65b217e124b3bd5a8844e73f447eb1b79
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:30:53 2009 +1000
test: add xi2 directory, prepare for protocol testing.
These two files provide a couple of common defines, functions and variables
that will be used in a number of protocol tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4b93413b2a490a74de2e27b37268332b609ac872
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 14 11:20:01 2009 +1000
Add test subdir to base Makefile.am
If unittests are enabled, make will build those as well - spotting potential
build errors in the tests faster. Furthermore, this allows for the tests to
be run from the top-level directory.
This patch removes the "run make check to build the test suite" message
since that'd pop up after every build now.
If unittests are disabled, this change has no effect.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2226f3cd7d1bef598f9657b756a171b02f1a299
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 14:57:04 2009 +1000
dbe: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3e1a054423c22f0e35f25127dde1ea8263892480
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 14:24:45 2009 +1000
record: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 089c460058c4e6814d98d40179eb4c731f37fa80
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 14:22:40 2009 +1000
xkb: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0dc11da57562a7bbb6830ab657a2b818c596a537
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:41:29 2009 +1000
ephyr: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 34bfaa9d9ecd90cfe8413bc275179fdcc193eab3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:29:26 2009 +1000
xfixes: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e216527107fda470b92b7e526f3db22465962a43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:27:23 2009 +1000
render: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1d6b71b8d0dc24355e84391ba413170a03ccdbf4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:25:39 2009 +1000
os: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 86b239ff9c4d01685c357ca2b1ef761d167e3224
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:24:27 2009 +1000
randr: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b9e84e320a6f6449fe7bc58a8d6a094ae37b86c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:20:21 2009 +1000
Xext: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa19d355125a10b1a385c8f134d68e79d3d609c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 10 14:25:22 2009 +1000
xwin: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b4e6af857bcc5513e4c19912a54656d4696e56d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:12:57 2009 +1000
xquartz: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ad508c93c239a5ba8381000c031e96caf2769265
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:12:20 2009 +1000
xfree86: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c20304226b3ca2f8d0a4f4866480b0d71913941c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:07:00 2009 +1000
glx: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 87ce93c9973067255b4197d82772f83cd4ea5d27
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:06:47 2009 +1000
dmx: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dc82e11e509ecf586d77c3e7c1325d515509ce51
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:03:34 2009 +1000
exa: switch to byte counting functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Michel Dänzer <michel@daenzer.net>
commit 2d35ea8d957a955e1200ba2b14424bddfe1f4148
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 16:50:03 2009 +1000
dix: switch to byte-counting functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7dd415aa6a3959f15276741db168ba264948ecfe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 13:57:14 2009 +1000
Xi: use byte-counting macros instead of manual calculation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 912402fd71144bcee255141efe12a78abad39240
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 29 13:09:57 2009 +1000
include: introduce byte counting functions.
This patch adds the following three functions:
bits_to_bytes(bits) - the number of bytes needed to hold 'bits'
bytes_to_int32(bytes) - the number of 4-byte units to hold 'bytes'
pad_to_int32(bytes) - the closest multiple of 4 equal to or larger than
'bytes'.
All three operations are common in protocol processing and currently the
server has ((foo + 7)/8 + 3)/4 operations all over the place. A common set
of functions reduce the error rate of these (albeit simple) calculations and
improve readability of the code.
The functions do not check for overflow.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2c535b6f13ffbf2c4ac59834dae39bb8e172c003
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 14 08:58:23 2009 +1000
dix: don't send presence events for attaching/detaching slave devices.
The code that didn't list attached slave devices for XI1 clients doesn't
exist anymore, so there's no need for these presence events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0c0ef42292f4c910c73b308cd75d77637312da53
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jul 12 21:43:06 2009 +1000
dix: Remove temporary detachment of slave devices.
Previously, an active grab on an attached slave device would send the device
floating for the duration of the grab. This breaks existing XI applications
(e.g. the GIMP) since they grab all devices automatically - resulting in the
loss of control over the VCP.
The behaviour of extended input devices during a grab in relation to the
core pointer is not specified in the XI protocol specification.
The removal of the temporary detachment restores the behaviour of extended
input devices as present in currently released servers - even if a device is
grabbed, an event from this device will result in an event from the core
pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f1570c8f4f549cdd2fbae1234011290fcc73e18
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 26 09:12:47 2009 +1000
input: include effective modifiers in device events.
Require inputproto 1.9.99.13
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 78aedbe609e309446e71835ed15e4557d3ccf723
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jul 10 17:35:57 2009 -0700
Fix int10 module build after typo in commit 2638e9899
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 35758544813f156eaac28844e693b2a28f6de316
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Jul 10 20:06:02 2009 +0200
EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 .
commit 2638e9899e57d9b25a2cade3247083a6e101dee2
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 10 16:09:08 2009 +0300
configure: introduce --{enable,disable}-int10-module
Not all chipsets need to rely on the int10 scheme to do its daily work.
Well, the ideal would be to remove all int10 module from the server. I'll try
to provide some patches "soon" for this. Something like:
http://cgit.freedesktop.org/~vignatti/libx86/
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
commit 42d95a38535f382bfb2ddfaef93839ab9bbf584f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 10 15:54:07 2009 +0300
configure: introduce --{enable,disable}-vbe
Not all drivers need this kind of access as well.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
commit 53d64930513fecaa417bb5a922966b45c9ff8679
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 10 15:38:51 2009 +0300
configure: introduce --{enable,disable}-vgahw
Not all drivers need this kind of access.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
commit aafcae79d17c1f802bc880d2142af7171fed75d8
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 10 14:56:31 2009 +0300
xfree86: remove unused vbe header file
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
commit 3711d68f657c77b947cc4670cc4eac4f62de3af8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 10 11:10:30 2009 +1000
Revert "XKB: Sanitise * actions" commits (#19602)
Reverts the following four patches:
feb757f384382c7782ceac55 "XKB: Sanitise vmods for redirected keys"
b5f49382fe48f0a762d9a15f "XKB: Sanitise ctrls action"
1bd7fd195d85681e722161f8 "XKB: Sanitise pointer actions"
61c508fa78aa08ea2666fde9 "XKB: Sanitise vmods in actions"
Strictly speaking, the structs used in the server are not part of the client
ABI. Practically, they are as we copy from the wire straight into the
structs. Changing the struct sizes breaks various wire/server conversions.
Even when the structs have the same size, some internal magic causes
conversions to fail. Visible by diffing the output files of:
setxkbmap -layout de; xkbcomp -xkb :0 busted.xkb
setxkbmap -layout de -print | xkbcomp -xkb - correct.xkb
Interestingly enough, busted.xkb is the working one although the output is
incorrect. Revert the four offending patches until the exact cause of this
breakage can be determined.
This patch restores functionality to Level3 modifiers.
X.Org Bug 19602 <http://bugs.freedesktop.org/show_bug.cgi?id=19602>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08df24555cb432eb0d90a3f63275e9485e777c4c
Author: Soren Sandmann Pedersen <ssp@redhat.com>
Date: Thu Jul 9 17:23:04 2009 -0400
Reserve space for two GC values in copy_drawable().
Pointed out by Pierre Willenbrock.
commit 3c53f3241319d96affad2f4539f7661e02e80521
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 9 17:21:07 2009 -0400
Since font modules are dead, don't mention them in xorg-server.pc
commit e812103382a7bc3f7ba8b2f44ab97960dec265a9
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 9 10:58:17 2009 -0400
config: drop i810.
The driver assuredly no longer builds against 1.7. Please don't feel
compelled to fix it.
commit 55ac155d42268009eaecbc183329a8744d6ae48c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jul 7 16:59:39 2009 -0700
Xephyr & Xserver man page fixes
Xephyr(1): Fix quote formatting, add missing ' to contraction
Xserver(1): Add Xephyr(1) & startx(1) to SEE ALSO section
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 36dc66ae79b6e1cbe0a23587e32aebb68365b0d0
Author: Michael Lorenz <macallan@netbsd.org>
Date: Tue Jul 7 20:21:39 2009 -0400
The way XaceHook() mixes struct initializers and va_arg() is not portable and
gives bogus data on sparc and probably others leading to a crash.
Fix:
Don't use initializers, instead set each member directly to enforce order.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 48a9d65b88f56d1f8ab3bf824a4fe48c2f68725f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 5 16:06:32 2009 +0100
Cygwin/X: Window positioning improvements for multiwindow mode
A few tweaks to winUpdateWindowPosition():
* Don't allow window decoration to disappear off to top or left edge of the
display as a result of adjustments to add decoration for the window style
* Honour the position requested by window geometry for the client area (so
windows which save their position don't get moved by the decoration width
every time they are created) (unless we need to bump it away from top or left edges)
* Fix an issue with initial window placement being offscreen on multimonitor
systems when some monitors have negative coordinates (are to the left of or
above the primary monitor)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5aec72745232dd61e60cfbf3acc4628d4fcd0315
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 6 11:53:02 2009 -0700
Remove old DRI2 buffer alloc/free interfaces
These old interfaces are no longer supported by the server, removing them
requires bumping the video driver ABI. Note that this is not guaranteed to
be the last change in ABI version 6.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2e2c5b216cc1c7a9bc26bd2c68226aaed5fc52ca
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 1 14:01:57 2009 -0700
dri2: Preserve compatibility with 1.6 DRI2 API/ABI
The old DRI2 buffer allocation API wasn't great, but there's no reason to
make the server stop working with those drivers. This patch has the
X server adapting to the API provided by the driver, using the new API where
available and falling back to the old API as necessary. A warning will be
placed in the log file when the old API is in use.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c7f0c2c6a04f7044d5ce69e97a615735e5831f1
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri Jul 3 14:36:54 2009 -0400
Use IncludeInferiors when copying windows before compositing.
Part of bug 22484.
commit 43ee8d2ead862f84a4526a472519663ef27a8d6a
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Jun 24 18:26:23 2009 +0200
Unclaim PCI slot if driver probing fails.
Otherwise no subsequent driver will be able to claim this pci slot.
Example for this: fbdev tries to claim, but framebuffer device is not
available. Later on VESA cannot claim the device.
commit 73abdc94c3cceadeda26a9b6bd3cdfecf0df8db2
Author: RALOVICH, Kristóf <tade60@freemail.hu>
Date: Sun Jul 5 16:42:54 2009 +0200
glx: damage is only used with DRI
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 7208a0f032d487bd3bc9809800f4557f1da1e2db
Author: RALOVICH, Kristóf <tade60@freemail.hu>
Date: Mon Jun 29 15:18:56 2009 +0200
glx: remove Xgl leftover
GlxSetRenderTables was only used by the long gone Xgl.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 89cf81cd85919e3dbb5adff5e6c6056c7990b60f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 10:29:40 2009 +1000
Xext: return BadValue for XTestFakeInput on unsupported capabilities.
Calling XTestFakeDevice*Event on a device that doesn't allow the matching
event returns BadValue.
Reported-by: Florian Echtler
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b773b4e8e0087993406d1d8c2df895db4d6301ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 11:04:47 2009 +1000
s/MAX_DEVICES/MAXDEVICES/ updates.
The number of input devices is MAXDEVICES, not MAX_DEVICES (f781a752e6)
Two comments updated to refer to MAXDEVICES.
MAX_FUNCS in sigio.c was set to 16 if MAX_DEVICES was undefined. If more
than 15 physical input devices were present, this could result in a
failure to install the SIGIO handler for any device above 15.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 183c075d2f9d5f6effa1ce7ab135fb0c2e46085a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 13:26:48 2009 +1000
dix: always init the full button map to default values (#22594)
Master devices must have the standard button map applied for all buttons to
ensure buttons larger than 7 (the default for MDs) are mapped appropriately.
We can't copy the button map from SDs to MDs since that breaks the chained
button mapping. However, by ensuring all buttons (even non-existing ones)
are mapped, devices that send such buttons continue to work.
X.Org Bug 22594 <http://bugs.freedesktop.org/show_bug.cgi?id=22594>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 744bb559826ede37a77e9000b6c620eaa6a3c837
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 13:58:38 2009 +1000
Xext: remove unused variable 'it'.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fd4eed69e40cf090aa16e79a8596eb1442461829
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 15:24:54 2009 -0700
dri2: Enable GLX_SGI_make_current_read when the DRI driver supports it.
This matches idr's 82f150d73cc9a7d8eaf7241a51b03af05bcec159 for DRI1.
commit d6b8205e699c0c62af76c4a9cbff1402337927b3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 3 19:25:33 2009 -0700
XQuartz: ProcAppleWMAttachTransient to play nice with the new Dock in SL
(cherry picked from commit ddc0242d8f291d0f961ba9aa8c883e39861ce2ad)
commit a49ae50370ec94e08e7dec3c742d33e20e79ef36
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Jun 29 22:55:52 2009 +0100
Xming: Apply window style hints in -multiwindow mode
Remove frames from 'dock' windows and make them topmost in -multiwindow mode.
Remove frames from windows with MOTIF_WM_HINTS of no decorations in -multiwindow mode.
Apply some _NET_WM_STATE hints in -multiwindow mode.
Apply window styles overrides from .rc file
Correctly update region of shaped windows when applying styles
Copyright (C) Colin Harrison 2005-2009
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
commit 17e67c407d130c325d3899c18d68b8eef6a88bea
Author: Joe Krahn <jkrahn@nc.rr.com>
Date: Wed Jun 24 23:32:09 2009 +0100
Cygwin/X: Change to a single native window class for all X windows
from fd.o Bugzilla #4491:
There is no point in having one class for every window, aside from trying to
set custom icons via the class, which we no longer do, so converted to using
a single class for all client windows.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 2c69deb92e11542f615df0f24fdc03e3b4415475
Author: Rémi Cardona <remi@gentoo.org>
Date: Fri Jul 3 10:51:50 2009 +0200
configure: libXinerama isn't needed anymore
since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and
xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the
server no longer needs libXinerama.
Signed-off-by: Rémi Cardona <remi@gentoo.org>
commit 97e29ffb5bf04a9d8280f1fa32ceced148503492
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 09:52:04 2009 +1000
xfree86: fix wrong IsMaster() check causing crashes.
Crashes caused by dereferencing NULL if the path was executed for a floating
slave device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 50a2a8dc76645d8736f7d712f0ef05f23089407e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 09:18:57 2009 +1000
Fix IsXtstDevice - returns false positives since 0814f511d5.
Missing check for the value of 'mid' returned false positives if master was
NULL.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3525d140567e0ad5f0184e4b37893c47239e1628
Author: Felix Kuehling <felix.kuehling@amd.com>
Date: Tue Jun 30 20:07:30 2009 -0400
Export symbols needed by the RandR implementation in fglrx
GIT change
http://cgit.freedesktop.org/xorg/xserver/commit/?id=45c8bd0fe54273039fdaa1eeeafb81b5774f2c75
changed the default symbol visibility of the Xserver. As a result 2 symbols
that are needed by the RandR 1.2/1.3 implementation in the fglrx driver are no
longer visible:
xf86configptr
xf86CursorScreenKey
We would like to get these two symbols _X_EXPORT'ed before Xserver 1.7 is
released. Otherwise it will be problematic for fglrx to support RandR 1.3 on
Xserver 1.7.
In the future, we may want to sync our RandR implementation to later versions
of the RandR implementation in hw/xfree86/modes. Therefore it would be nice if
all symbols used by the Xserver RandR implementation were _X_EXPORT'ed in the
future.
commit e13605ea40cfc671314a0086c75b917564298b55
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 23 14:09:22 2009 +1000
dix: introduce "Xtst Device" label property.
Xtst devices get this property assigned automatically so they can be
detected easily by a client.
The property is read-only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0814f511d56a89c7b1868b17eba7a89f990b9ab1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 23 10:50:52 2009 +1000
input: store the master device's ID in the devPrivate for XTest devices.
Rather than storing a simple boolean in the devPrivate for XTest devices,
store the actual master device's id (since it is constant for the life of
the device anyway).
Callers should use GetXtstDevice now instead of digging around in the
devPrivates themselves.
This patch allows for a cleanup in the creation of new master devices since
GetMaster and GetXtstDevice spare the need for loops, IsPointer checks and
similar.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
commit 1bcc0d3c244ce7d9f5cbab626aa5fd5784b41a1c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 22 16:55:12 2009 +1000
input: abstract Xtst device lookup
The callers should need to use the dev privates key to look up xtest
devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
commit 34424fab9abd7a4ca11036be25414129980db0e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 23 11:50:29 2009 +1000
dix: set the client's error value to the bad deviceid in check_butmap_change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit da04e8f1354fa9d253443489dc002b16f94d6fab
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Jun 30 17:52:42 2009 -0400
dix/property.c: use memcpy where appropriate.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 65d74d93145d22b68bad5728a7ebe38dc662cb21
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed May 20 21:32:54 2009 +0100
Cygwin/X: Fix multiwindow extwm mode to build again
Build and link with rootless extension
Update Xwin code for removal of RootlessAccelInit()
Fix Xwin code which now has a collision with the type name EventType
Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 638ca9a7a2363757dc5b5d456e10d34f6f158885
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 18 18:14:41 2009 +0100
Cygwin/X: Avoid a visual glitch on window move in rootless modes
Handle and ignore WM_ERASEBKGND since we repaint the entire invalidated region anyhow
(this avoids a white flickering on window resize)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b718b2e0880cf2b969675da98d5ef8a4a01ca5d6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 18 18:14:09 2009 +0100
Cygwin/X: Allow pointer warping to work in rootless modes
Mouse pointer warping in multiwindow/rootless mode was never implemented,
due to concerns that moving the mouse pointer without asking might be rude
This patch allows X applications to move the mouse pointer in rootless modes,
Let's hope they don't abuse this privilege ;-)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 85614946ba3d5a233eece612afc7f09572a347c2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 18 18:13:08 2009 +0100
Cygwin/X: Improve mouse tracking for moving/resizing undecorated windows
In -multiwindow mode, tell Windows we wish to capture the mouse when a button
is down. This causes Windows to continue to send movement events for the mouse
even if the mouse pointer moves outside the window frame.
This helps greatly with undecorated windows which have regions you can grab
to move (e.g. gmplayer, xine control panels) or resize (e.g. Songbird) the
window, as it means the window continues to receive the mouse motion even if the
mouse pointer moves out of the window (which presumably happens if we don't
manage to update the window fast enough to track the mouse pointer)
Consolidate the multiple instances of the code to start the mouse position
polling timer into a new function winStartMousePolling(), and use that to
restart the polling timer when we release the mouse.
Also, start the timer on WM_SHOW, so that xeyes will track the mouse position
when it is first shown, even if the mouse doesn't enter it's window
(You probably need focus-stealing turned off to see this problem)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit f351c10a9774cc0ea2cbb58f00f07ece7f7c6e73
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Jan 5 16:17:30 2009 +0000
Cygwin/X: Man page fixes
Correct path names in man pages, using cpprules.in
Install XWinrc man page into section 5
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5c1afac5eea1d8327c74342d12d082b75f0cebde
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 29 11:16:16 2009 -0400
EDID: Fix timing class names to match the spec
commit bf0f3b8f2bc830c8bd6f8f9410b89394b8d96257
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 29 13:31:02 2009 +1000
test: fix build error introduced by XINPUT_ABI 7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cbeb6a73c44143674a700d36a7e9804d41003a4f
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Jun 20 20:17:41 2009 -0400
dix: report subpixel coordinates for high-resolution devices
Acked-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 069b4c5f0a38649de73d1e0f70ee81bf862399dd
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Jun 20 18:57:22 2009 +0200
dix: make part of ptrveloc.h internal
Though this is a SDK header, some functions are intended solely
for the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2830e8493757e0da1253fe5ab280562b84730e77
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jun 24 11:33:19 2009 +0200
dix: rename pDev->dev, pVel->vel for consistency
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 373e8c960d00e2b8c2250dd3f66859b081e14854
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jun 24 11:16:24 2009 +0200
dix: improve pointer acceleration API
This makes the ptr accel api actually sensible from a driver
perspective, since it avoids superfluous device lookups.
Also, makes independent accel contexts possible.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b8050bb6deebdb1ee60731f63884ffca575c09ce
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 27 15:28:34 2009 -0700
XQuartz: Don't leave zombied processes at startup
(cherry picked from commit 40c1406830588fa85d880e9f4e9ca570db1db306)
commit aaff92c8c22a47804a21010d023ef76d82e7ec7e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 27 14:40:03 2009 -0700
XQuartz: 64bit fix for screen origin in AppleWM
(cherry picked from commit 60a757d2802a5c34acd91ca9a052937b5a169ede)
commit cabcc1a7ad697dde915794ddcea6a300f66b0a28
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 27 10:40:59 2009 -0700
XQuartz: More localization updates
(cherry picked from commit 5925c1f48ad05bf94195b986c1fdefc52a20ae42)
commit 31166c2ae0ce898c96995a8b16b58b127dc85a2f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 26 16:51:22 2009 -0400
xace: add a new hook for checking property content after it has been set.
Allows security modules to enforce what property contents can be set by
clients. Uses the new DixPostAccess bit to distinguish between the
existing call made during the lookup (with the old property data) and
this new call. Note that this only applies to writes, prepends, or
appends to existing properties; for new properties the existing
DixCreateAccess hook call may be used since it includes the new data.
Refer to the XACE-Spec document in xorg-docs, section "Property Access."
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 51105de9b0d865c4b5e5a7d9ab23c89d808d1cfa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 26 16:50:12 2009 -0400
xselinux: ignore property hook calls with the new Post access mode bit set.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 10812204b3415c969bcebd3215e84d758a0b4dd8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 26 16:48:24 2009 -0400
dix: add a new DixAccess bit, "DixPostAccess".
This will be used for follow-up checks after a client has written something,
for security modules that enforce a set of valid values a client can set.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 9480725af0275b72b24b9e1cb3b68d5b97288d01
Author: Rémi Cardona <remi@gentoo.org>
Date: Wed Jun 24 10:12:50 2009 +0200
xfree86: DIST_SUBDIRS should not contain variables
This patch reverts a change done in commit
800d4ceb946c93724661ebfd28afb658ca63b6b1 to add conditional XAA support
Signed-off-by: Rémi Cardona <remi@gentoo.org>
commit 84662e40c3d4141ebb298a1ad714f75056a4ab74
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 23:19:21 2009 -0400
Xi: check for GetAttr permission when listing or querying devices.
If the check fails, leave the device off the returned list of info
structures. Under XI2, this may cause inconsistent views of the device
topology after a change (for example, devices disappearing from view,
or showing as attached to a master that cannot be seen). More work is
needed to deal with topology changes and device relabeling.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 00bc8d34c68dab6c818cd1c7e03e9992d1d0cbfc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 21:41:17 2009 -0400
Xi: check for Use permission on the device in SetClientPointer().
Presumably, some intelligent, XI2-aware management app will be calling
XISetClientPointer on behalf of other clients; this check makes sure
the target client has permission on the device.
Requires changing the prototype to return status code instead of Bool.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 119b96667778391436998c76a68bf64e746c9e08
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 21:02:28 2009 -0400
Xi: fix up access modes for calls to dixLookupDevice().
New access modes are being passed to the device access hook for XI2:
DixCreateAccess for creating a new master device;
DixAdd/RemoveAccess for attaching/removing slave devices to a master; and
DixListProp/GetProp/SetPropAccess for device properties.
Refer to the XACE-Spec document in xorg-docs, section "Device Access."
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 07c36e4fdcd93df3d33bdab6cca4780ebc9c1f54
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 10 13:33:47 2009 +1000
dix/resource: fix use after free in resource code with DRI
LookupClientResourceComplex is used by DRI1 code to find and free a DRI
drawable in a callback, however when the DRI code returns this->value
is now pointing at freed memory. It seemed easiest to store the value
to a temporary and return it afterwards.
Another option might be a new FreeClientResourceComplex or one that
also returns the id, so we can free it using an alternative means.
found using valgrind.
amended along ajax's suggestions
commit 184deb9bc325eb7aa7eb7b7d4f98aa917f0269cb
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 24 10:40:05 2009 +1000
GLX: make function static.
This function isn't called from anywhere else and I don't think it shuold be.
commit 9d85b56078ec05da1369ca22930d8eb214c389db
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 24 10:38:49 2009 +1000
GLX: note the implicit flushes with ReadPixels in indirect contexts.
This just notes the flush has occured when readpixels returns, and
fixes the glean test.
commit e341512bfa40dd98853a20596dc65dcac4dcaa37
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Jun 20 21:37:59 2009 -0400
dix: update a comment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5cbd4d3d6e54d202ecdbb527b57aaefeb8435600
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Jun 20 20:17:04 2009 -0400
dix: do away with an instance of temporary in-place modification
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 94cdc1ef0a72802573a11ba292e2f5cc8474aa8e
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Mon Jun 22 13:00:37 2009 -0400
dix: deal with first_valuator > 0 correctly if POINTER_SCREEN is set
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 21cbb4c9de44e2629dc0fa6f647ce2d139f2cef0
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Wed Jun 24 00:24:44 2009 +0300
xorg-server.h.in: Export the X Access Control Extension (XACE), too.
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 800d4ceb946c93724661ebfd28afb658ca63b6b1
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Jun 24 00:13:32 2009 +0300
configure: Provide the --enable/disable-xaa option.
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit ce3d539ac6ecab3e343cef7c4dc112bc82ea3b02
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Wed Jun 24 00:08:51 2009 +0300
xf86Config: Avoid attempting to load non-compiled modules.
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 33e25143361d63ea776dfafeeb6d4ffb2f6fd8d4
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Fri May 15 22:42:30 2009 +0100
Cygwin/X: add hebrew to autodetected keyboard layouts
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b079945c39e2a72220b46953352e24c3a74ef39a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 20 15:21:35 2009 +0000
Cygwin/X: more warnings fixes
More warning fixes, mainly removing casts on function return values
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e79db6a97d02c8a256a4a7e145ea0b48b5a084ab
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Feb 11 23:00:58 2009 +0000
Cygwin/X: Remove an obsolete mention of xf86Config
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 3020b1d43e34fca08cd51f7c7c8ed51497d49ef3
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jun 23 16:45:40 2009 +0200
glx: Clean up more thoroughly if the drawable of a current context goes away.
Fixes crash when restarting compiz, due to cl->currentContexts[x] being stale.
commit df597709d71f47b8516e27c6fb1bfffd59de5e48
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jun 23 16:45:39 2009 +0200
dri2: Don't crash if pPriv is NULL.
commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Wed May 27 15:24:34 2009 +1000
quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 07154db4a8b96467785fd6be93d20379acacffa8
Author: Ben Gamari <bgamari.foss@gmail.com>
Date: Mon Jun 22 08:59:45 2009 -0400
Xi: Remove redundant and incorrect butmap range check
Maps are CARD8s, therefore checking for values above 255 is completely
unnecessary. Moreover, 0 is a valid value for maps, so the check wasn't
even correct to begin with. This fixes bug #22392, which was uncovered
by commit 280b7f92d729ec910ffa3d18dce7bbc215be7a3c.
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 96706c24bd57fbd9b11e5bd5e38d05d81b90aebe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 18 15:40:08 2009 +1000
dix: fix wrong indices in set_valuator.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ae20e748cd3a656173e1f50109bfd4af0712bb87
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jun 19 21:16:10 2009 -0700
XQuartz: More localization updates
(cherry picked from commit 7fbe974246f54535c545861a57c043d80e127ee7)
commit 30df49f54945e75f033a0eb6445c26d37eb33c5e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 23:15:47 2009 -0400
Xi: fix 2 memory leaks.
In ProcXIQueryDevice() and XISendDeviceHierarchyEvent().
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit eb35402d0a5290e8a73d7d1e92f173294c364cc2
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 19 12:42:07 2009 -0400
pci: Dump vendor/devices ids in the printed device list
commit c733660428c0a7c1d11f7bd21e23e1bb934d352e
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri Jun 19 08:37:18 2009 -0400
Use pixman_version_string() instead of PIXMAN_VERSION_STRING
Pointed out by Julien Cristau.
commit aef6b904ebf0d7de6259058606c7c04ea177bda3
Author: Dave Airlie <airlied@panoply-rh.(none)>
Date: Thu Mar 13 16:16:46 2008 +1000
fbdev: make entity fail if PCI claimed already.
bad kitty fbdev, been shipping this in Fedora for a while now
commit 3efb23a6c40dc3583d083d25ada3853ecc56000d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 19:35:22 2009 -0400
xselinux: Add new device permissions for XI2.
Refects the ability of clients to add/remove devices and device properties.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 1e060c3d8b13d352a58fc65980cb9a3c6cb5718f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 18:48:24 2009 -0400
xselinux: Move the security class mapping to the header file.
Take the mapping of DixAccess bits to Flask permissions, move it
into the header file, break up the extremely long lines, and
annotate the permission names with the bit being referenced.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 75c51c67b340548286efd41a53882e2acaf74ab5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jun 18 09:49:12 2009 -0700
Clarify use of and need for mffs vs. ffs
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 128cd03eecacc6d5c5903d59a11966dcf3697bf1
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Sat Jun 13 10:55:04 2009 -0400
Fix miComputeCompositeRegion() to follow new clip rules.
Ignore the hierarchy clip, and always apply any client clip after
transformation and repeating.
commit e9aa61e9f0d663d5b34a397b943b4d1df44e873d
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Sat Jun 13 10:28:21 2009 -0400
Fix clipping when windows are used as sources
The new clipping rules:
- client clips happen after transformation
- pixels unavailable due to the hierarchy are undefined
The first one is implemented in pixman; the second one is realized by
making a copy of window sources (to prevent out-of-bounds access).
commit d9b5e77a0e48a16c53653b56bc61a0b8dc4122a1
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Jun 9 14:36:21 2009 -0400
Print the current version of pixman.
commit 1e9907499c27321a2aa5dc8a75a375b7a82c999a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 18 15:14:00 2009 +1000
record: use dixLookupResourceByClass instead of LookupIDByClass.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 66089e9129a821cfb1983d3d35f41b975a52de5e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 25 12:55:42 2009 +1000
xfree86: fix SWCursor check in xf86CursorSetCursor.
Wrong check for inputInfo.pointer resulted in a SW cursor being rendered when
the pointer left the screen (in a Xinerama setup).
We must call the sprite rendering function if
- SW cursors are enabled, or
- The current device is not the VCP and not attached to the VCP.
Reported-by: Gordon Yuan <GordonYuan@viatech.com.cn>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit afa680e495622f521cae80563511c0d284f57551
Author: David Miller <davem@davemloft.net>
Date: Thu Jun 11 05:15:05 2009 -0700
mi: ignore DGA events in ChangeDeviceID
DGA events don't have a deviceid, so they don't need changing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cd8abd17abcc8ae9da6704d03b97a9f134f36aab
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 17 14:17:07 2009 +0100
Cygwin/X: Fix permuted args to InitPointerDeviceStruct()
Fix a minor error in commit a30fef9956b296f59ea18a9ee38d0abafeb15a4e,
new btn_labels argument to InitPointerDeviceStruct() wasn't added in
the right place
commit 14581afb474552716c02ca15220ca7050123c375
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Thu Feb 26 17:32:10 2009 +1030
xfree86: correctly define barriers for FreeBSD amd64
Previously when compiling on freebsd amd64 we'd end up at xi86
block (line 1315) which would define mem_barrier and write_mem_barrier
to be NOP's. Instead they should be valid, as per the linux amd64 setup.
This stops the hangs experienced by many when using the nv driver
which would hang due to out of order dma requests as noticed in
http://bugs.freedesktop.org/show_bug.cgi?id=3168
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
commit e92dcb6ce07aa3cfb53e8bad5701481c106c4094
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 18 14:40:20 2009 +1000
input: unify button numbers on master devices.
Master devices provide the union of all attached slave devices' buttons,
i.e. the number of buttons on the master device is always the number of
buttons of the slave device with the highest number of buttons. When slaves
are attached or detached, the master device adjusts the button number to
reflect the new buttons.
On a slave switch, this slave's button labels are copied into the master (up
to slave->num_buttons). The remaining button labels (if any) stay as they
are. Thus, if any of the higher buttons is still pressed, it reflects the
label of the last pressed device that provided this button.
If two devices press the same button and it is differently labelled the last
pressed one will be reflected in the master device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 280b7f92d729ec910ffa3d18dce7bbc215be7a3c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 17 22:38:24 2009 +1000
dix: reduce MDs and xtest pointers to 7 buttons by default.
MD's will soon be the union of all devices anyway. XTest pointers are only
for the core protocol XTest stuff, so 7 buttons (lmr + 4 wheel buttons)
should do.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6c7d992735eebbd7a20247926e7725896348b865
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 17 09:11:52 2009 +1000
Require inputproto 1.9.99.12
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09cef7573938e5c08007e578e1b638bc5e1796a8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 17 09:04:08 2009 +1000
Xi: valuator/button labels are called labels now, not 'names'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc2ff5365030ad8bc11efde430b1064080dd7098
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 19:36:57 2009 +1000
Xi: copy the valuator mode from SD to MD.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 87d1f44bad608507e3995e17eb84fa0a0119796c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 14:18:45 2009 +1000
Xi: copy the button and axes labels into the XIQueryDevice reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a30fef9956b296f59ea18a9ee38d0abafeb15a4e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 16:38:11 2009 +1000
input: Add labels to buttons and valuators - ABI_XINPUT_VERSION 7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 17f9723f488d0470e3879c6b0dfdba61544cdd7b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 17 08:37:44 2009 +1000
input: bump to ints for deviceids - XI2 requires 16-bit deviceids.
Note: ABI break, but ABI_XINPUT_VERSION has NOT been bumped. Recompile input
drivers.
Revert "Xi: return BadImplementation for deviceids 256 and above"
This reverts commit 2b459f44f3edaea137df9a28bc7adfeb1b9f1df7.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cbeb73e2055f6c013c8fe6325851f2631170137d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 10:51:52 2009 +1000
Xi: return current valuator values in XIQueryDevice.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 80837dbefd9d5e96ab5c1f4b4c2d5c66ce17ce67
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 10:51:17 2009 +1000
input: change axisVal from uint to double.
With subpixel support, uint just doesn't cut it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 25b6fc4a42f7698e6ae0b16becb316bfd7835d05
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 10:48:48 2009 +1000
Xi: last_valuator is used like an index, so range it accordingly.
The previous code would always skip the last valuator due to a wrong
upper boundary in the loop. last_valuator is the index of the last set
valuator - which also means it must be initialized to -1, not 0.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3fc762ea9474cf92f6b7ef60dd0bb68f59385272
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 10:48:03 2009 +1000
Xi: Motion events update the device state too.
Without this line the device's axis values don't get updated properly for
pure motion events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ad6347afead500fefb34131841f4beb5b03ad4ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 16:35:40 2009 +1000
Xi: don't use a constant number for class sizes - use sizeof instead
The protocol is still changing, and having to debug crap like this is
annoying.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5a15e65b7d2fdda14fb719e3ebf076cce896386
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 14 09:15:42 2009 +1000
Xi: include button state in XIButtonInfo.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01241b4247a7ad0974d48412cc0d88e1a09a3c49
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 7 19:43:11 2009 +1000
Xi: Add support for sourceid in the device classes.
commit d230742ea820a21a3f1ed0c58b5e6d8680b2f2aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 12:13:16 2009 +1000
Xi: namespace XI2 files.
Some files (notably those merged with MPX before XI2 came along) didn't use
a 'xi' prefix. This patch changes all of them to meaningful names.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ddb002b6847e8a88e6f13ae0453a35ee79946ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 15 15:14:47 2009 +1000
xfree86: fix two compiler warnings in xf86vmode.c
xf86vmode.c:1578: warning: pointer targets in passing argument 1 of
‘SwapShorts’ differ in signedness
../../../../include/misc.h:231: note: expected ‘short int *’ but argument is
of type ‘CARD16 *’
xf86vmode.c:1543: warning: unused variable ‘i’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9d039ef5047af2dedff0c583dda11032f71bed01
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 15 15:11:55 2009 +1000
xfree86: silence a few int10 compiler warnings.
'format ‘%#x’ expects type ‘unsigned int’, but argument 2 has type ‘CARD32’'
and similar.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fb882b3da189847bc98b646faddac9e8b42aa435
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 16 14:58:10 2009 -0400
EDID: Carp about 1.4 monitors with no preferred refresh rate
You would think, having finally tightened down the spec, that
monitor vendors would bother to implement what the spec actually
mandates. You would be wrong.
commit b2d2af76b43d62c9be07fd736652f904632fd663
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 15 10:10:26 2009 -0400
randr: fix typo in swapped dispatch
commit 1d20b9021e8aecb942619f64017cc2fc31f02d29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 14 18:21:43 2009 +1000
Xi: fix wrong bit->byte conversion in ProcXIQueryPointer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9afc3241c157e5c19454f913c7105b3fdfa97ec4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 14 18:24:22 2009 +1000
Xi: remove un-used IsOn macro.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b67ff1d6e0d01170c6261593ca36d0f51d917393
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 16:45:36 2009 +1000
Xi: XISelectEvents/XIGetSelectedEvents use 'win' instead of 'window' now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b2bf67b61c564a4b92a429ca9ad455403161f33a
Author: Benjamin Defnet <benjamin.r.defnet@intel.com>
Date: Wed Jun 10 21:35:48 2009 -0700
randr: fix operation order so that rotation+transform works
The matrix multiply to combine rotation and projective transforms was being
done in the wrong order.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3627215e97734cc367fff273a3358c2a95a53481
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 16:38:46 2009 +1000
Add check for GNU ld in the test suite.
The GNU linker supports a -wrap option to wrap function calls at link-time.
This allows for easy overriding of functions in the X server with stubs in
the test suite. This functionality is only supported on the GNU linker and
will be used extensively in the tests. Disable the tests if GNU ld is not
available.
commit 5e0ca6fabd12401de6bd6039484be2079e28851e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 16:26:23 2009 +1000
input: remove un-used "setter" argument from SetClientPointer.
It's obsolete, not likely to come back, let's drop it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e6a18762ef113296c6a09833be70cb4b45aa3940
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 15:40:56 2009 +1000
Xi: fix XISetClientPointer return values.
If SetClientPointer fails, the only reason may be that the device is not a
pointer or that the device is an SD. Return BadDevice instead of BadAccess.
(BadAccess is a leftover from the early times of the ClientPointer
implementation when only one client was allowed to set it).
If the window parameter doesn't name a valid window or client, return
BadWindow.
Finally, allow both master keyboards and master pointers as deviceid.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ae7dab2a136d15b976b956f68feec53886951dd6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 15:40:38 2009 +1000
Xi: Fix XISetClientPointer swapping.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98e8ec8deb09db1c56e06afed267e6f517042fa3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 10:54:55 2009 +1000
Xi: sanitize ProcXIGetClientPointer.
This was quite old code and can be streamlined a bit. The new code is
essentially the same as in ProcXISetClientPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 96ea82fdac7c28feb2748cd4ff7faa7c00dbbdcd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 10:54:25 2009 +1000
Xi: fix reply swapping in XIGetClientPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 76f25086a9ab6f0c27d9e2cd745f8463c6b3df5f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 11 16:34:06 2009 -0400
vfb: Re-enable 30bpp support
commit 0de58c88aba7ddd69b04f24ab5b2967c359aa69e
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 11 14:21:53 2009 +1000
xfree86: move didLock assignment down to where the function pointer is valid.
crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so
it's actually defined before we use it.
Introduced with 6f59a8160042ea145514fdcb410f17f33fd437c2.
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a85d210b34506cb39e7f08d81d4586fe4448b47f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 12:32:39 2009 +1000
Xi: store mask_len before swapping in ProcXIGetSelectedEvents.
Swapping the mask_len and then advancing the pointer by the swapped length
is just a bad idea.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5043f42f36b49e7702d0c496dd4fe157788d44ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 12:31:40 2009 +1000
Xi: correct return buffer size for XIGetSelectedEvents.
The maximum number of bytes is calculated by the mask len, and the mask len
is always in 4-byte units. XI2MASKSIZE however is in bytes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fcf0c0b8f332cbde03c1a479376b7913197962eb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 13:23:40 2009 +1000
Xi: XISetEventMask needs to clear the mask if len is 0
zero-length masks are supposed to clear the device's mask.
ProcXISelectEvents passes these masks through directly, so we need to clear
the bits here if such a mask is supplied.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 22b4ac44e4fdbe8f36f2b570cdbdaf237062e33e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 11:08:07 2009 +1000
Xi: XIGetSelectedEvents mustn't returned masks from non-existing devices.
Or devices the client doesn't have XACE permissions for.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7868956b0fb50a9d77506f01413612e429f540a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 10 17:09:39 2009 +1000
Xi: ProcXIGetSelectedEvents must use WriteToClient for swapped data.
The data is already swapped before, so we just post it to the client as-is,
without attempting to swap it again.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa2babf11c30be4d289b58212dc330b84efb4053
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 10 14:41:11 2009 +1000
input: remove dependency on XI2 protocol for XI_LASTEVENT.
inputstr includes XI2proto.h for the sole purpose of XI_LASTEVENT.
However, using XI_LASTEVENT in the server is prone to errors, if the server
is recompiled against a newer version of the protocol it would bump this
variable and associates bits, including potential ABI.
This patch defines an XI2LASTEVENT for use in the server and removes the
XI2proto.h require. XI2LASTEVENT is the current value of XI_LASTEVENT.
This patch is required by components that require access to inputInfo
(currently xf86-video-geode and xf86-video-cirrus) but should not have a
require for the XI2 protocol.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 77cc816da4a2777110182ed01c22c0f5e6ac3b65
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 10 13:54:42 2009 +1000
Xi: rename ProcXISelectEvent to ProcXISelectEvents.
The request name has the plural, so let's do it here too. Purely cosmetic
change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9563feeeb5309de1971c4e04419fed6fd31c9cea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 16:57:09 2009 +1000
Xi: start checking for invalid mask bits _after_ LASTEVENT.
Two issues that combined to false positives and false negatives.
- The checking for invalid bits must be performed when there are enough bits
that an event outside of LASTEVENT may be selected.
- The first invalid bit is LASTEVENT + 1, not LASTEVENT.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2fbaebb87e18198143a4b8e6be7e650563cd819
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 14:38:25 2009 +1000
Xi: XISelectEvents returns BadValue for num_masks == 0.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cfeb65ac45b194dead5e8b9b26192df2619d6f9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 14:37:42 2009 +1000
Xi: XISelectEvents needs to be at least size 3, not exactly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f3c26034eca98924d93a004aaa1f61ffe5d344ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 13:04:56 2009 +1000
Xi: XIQueryDevice should use XIFooClass instead of the old FooClass defines.
This is merely a cosmetic change, the actual values are the same anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 482cc72aa790bd2f23c7ebe12c5549b47c737115
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 13:03:38 2009 +1000
Xi: get the class length before swapping.
Advancing by the already-swapped length lets our pointers point into
nirvana.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9974249980894f74f3ead466655da87958a43670
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 13:02:52 2009 +1000
Xi: Swapping 32 bit keycodes requires swapl, not swaps.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 918923e285f4e269a257bb5be4d3c8a50174aad0
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 10 15:13:45 2009 +1000
glx: fix open-coded linked list removal function
OMG stab stab stab, YALL.
removal function was made of crack, actually truncated the list from
the one after the find point.
However fixing this makes glean makecurrent fail with a GLX error.
commit 3ea747c0dbbec0db6761d66d4f6c680d2e9ddeaf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 16:53:18 2009 +1000
KDrive: Warning fixes
xEvent vs. InternalEvent confusion still reigns though.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 754be1e2ec9be2486bf45000d7244d217556de07
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 16:51:48 2009 +1000
KDrive: Xephyr: DRI: Warning fixes
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit f534e6bea17746db952feb563ffea7320846b49d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 15:38:54 2009 +1000
OS: Fix compile warnings
It's a marvel the sigaction() ever actually worked.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 305ab237f666936cd812c464bf43f86f6079838e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 22:11:19 2009 +1000
KDrive: Warning fixes and cleanups
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4c8812b544ce5f319a7ac59a131c626c8509ef99
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 10 12:46:19 2009 -0400
kdrive: undef PSEUDO8
Whatever that was, it no longer is.
commit 973ef5a7086aedb88a4888e73630c96ae68078e4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 10 12:44:45 2009 -0400
kdrive: Remove a lie about PCMCIA support.
commit e3c65cf1df9bbfb126f07b4b8e1254a855fb70c7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 10 12:05:09 2009 -0400
xephyr: Add -title option.
commit 803522300344265f11ea9f869ee6747730413bae
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Jun 10 13:32:54 2009 +0100
Xming: Simplify logic for ownership release of native clipboard
Make the logic simpler for the ownership release of the Windows
clipboard in winclipboardwrappers.c - We've already marked a selection
as unowned if it is owned by our clipboard window
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c7d3965bee0edb72468a0135aaa8a081348c2b23
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 10 13:09:44 2009 +0100
Cygwin/X: Add a needed inputstr.h
Add a needed inputstr.h to fix build after commit 6d4ffcc9e066bc7c49dcff1a2ff0111801c7286d
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6d4ffcc9e066bc7c49dcff1a2ff0111801c7286d
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 10 11:15:24 2009 +1000
input: move inputstr.h to where its needed.
This stops inputstr.h being needed to be included by output drivers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6f59a8160042ea145514fdcb410f17f33fd437c2
Author: Benjamin Defnet <benjamin.r.defnet@intel.com>
Date: Mon Jun 8 21:45:42 2009 -0700
hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major
This moves code out of each implementation of set_mode_major and back into
the X server. The real feature here is that the transform is now available
in the crtc for use by either xf86CrtcRotate or whatever the driver wants to
do. Without this change, the transform was lost for drivers providing the
set_mode_major interface.
Note that users of this API will want to stop smashing the transformPresent
field, and could also stop setting mode/x/y/rotation for new enough X servers,
but there's no reason to make that change as it will break things when
running against older X servers.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit e244a5991e2cc55f5aa2f6e5255f1dabf56f0235
Author: Federico Mena Quintero <federico@novell.com>
Date: Tue Jun 9 13:28:28 2009 -0700
dix/randr: Add missing fields to SRR*NotifyEvent()
Also, remove redundant field swaps and make others match the order in which
they are declared in the xRR*NotifyEvent structs.
Signed-off-by: Federico Mena Quintero <federico@novell.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 746e7b22e1bdfbf2363040367209b4c46b1c2fec
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 16:20:11 2009 -0400
cvt: Allow multiple-of-60Hz refresh rates for reduced blanking.
Doing so generates the same timings as given in the DMT spec for
120Hz RB, so we should be set there. Other rates might be legal
too but why push our luck.
commit 2a035600e603117a4dbe668cad50bae2a5609094
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 10:14:18 2009 +1000
require inputproto 1.9.99.11
commit c5bebca46f63bcd7279f3c73ed1d50e0c1b6051f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 8 17:54:05 2009 +1000
Xi: hierarchy events have a num_info now instead of num_devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 810b74dbbcc1db3e68e0f95ff5223ddb2032e46d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 8 13:41:22 2009 +1000
Xi: change from XICreateMaster to XIAddMaster for consistency.
add/remove is used for slave devices and hierarchy flags.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e66a443a09176b8a875195d5473b953c07aa1d7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 8 12:24:24 2009 +1000
Xi: return BadValue for XI_HierarchyChangd mask on devices.
This mask may only be selected for XIAllDevices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69a9545d1f8110841538410818df19fd960412c5
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 28 14:43:27 2009 -0700
Make RANDR 'set' timestamps follow client specified time. Bug 21987.
The lastSetTime value which indicates when the configuration within the
server was last changed was not getting set in the appropriate RandR
requests.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa18c569ed26d2fdd442af6b39723cb7e30d18df
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Tue Jun 9 09:14:50 2009 +1000
exa: driver pixmaps enabled if either CreatePixmap or CreatePixmap2 present
commit 9390b7a133b0e17bc4d303effb7a99ff7017b086
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 7 19:26:45 2009 +1000
dix: protect against missing ButtonClasses in GetPointerMapping.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 21ee53060b4dcb5c12074cf6682ff0067021ff60
Author: Simon Thum <simon.thum@gmx.de>
Date: Fri Jun 5 19:14:48 2009 +0200
config: fix build after XI2 API changes to RemoveDevice.
This patch fixes the build with --enable-config-dbus is enabled
(default disabled).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 07c59411817c10fbcbf1bc9efa6a0818b6e0493a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 6 22:17:44 2009 -0700
GLX: Make sure the types match for ALIAS in indirect_reqsize.c
(cherry picked from commit 31a20a573b867fb7f02da15425e3b92eccb82dec)
commit 077556ec39ca7e0d14486005cf71fcdc70a350cf
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 6 21:55:51 2009 -0700
XQuartz: AIGLX dispatch table cleanup
This should fix some issues when building on different versions of OSX. We only use extensions that OpenGL.framework's glext.h header tells us are supported.
(cherry picked from commit e10c53421f1e780573c8adcd8ea89d6ffa28a819)
commit fc24a97a8d022e986082b65b5133701e7273805c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 2 19:12:41 2009 -0700
Rootless: Use serverClient instead of NullClient
This seems to stop the crash when moving windows.
(cherry picked from commit fcd857c8e295ac7a2b0e58d49dc71251ed9d1266)
commit 2429daa7e6b35a4a8032e1c3736e417a5a9baa07
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 2 10:19:10 2009 -0700
XQuartz: Default to forcing the dialog box before quitting.
This will show the quit dialog for users of other WMs.
(cherry picked from commit 639ee0c913f892776fee40bcfb856e0d7c2c7db5)
(cherry picked from commit 09432fa5b1cc8e9a30fb8aa4f8dfcd08c4a91e30)
commit 6d75606a9e7f6ebc4d79a5261a48f5915c71cbcd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Jun 1 22:58:40 2009 -0700
Rootless: Despite its name, we still want to allow rootless to mess with the root window
This fixes the bug whereby we weren't drawing the contents of the root window since RootlessPaintWindowBackground got nuked.
(cherry picked from commit bb0e208787739fbed2a0c8d1af6b6504319fdf88)
commit 7348bf4935c8887bca33fe340ac2548f551bee3d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 7 09:25:51 2009 +1000
dix: set the generic event type for implicit XI2 grabs.
event->type is always GenericEvent for XI2 events. Instead, XI_ButtonPress
(the generic event's evtype must be stored.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bb1c131b785ca30cf40041db3513b7669beebd34
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu May 28 16:43:42 2009 +0200
dix: suppress pointer acceleration on xtest devices
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 707b1241681c33401d5e0eb6edeace33f5970928
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Mar 21 18:19:19 2009 +0100
dix: prefer lroundf() over roundf() in axis scaling
it's unclear whether there actually is a problem, but in a very similar
case there is (bug#21456). Also, integer addition is generally faster.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef0e435052b2fda598cd8670c8e892aea685a102
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 5 19:29:02 2009 +0100
Cygwin/X: Remove obsolete ChangeLog files
Remove obsolete ChangeLog files, this information is preserved in
the automatically generated top-level ChangeLog
commit 752508577aa7f0a1d80c8b7f4d3fe2b098e5e5fa
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 2 21:19:46 2009 +0100
Cygwin/X: Tidy up a bodge to avoid collision between X header and native Win32 API definitions of ATOM
Remove a bodge to avoid collision between X header and the native
Win32 API definitions of ATOM, use X11/Xwindows.h which exists to
address these issues
Consequently, include misc.h in winclipboardthread.c, to provide the
max() macro, as previously we were using the the one from windows.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7f3456a4080d1bf21010170e126128cb653bd2ac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 16:44:46 2009 +1000
Revert "test: check from INT_MIN to INT_MAX for core type conversion"
This patch requires extra special casing to check if the linker supports the
-wrap option. Patches to do so will follow, in the meantime, revert this
commit. It shouldn't have been pushed in the first place anyway.
This reverts commit d979f443946011158b6a183582728a6899c33b85.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d770d57f1701c7c8272b4ca3714f64c46c47adf1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 11:38:22 2009 +1000
Xi: fix XIQueryVersion major/minor swapping.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 17d62306b602ec61e8c5b44a79c9e1edc6b63a21
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 11:31:39 2009 +1000
Xi: add XIQueryVersion reply swapping hook.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2b459f44f3edaea137df9a28bc7adfeb1b9f1df7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 10:15:04 2009 +1000
Xi: return BadImplementation for deviceids 256 and above
The protocol allows for 16 bit device ids, but the implementation doesn't
yet. We need to break the input ABI once more to shift the DeviceIntRec's
CARD8 to a CARD16, along with some changes in the privates.
Once that is done, revert this patch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c77f42049f77417c68bbce3dd2e995d916fc5af5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 09:29:04 2009 +1000
Xi: fix flawed logic in XIQueryVersion return value.
The server returned the minimum of major/minor each instead of the lower of
the combined major.minor version. As a result, a client reporting
3.0 and a server supporting 2.7, the return value would be 2.0 (the minimum
of both).
Reported-by: Rémi Cardona
Reported-by: Simon Thum
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b6c16fc7dad5a4ffcaaab647c0e3fabed372efd5
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 5 11:57:39 2009 +1000
crtc/gamma: check xf86_config is valid before using it.
If you have multiple cards, some that support randr 1.2 and some that don't
you can get a null dereference in here.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit da682abc78c9a5b2fde09679061fe08a3a1c665b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 4 17:33:25 2009 -0400
xace: fix a bad send access hook call.
commit 993daf06497c85bb6a1e70592df380503d721dfb
Merge: 2bda50e e1e8c7d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 15:11:36 2009 +1000
Merge branch 'master' into xi2
commit 2bda50ee14b7873f28081bf0f1bfb7b79a40de43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 14:51:32 2009 +1000
Xi: memset the device name padding to 0.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09266d6cd1bb6e09fe8bcb875c63fb4011c05b55
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 13:36:29 2009 +1000
Xi: XIQueryVersion requires major_version of 2 or higher.
Otherwise, a BadValue error is sent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6ea76c550486bd17eb31f43757030fb44bdf1eab
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 12:55:59 2009 +1000
Xi: reply with the XI2 version that is supported by both client and server.
XIQueryVersion must return the client's version if the client's version is
lower than or equal to the server's version, or the server's version
otherwise.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d979f443946011158b6a183582728a6899c33b85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 11:40:14 2009 +1000
test: check from INT_MIN to INT_MAX for core type conversion
ErrorF is link-wrapped to reduce the run-time of the test.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d8471bc7a19cd248fa3e0845496c86cd9251c013
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 11:32:15 2009 +1000
test: adjust event_to_core_conversion test for new ProximityIn/Out behaviour
Both types now return BadMatch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e1e8c7ddd7fdbfd674361364295fb1cbd5f28b45
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 3 13:37:32 2009 -0400
s/MIN/min/, s/MAX/max/ (#2968)
commit 6de67d3206f0a4e307070714564c19efc84da2ec
Merge: af4e658 7f027d9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 16:11:33 2009 +1000
Merge branch 'master' into xi2
commit 7f027d9dc0146e229802aeac342ea2dbab63264a
Author: Olivier Blin <blino@mandriva.com>
Date: Thu May 28 20:57:36 2009 +0200
kdrive: add protocol mouse option
kdrive probes a lot of PS/2 protocols for the mouse device, which
makes the mouse unusable for some seconds after X startup.
This new "protocol" option allows forcing the mouse protocol.
It can be used this way:
Xfbdev -mouse mouse,,protocol=ps/2 -keybd keyboard
Signed-off-by: Olivier Blin <blino@mandriva.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af4e658401ecbd2f2cc515b4c5abe5aee361cd64
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 12:30:49 2009 +1000
mi: only process master if the SD is still attached.
SDs may be detached during event processing (e.g. if a passive grab
activates). In this case, the event must not be processed through the master
device.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eb3fe72cbcd10c3953d713e07c321e695194a328
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 12:19:14 2009 +1000
dix: set the device state for XI valuator events.
Valuator events need to include the device's state, while other device
events need to include the state of the core devices.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08fd2ae652883393ecff6f3d5177e63408d58472
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 12:18:17 2009 +1000
dix: use GetMaster in PickPointer and PickKeyboard.
GetMaster is more reliable than GetPairedDevice, it always returns the
keyboard/pointer if desired, even if the wrong device was passed in.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a1d1dd06f8f91c1d1802f7581a4ba7568b85e69c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 12:15:32 2009 +1000
Xi: fix wrong grabtype from ProcXGrabDevice.
86077f0058ce88ee9b3df5d1ab854eeca43 switched from a boolean to a grabtype
enum. ProcXGrabDevice didn't switch with it. PickPointer during an XI grab
on a slave device would thus return a wrong (or NULL) device and crash the
server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a371a47205fc58a587e1aecaa4a031184481c228
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 11:47:16 2009 +1000
dix: EventToCore must return BadMatch for proximity events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2bd5ea80652358565346071bed829070ddf5de85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 10:45:28 2009 +1000
dix: rework event conversion before delivery.
Let EventToXI, EventToCore and EventToXI2 return BadMatch if there's no
matching event for this protocol spec.
Adjust the delivery paths to cope with BadMatch errors (and clean them up on
the way).
As a side-effect, this fixes server crashes on proximity events for a
grabbed device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20d9f11abfd6ce3630d9640ff7383c7e27196956
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:49:09 2009 -0400
Typo fix
commit ab5d1ae82ebd467d0a5b39821b286097865ba0c7
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:39:55 2009 -0400
Remove some libXfont leftovers
commit 75795637c7160f1579dbe81c2d7600e85b1d141f
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Jun 2 18:41:36 2009 +0200
Revert "randr: Setting gamma: inverse logic looks more sane"
This reverts commit 79138eec1b49cbaca6a16f2bdd8579b5828aeb28.
commit fc8cfc3a055d8af4ac809799c71f3db0d5246433
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 16:53:41 2009 +1000
dix: ensure EventIsDeliverable has inputMasks set at all times.
For proximity events, the XI2 type is 0 and inputMasks never got set in the
preceding condition. As a result, proximity events got never delivered.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef9f851057a0ae214be02cb919f1e6634cead20b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 16:38:32 2009 +1000
dix: protect against floating slaves in DeviceFocusEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b40289c8766c5e7543b7288009b4d965f57c04ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 16:22:58 2009 +1000
xkb: allow pointer events to pass through for floating SDs without a key class.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38df8351b36195070232b42a6d3369a9a08df8df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 17:09:03 2009 +1000
test: add grab matching tests.
commit a66686a83edd6093ed540414dda2b8700e4696fe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 15:37:53 2009 +1000
input: add support for XIAllDevices and XIAllMasterDevices passive grabs.
These grabs are suported through two fake devices inputInfo.all_devices and
inputInfo.all_master_devices. These devices are not part of the device list
and are only initialised for their device id, nothing else.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f00cf7675164bb984ef310412f9e09582813adb1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 10:23:21 2009 +1000
dix: get the current MD keyboard for the grab modifier state.
A passive XI2 grab always uses the paired master device as a modifier
device. After issuing a passive grab, the slave may be reattached to a
different master and hence the modifier device may change.
commit 1cd7ed75d903b5b0ea4e1070d2c26f4f931bdec7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 17:14:06 2009 +1000
dix: float slave devices during passive grabs.
Exception - implicit passive grabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f56ad22e8fabdca6d9fd1e408a539696e30599fc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 15:07:53 2009 +1000
dix: rework temporary slave detachment.
Rework addresses two issues:
- storing the master device's pointer is a bad idea, we need to store the ID
of the device in case it disappears during the grab.
- restoring the old master did not actually reattach the device. Fixed now.
commit b3e4810a283d369e1a2c6c3288177fe79fd1e9d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 16:22:51 2009 +1000
dix: move grab device assignment into GRABTYPE_CORE block.
grab->type is the device type and XI2 types overlap with core events (being
less than GenericEvent). Thus, for passive grabs the grab device would be
overwritten with whatever device was activating it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 18ae48670859d05788776e164c65985e3b35a723
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 16:06:52 2009 +1000
dix: don't try to activate a passive grab on top of an active one.
If we already have an active grab on the device, don't attempt to activate
another one.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ff1d6244eba8367a8d50601ca393e951c60c94b6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 12:14:52 2009 +1000
input: add support for XIAnyModifier in passive XI2 grabs.
commit eb97d125fb6adeff0b23c2460108e0587ba253e2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 1 15:50:50 2009 -0400
doc: Remove mention of Kerberos replay cache from Xserver.1
The krb5 auth code is gone, so this is no longer relevant.
commit 80ea32ad4f1440d068e18db65830f45498703b09
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 12:06:55 2009 +1000
dix: switch grab checking from unsigned shorts to unsigned ints
XIAnyModifier is outside of the unsigned short range.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 080b0331b3d1de1bab5ecdc9df175b287616e358
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 13:33:29 2009 +1000
input: Add grabtype to GrabParameters.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bee02a154145c0e4ed97980f7857dc27a96b1be8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 10:49:22 2009 +1000
dix: ensure implicit passive grabs have the xi2mask zeroed.
This fixes XI2 enter/leave events being sent to non-xi2 clients.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cc71dfb4f5cf6113053951070dec9556e941aa24
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 13:19:30 2009 +1000
test: Add GetSelectedEvents request to struct size tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de5c5b1db083a9c1d23e1461b54ca646c5a5c445
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 13:21:36 2009 +1000
test: fix compile error introduced with the removal of isMaster.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 45530d16097459a756696e255ab4e72d6e51fbc4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 29 18:07:48 2009 -0400
vfb: Fix depth setup.
Initialize the depth corresponding to the root window before the
pixmap-only depths. Otherwise you end up with the root window depth in
the depth list twice, which is mildly confusing for clients and
catastrophically confusing for PanoramiXConsolidate().
commit 5c8540d8cf9ebaafa7572cb2879d057cd3d15190
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 29 14:49:05 2009 -0700
GLX: Purge glxint.h usage
Change (__GLXvisualConfig *) to (void *) in ABI compat stubs.
(cherry picked from commit b4adec886c65e49cfbd30d1e3a41b613f75ed3f5)
commit da2aaee24a77e1a9e5c623af4a78ca6acc94b787
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 29 14:27:46 2009 -0700
GLX: Purge some glxint.h usage in glxcmds.c
This is related to d0b249f1c5df81f3941d638f9625fe1e16c31807 in the 1.4 branch and was ok'd by krh
(cherry picked from commit e587436cf2e1237813c924699ff0662aea3034e1)
commit f2151f1b0dcbfec23488a29a7ea887fbfd53b760
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 29 14:09:41 2009 -0700
XQuartz: Fix alpha to be 1 (screenshots bug, etc)
This is related to: bc964ff1e3f3d8ab590eab40d767c6241e9480d4
XQuartz: Stab at fixing the alpha 0/1 bug (screenshots, etc) by pulling in some old code that got gutted from rootless.
which was on the 1.4 branch and implemented in fbPaintWindow. Now that fbPaintWindow is gone, this is now in miPaintWindow().
(cherry picked from commit 032173f693f75385a40e144ffe2b7b5378bb6f2e)
commit 7c158ffa766d32f5e8ec459693da5ef6ba0892e9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 29 14:02:18 2009 -0700
Rootless: Use miPaintWindow since PaintWindowBackground is dead
(cherry picked from commit 4975c087257b52189a5c21d93d121f183e60e4c8)
commit ec9e9c8bcabda3d8b4ea07037fb247f7408dde8b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 28 15:30:20 2009 -0700
XQuartz: English localization update for HIG compliance
(cherry picked from commit 86b319d7cbef39d75b54c9d321e5dbf097b552be)
commit 0f47203a9a690498c18b1c04e2ef5deed23a0e3e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 14:18:37 2009 +1000
dix: Set the implicit passive grab flag for keyboards too.
Extension devices have ActivateKeyboardGrab as their grab activation
function, hence we need to ensure the implicit passive grab flag is set
accordingly in the grab for further event delivery.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 75c73ddbfc9236bb80a3709d467674c4a1018fa3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 14:01:21 2009 +1000
dix: fix broken XI event delivery during grabs.
If an implicit passive grab is active, the XI event mask is in
grab->deviceMask. Otherwise, for explicit grabs, the XI event mask is in
grab->eventMask.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 29ec14625111a8ae600d245ccbf905f059074d7c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 13:26:22 2009 +1000
Xi: passively grabbing slave devices must be possible.
There's use-cases where this is useful, so take the check out preventing
that.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 235cf5713a8fe535c439628cce9ea5b42432acb1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 12:09:06 2009 +1000
dix: init inputMasks to NULL to avoid random value dereference.
If the XI2 type is 0 (e.g. proximity events), inputMasks is never set and
may not be NULL.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 68d86adbe8d84099812c37a04098f2ab5ccc45a4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 12:03:07 2009 +1000
dix: GetProximityEvents doesn't need extra events for valuators.
With internal events, we only have one event for all the data, no need to
calculate for extra events.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 71a83d68ab07536c0778d13cd7da974c40e77457
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:32:03 2009 -0400
xfree86: Remove loader symbol list ABI stubs
These have been nops since 2006 and functionally void since 7.0.
commit d7aef3f663f4b5d861799f8615dcd301d5ce2906
Merge: a25f248 e08c6a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 28 17:20:58 2009 +1000
Merge branch 'master' into xi2
Conflicts:
Xext/geext.c
Xi/chdevcur.c
Xi/extgrbdev.c
Xi/xiproperty.c
configure.ac
dix/ptrveloc.c
hw/xfree86/common/xf86Config.c
mi/mipointer.h
test/input.c
xkb/xkb.c
commit a25f248fc3bd0375d91ca8a44320200d445ecfbb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 15:47:12 2009 +1000
Xi: Send Enter or Leave events with XIPassive(Un)grabNotify
If a passive enter or focus in grab activates, send additional enter or
focus events with mode XIPassiveGrabNotify to the grabbing client.
Likewise, if the grab deactivates, send additional leave or focus out
events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2107becb0ce2ffda001be65728c53563496d8d50
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 27 17:13:19 2009 -0400
xfree86: Remove unused (and useless) xf86{Add,Delete}ModuleInfo
commit e08c6a0752772745f35f7afcf6c2b1c927b91cc0
Author: Federico Mena Quintero <federico@novell.com>
Date: Mon May 4 19:24:47 2009 -0500
randr: bug #21554 - re-probe outputs when coming back from laptop unsuspend
Make xf86 RANDR wrap the EnterVT call chain, so it can re-probe the
outputs when a laptop comes back from suspend/unsuspend (actually, any
time that we enter our VT again). The X server should then send RR*
events to clients, so they can cope with a monitor that was unplugged
while the laptop was suspended.
Signed-off-by: Federico Mena Quintero <federico@novell.com>
commit b12010e10f38951358b48ff1076c026f943b7cc3
Merge: 6e69272 f1441b8
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed May 27 15:56:30 2009 -0400
Merge branch 'master' of git+ssh://sandmann@git.freedesktop.org/git/xorg/xserver
commit 6e6927247359cc0db47501fb9d2dbb7856aa5985
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed May 27 15:51:19 2009 -0400
Fix alpha map computation in miComputeCompositeRegion()
According to the RENDER spec, the origin of the alpha map is
interpreted relative to the origin of the drawable of the image, not
the origin of the drawable of the alpha map.
This commit fixes that and adds an alpha-test.c test program.
The only use of alpha maps I have been able to find is in Qt and they
don't use a non-zero alpha origin.
commit f1441b83538e6ba8a1557c4f5ea50c53a1837087
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed May 27 10:06:10 2009 -0700
XQuartz: More localization updates
(cherry picked from commit b107390c9f30571902556b4d053e62d345a06254)
commit 996357e905c1082479bb238110b93bc170b8cb84
Author: Joe Krahn <jkrahn@nc.rr.com>
Date: Tue Jan 20 17:22:37 2009 +0000
Cygwin/X: Update icons directly, rather than modifying the window's class
Update icons directly to windows rather than modifying
the window's class. Respect custom icons overriden via
the configuration file.
fd.o bugzilla #4491
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9955252564922e7e8702dfb6eab52c75605a4a22
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 5 17:55:58 2009 +0000
Cygwin/X: Remove unused TimeSinceLastInputEvent()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 966c8fccf16e77c8f459b4b175718323f2ec5d58
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Jan 5 18:04:42 2009 +0000
Xming: Fix some log spam
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d190a27a33ab8c198568baf184fad14df57e24ad
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Jan 29 11:00:49 2009 +0000
Xming: Various tidy ups in winClipboardFlushXEvents()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit fbe9ed27b1c2f932a74aa6ced134ecec021a3fc1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Jan 29 10:55:38 2009 +0000
Xming: Avoid log spam if a windows application won't provide CF_UNICODETEXT clipboard format
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 71ba9856a4f01aa7a42f1178c8da98a2e5ac23ae
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:52:11 2009 +0000
Xming: Cache atom lookups in clipboard integration code
Cache the CLIPBOARD atom lookups in winClipboardWindowProc()
Cache atom lookups in winClipboardFlushXEvents()
Recache on server regeneration
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 4ec110327bdc4f2617cd6116539812d7ef96b24e
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 18:29:49 2009 +0000
Xming: Prevent the mouse wheel from stalling when another window is minimized.
Fix internal WM to prevent the mouse wheel from stalling when another window is minimized.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 888e6961a4ee76d05d212cfb946f089caafb3f69
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 7 18:29:16 2009 +0000
Cygwin/X: Correctly allow for the native window frame width in ValidateSizing()
Fix internal WM to correctly calculate the native window border when validating window sizing
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit a72865868f03b675f86990476fcee601822894b3
Author: Joe Krahn <jkrahn@nc.rr.com>
Date: Tue Jan 20 17:09:43 2009 +0000
Cygwin/X: Consolidate dialog initialization in winInitDialog()
Changed windialogs.c to set icons via window properties rather than class
properties, and use LoadImage() for small icons, because LoadIcon() can only open
large icons. Since this code is redundant across the dialogs, I put it in the
winCenterDialog function, along with a few other redundant instructions, and
renamed in winInitDialog().
Also, don't bogusly put our dialogs at the center of the virtual desktop if we
are on a multimonitor system (this causes the dialog to end up split across two
monitors in a dual-monitor side-by-side setup)
Corrections to use HWND_TOPMOST instead of HWND_TOP and not to use SWP_NOZORDER
from Colin Harrison
fd.o bugzilla #4491
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d053c3b35f730fdaddd22f841dbd8ed6c9a07ba0
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:40 2008 +0000
Xming: Slightly adjust the formatting of the logged command line
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit a7e23a79c1fc429aedbf9b6c0e78b1c8d7e02238
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 14:42:25 2009 +1000
Xi: Add support for Enter and FocusIn grabs.
Enter grabs are checked for in CheckMotion(), each time the sprite window
changes the current grab is deactivated (if applicable) and the new grab is
activated (if applicable). Exception - if the grab is on a parent window of
the current window since we keep the grab across descendants.
Since CheckMotion() may change the grab status of a device, we mustn't get
"dev->deviceGrab.grab" in ProcessOtherEvents until after CheckMotion().
FocusIn grabs are checked in much the same manner.
The event delivery for grabs replaces the NotifyNormal on window change with
a NotifyGrab on window change. Note that this happens before the grab
activates, so the EnterNotify(NotifyGrab) is still delivered to the window,
not to the grabbing client. This is in line with the core protocol semantics
for NotifyGrab events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ec2fe9660dbc0c16cdaca33b3b878011857e0fe2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 14:18:51 2009 +1000
Require inputproto 1.9.99.10
commit 0ef6ba9f3b9e68307bfe623e12dc36d44440e97f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 11:15:54 2009 +1000
Xi: set the passive grab's resource mask on ungrabbing.
Not having the resource mask set means we never match an existing grab,
hence we never actually ungrab.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1f61d6647f25add487c5cae9739643a6e33ef9f7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 11:15:23 2009 +1000
Xi: use GetMaster(MASTER_KEYBOARD) to get the modifier device for XI2 pgrabs
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bedfd561fa534b65baea45c4a05b1752ef172c45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 15:28:33 2009 +1000
dix: fix wrong cast of eventMask into CreateGrab.
commit 023f959e6812e63f9d38b078158275bc13d238ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 14:56:40 2009 +1000
Xi: fix an inputInfo.keyboard usage.
In the case of a RevertToFollowKeyboard, the master device should be used
(since this is the closest equivalent to the VCK as before). Only if the
master keyboard is the same as the device, revert to the VCK itself.
commit b3463fd6a89d50a7562c357aeb5314ce0fd6493d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 13:58:04 2009 +1000
dix: convert window coordinates to FP1616 before calculating event_x/y
root_x/y are already in FP1616 at this point.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 10b5e981016132b4c07ad9ce68646d0a385e9c24
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 11:12:08 2009 +1000
dix: take grabs into account for XI_Enter/Leave events.
commit 1815defdb2f19e79f4ec0354d188ea763ff1f15e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 10:08:46 2009 +1000
Xi: only deactivate passive grabs if the event type matches.
This didn't use to be a problem when devices could only be pointers or
keyboards, not both. Nowadays, slave devices may have both buttons and
keyboards, and in this case we don't want to deactivate a passive keyboard
grab when a button release is detected.
commit 9dc3810a034f067096d71b33b0b47f1f52092fe6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 13:53:46 2009 +1000
dix: set the right grab event type for implicit passive grabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6583477035234e23ead2fad9db7a07e5862447a4
Author: Nicolai Hähnle <nhaehnle@gmail.com>
Date: Sat May 23 13:35:24 2009 +0200
Remove reference to non-existing requestLog and requestLogIndex
These fields were removed in 252ec504817e05b185e4896a2d899e9c00b8aeef.
Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 53e821ab4a41cbc85932b9ef150311bc2e57c108
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 25 12:20:37 2009 +1000
Xi: add request processing for XIGetSelectedEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b377994336c978875dd786f4a4a9ef2e7b20e32c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 25 13:55:17 2009 +1000
Xi: advance by the right number of bytes when trawling XI2 event masks.
The wire layout is [struct xXIEventMask][mask bytes]. So the pointer needs
to not only be advanced by the mask bytes, but also by the size of the
struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 12e725d08b4cf7dbb7f09b9ec09fa1b621156ea9
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 22 09:54:38 2009 +0200
randr: fix server crash in RRGetScreenInfo
We don't return rates to randr < 1.1 clients, so don't allocate space
for them. This fixes a FatalError due to not all allocated space being
used.
X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861>
Reported-by: Guillaume Quintin <coincoin169g@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit c70511931ca1441878daed50e710fa514f6ab077
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun May 24 10:32:38 2009 +0200
fix typo in cabff9007 which led to an unintialized memory read and a crash.
commit 99e22b86c5f1a3653f3caaf01368a777d2b208d0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 22 12:01:55 2009 -0400
EDID: Add modes from Established Timings III descriptor to mode pool
EDID 1.4, section 3.10.3.9
commit b395da91c531d633ec47bb5a51e361d321663a3a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 22 15:24:46 2009 +1000
Xi: silence two compiler warnings
chdevcur.c:97: warning: ‘SecurityLookupIDByType’ is deprecated (declared at
../include/resource.h:269)
xiproperty.c:200: warning: passing argument 2 of ‘GetEventFilter’ from
incompatible pointer type
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4a36db60774640ea92a2133a3b08fbf1a48d2cb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 22 15:16:43 2009 +1000
os: fix compiler warning "too few arguments to format"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit da0d3baf71b34657cc235d6c6b37d548541f9449
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 14:11:27 2009 +1000
dix: protect event generation against single-valuator devices.
If we have a single-axis device and it sends events it should not access
non-existant memory.
commit b25e29e8014927815d4fdc9c416bfeb2af0ecba6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 12:07:03 2009 +1000
mi: use GetMaster() from MIPOINTER and MISPRITE.
Both may in some cases be called for a SD attached to a master keyboard. In
this case, we need to get the right master device (i.e. the pointer).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c9df51b070377ca33e48644dbc842b6e3dfb2975
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 11:16:37 2009 +1000
input: allow for master pointers to not have a button class.
There's devices (e.g. some barcode readers) that have axes but no buttons.
When such a device sends a motion event, the valuator and button class is
copied into the master pointer (i.e. removing the button class).
So we need a couple of extra sanity checks for the button class to exist.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ebe45e1a72a81ad22413e5d0514869b3e45a69b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 10:55:03 2009 +1000
input: introduce partial class copying depending on the event.
Copying all classes into the master device has drawbacks for hybrid devices
(devices that are both mice and keyboards). If such a device posts an event,
it's key classes are moved into the VCP. The key event itself is unaffected
by keyboard grabs and the like.
Partial class copying copies depending on the event and copies the classes
into the right master device (i.e. the VCK for key events, the VCP for
pointer events).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc63c8a4570c989f19a036965854bceb9800ce19
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 12:33:49 2009 +1000
dix: introduce GetMaster()
For hybrid devices (keys + buttons/axes) the attached master device is
generally the wrong one. One shouldn't post a button event through a
keyboard and vice versa.
GetMaster(dev) returns the right master device for the given type needed.
This may be the MD paired with this device's MD.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d79318f269d959d566ec66239b4c985afd61b259
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 08:29:14 2009 +1000
dix: Add a deviceid to the DeviceChangedEvent.
ChangeDeviceId would actually overwrite the flags field if deviceid wasn't
present. Aside from the event of course not telling which device generated
it in the first place.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eeffb83fea2d87070beafd0c692fb0ad54d8335b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 18 20:03:07 2009 +1000
ABI_XINPUT_VERSION 6
commit 438a4eafa5d14ab676827f7a5d58782c02db4cdf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 17:02:50 2009 +1000
input: remove nested union from InternalEvent.
There's no need for internal events to be a struct with a single nested
union, we might as well make the union itself the InternalEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b12d302df8283186ce87882c29b2b0294adb2770
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 15:28:16 2009 +1000
Input: rename DeviceIntRec->isMaster to ->type.
isMaster is not enough as long as we differ between master pointers and
keyboard. With flexible device classes, the usual checks for whether a
master device is a pointer (currently check for ->button, ->valuators or
->key) do not work as an SD may post an event through a master and mess this
check up.
Example, a device with valuators but no buttons would remove the button
class from the VCP and thus result in the
IsPointerDevice(inputInfo.pointer) == FALSE.
This will become worse in the future when new device classes are introduced
that aren't provided in the current system (e.g. a switch class).
This patch replaces isMaster with "type", one of SLAVE, MASTER_POINTER and
MASTER_KEYBOARD. All checks for dev->isMaster are replaced with an
IsMaster(dev).
commit add2defac7e59dcb355e5ba12b6de60861741d57
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 16:23:38 2009 +1000
Split the signal-handler's lastSlave out into a separate variable.
dev->u.lastSlave was not signal safe since it was accessed by the DIX and
during signal handling.
Replaced with:
'dev->last.slave' for the signal handler's lastSlave (used to generate
DeviceChangedEvents), .
'dev->u.lastSlave' for the DIX lastSlave (currently only used in
change_modmap)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 525aa17f804d37d1cfcbbf6b8e6cddb45e999b20
Author: Tomas Janousek <tomi@nomi.cz>
Date: Wed May 20 15:03:01 2009 +0200
Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields.
In ProcXkbGetKbdByName, mrep.firstVModMapKey, .nVModMapKeys and
.totalVModMapKeys were not initialized, contained random values and caused
accesses to unallocated and later modified memory, causing
XkbSizeVirtualModMap and XkbWriteVirtualModMap to see different number of
nonzero values, resulting in writes past the end of an array in XkbSendMap.
This patch initializes those values sensibly and reverts commits 5c0a2088 and
6dd4fc46, which have been plain non-sense.
Signed-off-by: Tomas Janousek <tomi@nomi.cz>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7db55a0806c82bd4143c8bf1b8eb2b62e456ad9a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:38:25 2009 +1000
dix: remove superfluous loop in change_modmap.
A device can only be attached to a single master device. So instead of
looping and searching for the master device, we can just use dev->u.master
directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cabff9007a4abad026b450a4aab155c7bcd94326
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 15 08:33:07 2009 +1000
xfree86: treat other drivers as mouse drivers in the config.
Historically, if no input device was referenced in the ServerLayout,
the server would pick the first "mouse" device found in the xorg.conf.
This patch gives evdev, synaptics, vmmouse and void the same status. If
there is a section in the config file using this driver - use it as the core
pointer.
Device selection is in driver-order, not in config-order. If a "mouse"
device is listed after a "synaptics" device, the "mouse" device gets
preference. This replicates the original behaviour.
This code only takes effect if AllowEmptyInput is off and there is no core
pointer in the server layout.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a8bd1e1f96d8e5380972a7dce8d9940cd912aa09
Author: Søren Sandmann Pedersen <ssp@l3000.localdomain>
Date: Thu May 21 18:21:28 2009 -0400
Fix alpha map computation in miComputeCompositeRegion()
According to the RENDER spec, the origin of the alpha map is
interpreted relative to the origin of the drawable of the image, not
the origin of drawable of the alpha map.
The only use of alpha maps I have been able to find is in Qt and they
don't use a non-zero alpha origin.
commit a2c5ee36b21c2ee5c0468f1b251e74c1412dbecb
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 21 10:20:48 2009 -0400
EDID: Be more cautious about finding vendor blocks.
Many old monitors zero-fill the detailed descriptors, so check for that
to avoid a useless warning like:
(WW) RADEON(0): Unknown vendor-specific block 0
commit 73c7398aafa050950ad614483fb0d5bdd2da97ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 10:40:50 2009 +1000
dix: 'namespace' HAS_OLD_SLAVE and HAS_NEW_SLAVE.
We need more flags for this in the near future, so let's namespace them now.
commit 5b5e3fa2771383a85afff679be34df19d3a4e290
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 15 08:33:07 2009 +1000
xfree86: treat other drivers as mouse drivers in the config.
Historically, if no input device was referenced in the ServerLayout,
the server would pick the first "mouse" device found in the xorg.conf.
This patch gives evdev, synaptics, vmmouse and void the same status. If
there is a section in the config file using this driver - use it as the core
pointer.
Device selection is in driver-order, not in config-order. If a "mouse"
device is listed after a "synaptics" device, the "mouse" device gets
preference. This replicates the original behaviour.
This code only takes effect if AllowEmptyInput is off and there is no core
pointer in the server layout.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1cce55cc0333a026474100cf2f784e220fd96473
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:07:03 2009 +1000
input: rename device->type to device->xinput_type.
This type is only used in XI to give a hint of what type this device may be.
Call it xinput_type for clarity.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 81b3b0cce088866dc3cda099d7c8d6655849fd43
Author: Tomas Janousek <tomi@nomi.cz>
Date: Wed May 20 15:03:01 2009 +0200
Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields.
In ProcXkbGetKbdByName, mrep.firstVModMapKey, .nVModMapKeys and
.totalVModMapKeys were not initialized, contained random values and caused
accesses to unallocated and later modified memory, causing
XkbSizeVirtualModMap and XkbWriteVirtualModMap to see different number of
nonzero values, resulting in writes past the end of an array in XkbSendMap.
This patch initializes those values sensibly and reverts commits 5c0a2088 and
6dd4fc46, which have been plain non-sense.
Signed-off-by: Tomas Janousek <tomi@nomi.cz>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 79138eec1b49cbaca6a16f2bdd8579b5828aeb28
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Mar 10 16:03:26 2009 +0100
randr: Setting gamma: inverse logic looks more sane
commit c2785ae7eb6197bbfc75e92e99fffbb8ad8064da
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:29:13 2009 +1000
dix: refuse events from disabled devices.
If the device is disabled ("off"), it must not send events to a client.
The driver shouldn't send events in that case anyway, but just to make sure
we simply drop events coming while the device is disabled.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 47a89b1cba67a43ddc225f7e1b5d2b3b217c8d93
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 13:59:22 2009 +1000
Xi: remove DeviceIsPointerType
This approach is broken anyway. DIPT only checked for the XInput type
"MOUSE" and the only user of this is xf86ActivateDevice when it sets the
Activate/DeactivateGrab functions.
Since synaptics and wacom set their own types, evdev only sets MOUSE for,
well, mice half the devices didn't have this set correctly anyway.
Instead, ActivatePointerGrab should be merged together with
ActivateKeyboardGrab.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b891e450f005688e41e61016e6d3e394c67f6be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:23:16 2009 +1000
dix: Remove obsolete comment
CorePointerProc doesn't back up the device classes anymore.
commit 42719ce5c715ac3a0c74c3c7df872d35e0449de9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:38:25 2009 +1000
dix: remove superfluous loop in change_modmap.
A device can only be attached to a single master device. So instead of
looping and searching for the master device, we can just use dev->u.master
directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 22a33a7250f879b8f3eb84176a1dc57027d8cfe4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 19 22:45:26 2009 -0400
glx: Register names for the GLX resource types.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 77e90261d5f91e1170c6e02deb0e3739c24fcfd6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 19 19:36:03 2009 -0400
dix/events.c: Use wClient where appropriate.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 3cea176d5abcb0f14eefbdcbe17fed0847524dd4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 19 19:30:33 2009 -0400
xace: Fix a bad device access hook call.
Add a proper access mode, and reverse the logic of the return value.
Zero ("Success") is returned on success from the hook calls.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 4addfcd633484b7f53b5df1b92bfca8bfc1dc48d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon May 18 17:53:35 2009 +0200
EXA: Allocate from the end of free offscreen memory rather than from the start.
This way we don't always need to scan over previously allocated areas when
looking for an available one, and there might be less fragmentation.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 510cbd43cd4e34bd459e8f74ab2855714b4ca95d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon May 18 17:48:57 2009 +0200
EXA: Defragment offscreen memory.
At most once per second, under the following circumstances:
* We can't satisfy an offscreen memory allocation, but there seems to be enough
offscreen memory available in total.
or
* The server has been idle for at least 100ms, and there is more than one
available offscreen area.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 8331bde0adeccefb275c4d707e7b2cb1d95b1581
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri May 15 21:36:28 2009 +0100
Cygwin/X: link with libmain.a to provide main()
Commit 987579c930bda803427a28cb82773c389f5110d6 moves main.c into
into libmain.a to be linked with separately, and updates the various
DDXs to link with libmain.a, except Xwin, which also needs this change.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b89dcfbfbd38f8d19f1d4f24f81820b1048572c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 18 16:07:08 2009 +1000
Xi: fix length field in XIQueryPointer.
Buttons append 4-byte units to the end of the reply, they need to be
included too.
Reported-by: Mark Dokter
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33fcaaaea5ea30be39156ecfdbcca891b47ab465
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 18 16:05:35 2009 +1000
Fix missing parentheses in FP1616 macro.
Missing parens led to interesting results if an expression instead of a
constant was passed in (ProcXIQueryPointer for example).
commit 6258bb1d6bb78ea4ba1d33470bc74e9b711b25f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 15 20:24:45 2009 +1000
require inputproto 1.9.99.9
commit e7e94ff5fd3205a9ee01fe9342d9f3a426b0a068
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 14 21:45:35 2009 +1000
Xi: set the right length for the XIQueryPointer reply.
commit 00ab04d73c612ac85e024105015bdb7c79e8874b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 14 16:24:35 2009 +1000
Include full modifier + button state in XIQueryPointer.
commit de78aab0ea3a2d8c61222493f25911258dea65a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 14 15:53:00 2009 +1000
Xi: take the paired device as modifier device only for MD pointers.
commit 0e089f9ceb0edec532078c6e1df7f642f7220fb5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 14 15:29:20 2009 +1000
Xi: check cursor and grab_window before attempting the passive grab.
Both values need to fail the request, so we need to check them before
looping through the modifier masks. Otherwise, a wrong grab_window will
show up in each failed modifier return but not actually cause an error.
commit 5c3e7289801c958e2c70e2629d3ebee122449be8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 13 16:54:01 2009 +1000
dix: count must be 1 if we have an XI2 match.
This fixes events that activated a grab not getting delivered to the client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e083a0d0692baa5ad29002a38293b36dd3b4c06f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 13 15:23:42 2009 +1000
Xi: set the correct length for XIPassiveGrab replies.
commit 8ff1bff8f462b15e05fc298704e1e40cb244587f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 21:33:54 2009 +1000
Update to new XI2 names
commit bbf266cca3de726e3eb932d66dd5b8981ef40fa8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 21:24:07 2009 +1000
mi: un-deprecate miPointerWarpCursor
This function was deprecated in ef68273f5bdb27a492ec0b69548ec4fbede46c08
because it didn't take a device argument. The device argument was added in
1c7568b8a1417257fa67c7fca69aa253099b9461 though, so the deprecation is
obsolete.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 273890924b8ed6f8b7949c0322c8258b9e6f8630
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 16:09:35 2009 +1000
input: reduce the number of superfluous hierarchy events
There's only two reasons for hierarchy events:
- device is added, removed, etc. In this case we want to send the event as
it happens.
- devices are added in a XIChangeDeviceHierarchy request. In this case we
only want one event cumulating all changes.
commit 033a2b12fcd02fa9a2c2f20a352bec0a43074512
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 14:50:57 2009 +1000
Xi: set per-device hierarchy changed flags.
Rather than have one field per hierarchy change, XI2 has two fields - one
generic one and one per-device that include the device-specific flags.
This requires some funky handling for removed devices, but oh well.
commit 8fb51feae222ff4f4aa1c440b6973ce7383bbc09
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 15:45:46 2009 +1000
xkb: if kbd init failed, NULL out the pointers after freeing them (#21278)
Reproducible:
Configure a server that uses the keyboard driver with an invalid ruleset,
e.g. (Option "XkbRules" "foobar"). Ensure that Option "AllowEmptyInput" is
"off" in the ServerFlags or ServerLayout section. Start the server.
After failing to init the keymap, the server will try to clean up after the
device, double-freeing some xkb structs that have not been reset properly.
X.Org Bug 21278 <http://bugs.freedesktop.org/show_bug.cgi?id=21278>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0cea199eda772a5ddd5ce72e4823a00ec14405d4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 12:53:56 2009 +1000
kdrive: set Activate/Deactivate grab for input devices (#21591)
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
commit fdce58ca822f4e43e03e84076190f52d7104e01f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 12:51:40 2009 +1000
dix: ensure Activate/DeactivateGrab has a valid value.
Xephyr doesn't manually set Activate/DeactivateGrab for new devices,
resulting in a NULL-pointer dereference later when a grab is activated.
Avoid the segfault by ensuring that the pointer is always valid.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e3f296d91dfe6b827195e1d387e1a04aa73b85c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat May 9 10:33:20 2009 +1000
xfree86: Remove superfluous ifdef DEBUG checks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2f6253376df45e508284ff7766b186cfc7fb56d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat May 9 10:33:20 2009 +1000
xfree86: Remove superfluous ifdef DEBUG checks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b1b5ec45c1cb650ccb8c659218f9481379c777d9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 12:53:56 2009 +1000
kdrive: set Activate/Deactivate grab for input devices (#21591)
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
commit 6f9e22049862ee9ac7f604411d005d8bb1b2dd1c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 12:51:40 2009 +1000
dix: ensure Activate/DeactivateGrab has a valid value.
Xephyr doesn't manually set Activate/DeactivateGrab for new devices,
resulting in a NULL-pointer dereference later when a grab is activated.
Avoid the segfault by ensuring that the pointer is always valid.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c1d7deca9281ba1df0df1abcea1fe7f841b10ff9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 21:24:07 2009 +1000
mi: un-deprecate miPointerWarpCursor
This function was deprecated in ef68273f5bdb27a492ec0b69548ec4fbede46c08
because it didn't take a device argument. The device argument was added in
1c7568b8a1417257fa67c7fca69aa253099b9461 though, so the deprecation is
obsolete.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8609a4e883e917d1652fbe810108de99bc89713f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 15 11:22:32 2009 -0700
Correct some Sun license notices to Sun's standard X11 license format
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 94c5093c8bc803d0b14429b5a4d07ae46da865cc
Author: David Marx <David.Marx@Sun.COM>
Date: Wed May 13 17:53:30 2009 -0700
Solaris: Make sure non-inline versions of asm routines end with ret statements
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 2be5eecb4b0f30b9c55d12521415edbb88c1f8fd
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 15 17:29:32 2009 +0200
xfree86: add edid quirk for Samsung Syncmaster 2333HD
It reports vertical size in cm in the detailed mode.
X.Org bug#21750 <http://bugs.freedesktop.org/show_bug.cgi?id=21750>
Reported-by: Peter Poklop <Peter.Poklop@gmx.at>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 7c8327f0a75087a85864256a9cea80dd4b86def5
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri May 15 15:48:37 2009 +0200
EXA: Always damage glyph cache pixmap manually after uploading a glyph.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 850675d4de4373e5df95507dbf2cd9affaaf54bc
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri May 15 15:48:37 2009 +0200
EXA: Take GC client clip type into account for migration.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=18950 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit c1bbac2708bbccbec01cecba39cdf2b8160c1dc3
Author: Matt Turner <mattst88@gmail.com>
Date: Thu May 14 16:00:41 2009 -0400
Fix mem_barrier() on Alpha
Some clean up (da086901c6579e41b28b1418fa12ebb82744fc87) went a bit
too far and removed the needed mem_barrier macro on Alpha.
This re-adds it.
commit 4cc33190ef1a4207c0f8fc74201cdf2568a239c2
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 14 17:01:57 2009 +0200
xfree86: Add two __FreeBSD_kernel__ checks
Debian bug#525475 <http://bugs.debian.org/525475>
Reported-by: Petr Salinger <Petr.Salinger@seznam.cz>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit ed9aecf8517bf74e943e3e5dd3ee407524e8f122
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 14 06:55:21 2009 -0400
COPYING: SGI FreeB 1.1 -> SGI FreeB 2.0
commit c66cf7b64c7bcb31c81b9fde27cc40c1440753b1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 14 06:53:08 2009 -0400
Update several of my and/or Red Hat's licenses to standard form.
commit 2075d4bf9e53b8baef0b919da6c44771220cd4a5
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu May 14 11:46:41 2009 +0200
glx: If a destroyed window is bound to the current context, make it not current.
Avoids subsequent crashes due to stale pointers to the DrawableRec, see
https://bugs.freedesktop.org/show_bug.cgi?id=21132#c15 and previous comments.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 2c1190f888515292de01e60fe74657c34b99fd9e
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu May 14 11:39:16 2009 +0200
randr12: Initialize and keep track of updates to VidMode extension gamma value.
This way clients querying the gamma value via the VidMode extension at least
get the last value set via the same, rather than always something bogus.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit fc3ce861cdab8606610726ce7c53f57d950c2407
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu May 14 11:35:25 2009 +0200
randr12: Fix calculation of gamma ramp values.
The reciprocal gamma value was missed in the first copy and this mistake was
propagated to the second one.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit f3c61377d0fb1f09a18833995556fc9ffd11e097
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 12 18:27:09 2009 -0700
COPYING file updates for git master changes since 1.6 branch
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit b746a00cffca5c553b607a8e9c1074294a23b443
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 12 16:11:01 2009 -0700
Resync COPYING file with notices in code base as of xorg-server-1.6.1
Remove notices for code no longer in tree (Xprint, Xgl, kdrive, cfb, etc.)
Add/update notices for new/changed code in tree
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit f250eea2e90fc50bec5214c2f41132b95edc2c46
Author: Jerome Glisse <glisse@freedesktop.org>
Date: Mon May 11 22:52:46 2009 +0200
DRI2: update DRI2 private drawable width & height according to X drawable
commit 0952d12717031e9dda9e48123bb922d0f4e81834
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon May 11 15:27:46 2009 -0400
xselinux: Relax ownership restriction on SetSelectionUseContext.
Instead, clients should keep track of the selection instances they use.
commit ac13145dbcb284293582435409d8a90f276785c5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 15:45:46 2009 +1000
xkb: if kbd init failed, NULL out the pointers after freeing them (#21278)
Reproducible:
Configure a server that uses the keyboard driver with an invalid ruleset,
e.g. (Option "XkbRules" "foobar"). Ensure that Option "AllowEmptyInput" is
"off" in the ServerFlags or ServerLayout section. Start the server.
After failing to init the keymap, the server will try to clean up after the
device, double-freeing some xkb structs that have not been reset properly.
X.Org Bug 21278 <http://bugs.freedesktop.org/show_bug.cgi?id=21278>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ebfd6688d1927288155221e7a78fbca9f9293952
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Sun May 10 23:27:56 2009 -0400
Make compositing with transformed windows work again.
The coordinate translation was broken in pretty much every way
imaginable.
commit c2b668e6fff11c52f2a3f0dc3f4d1fc2c5bcf3e6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 5 20:27:53 2009 -0700
XQuartz: pbproxy standalone: added missing variable declarations.
(cherry picked from commit 2d947d17a3ef5fb8cef959bff0eb08b8bb5b6548)
commit 9c5b761c8c86cca56f4b4af272f42ba89c9c3ba5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat May 9 16:19:13 2009 +1000
Revert "xkb: write the _XKB_RF_RULES_PROP to each device."
This commit shouldn't have been pushed, we're still sorting out the API we
want to use.
This reverts commit 876910a951053f0bd31e30098de3da15a1c1f5d6.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 8 21:31:01 2009 -0700
Don't printf NULL pointers on HAL connection error
Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit b680bda34da130ce408783f04214771471e41e8d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Apr 30 18:49:06 2009 -0700
Fix a couple off-by-one array boundary checks.
Error: Write outside array bounds at Xext/geext.c:406
in function 'GEWindowSetMask' [Symbolic analysis]
In array dereference of cli->nextSib[extension] with index 'extension'
Array size is 128 elements (of 4 bytes each), index <= 128
Error: Buffer overflow at dix/events.c:592
in function 'SetMaskForEvent' [Symbolic analysis]
In array dereference of filters[deviceid] with index 'deviceid'
Array size is 20 elements (of 512 bytes each), index >= 0 and index <= 20
Error: Read buffer overflow at hw/xfree86/loader/loader.c:226
in function 'LoaderOpen' [Symbolic analysis]
In array dereference of refCount[new_handle] with index 'new_handle'
Array size is 256 elements (of 4 bytes each), index >= 1 and index <= 256
These bugs were found using the Parfait source code analysis tool.
For more information see http://research.sun.com/projects/parfait
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00bc043fa0398a1d14d46b87da2ff3031a9535dc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 8 10:10:25 2009 +1000
dix: export subpixel precision in XI2 events for root/event coordinates.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bae070914fc27db122e6131ae4838559c4a72f65
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 7 16:52:31 2009 +1000
input: update to inputproto 1.9.99.8 XI2 defines.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 83f32d3972b8bfb0a87069dfb3fcd64b6b7c6424
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 7 10:05:29 2009 +1000
Xi: Add XI2 property requests.
commit 9935bec6e860cba9a3cc5baadd372ddb89d72ef0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 7 09:43:56 2009 +1000
Xi: split some code out of the XI 1.5 property request processing.
This is in preparation for the XI2 property requests that can re-use much of
this code.
commit f6f1e417063d2d61d65731a7e3ebca3ec2bdaacc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 22:25:28 2009 +1000
Xi: fix copy/paste error causing sizeof against wrong struct.
This wrong check may cause BadLength to be returned to the client even if the
length is correct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc0013d744a345199f013ba5b6ef0e44201d0e68
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 16:55:32 2009 +1000
Xi: don't double-swap the XListDeviceProperties reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 409012061b7d361a172b20455d4aaa5e47527c42
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 16:42:46 2009 +1000
Xi: add missing break in XI event swapping function
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c3c64978c4a231a3a8c18211d0716df875c75efa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 15:05:06 2009 +1000
Xi: fix a couple of wrong dixLookupDevice permission tags.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0d947aa8e87c5d92b702c60190c8bc5d32c9ba9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 12:07:07 2009 +1000
xfree86: fix xf86PostMotionEventP type checking
We only put internal events into the queue now, so let's check for ET_Motion
rather than the MotionNotify.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9457ce448988dacea9a3a1c14b6955767118ff31
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Apr 30 13:01:17 2009 +0200
dix: remove superfluous includes from ptrveloc.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ee30e1b102d779403eeda97e007b81e85f006a37
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Apr 30 12:58:48 2009 +0200
dix: fix warning in pointer acceleration
newer gcc's warn against how this cast is done (though it eludes me why),
and lrintf() is also faster especially on insane processors like the P4
(http://www.mega-nerd.com/FPcast).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5cf70183812541b33a6e83c7e1e3bc6198730cbe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 21:00:31 2009 +1000
xkb: remove _XkbAlloc, _XkbCalloc, _XkbRealloc and _XkbFree
We all agree that wrapping is fun, but seriously. One of these days someone
will get hurt.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e31d3906deaee5d9ada66e538b9e93574a4d610
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 21:07:07 2009 +1000
xkb: remove some now-useless XFUNCPROTOBEGIN
We bring them back if we start rewriting the server in C++, promise.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b583ca2b21155359c6255f406c96599b277c762
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 22:25:28 2009 +1000
Xi: fix copy/paste error causing sizeof against wrong struct.
This wrong check may cause BadLength to be returned to the client even if the
length is correct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ab5e9b97c300bba793a23fa13506b0c77c50ddf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 12:07:07 2009 +1000
xfree86: fix xf86PostMotionEventP type checking
We only put internal events into the queue now, so let's check for ET_Motion
rather than the MotionNotify.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 50cc8adafca4ba3838d468278d6eb8a4692d2488
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 16:55:32 2009 +1000
Xi: don't double-swap the XListDeviceProperties reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3fc6fcfb267888d65a22ed7c3eda175a2530a3d5
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed May 6 10:39:16 2009 +0200
dix: add 'none' pointer acceleration profile with number -1
This is a shorthand for disabling acceleration, while retaining the
possiblity to use constant deceleration. If constant deceleration is
also unused, it will optimize motion processing.
Other possiblities to deactivate acceleration were quite hidden,
and didn't always work as expected. E.g. xset m 1 1 would retain
adaptive deceleration, while xset m 1 0 would not (in the default
profile).
Also removes the 'reserved' profile; it was unused and it's trivial
to add new ones anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9d1597cbefea6a5e7959f2099c46f1a284def7ad
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Apr 30 13:01:17 2009 +0200
dix: remove superfluous includes from ptrveloc.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 35fce4e5c7fa34f98b3e4010c6cb09ce38a9205c
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Apr 30 12:58:48 2009 +0200
dix: fix warning in pointer acceleration
newer gcc's warn against how this cast is done (though it eludes me why),
and lrintf() is also faster especially on insane processors like the P4
(http://www.mega-nerd.com/FPcast).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d220d6907d1d5138d1528c48b739e77f65616225
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 4 17:38:02 2009 +1000
Xi: add GrabButton and GrabKeysym code.
We don't do keycode grabs in XI2, they're pointless.
commit 1b593ced171d02f1d00034f0f733060706bb6d41
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 16:57:46 2009 +1000
Xi: access the prev_state to get group/modifier state for key events.
Key events may change the modifier state, so we need to get the prev_state for
those (i.e. without the changes by the event already applied).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 35a4b8e7f4526a92d44cb16a783f21030cd1f6df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 16:51:59 2009 +1000
xkb: remove oldState from XkbHandleActions.
I really don't know what the purpose of this variable is or was, aside from
potentially clobbering up our key state since there's a path where it may be
used uninitialised.
Also, this means that xkbi->prev_state is now accessible from the DIX with
meaningful data.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d523fbe428e4513d85402caa83e9349256b680cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 4 17:00:57 2009 +1000
test: add test for xi2 struct sizes.
commit 1b1b20d6e3e696e4437a9ef56128cde70a485f66
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 13:47:55 2009 +1000
Change glib require for tests to auto.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 749cae82204f347248c815b1068ffcae9825fe70
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 30 14:58:00 2009 +1000
mi: don't crash if we're trying to update the pointer for a keyboard.
If a device doesn't have a pointer, just return.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ecedb0f2ee5b53513205d1f0aa381451893b9c5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 14:35:12 2009 +1000
include: up the number of max. input devices to 40.
With the Xtest virtual slave devices we have 4 devices for each MD
pointer/keyboard pair, plus the AllDevices and AllMasterDevices reserved
deviceids. It's quite easy to hit the current limit.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a38d33f6ac765bc5a3296b325e2c9b4a6a10ebf1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:24:02 2009 +1000
Xext: shut up compiler warnings in xtest.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 14d5471981151b27678de826daa078977217477a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:22:37 2009 +1000
Xext: return BadDevice from XTest if we don't have keys/buttons/valuators.
BadDevice is an XI error, but this cannot happen for core XTest fake input
anyway since the device will be the matching virtual XTest slave device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f1bed0959e803784af142a0f45177ee3b675d78a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:15:04 2009 +1000
Xext: fix core Xtest button presses, don't call PickPointer.
We already did the device selection before, so dev should be the XTest virtual
pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 94648bb797d94b025746c60679c584e5be2fae28
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon May 4 15:38:22 2009 -0700
Don't prepare outputs & crtcs if set_mode_major is present
A driver with this hook will take care of preparing the outputs & crtcs,
so calling the prepare functions will just cause unnecessary flicker.
Fixes bug #21077
commit 7d85169c7ab1d05c21fdbb2877ffd79f344dbb6b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon May 4 10:14:43 2009 +0200
Fix typo in ProcRenderCreateAnimCursor.
commit 59358de4b68a01452bf68593beb83605087ebc8f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 4 17:30:19 2009 +1000
input: ensure various ProcUngrabKey/Buttons have the right grabtype set.
commit 834ea071b619506e0bef5bdbf0e3c59831cf6e99
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 4 15:58:15 2009 +1000
dix: if grab types differ, two grabs cannot be the same.
commit 63a3c727b35d1ffd8a850a5177bd6623cd78b179
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:24:02 2009 +1000
Xext: shut up compiler warnings in xtest.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 226dd90597ef29998ac5db15c5457aad3fe9729e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:22:37 2009 +1000
Xext: return BadDevice from XTest if we don't have keys/buttons/valuators.
BadDevice is an XI error, but this cannot happen for core XTest fake input
anyway since the device will be the matching virtual XTest slave device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0fdff0a47a57a0096974ee83e07fefbad03075dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:15:04 2009 +1000
Xext: fix core Xtest button presses, don't call PickPointer.
We already did the device selection before, so dev should be the XTest virtual
pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f0124ed93cdcee8d22a6690e639a3f60b9a63c54
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 14:35:12 2009 +1000
include: up the number of max. input devices to 40.
With the Xtest virtual slave devices we have 4 devices for each MD
pointer/keyboard pair, plus the AllDevices and AllMasterDevices reserved
deviceids. It's quite easy to hit the current limit.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08cd846000286eb5e07cc8d8cb313aff2d6e7faf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 11:06:06 2009 +1000
dix: only free the old cursor if the grab was successful.
Testcase: start thunderbird and move a message around, crashes after two or
three moves.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 557dbadf3be273255e8fdb12d9321f4e88bf2b65
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat May 2 00:26:18 2009 -0700
XkbSetNamedIndicator should ignore SD's without LED's
When ProcXkbSetNamedIndicator is called on a core device, and we
walk the slaves to set the LED's on each of them, ignore any slaves
that do not have either a KbdFeedbackCtrl or LedCtrl structure.
(This is much more critical in xserver-1.5-branch, where we walk
*all* devices, not just the slaves of the specified master, and
thus return failure when setting an LED on the Core Keyboard and
hit a xf86-input-mouse device with no LED's to set.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0d9d3f3e361f769822caedccf4c2a58cc9930ecc
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Apr 27 15:11:10 2009 -0700
DRI2: Force allocation of real-front buffer for non-windows as well
For redirected rendering we end up with pixmaps (which the app thinks are
windows) that are double buffered.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Pierre Willenbrock <pierre@pirsoft.de>
commit 3d30789a05a730a03faa6058c73a5eda36ef3779
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 30 14:58:00 2009 +1000
mi: don't crash if we're trying to update the pointer for a keyboard.
If a device doesn't have a pointer, just return.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 876910a951053f0bd31e30098de3da15a1c1f5d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 30 14:46:45 2009 +1000
xkb: write the _XKB_RF_RULES_PROP to each device.
We only have one root window and writing the rules used to the same property
for each device is quite pointless if you don't have the same RMLVO on all
devices. So let's be sensible and write the same property to the device too,
so at least we know which device got loaded with which RMLVO.
commit 44044adc92e6bb6537f48c84727523d5cb23528c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 30 11:39:50 2009 +1000
xfree86: print a message if NIDR fails due to AutoAddDevices off.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 43dbbc30327f826068bc7cd2cdaf870ed61b4522
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 28 21:01:36 2009 +1000
Xi: fix typo in ProcXIGrabDevice
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a618929a0c06ba0d6dac13d7e644cd9658d98ed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 28 16:49:45 2009 +1000
input: reshuffle CreateGrab and friends to take a GrabParameters param.
This is cleaning up work in preparation for XI2 passive grabs.
commit e8e26f700c9c70d3f1bb53bdb71d1100f5c43a69
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 26 21:43:25 2009 +1000
Xi: split some grab parameter checking out of GrabButton and GrabKey.
commit 57aff88c7d0761e590806d07bee1c9410680c89f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Apr 29 01:04:37 2009 -0400
Fix most remaining deprecated resource lookups.
Callsites updated to use dixLookupResourceBy{Type,Class}.
TODO: Audit access modes to make sure they reflect the usage.
commit 1abe0ee3da5e1268c7315f841d31337ea6524cf0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 28 23:51:40 2009 -0400
kdrive: fix Xvfb build with separate libmain.
commit 737b49199a05299486064e6e762cf2a2f6f95be6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 15:40:24 2009 +1000
xfree86: restore default off for DontZap
Zapping is triggered by xkb these days, so note in the man page that it's the
Terminate_Server action. Since it's XKB, personal preferences towards or
against zapping should be achieved through xkb rulesets.
If Terminate_Server is not in the xkb actions, then we can't zap anyway and we
don't need a default of DontZap "on".
This patch restores the old meaning of DontZap - disallow zapping altogether,
regardless of XKB's current keymap.
Ideally, this patch should be accompanied by b0f64bdab00db652e in
xkeyboard-config.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98a1fa994158feca8bc80a10296a7675465c0e56
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 21 22:18:23 2009 +1000
test: add InternalEvent to core event conversion tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 990e8362a76fadc173e890d9052a2e5274b6eac5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 11:41:58 2009 +1000
test: add a simple test to verify device axis intialization.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4eac0df060b897470fb01cfd3b70f500da757c74
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 17:21:08 2009 +1000
Add a test-suite for in-server unit-testing.
This patch adds a test/ directory that contains the setup for a unit-testing
suite designed for in-server unit-testing. All functions available to the X
server are available to the test binaries through static linking.
This test suite uses the glib testing framework.
Do not use glib calls outside of the test/ directory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2c515ead38d9a6c9eae0b83aa7a82208f177b7e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 22 13:26:40 2009 +1000
dix: remove all but main() from main.c
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dc2767d1c5db60385867c76ba2de507fe0cb8a90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 21 22:18:23 2009 +1000
test: add InternalEvent to core event conversion tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1127ca097cb75450bcccfc5f5d82e435de2fb5b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 11:41:58 2009 +1000
test: add a simple test to verify device axis intialization.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4124c465a85713fe44843a16c5e2b13ece17e9d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 17:21:08 2009 +1000
Add a test-suite for in-server unit-testing.
This patch adds a test/ directory that contains the setup for a unit-testing
suite designed for in-server unit-testing. All functions available to the X
server are available to the test binaries through static linking.
This test suite uses the glib testing framework.
Do not use glib calls outside of the test/ directory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 987579c930bda803427a28cb82773c389f5110d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 22 13:26:40 2009 +1000
dix: remove all but main() from main.c
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2a2a7fa6856b2e1954e904577535118f20cd9133
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Apr 27 20:23:53 2009 -0700
Solaris: use <sys/agpgart.h> instead of stale copy in Xorg sources
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 707af5f8c5fae3b6c4c5125a91917667bb0ab908
Author: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Date: Thu Apr 23 16:15:01 2009 +0100
Make the cursor completely optional
For embedded use, it's convenient to be able to disable the cursor
completely, without having to audit and fix up all your third-party
code (e.g. Mozilla Firefox).
Add -nocursor and -cursor server options to enable and disable the
cursor. The default is still -cursor, but embedded users can run the
server with -nocursor to hide the cursor regardless of what
application developers do.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 40a8f2f4088aa353de733a11327b628ef13a52e6
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Sun Apr 19 21:15:22 2009 +0200
Fix obvious copypasta
Reviewed-by: Ian Romanick <idr@freedesktop.org>
commit a8cf63fd18b0ddadbadf7b47d620159854920050
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Apr 23 14:57:04 2009 -0700
Export CompositeRegisterAlternateVisuals.
Drivers need this if they add visuals that require implicit redirection. Add a
new SDK header, compositeext.h, to contain the prototype for this function.
commit 48573e7ea13e279593249036e6d30f1d7507882f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 26 21:32:37 2009 +1000
Xi: swap stuff->cursor in SProcXIGrabDevice
commit ff6c7764c2909e4126403b7211faa6c58556b341
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Apr 24 12:49:19 2009 -0700
DRI2: Implement protocol for DRI2GetBuffersWithFormat
This change implements the protocol for DRI2GetBuffersWithFormat, but
the bulk of the differences are the changes to the extension / driver
interface to make this function work. The old CreateBuffers and
DeleteBuffers routines are replaced with CreateBuffer and DeleteBuffer
(both singular).
This allows drivers to allocate buffers for a drawable one at a time.
As a result, 3D drivers can now allocate the (fake) front-buffer for a
window only when it is needed. Since 3D drivers only ask for the
front-buffer on demand, the real front-buffer is always created. This
allows CopyRegion impelemenations of SwapBuffers to continue working.
As with previous version of this code, if the client asks for the
front-buffer for a window, we instead give it the fake front-buffer.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
commit 28ddfc88d8d547941c7f4713db527a3c2f9ec35a
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Apr 24 12:09:21 2009 -0700
DRI2: Add interface for drivers to query DRI2 extension version
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit a1c98f7fa9aa0cd5075ef2054c5d2be4d1e740f0
Author: Joel Bosveld <Joel.Bosveld@gmail.com>
Date: Fri Apr 24 10:12:26 2009 -0700
Correct fcntl(F_SETOWN) error check in non-Solaris sigio code
commit 64b7f96dca accidentally inverted the comparison, could
result in crashes on some systems later on.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 64b7f96dca23d2b33e0b8a8785d628d9a2f50e7b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Apr 24 00:14:12 2009 -0700
Add SIGIO/SIGPOLL support for Solaris
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 0c467b1f990f156a34d5ef117bd825df6b633114
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Apr 24 00:05:28 2009 -0700
Add casts to generated entries in sdksyms.c to silence type mismatch warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 7d0f7518c2235a9dc783029971259ddaada2db20
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Apr 23 08:42:38 2009 -0700
Fix byte swapping of XF86VidMode{Get,Set}GammaRamp
Fixes OpenSolaris Bug 8315:
Xorg segfaults when screensaver fades in cross-endian xdmcp session
<http://defect.opensolaris.org/bz/show_bug.cgi?id=8315>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 057fc9a4f89282e440b5e11458f1dd8655879dd8
Merge: 95628b7 932d6bc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 24 16:15:47 2009 +1000
Merge branch 'master' into xi2
Conflicts:
Xi/chdevhier.c
include/input.h
commit 932d6bcbb68194c5bdfeb336f700dc8b31529223
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 24 15:28:45 2009 +1000
mi: remove superfluous check.
mieqProcessInputEvents doesn't process events from MDs anymore, so we don't
need to check for pDev->isMaster.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fab563bf8f6b63906ce9d5a568c467425843265b
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Mar 27 16:44:15 2009 +1030
input: propagate XTst events through virtual slave devices.
A XTest virtual slave device pair (kbd/ptr) exists for every master
device pair. This is so XTest events are correctly propogated via slave
devices up to Master devices and the classes are correctly changed along
the way. We add the XTest slave device pair to the Virtual Core pointer
and provide a simple way of creating the devices.
A XTest Slave Device is identified by the XTstDevicePrivateKey property
being set in the devices devProperties
XI events are still propagated through the matching device, in the hope the
client knows what it is doing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ccd28ca2ad40aecf951ab058d89062828e3e5d8a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 22 19:23:17 2009 -0700
XQuartz: Localization update
(cherry picked from commit 9435fc5e20e25ce66ec85bde033daff51f39f69c)
commit a362d0f4fb79150f7b8e0eb3d1dc1cdee2f98d95
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 19:06:45 2009 -0700
XQuartz: Make sure the bgMouseLocationUpdated state is consistent
(cherry picked from commit 8fa8a8e1db60c8ac60d10f1f15517471d2291f77)
commit 8dc8812c226222fc64f8e489f9f123687a95d3d1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 23 12:13:35 2009 +1000
exa: add missing exa.h header include
commit 3ec6a121e110ba3cae964ee201d4d5bf818b6dff
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 23 12:13:05 2009 +1000
exa: missed exa.h change
commit 02ae85c4c93bbd0013c063ce0014b365a8ba061f
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 23 12:04:17 2009 +1000
exa: add CreatePixmap2 hook for driver pixmaps.
This adds a revised pixmap hook for driver pixmaps, which is
required to support tiling on various chips.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9d684ba0bcab53841a17ebd521507b6df8bc4b45
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 16 10:28:36 2009 +1000
exa: avoid offscreen pixmap swapped out flag for driver pixmaps
commit 0dfb97f15f591f85e079f5829c77d0c328d00464
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Apr 22 20:01:49 2009 +0200
Bug#21324: Add quirk for Iiyama Vision Master 450
Reported-by: Jeremy Henty <onepoint@starurchin.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 44227ef1b77467c76147b9bf79bdd0e6305a522a
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Apr 20 18:20:52 2009 -0700
DRI2: Send the version the code actually supports
This prevents building an older server with a new dri2proto.h from
resulting in a DRI2 extension module that lies about the version it
supports.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit d1e916d29be8b470cbc8cadcf6e83991fdbc5a9f
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Apr 16 12:10:34 2009 -0700
DRI2: Add missing front-buffer flush callback.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit 826a5bff0136b2b4d55a9e6e6bc3a7a64da9031e
Author: Benjamin Close <benjamin.close@clearchain.com>
Date: Thu Apr 16 15:33:30 2009 +1000
dix: Change AllocMaster into AllocDevicePair, allow creation of SDs too.
Allocating a slave device is essentially the same as allocating a master device.
Hence we rename AllocMaster to AllocDevicePair and provided the ability to
indicate if a master or slave device pair is required.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2e5932bda3f473629d4be6f3ca4dcab18993eb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 11:06:52 2009 +1000
dix: don't allow more than MAX_VALUATORS on one device.
Some keyboards (?) advertise more than MAX_VALUATORS axes. Parts of the
internal event delivery relies on not having more than MAX_VALUATOR axes, so
let's cap it down.
If there's real devices that require more than the current 36, I'm sure we can
bump this up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 063833f3a6d9f8f657e3de309c8d6d5c3d606513
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 24 14:23:37 2008 +0100
Add XI 1.5 event and requests to protocol.txt
commit 4f86ee61a4abf7a29e565d095aa08abd0ca9dc66
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 24 14:17:27 2008 +0100
Add RandR 1.3 requests to protocol.txt
commit 6559f02ef89cb0ee365110d6a928ebd29632ad53
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Apr 17 15:14:45 2009 +0100
xkb: set bell_func in InitKeyboardDeviceStruct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 95628b797e2b326ae15406df4f736e25f5d2f12f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 20 14:04:54 2009 +1000
Xi: use the XI2 defines for AsyncPair, SyncDevice, etc, not the XI ones.
And don't allow some values on SDs either.
commit 335c63fcd6a53c1d3dffd6e00c0acd400c61e3d3
Author: Werner LEMBERG <wl@gnu.org>
Date: Fri Apr 17 15:22:57 2009 +0200
Add newline to some LogMessage strings.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5ad14c8ed4d8360e1df8cd0bacf6a7c9c31df91
Merge: 54716fd 0e0642e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 19 22:28:22 2009 +1000
Merge branch 'master' into xi2
commit 54716fd3dbc251db9d251d1d0435942efaa63259
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 19 22:12:11 2009 +1000
Convert to using int32_t fixed point values on the wire.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 129ac9a9145323e3f126590b491e718f976f80ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 19 21:31:56 2009 +1000
dix: set root_x/y for device events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eeb1e4cd254c047539933c3b886037e67ef30762
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 22:17:15 2009 +1000
Xi: add support for XIAllowEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 74d0fc3aee05bc4f505274d81dd44c0d2b4368ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 11:06:52 2009 +1000
dix: don't allow more than MAX_VALUATORS on one device.
Some keyboards (?) advertise more than MAX_VALUATORS axes. Parts of the
internal event delivery relies on not having more than MAX_VALUATOR axes, so
let's cap it down.
If there's real devices that require more than the current 36, I'm sure we can
bump this up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit edb70caf21fa5da3c336c47c62218a3f05c635b8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 22:16:49 2009 +1000
dix: remove un-used parameter "core" from AllowSome
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bb5418d4901017c657031181d3839f58b387a2a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 22:22:21 2009 +1000
Xi: Add support for XI2 active grabs and ungrabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c11ef87931f920ba782ba4e9b47d9c31ad7c1cf7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 22:16:14 2009 +1000
Xi: take XI2 requests into account when checking opcodes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c94ea5bc055e4efc323e84b7a8266e8b8a4af48e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 17:38:28 2009 +1000
input: use a GrabMask union in GrabDevice to allow for XI2 masks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6bb4b5b93701535402f65ea828348ed7747c7dbf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 16:20:10 2009 +1000
Xi: add XI2 grab protocol request handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09f9a86077f0058ce88ee9b3df5d1ab854eeca43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 16:19:45 2009 +1000
input: replace GrabRec's coreGrab field with grabtype.
Don't allow grabs of different types to override each other.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7fbe1b7d63c94b344e8ff9d09c0bb162ca104909
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Apr 11 13:10:31 2009 +1000
Xi: remove the GetExtensionVersion hack.
Squashing data into a request that's defined to be padding is probably not the
best idea.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e0642ee9466d3268476d0084a83a9d93a4aa555
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 16:17:07 2009 +1000
os: don't malloc memory in LogVMessageVerb.
LogVWrite is limited to a buffer size of 1024, so we don't loose anything here
by truncating. This way we can use LogVMessageVerb (and xf86Msg and friends)
during signal handlers with the normal message types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 62d2fb68638e9f2aa3c1d72027619c4d38f5b812
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 17:06:33 2009 +1000
xkb: Add XkbFreeRMLVOSet helper function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
commit 73e1055b1275470dcc2d53b15898c866d9721d3e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Apr 11 11:19:29 2009 +1000
Xi: fix a typo in a #ifdef
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cbbc7fed994448852961a987a8b0eadf718b24bf
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Apr 1 10:53:10 2009 +0200
dix: correctly utilize tracker buffer and protect from timer overruns
two small related fixes hard to split up
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ca4918ac2ff003142aefbd8ac7ec2bc398ccc6eb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:31:04 2009 +1000
Xi: remove fail from SProcXISelectEvent.
Leftover from rebasing once too often, I guess.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 463676f016a105a790cbb386d20eb5b188c04652
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:11:59 2009 +1000
Xi: remove un-used variable pXIClient
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32b13ec4cd42842a133aa6428f49638b0448efc9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:11:27 2009 +1000
Xi: silence compiler warnings about "wrong" event types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f2e957c5342aefc8329e9fe282b7072f767fcd28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:07:36 2009 +1000
mi: add prototype for CopyGetMasterEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d80798ba2ae018086aaf230fcd8bc71d3bf06b11
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 20:27:00 2009 +1000
mi: fix wrong (*EnqueueEvent) declaration in miPointerScreenFuncRec.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4dedb900f4fbd3bdc9538b1e82cab2044438a770
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:42:06 2009 +1000
xfree86: shut up compiler warnings - typecast to InternalEvent
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fa7fcf610d2ab91c1158f8034bbc0531060a86f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:40:20 2009 +1000
mi: fix compiler warning - explicitly typecast to InternalEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8bf2f562678107c346e8664f18c10f315c2768f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:14:39 2009 +1000
dix: fix dev/keybd variable mixup.
Reported-by: Eric Anhold <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 012cb1956a69f6cf2a878c5331e792fb12c73e9d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:06:32 2009 +1000
xfree86: fix use of uninitialized variable in DGAProcessPointerEvent.
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 73b01a9aac5fde46ccd90c08a070e9d2496092b9
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Apr 8 14:35:01 2009 +0200
dix: fix pointer accelerations remainder handling
This didn't really work as intended, but did amazingly well thanks
to roundf() hiding the defect. Cheers!
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4318075140cc287871d3c3b9f777289ea4ffa23a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 7 21:51:02 2009 +1000
dix: store subpixel precision and send it down the wire to the client.
For the valuator data, not yet for root x/y and event x/y.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9212948461c5e053abb61fff73ced4a00f138544
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Mar 21 18:19:19 2009 +0100
dix: allow relative motion buffer to accumulate in a natural way
Since with XI2 we pass sub-pixel motion, anything else is broken.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ad76656f8869e2065f0c4e66cfbeef0b42c61769
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 17 17:46:58 2009 -0400
randr: Accept gamma set requests from XF86VidMode clients too
commit d9bf52b4abd29a3c206cd1e765b680659ddac1c6
Author: David Jander <david.jander@protonic.nl>
Date: Fri Apr 17 01:34:18 2009 -0400
[kdrive] Fix rotation of pointer
Rotation matrix for pointer coordinates was incomplete and pointers with
absolute coordinates did not work correctly in xserver (kdrive) when the
sceen was rotated other than by 0 degrees.
Signed-off-by: David Jander <david.jander@protonic.nl>
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit 4559d2ace6ac55fe361f572ded0769cdd1f3b545
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 16 22:48:11 2009 -0400
security: Grant untrusted windows remove access on all windows.
This allows untrusted clients to destroy their own windows when they
have been reparented by a trusted window manager.
commit 3481b32ab971c41cb972f6819ae049f3e9f7033b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 16 22:39:54 2009 -0400
security: Fix a crash caused by wrong ordering of format arguments.
commit 6045506be0cebca4ebbe943ae77f020aafa703d4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 16 22:33:12 2009 -0400
security: Revert behavior of extension access for compatibility.
Previously, three extensions were defined as "trusted" by the extension:
BIG-REQUESTS, XC-MISC, and XPrint. No other extensions were permitted
to be used by untrusted clients.
In commit 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763 this was changed for
some reason. Return to the old, compatible behavior.
commit 56a5955c8cd87137248edb2cbc65d384376d72ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 14 17:05:04 2009 +1000
xkb: strdup the values returned by XkbGetRulesDflts
XkbGetRulesDftls may get a copy of what will later be freed when passed into
XkbSetRulesDftls.
On the second run of XkbGet/SetRulesDflts:
XkbGetRulesDflts(rmlvo)
rmlvo->rules = current-rules
XkbSetRulesDflts(rmlvo)
free(current-rules)
current-rules = strdup(rmlvo->rules)
Leaving us with garbage in current-rules.
This patch requires callers of XkbGetRulesDflts to free the associated memory.
See also
http://lists.freedesktop.org/archives/xorg-devel/2009-February/000305.html
Reported-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit b406886bbffadaa52864a99f2a0520999eadc15d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 14 16:57:29 2009 +1000
input: allow NULL as XkbRMVLOSet in InitKeyboardDeviceStruct.
Virtually all callers use
XkbGetRulesDefault(&rmlvo);
InitKeyboardDeviceStruct(..., rmlvo);
Let's save them the trouble and accept NULL as a hint to take the
default RMLVO.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4e4e263bc073bf452f19c932b937c4881ae71f64
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 22:16:49 2009 +1000
dix: remove un-used parameter "core" from AllowSome
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dd6e8a14ec1c8f4ed9c51ca2764261e6e48d13b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Apr 11 11:19:29 2009 +1000
Xi: fix a typo in a #ifdef
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de1e43181bd670877b994db221ad8a04b5d63324
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 15 11:13:48 2009 -0700
DRI2: Don't leave empty entries in private->buffers
This should fix bug #21130.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit b3e3154cce47add97f5561088036ce3b9e7dc937
Author: Robert Noland <rnoland@2hip.net>
Date: Wed Apr 15 12:06:19 2009 -0500
One = is more than adequate here. Make is sh safe.
commit 74d27c8b5bac7c8d2ed02ba86e09bf09924ce05c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 15 15:44:17 2009 +0200
Fix build on hurd-i386
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523970
commit faf7dfa099f5b42a703313fbd1bf8afdad07a179
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Apr 15 18:26:06 2009 +1000
randr12: looking up these bits if randr isn't initialised is bad.
When xinerama is enabled we don't get randr protocol, but the
driver might still want randr internals
commit efa31092d6703397121a0ada4f7205a8ecad3d3d
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date: Mon Apr 6 16:01:20 2009 -0300
xfree86: Remove device from inputInfo.devices if ActivateDevice failed.
After the call to xf86ActivateDevice, the new device will be added to
inputInfo.devices. However, if the subsequent call to ActivateDevice
fails, the correponding InputInfoRec for the device is deleted but an
entry still remains in inputInfo.devices. This might lead to a server
crash later on (on InitAndStartDevices for instance) when the device
control proc would be called for an invalid device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d79bad0aa70403ead8ec87bac8463a6e2005802c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 13 17:49:00 2009 +1000
xfree86: don't synthesise a mouse section if synaptics devices are found.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4a27618565f3151ab17f0ca9ecbde12fa7ba13c0
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Apr 14 16:21:04 2009 -0400
composite: Fix resource lookups
commit e7785e8af3e34f9d1089d8499d16802984ab9823
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Apr 14 14:24:31 2009 -0400
xfixes: Fix a couple of resource lookups
commit 0eb19f9437b7d8c19592e49eedb028771d300d80
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 14 10:54:25 2009 -0400
xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)
You could be more clever than this, but the wire protocol says this
really is an array of not more than 255 ARRAY8, so it's not just a
matter of changing the types.
commit f0543ae4ec0fcb5d696e7b2983653bd779f1eddc
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 8 14:17:41 2009 -0700
Fix unused var warning from pci cleanups.
commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 8 14:17:40 2009 -0700
Add shave so that we can see the steaming piles of warnings generated.
The old style output can be reenabled for build system debugging using
"make V=1", or --disable-shave at configure time.
commit 4474c200a102feda72f9572a96cb588009aa0147
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 8 14:17:39 2009 -0700
Move VENDOR_* defines from AC_SUBST to a header to avoid angering shave.
This is more sane anyway, as it ensures a rebuild when changing them.
commit e72c85547b405fbd0117dc1236e5ca5a2126063c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 8 14:17:38 2009 -0700
Move contributed m4 to a subdir so we can more easily update contributions.
commit bef1cfb2395df47458159a0b7ae27b9db15025ef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 14 16:54:42 2009 +1000
xnest: remove unused variable 'names'.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b6400a1b8d2f228fcbedf17c30a7e3924e4dd2a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Apr 9 13:16:37 2009 -0400
glx: Fix drawable private leak on destroy
When a drawable goes away, we don't destroy the GLX drawable in full,
since it may be current for a context. This means that when the drawable
is destroyed in full later, the backend doesn't get a chance to
destroy resources associated with the drawable (the DRI2Drawable).
With this patch, we destroy the GLX drawable in full when it goes away
and then track down all contexts that reference it and NULL their
pointers.
commit 140463a197fb93d0a4bfad924efc35b860e8cc54
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 16:53:59 2009 -0700
XQuartz: Use correct values for ProximityIn and ProximityOut
This was the other underlying cause of teh 100% CPU tablet issue.
(cherry picked from commit a9cecf34c23fbcd59b56b380c51d31a9fabc3eb7)
commit 80a7bb2605f9b439d6221c0495a629a39177a018
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 17:26:07 2009 -0700
XQuartz: Solve the tablet 100% CPU bug
This happened because we put a byte in the fd to wake up dispatch, but we never actually enqueued anything in mieq because the num_events was 0.
(cherry picked from commit c21ca7558d2faf93c61f5feaafd7c878e9e21942)
commit 6f8f7c78f1b722bc70a0ea8f6340116a1e09e858
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 16:13:42 2009 -0700
XQuartz: Re-enable background window checking
since that code was not the culprit for the wacom tablet, background 100% CPU bug
(cherry picked from commit fc1dc5d71b2a488a8a94d953dd8e67353161a590)
commit 8522a759c9e78478bb399b91d3a0af2d23ea6766
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 16:12:23 2009 -0700
XQuartz: Only set MotionNotify on activation if it is updated.
(cherry picked from commit ae8077a251ef27381a755d57ff974767bda16148)
commit 5e55becddccc376ab7338789562ad6d6cd750de9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 14:23:41 2009 -0700
XQuartz: Make sure the Fn doesn't trigger unneccessary calls to DarwinUpdateModKeys()
(cherry picked from commit 70a18558c6b0a02b633fd8974f002cdf3cdc713e)
commit bd1d9179094657865b0606ed0ac835a8b8df3be1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 13:53:38 2009 -0700
XQuartz: Re-enable Fn as an option for 3button mouse simulation.
Patch from Martin Otte <otte@duke.edu>
(cherry picked from commit b5ec3be6b5449b5d575bc1472fdd1c9cb15cb8be)
commit 1b5758bef0840c6614244e321790231b3c9477c9
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Apr 9 15:45:57 2009 +0200
exa: implement UTS based upload through CopyArea
- Some image viewers (eog, gqview) trigger the CopyArea path of Xext/shm.c
- I'm not aware of any code path that wouldn't like UTS and trigger this code.
- miDoCopy should handle src coordinate clipping.
- Overlapping blits are obviously not an issue (both would have to be offscreen or not).
commit 567cf67959b30432ae30f4851ec17b3a375ab838
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Apr 9 14:38:24 2009 -0700
DRI2: Synchronize the contents of the real and fake front-buffers
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit f1a995d1496d73741731e32f475097c44a8da972
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Apr 9 14:31:01 2009 -0700
DRI2: Do not send the real front buffer of a window to the client
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit aa2928325fe51d94a636dde9c090e8f54a311a12
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 8 15:44:34 2009 -0700
DRI2: Add fake front-buffer to request list for windows
If a front-buffer is requested for a window, add the fake front-buffer
to the list of requested buffers.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit 808fd2c67f303cb721769375b11ce8b90ffc1909
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 20:00:37 2009 -0700
XQuartz: xprSetWindowLevel updated to store the level requested by the WM
(cherry picked from commit c28c2ddc3a8f3c5b9beec396953bb3ac9ee4714b)
commit dfb0d7aefbbdfc0db966e3a84d52f638135d9138
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 18:51:22 2009 -0700
XQuartz: Update window levels when changing rootless state
(cherry picked from commit 1359ded5bfc14a80fb998b01a54ecacb96c4ff88)
commit d5ef88d7543ed787093099ab18db766c446b47d1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 18:27:22 2009 -0700
XQuartz: Fix window levels for rooted mode to allow showing the menu bar.
(cherry picked from commit 80759a4186bf0335edc85aecea2faf11fe09f491)
commit 15146b863759640e7a73fab2301fb28ef4dead84
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 17:47:41 2009 -0700
XQuartz: Properly set the window level for the root window
(cherry picked from commit bdf9286d1cbfeaaf8eaf03d28091e91ee587ee25)
commit 8d5dcfe2154f217bd8fde5509d78f3383add8725
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 04:36:26 2009 -0700
XQuartz: Properly set the menu bar and hotkey state when changing rootless mode.
Currently no code path exhibits the broken behavior since we only toggle into rootless if we don't have the root.
(cherry picked from commit 970f100ca3c5fc0662ae7658d49d118fbd9de943)
commit 82d7cf5cdcbc5e451a87f8c2f64cd5d2e3627d54
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 03:55:13 2009 -0700
XQuartz: In rooted mode, make sure we start in the hidden state.
(cherry picked from commit 5ecc497f71c2133f773f6c56ad76cb778862ddd6)
commit e86f4e93020d56385418850a9eebae8076dcb9ac
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 6 21:34:14 2009 -0700
XQuartz: Send MotionNotify before button presses when X11 is in the background
(cherry picked from commit c80d0ec18ef5b842447d31360406d0b5b9424222)
commit 5ccfad8df099e8ebc4bf2dd53c3db1460903b135
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 6 19:21:46 2009 -0700
XQuartz: Revert most of the previous override redirect patch
The changes actually caused all windows to move to the current space. Instead, we're going with a fix entirely within Xplugin that depends on quartz-wm being the window-manager for now.
(cherry picked from commit 997b6f3142c622541bb5bac98652abae75d1101d)
commit ff7f019bbcbc52618cc478db7baed57aa5b7c3d3
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Apr 1 10:53:10 2009 +0200
dix: correctly utilize tracker buffer and protect from timer overruns
two small related fixes hard to split up
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 06aebecb19dd9d90d73b742a09b6068b862f1d05
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Apr 8 14:35:01 2009 +0200
dix: fix pointer accelerations remainder handling
This didn't really work as intended, but did amazingly well thanks
to roundf() hiding the defect. Cheers!
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98f4179156391752e6688339487458ad7828abf4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 26 23:04:24 2009 -0700
Use RTLD_DI_SETSIGNAL to catch runtime dynamic loader errors and clean up
Based on fix for Sun bug 6813925: Xorg needs to catch ld.so.1 failure
so it can close down devices cleanly
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6813925>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit a0b6a363dca8ce0dc6f4eb79333e48496153cd67
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 9 13:22:57 2009 -0700
Lift fatal signal handlers from DDX'es up to a common DIX implementation
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit fcc19e673e3ef33d64916dd933853f8aa667c4d7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 20:27:00 2009 +1000
mi: fix wrong (*EnqueueEvent) declaration in miPointerScreenFuncRec.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fee979d0632751d3d54d2115e84e9654edf0622
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:11:27 2009 +1000
Xi: silence compiler warnings about "wrong" event types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6b467bf879eeb77d167ef321e6dda97ca9d7010a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:42:06 2009 +1000
xfree86: shut up compiler warnings - typecast to InternalEvent
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8a2a184da78a3e9cbeae8290431f40d5ec7f3636
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:06:32 2009 +1000
xfree86: fix use of uninitialized variable in DGAProcessPointerEvent.
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 011cee3103c146c8096b7098a27993f99e07a824
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:14:39 2009 +1000
dix: fix dev/keybd variable mixup.
Reported-by: Eric Anhold <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 630a6e9d14ffbf036fa72f580c72c0172d7c20bd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:40:20 2009 +1000
mi: fix compiler warning - explicitly typecast to InternalEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e3bb7dea06b9ab0e30d801bf6c3a59f94290aaed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:07:36 2009 +1000
mi: add prototype for CopyGetMasterEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 346e71525fc545c6ca4ad79425722282d1544459
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 9 09:36:41 2009 +0200
EXA: If the driver can't composite to an a8 mask, try an argb mask for glyphs.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 682d7b55699cacbb2dbcd84a5e816bf6e2d2f02a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 9 02:48:04 2009 -0400
xselinux: Don't BadAlloc in List* requests if there are no items to list.
commit 3a0ee199dcec39596756a995996eac388acf6315
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 9 02:26:24 2009 -0400
config: fix crash caused by strdup(NULL)
commit 7b3982eb6518da33ab01c2fbf7ceb45b89f841df
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 9 08:21:09 2009 +0200
glx: Test the error value, not its address...
commit 03aebed519986c4dd03e02b3b3d4af1f64595ca7
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 8 14:54:30 2009 -0700
Use a #define instead of a magic number
The number of buffers is likely to change in the future, so having
this as a define is the right way to go.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit 0d9f3ca7eabd4c514808114d30627f682c8bd030
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 8 14:53:46 2009 -0700
Allow GLX sources to build against Mesa 7.4 sources
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit e8b324102f6e21ae2b8292a6f50d016dd6254dd6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Apr 8 15:10:16 2009 -0400
xselinux: Don't require incoming context strings to be null-terminated.
commit df27b870a8db7a5153b18a556fe77efa590f9eee
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Apr 7 16:28:08 2009 -0400
Convert remaining GLX LookupIDByType() calls
commit 92562747a0fdbef1dbedf734cb55dd6a9e1d2994
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Apr 7 13:58:53 2009 -0400
Add validGlxDrawable() and use dixLookupResourceByType().
Fixes deprecation warnings, and fixes a couple of GLX error codes
for failing drawable lookups.
commit f70cfc8f90091ef0f5ed0a5b2e023e7fd6369b36
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Apr 2 17:30:19 2009 -0400
Don't stomp on dixLookupDrawable() return value in DoCreateGLXPixmap().
commit 30d81ad72e870cc37754bd8c8aadf605450ec16e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Apr 2 17:24:12 2009 -0400
Make GLX context lookup use dixLookupResourceByType()
commit 66539cc05d0b017b9feb4a038499907810140623
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 26 22:22:32 2009 -0700
Don't leak default font path when appending built-ins
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 6c3b633299f12051fcf37fb8439f358de876cf03
Merge: adf21db 0cfd481
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 7 19:36:27 2009 +1000
Merge branch 'master' into xi2
commit 0cfd48130842685828e0662a27272a3a65facd23
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 23 11:41:16 2009 +1000
dix: Dont change the keyboard mapping on non-keyboard devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69e73e5ce0e3971eceed71216d2d7e7d9cd57cc2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 6 17:56:49 2009 -0400
config: Remove useless xf86conf{{m,c,re}alloc},free} macros
commit 485946120a6522db9298111752de9be3d675e0b3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 6 17:51:35 2009 -0400
config: s/xf86configStrdup/strdup/
commit 5f769b73441cf29c05a05c728ab81bdde1fc00b6
Author: David Jander <david.jander@protonic.nl>
Date: Mon Apr 6 13:01:08 2009 -0400
kdrive: Fix segfault in tslib support
commit 843166b033dc0544b9f3cf3c91fc3ae3650bda14
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 6 11:05:17 2009 -0400
os: signal handlers return void.
commit aa6fbc2a3679896181610aee7ce2844d4322a5ce
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 6 10:58:47 2009 -0400
Remove some OS/2 leftovers.
commit 2c03a63ff6855272d587b4972a67f64115a1ce4c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 5 03:20:40 2009 -0700
XQuartz: Use updated Xplugin API to send overide-redirect windows to the current space when they're ordered in
This fixes the annoying "using a menu moves me to another space" bug
(cherry picked from commit 9e6dab89e08a26d764ba1aeaeb804c3d25c667da)
commit 67621f3b39c387b3f7bfc65781051aea51c0b83f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 5 00:06:57 2009 -0700
XQuartz: Send a MotionNotify event for the mouse cursor when activating X11.app
Otherwise if X11.app was activated with a mouse click, the location of the even is the last location of the cursor before X11 was deactivated
(cherry picked from commit c7457d7b31ddd2ddfd04dd6294bed4532664e1ab)
commit e1338d27141125af61634597c5dea880692c4017
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 4 23:43:28 2009 +0200
xfree86: Remove unused DEFAULT_UNRESOLVED and DEFAULT_BEST_REFRESH macros
commit e25d55ad546905c4921f0a26385bdb9f22038429
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 22:38:00 2009 -0400
Revert accidental Makefile change from previous commit
commit 472811dc4ba741ab09db184216878700f4adf745
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 22:27:51 2009 -0400
DPMS: Re-export the various DPMS variables.
The drivers might not need them but extmod does. Should move it to
builtin though.
commit cbb165ab88cb0810268001e84d87671440baf837
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 18:34:45 2009 -0400
os: Remove the useless -x option
commit 6574ab092fb80b7731e06ede653b6af92fa7684e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 18:03:43 2009 -0400
DPMS: Remove the defaultDPMS* variables
commit c1cf36ee29e41901ecd382f0258110ebb4a0124e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 17:51:55 2009 -0400
DPMS: Simplify command line parsing
commit 2d0a4fff7985f58c21023cc4757090ee67067593
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 13:44:37 2009 -0400
DPMS: Remove unused DPMSGet()
commit d52fddefaeb43f15b677eefbea4a288a9948373b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 13:33:03 2009 -0400
DPMS: Align the default timeouts with the default screensaver timeout.
On a typical LCD, a black screensaver is actually worse for power
consumption than a normal screen, because it takes more energy to turn
the crystals opaque. Also, the intermediate DPMS states are essentially
useless and most monitors alias them to the 'off' state, so we may as
well do the same.
As a pleasant side effect, this brings the default DPMS timeouts in line
with the EnergyStar Program Requirements for Computers:
http://www.energystar.gov/index.cfm?c=revisions.computer_spec
which state that products must be "shipped with the display's Sleep mode
set to activate within 15 minutes of user inactivity".
commit 38576dc3ae8ddec2baedd2f7e64abdfc56bedf93
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:55:41 2009 -0400
DPMS: Simplify some macro silliness.
commit 1c01127a214731a21c4784249a429c74f17bd424
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:39:18 2009 -0400
DPMS: Unexport all the various setup variables.
The drivers don't need to know any of this.
commit a99b0ab918998c9a1b9f8692591b8cb59a12eb9e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:32:00 2009 -0400
DPMS: Fix cast abuse
commit 4da347adb1fcc39e8f4fb2cadd98e887d7ac877a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:18:21 2009 -0400
DPMS: Code motion.
commit 1731882341c191b4ffd78e0c1fd9297c636e0401
Author: Havoc Pennington <hp@pobox.com>
Date: Fri Mar 27 12:30:37 2009 -0400
Set bg pixmap of composite overlay window to None (#20912)
Otherwise it's impossible to get the COW without a white
flash on the screen, because it's on top, mapped immediately,
and unaffected by composite redirection. This makes
initial login ugly when it doesn't need to be.
commit d2690375dfd994817f004cda133ca2a492c0b956
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:06:50 2009 -0400
kdrive: s/KdSaveString/strdup/g
This isn't even funny anymore.
commit 91b697efdefba125348dbcaf584ee51a7f8c9bf6
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 1 17:42:33 2009 -0400
Support setTexBuffer2 in AIGLX.
Fixes broken GLX_tfp, specifically, lets compositors ignore un-defined
alpha channel for pixmaps.
commit 1c101d75d4855b2698e3fc8d2dd662f20585812f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 26 22:25:08 2009 -0700
Don't leak canonical module name and patterns if module is built-in
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9180081ec32b6c655d193de4c89b59d222a72579
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Apr 1 13:45:02 2009 -0700
XQuartz: Still send mouse events while X11 is in the background if we have test extensions enabled
(cherry picked from commit f393fb686cfbedb11a1539d4eaf5c491af8b3a64)
commit 029307e79a14cad5bde8f1f4a5d0a2f740271f06
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Apr 1 13:07:15 2009 -0700
XQuartz: Return BadRequest when SendPSN isn't implemented rather than success
(cherry picked from commit 49871e99179d5176a1ec516c8f449e2dc219faea)
commit 0603fbc1d3b2db5c25faabbfb5e04914110b4d0e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Apr 1 12:46:51 2009 -0700
XQuartz: Pad xAppleDRINotifyEvent to 32bytes to match sizeof(xEvent)
(cherry picked from commit 276ee3bb087c772f57a987519aa4d94afeceadaa)
commit b1dab580bdfb4acfe3feddeda6e760098ec4922a
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Wed Apr 1 19:32:21 2009 +0200
xfree86: edid quirk for Philips LCD LP154W01-TLAJ
This panel reports its vertical size in cm.
X.Org bug#21000 <http://bugs.freedesktop.org/show_bug.cgi?id=21000>
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 7d94414cf4b16501ce4c4291846498f393f150a4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 1 09:42:06 2009 -0400
input: Remove xf86ReloadInputDevs hack
We have input hotplug now, no need to fake it.
commit 3311ef6ec93df4325d198715e0fce73af19f0781
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Mar 31 18:11:19 2009 -0700
XQuartz: Don't report mouse events while X11 is not the foreground application
(cherry picked from commit 5d1dd35096334b59564d77caef7a97bd58845c5d)
commit 89887fadc97f6fd5059886396a6d7cf61de1982f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 31 15:09:57 2009 -0400
APM: Don't carp if not available.
commit 2e145989d10ef454581f8aa60358ed3782fd6442
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 30 17:22:28 2009 -0400
dix: Simplify InitClient()
commit 252ec504817e05b185e4896a2d899e9c00b8aeef
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 30 15:18:30 2009 -0400
Document which bits of ClientRec are currently unused
commit 0b6e14d46feaf8c46fd3768ee5353b844391b79b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Mar 30 20:37:25 2009 -0700
XQuartz: Fix mouse tracking for quake, et. al. in wine
Patch courtesy of Codeweavers
Fix mouse movement tracking. For a non-window-related mouse-move event,
calculate the new position by adding the event's delta-x and delta-y values
to the previous mouse position. Do not rely on the current mouse position
because it may have been changed by a XWarpPointer call.
(cherry picked from commit 7a67935b05a475215b9bdbb959e4f7e15f32416f)
commit c74220b853cd99d03e33cc62d32431ca3a879483
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 30 14:56:15 2009 -0400
APM: Use general handlers, not input handlers.
Otherwise APM events get treated as input events, which messes up idle
time accounting and screensavers and such. Not, we hope, that anyone
is using APM anymore.
commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 15:56:15 2009 -0400
selinux: Only activate if policy says to be an object manager
commit 8e7facfe3013abda12a0c39ad8b4d025618077a7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 15:48:17 2009 -0400
config: Fall back to vesa for Intel Poulsbo.
commit 17239c8e3163fef0159835d43c0dde20e78192a1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 12:44:20 2009 -0400
misprite: Remove private header, fold into misprite.c
commit bb89fc2771d2e54d7e0cd0371db68ddb754a64e5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 12:36:42 2009 -0400
misprite: Fix software cursor on multiple ScreenRecs
commit 2c000f4980d30015e6da95de3c77c0fdda0090e4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 11:54:52 2009 -0400
misprite: Do window check first for Get{Image,Spans} too
commit 8beced6c02610444105f3d0b8ee3a49e1072096d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 11:43:33 2009 -0400
misprite: RECT_IN_REGION -> miRectIn
commit a232116b9ecd41ce55f8eeee9dfe2b67d76479d6
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 11:41:40 2009 -0400
misprite: Fix a typo
commit 1f0eaf886d88f3935e43985d2c889b374f412e43
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 11:29:40 2009 -0400
misprite: Fix cast abuse
commit e3c1096273446bb7eb993b179ceb989617d149cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 23 13:20:22 2009 +1000
dix: build_modmap_from_modkeymap needs to bounds-check its argument.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 45baef0b77f6f0e5e6230eca045dfcbb1e48c647
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 23 13:32:32 2009 +1000
dix: return BadValue as error in SetModifierMapping.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 603db34337a61754e0c5f71525011d10eab78411
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 25 15:51:43 2009 +1000
Xext: set POINTER_SCREEN flag in XTestFakeInput if necessary. (RH #490984)
The POINTER_SCREEN flag must be set explicitly for XTest core events to avoid
out-of-range events when the lastSlave was an SD with an explicit axis range.
Device events sent through XTest don't need this flag, they are expected to be
in the valuator range of the device anyway.
Red Hat Bug 490984 <https://bugzilla.redhat.com/show_bug.cgi?id=490984>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ab93f05664890ff6738ef1089bcd956ce3f06e9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 23 15:19:47 2009 -0400
misprite: In SourceValidate, check that it's a Window first
It almost never is. However, you have _lots_ of input devices now, and
walking them all on every Composite operation is not the cheapest thing
in the world.
commit d698e62690e0a52fa537f1cd792cab7a5b1bafdf
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Mar 19 21:35:25 2009 +0100
xkb: plug a memory leak in XkbCopySrvLedInfo (#20756)
X.Org Bug 20756 <http://bugs.freedesktop.org/show_bug.cgi?id=20756>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e26f79335bb7a9ad34fe9b23c283a214202f89ed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 17 16:22:00 2009 +1000
xkb: put a few extra checks in against non-keyboards
commit 844bb629fe786ecf536039df3f5f4b3b214c9d40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 15:44:34 2009 +1000
dix: remove a truly useless a = (foo) ? bar : bar; statement.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 62183a06e5f72a18abc3d58c4bf5658a20ece217
Author: Tomas Carnecky <tom@dbservice.com>
Date: Fri Mar 20 16:19:33 2009 +0100
Remove two unused defines in C files
These two defines were defined in C files but not used anywhere:
dix/window.c #define DeviceEventMasks (KeyPressMask | [...]
os/connection.c #define MAXFD 500
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e0d7cc506b661b5e5cedf8be6e17aa4c8075aa8
Author: Tomas Carnecky <tom@dbservice.com>
Date: Fri Mar 20 16:19:34 2009 +0100
FID, whatever that was, isn't anymore
No traces of FID in the xserver nor in the modules listed in
util/modular/xorg.modules
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit adf21dba7617542f08309415e315d4b2699c10e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 20:40:43 2009 +1000
include: un-export a bunch of server-only functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 111ef10375204a6981a5be5c045860854c4da4e6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 09:33:02 2009 +1000
dix: move ProcGrabPointer guts into GrabDevice.
Yes, this means we have even more arguments to GrabDevice. But it beats having
a copy of most but not all of GrabDevice in ProcGrabPointer.
Also, reshuffle the order of parameters, the CARD* status is a return value
and should be last.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dc153271b6458cacd63a4bc0208594011c6460b0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 18 15:13:00 2009 +1000
Xi: purge old device enter/leave masks.
commit 15a969c0fcd4f19f3c560a7037c1a6a58bce51f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 18 10:21:59 2009 +1000
dix: remove now obsolete mskidx parameter from DeliverEventsToWindow.
mskidx would always be dev->id anyway, so if we're already passing in the
device, mskidx is superfluous.
commit f5409aa026b2cb501170867d04c6e220f3fe0a44
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:51:50 2009 +1000
mi: remove deprecated miPointerAbsoluteCursor
Functions that don't specify the device are so last year.
commit 46145a9312eaf5dcd0e8b6788ed8219e086f790e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:12:55 2009 +1000
dix: remove coreMods field from GrabRec.
Nobody uses it anyway, and it's taking up a whole bit!
commit 40e2a61e37109cd9c2ab57954ee40dcf4a062e31
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 16:53:56 2009 +1000
Add Get/SetDeviceFocus handling.
commit d9b7343eac1157490442cc0fb3b5b6d7d6e9a705
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 12:56:18 2009 +1000
dix: even if we don't get a XI1 event, continue processing.
commit e11dc10f01603b181e224c90d1dd4abe940f2ce7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 10:21:00 2009 +1000
dix: Send HierarchyEvents when devices are added/removed/enabled/disabled.
commit 8634e1bcbae9317fc22132f7c9bde1a4a881b9a7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 10:42:05 2009 +1000
dix: send presence events when floating and unfloating SDs
commit c9483a53bea1f721d2902ac11467f67317e7de14
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 11 16:20:22 2009 +1000
include: add a few prototypes to silence compiler warnings.
commit a4b61cfc78d81de02a71fa6ad8a44a06616f6794
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 11 16:08:24 2009 +1000
dix: un-static FixUpEventFromWindow and deal with focus events too.
commit 4cc6a96d7171e567a9bd5a10f552bb953077aafb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 10 16:08:14 2009 +1000
input: add support for RawDeviceEvents.
commit a668d91e28d5a3042a8ce0d087474883b046869a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 9 16:36:07 2009 +1000
dix: store the xi2mask on grabs and pass it around as needed.
This enables passive and implicit passive grabs for XI2 events, except that we
don't have the protocol spec yet to request them.
commit 32f338263ff7de1a2e76d570c98f5be979c18d4e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Mar 8 21:32:31 2009 +1000
Xi: Deliver XI2 HierarchyEvents when the hierarchy changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97e89a59572a4be6757510a317c142ec1d82e8f8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 23:22:00 2009 +1000
Allow XI2 event selection for AllDevices and AllMasterDevices.
commit 808a158182b0a3b985385899252c190947b4dbbd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 14:45:26 2009 +1000
dix: Enable XI2 delivery for events and focused events.
No support for grabbed events yet.
commit 87ff1159b497c66554a4036ae619f92d5631f00f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 11 09:01:23 2009 +1000
dix: deliver device enter/leave events.
commit 04ed0bcb2530866f7248b412974ecd15f0fbf6ac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 17:07:55 2009 +1000
xkb: remove Device/Enter leave handling - XI2 enter/leave don't have compat state.
commit 3f37923a727d5fc4b1880a53dac1145884ba7140
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 16:12:25 2009 +1000
Xi: send XI2 focus events.
commit daf7dd3bfecc9029bdd10c7a4ea5d2c875a89c41
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 11 09:01:12 2009 +1000
dix: Add GetWindowXI2Mask helper
commit 8b6a370058ad5a20e0a0e49ec9443daf03775de8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 15:58:07 2009 +1000
Add XI2 masks and XISelectEvent() request handling.
XI2 event masks are simply stored in the OtherEventMasks as a separate field.
This replaces the XiSelectEvent code.
commit 38bba0c1b75b84e8bbdfa7975cf701a9414a3afd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 16:07:33 2009 +1000
Xi: Change ChangeMasterDeviceClasses to new XI2 events.
Split ChangeMasterDeviceClasses into an extra XISendDeviceChangedEvent that
assembles the XI2 wire event for the DeviceChanged event. Re-use this when
detaching the last SD.
Not quite perfect yet, we still copy the device classes from the slave now
rather than from the data we had when the event occured. But it's a start.
(We can now unexport SizeDeviceInfo and CopySwapDevices, not needed anymore)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 181e41511d5772962b8bc998a1940d2a9ba62d5e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 16:14:51 2009 +1000
dix: fix up device enter/leave for XI_Enter/XI_Leave.
commit 0befeb36c175b14eac8d5416851f1556af90dd86
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 15:27:07 2009 +1000
dix: Add device info to DeviceChangedEvent, and fill in CCCE.
We need to fill the info here, as the device may change until we get a chance
to process it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b2ba77bac4fc3edab39372dfdc529e745ae74f77
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 5 14:23:47 2009 +1000
dix: add EventToXI2 and GetXI2Type.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dfa2e8e966b699f9d292628119d5a9cbd2dbdf5a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 15:12:32 2009 +1000
Xi: add XIQueryDevice request handling.
commit 560c58b53e4e60ebd26e0c66dd00399c438bd619
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 15:17:52 2009 +1000
Xi: name-space and fix XI2 requests
All XI2 requests have XI prefixes.
Requests affected:
ChangeDeviceCursor
QueryDevicePointer
WarpDevicePointer
SetClientPointer
GetClientPointer
XIChangeDeviceHierarchy.
commit 903449615b1a1188955c0287a552aec8ac5b3fbb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 15:03:35 2009 +1000
Xi: add XIQueryVersion request handling.
commit 77d51b94bd264be5a8625a2bdd98f2bfb2aa33d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Mar 8 11:47:26 2009 +1000
dix: FixUpEventForWindow needs to handle XI2 events.
commit 95ed2ab715fa881d36d508adf4ae5dadd92ae7b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 11:46:07 2009 +1000
Add XI2_EVENT check.
commit 92e0a324b5c738166ed4046cb00fe85ab8aea5a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 14:15:02 2009 +1000
require inputproto 1.9.99.7
commit 906fe9547957917ac463d646935473ceca10a72b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 20 09:36:09 2009 +1000
Xi: don't allow OpenDevice on any MD.
This restores the original behaviour of XI 1. Any slave device may be opened,
but none of the MDs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c7eb27f3927ba9a36f9904938996f346cca33021
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 4 18:45:09 2009 +1000
Xi: always only list VCP/VCK and the SD's in XListInputDevices.
If a client wants other MDs, it should use XI2's XQueryDevice() instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 801f14d4b742e506201b619d472087a7e82bd018
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 3 17:04:08 2009 +1000
Xi: don't send attachment info down with ListInputDevices.
commit 66dd8879b3527f30309fb747cad4a161d0709d91
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 15:01:05 2009 +1000
Xi: purge ExtendedGrabDevice request handling.
commit 43e48900fccd245e98d6d697e4cdbb6fa866a0dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 22:27:54 2009 +1000
dix: Force deviced ids of 2 and higher for actual devices.
0 is now reserved for the "AllDevices" virtual device.
1 is now reserved for the "AllMasterDevices" virtual device.
This also means that wherever we passed in (mskidx = 0), we now need to pass
in the deviceid.
commit 70896f6127e2c12c13479a027fdd6e67853d1f8b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 13 16:42:02 2009 +1000
dix: abstract event filters through GetEventFilters.
Don't let everyone acces the filters[] array directly. This is necessary once
we start dealing with GenericEvents, where the filters are a bit more
complicated.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8a8763f1502c9ddd1961f96f2cc7c73fbc0b49b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 16:07:15 2009 +1000
dix: restructure DeliverEventsToWindow, a little bit anyway.
Desperate attempt of making the code easy to read and understand. A failed
desparate attempt, possibly.
commit 891cfc802028c3e008ee6c2d3e2438a31f57f39f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 10:12:45 2009 +1000
dix: clean up DeliverDeviceEvents.
Move mask checking into external function and streamline the code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6b6b660c3633af75a94302725137549df0dbe446
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 10 10:15:45 2009 +1000
Xext: remove ev_fill from GEExtensions.
commit 445daa62e720fe58fa2d6c3cdc26663671b2bc48
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 15 17:16:22 2009 +1000
Xext: purge XGE event masks.
The masks were originally designed to generically handle event masks for
extensions. Since all that is in-server anyway, it's much better writing
custom event masks for those extensions that need it and not providing a
unified mechanism.
XI2 needs more than the current implementation, which is already too complex
for most other extensions. good riddance.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6fe4c28bf4f3a9f7c341b9403213470e9ded5cb3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 16 16:34:05 2009 +1000
Add agressive event type checking.
Best to FatalError if a wrong event comes in. At least that forces me to fix
it really quickly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 836864b65794dc0954a01245e418e714cead8125
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 12:43:17 2009 +1000
xkb: don't overrun the map index when accessing symbols.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 497a12533905b98f388775b6ba49adf21017cc75
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 11:52:33 2009 +1000
dix: remove duplicate PickKeyboard() command.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d4df0ee4414779ad5e519e7bd297c5dfec409a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 20:24:06 2009 +1000
dix: fix device sync state when calling SyncBoth during AllowEvents.
This did access the wrong device's sync state, potentially freezing or not
thawing the actual device that was supposed to be thawed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f1c7b95d83948160a0d5796ef6c16fc0d1bf5c5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 20 13:55:00 2009 +1000
dix: do percentage check before device check in ProcBell
This is just for correctness. The server should return BadValue for anything
not in [-100, 100].
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d60391d8ca9918d2089c23c0baef5c91177325f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 20 14:01:30 2009 +1000
dix: fix uncredible fail in PostSyntheticMotion.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1a71862d333282e2d251ff0036866cec22bcce85
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Feb 28 22:17:47 2009 +0100
dix/xfree86: simplified velocity approximation algorithm
Replace multi-stage filtering with simple linear velocity,
tracked several instances backwards. A heuristic ensures
only approximately linear motion is considered, so velocity
remains valid in any case. Numerical stability is much
better, and nothing changes to people who didn't tune the
advanced features of the previous algorithm.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5ae129baef85b47590c02e4cf61b23904d8f7aa9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 17 15:47:57 2009 +1000
Xi: check for existence of the button class before accessing it
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e8094d8f3f69f45850af031efd79a3928e584638
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 10:09:04 2009 +1000
dix: ProcSendEvent shouldn't use inputInfo.keyboard directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 12aeddf5ad41902a180f8108623f356642b3e911
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Mar 19 19:07:59 2009 +0100
exa: Accept scratch pixmaps with offscreen memory as such.
commit a635bb5357648779815ec6729d55f6b478493213
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Mar 17 19:34:45 2009 +0100
exa: round of fb_pitch to the next byte
commit ec328783593339e33772301a8c5fea35fd63c0a2
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Mar 17 10:45:21 2009 +0100
exa: check if the pixmap is pinned for unsupported AUX indices.
commit 3992dd38caf33b343affd8d732c94880d1099dcf
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 16 13:24:48 2009 -0400
selinux: Add support for avc_acquire_netlink_fd()
Requires libselinux 2.0.79 or newer. Without this, libselinux will
check for policy updates on the netlink socket on basically every policy
lookup. Statistically speaking, they never happen, and the check
translates to at least one more syscall on basically every operation.
Instead, take control of the fd from the library, and check it in
WakeupHandler if it polls readable.
commit be6dc9023b5fb3995a9ce56d607627e247918aef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:29:36 2009 +1000
xfree86: remove a superfluous assignment.
If dev is NULL, we don't have a VCP and that means we have other issues
anyway.
commit bfab422dcdbb9c009b2a91fe0dba288fac9bc859
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:27:49 2009 +1000
xfixes: useless (void) typecast removal
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4eeaee1e5a05ea973cbeb653abf99f2a352edc70
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:25:12 2009 +1000
xkb: xkbi has a pointer to the device - use this instead of inputInfo.pointer.
commit 3f801ba62ac493d4aeb664a5ae638e3fb0c9a262
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:23:50 2009 +1000
xkb: the VCP can post device events, don't stop xkb filtering on it.
commit 23686e5680d565c36e0b6320ce62c38c7830d06b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:20:56 2009 +1000
xkb: Fix a mis-use of inputInfo.keyboard.
commit c97c6c3de337f247406eaffd5845a847630ee6c1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:17:20 2009 +1000
xkb: fix a couple of device checks when looping through all devices.
Generally, we want to apply stuff to the device and to all attached slave
devices.
commit d21a546e9604ce2d3c914900f6e6ff2df9f5ca8b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:02:22 2009 +1000
Xi: VCP and VCK may register for ext. events, so delete them if necessary.
commit 6ec49098f7ef259b43870139511006627b308bb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:57:27 2009 +1000
render: replace a wrong inputInfo.pointer with pDev
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b2b330f6fbf8633ae682a17fbd95f6b5db2c112
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:54:27 2009 +1000
mi: remove a bunch of useless inputInfo.pointer assignments.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 31301861c1dd87a2f55c5c4300ac7c8f54154bf8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:49:22 2009 +1000
dix: remove wrong InputInfo.pointer usage - should be pDev instead.
commit 639658b2eab480a5bfb943dff51e4bdfc1e16e3b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:34:29 2009 +1000
dix: use GetPairedDevice in ProcQueryPointer rather than inputInfo.keyboard.
commit f01ee198ff0cbd7ca418217a84248d1c6131a0c6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:22:23 2009 +1000
dix: don't use inputInfo.keyboard to get the focus window in ActivateKbdGrab
I'm not sure if that's the right solution, but the other one is wronger.
commit de415743f4c1878df2de79f84f5fe087a88d5241
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:19:23 2009 +1000
dix: fix XACE checks in ProcWarpPointer
commit 18430616cfd5d0bc5a3efe61fcc2982b1726b0de
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 14:59:18 2009 +1000
dix: use PickPointer() and PickKeyboard instead of inputInfo.pointer/keyboard.
Affected calls:
ProcChangeKeyboardControl
ProcBell
ProcUngrabKey
ProcUngrabButton
commit e31727158cda7729283233cfdc9bc5bcb59a52c1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 14:51:55 2009 +1000
dix: fix ProcChangePointerControl's wrong inputInfo.pointer usage.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc5e8dc4a24c2b5bed4e6b5d00670c4401ec92d9
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 13 14:00:37 2009 -0400
Unexport xf86SetPriority
commit 89d7b88f32f9227fa72a043675367b94c4c9283c
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Mar 13 00:40:43 2009 +0100
exa: allow exaModifyPixmapHeader to set sys_ptr for EXA_HANDLES_PIXMAPS
- exaModifyPixmapHeader would save sys_ptr if needed, but it would be NULL'ed afterwards.
- This is needed to support pixmaps that are not offscreen.
commit 544cd9e7b50cd9905afc52404de1a5a2bcff91b5
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date: Thu Mar 5 12:57:28 2009 -0500
Honour Option "DPMS" "off" on xorg.conf
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit 7abb72c5c711a26a27a82604bd2398bcb6df0a99
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Feb 25 10:55:36 2009 +0100
xfree86: remove obsolete code
remove a few lines which redo part of the pointer acceleration
init. Properties is the way to go for them.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97cb3cc28e4a5694d17f156276efd84555a96d18
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 10:17:16 2009 +1000
dix: Merge DevicePresence notify events generation into a single function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7f1ba804a1c1aef725e20a04e5f6ef74478ecf44
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 10 11:55:04 2009 +1000
dix: s/numEvents/num_events/ in GetKeyboardValuatorEvents
GPE and GProxE use the same.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 067f26f7ba4c8cf37af7ddf0eb204b7e1d06096d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 19:42:27 2009 +1000
Xi: set the modifier + group state during POE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit da724e8f1d1867c36c9550a153c58829939800fc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 15:50:05 2009 +1000
Xi: Set the button state on the event during POE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b368dd1720c708aaec492b4a67fb7e4f87569c11
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 5 15:22:41 2009 +1000
dix: remove a few pointless (void) casts of return values.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cadf65a6e190a8952ad3cc216dc9ea55241de91a
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Mar 10 15:49:49 2009 +0100
randr: Nuke broken set_origin shortcut
Shortcut is impossible to implement this way, because we don't know for sure
whether the crtc of an output has changed or not.
commit 6544490700051b3b5e88ac1890d71b35634c9100
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 9 17:28:40 2009 -0400
Correct access mode in call to dixLookupWindow() within RRSelectInput.
Reported by Alan Coopersmith.
commit f8dd80d13bb5313a11b38b280f8ad3e22f0a6300
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 6 15:26:24 2008 -0700
Replace dixLookupResource by dixLookupResourceBy{Type,Class}
dixLookupResource attempted to automatically detect whether the caller
wanted a lookup by-type or by-class, unfortunately, it guessed wrong for
RT_NONE. Instead of trying to make the guess better, this patch just reverts
the unification and creates separate functions for each operation.
commit 0d9a42dc0380d1583889b6b6521bd5a2451735d4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 9 08:59:01 2009 +1000
Xi: don't crash on a NULL property name, just return None.
strcmp doesn't like NULL-pointers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 432a95032eb10f82fb59caa29e52d3f56dfb363c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Mar 8 21:34:02 2009 +1000
Remove useless (void) typecasts.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f508446a2bcd887df9cf5db786b15fc3cbc435a0
Author: Peter Åstrand <astrand@cendio.se>
Date: Fri Mar 6 19:41:35 2009 -0800
Composite: Uninitialized borderClipX/borderClipY
Valgrind warned me about two other uninitialized variables, which are not
padding. Valgrind output at the end. I'm a bit unsure of what these should
be initialized to, is zero fine?
commit d1338a94805cc774fe0a5d00c2225a3ee9673a9f
Author: Winfried Grünewald <winfried.gruenewald.ext@eizo-dt.de>
Date: Fri Mar 6 12:59:35 2009 -0500
[hw/xfree86] Fix StaticGray cmap.
Fix this bug report:
,----< from http://bugzilla.freedesktop.org/show_bug.cgi?id=20504 >
| Using the Visual StaticGray (8 bit depth) is missing one gray level.
| The gray level of index zero and index one are the same and all
| other levels are shifted by one. The max level (255) cannot be used.
`----
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit eba3bab71ff26d58bb0e49e4a9726fc21ff07258
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 5 15:09:28 2009 -0800
Remove #ifdef macII code left over from ancient A/UX 3.0 support
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit daa9727a02701cfac7b92f3e61d752be6fcc005e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Mar 4 11:33:00 2009 -0800
XQuartz: Implement SendPSN for AppleWM
(cherry picked from commit 779e9fdc2de9bfebc5f0a4c9d5f42e389fdd8593)
commit ce6e1771be5f2c21af6f72a9705795df26210413
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Mar 2 17:05:28 2009 +0100
exa: fix a serious issue in exaChangeWindowAttributes (and some more related things)
- fbChangeWindowAttributes can create pixmaps (and access them) without use preparing access.
- Also handle the destroyed pixmaps by finishing them first.
- Switch to DEST indices again in exaCreatePixmapWithPrepare, because they are obviously being rendered to.
- Also avoid calling FinishAccess on pixmaps that are destroyed (and their memory potentially invalid).
commit 7fb68e8b31d259325ce311ad67befc43a933f009
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 28 22:29:42 2009 +0100
exa: remove a few pExaPixmap checks.
- And make some fatal for a debug build.
commit bd2f35ef0d4b8c56eb205b8694b4fe5d2fa2c049
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 28 22:15:04 2009 +0100
exa: fix unwrapping of ModifyPixmapHeader upon CloseScreen.
- Cleanup wrapping too.
commit da8ea41a542787691ea1120e5c8c7dc3182cbea5
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 28 21:59:09 2009 +0100
exa: increase/rework safety checks in Prepare/FinishAccess.
commit 3ea3d505e8128ab3e878edcef697fd5656b0c917
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Mar 1 01:15:28 2009 +0100
exa: avoid a potential Prepare/FinishAccess inbalance.
commit 10334cf7e64e2e633cd507f2aa216027e840c8e5
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 28 21:46:00 2009 +0100
exa: simplify exaPixmapIsOffscreen
- This includes properly handling the framebuffer.
commit 57bed76e218471b60d340b18c346d492f37798c2
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Mar 4 10:29:34 2009 -0500
Remove dead EXTENSION_PROC_ARGS define
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
commit a6fb9f4ccfc69dc090b152e29142e3159f812166
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Mar 4 10:27:30 2009 -0500
Remove dead XTest code from extmod
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
commit c4081fee0995dae691665a00ea9bfdb8b8043b8c
Author: Topi Kanerva <topi.kanerva@nokia.com>
Date: Wed Mar 4 10:23:10 2009 -0500
Make DGA optional.
commit c7ebb4bef152b47880abb6ea4819416e89e6522c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 3 14:02:36 2009 -0500
Fix 2 const warnings.
commit c7cf926d25523d5d0d8e5c83671c901660070d71
Author: Eric Paris <eparis@redhat.com>
Date: Tue Mar 3 13:15:39 2009 -0500
This patch changes all places in the X code to use _raw functions. The
X server should never see, translate, or deal with a munged context.
Display managers which show contexts to the user should take care of
translating these to human readable form.
commit d84a2f855da9fd293e984084168c1e27f5a5115c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Mar 1 16:59:14 2009 +1000
xfree86: Add linebreak to two debug statements.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e0ed9f16d0ab871f3209837f54055446503c4108
Author: Jason Vas Dias <jason.vas.dias@gmail.com>
Date: Tue Mar 3 13:24:54 2009 +1000
Fix build with --enable-debug.
[amended by Peter Hutterer]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6093d3eb1d7d1e9cbacc2c2f4d376352f787dd53
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 26 15:38:45 2009 +1000
dix: fix two compiler warnings (old-style function definition).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b874a5c0aafc766891c9e567af48b891ea14be4f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 26 14:40:22 2009 +1000
mi: only print the "EQ overflowing" error once.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a706dd8771f87cf0a73578755552124d162baa5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 26 10:04:14 2009 +1000
include: add a range of button labels.
Mostly the same buttons as defined by linux/input.h, with five exceptions:
"Button Unknown" for a button that cannot be labelled.
"Button Wheel Up", "Button Wheel Down" for buttons 4/5, traditionally the
wheel buttons.
"Button Horiz Wheel Up", "Button Horiz Wheel Down" for buttons 6/7,
traditionally the horiz. wheel buttons.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 8a6ed44a8b2fc5f14729dc54fec17607ced03859
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 2 14:26:23 2009 -0500
randr: Fix thinko in xf86TargetPreferred
The only-one-output case would only work right if that also happened to
be the zeroth output. Oops.
commit 7bfad37f7706da5a76174c0da78dce4d6c6a585b
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Feb 27 22:26:52 2009 +0100
exa: fixup aux indices and ensure that the indices are used as they should be.
- In a previous patch i forgot to add a FALSE somewhere it seems.
- Rename AUX indices so the driver (think of driver managed pixmaps) can do optimisations based upon them.
- Fix one abuse of DEST index now that we have the AUX indices (same reason as above).
commit 8c6b4a827624aa70aea94b449fee6d5df8504105
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 27 12:42:43 2009 -0500
DDC: Redo extended device probe slightly.
We'll now only mention the E-EDID segment register if the device is
actually E-EDID-capable. While we're here, check for DDC/CI and
standard EEPROM support too.
commit b030f858f2f1ce1fd27a73ebf7f9ec5db541a668
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Feb 21 19:56:20 2009 -0500
selinux: Don't bother relabeling resources that are being destroyed
Makes window destroy about 40x faster in Xvfb.
commit f028b14876dc536b575d4b6e1df7f37ee525acec
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Feb 27 13:06:28 2009 +0100
exa: whitespace
commit ed00515ec54b294f304b8ae2857e3073f97860d2
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Feb 26 22:18:03 2009 +0100
exa: fixup exaAssertNotDirty.
- Do the right thing based on prepare access.
commit 2e88b6004f09dbcb888abf05d4d5554231b2bd1a
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Feb 26 21:14:23 2009 +0100
exa: minor glyphs cleanup.
- This should fix subtle coordinate bugs and make the code a bit cleaner to read.
commit 265d20068af5434489752b6dba0bf0065b3cc3ec
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:41:39 2009 +0100
EXA: Fix check for whether the glyph we're evicting from the cache is in use.
Since commit f07f18231a921d3ae9dd9b75881c9e58e9e2e235 ('EXA: Allow using
exaCompositeRects also when we can't use a mask in exaGlyphs.') we were
checking the wrong set of coordinates in the buffer where glyphs to be rendered
are accumulated when no mask is used in exaGlyphs.
This fixes occasional glyph corruption which can be corrected with redraws, in
particular with Qt4.
Thanks to Maarten Maathuis for asking the right question: 'where do we protect
against evicting glyphs that are still needed?'
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 9d5141f7bcfed36417873b47f850332506af83ac
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:37:28 2009 +0100
EXA: No longer use the driver UploadToScratch hook.
See http://bugs.freedesktop.org/show_bug.cgi?id=20213 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 4cfb36f6ad2df01215028fec48d99239a0e4496b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:37:28 2009 +0100
EXA: Handle separate alpha maps properly in Composite fallback, take two.
Preserve the EXA ABI by introducing a new driver flag EXA_SUPPORTS_PREPARE_AUX.
If the driver doesn't set this flag, we have to assume any Prepare/FinishAccess
driver hooks can't handle the EXA_PREPARE_AUX* indices, so we move out such
pixmaps at PrepareAccess time.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=18710 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 4bf707f01822abe99286909fd561da7e7a4211d6
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:37:27 2009 +0100
Revert "Fix up Xephyr build for recent EXA changes."
This reverts commit 4e8d98b61e1f763c187e7994c683b543cca1a33c.
commit de022f8e634baf5a7acd186934b370647df58355
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:37:27 2009 +0100
Revert "EXA: Handle separate alpha maps properly in Composite fallback."
This reverts commit 170cf1270dff38d3cce7f5ba5b940d1c0d70eff5.
Conflicts:
exa/exa_render.c
commit d0dd649035fc3698c5b436f9d9d248116aa106a3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 12 16:03:16 2009 +0000
Remove references to rgb.txt from files section of Xserver and Xorg man pages
The references to this file in the server code were removed in commit dda10c9066a660b647384179f82e1da8e063264f
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b0ad9e1ced9619f37acf77764c395c57b86cf463
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 12 16:02:17 2009 +0000
Remove long-gone '-co' option from Xserver man page
The '-co' option was removed in commit dda10c9066a660b647384179f82e1da8e063264f
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7907b37d96dc81f333351a6fedd6a9f4e31ae66a
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Feb 26 21:22:48 2009 -0800
XQuartz: Don't erase the mode_switch+keysym if it's the same as shift+keysym
(cherry picked from commit 3e2427e6e9675dd655c8ad328b82e12191b064f2)
commit f07f18231a921d3ae9dd9b75881c9e58e9e2e235
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Feb 26 10:35:44 2009 +0100
EXA: Allow using exaCompositeRects also when we can't use a mask in exaGlyphs.
This should give the full benefits of the glyph cache even when we can't use a
mask.
This also means we no longer need to scan the glyphs to see if they overlap,
we can just use a mask or not as the client asks.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit b26c136ee9bf7015c583136af53d0c9e9da67ace
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Feb 26 10:35:44 2009 +0100
EXA: Stop tracking damage for pixmaps subject to ModifyPixmapHeader.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 812e8d681a49b33d8748983843799ef692b8b148
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 25 11:08:01 2009 -0800
Oops. 62fc98c had crtc offsets applied backwards (fix from server-1.6-branch)
Crtc offsets are in screen space, not crtc space, and hence should be
applied relative to the screen->crtc transform, not the crtc->transform.
This fix was found in the 'cherry pick' of 62fc98c on server-1.6-branch,
clearly some new definition of 'cherry pick' that I am unaware of.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c090f5514d28e1602a6ebbe7c909e98a0e3374d7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 25 10:14:36 2009 -0800
Pre-clip panning coordinates to keep crtc within panning region
There is a separate panning region check, but that doesn't work under
transformation, so just pre-clip the mouse coordinates when computing the
panning offsets. This leaves the case where panning constants are changing
unresolved.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 77c7a64e8885696665556c9fbcb3cffb552e367a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 25 10:12:23 2009 -0800
RandR rotations and reflections offset by one pixel
The matrix computation for rotation and reflection resulted in dropping a
row or column of pixels as the offsets used in the matrix computations used
width and height rather than width-1 and height-1.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e8d98b61e1f763c187e7994c683b543cca1a33c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Feb 25 10:26:04 2009 +0100
Fix up Xephyr build for recent EXA changes.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit d6976e1436c035b8e4a6d1e10971b083b1b4184b
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 24 23:12:57 2009 -0800
XQuartz: Re-enable support for capslock
(cherry picked from commit 4901b8147e593d26d7a31a9b73a201254b948916)
commit 4b63f88b0ad5f6614fee5b7af4f97ce4581ab935
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 24 18:54:16 2009 -0800
XQuartz: Comment out the background pointer interaction that seems to be causing CPU spinning on some configurations
(cherry picked from commit 1d479fa4f3bca9cbd81808a6c87582422fd2a257)
commit 5672e2d66444be74125c71b81373b82f8e1b7dd2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 14:55:51 2009 +1000
Xi: remove AllExtensionVersions.
Keeping an AllExtensionVersions array to save all versions of
all extension is rather pointless if only one extension uses it.
Rename to XIVersion, reduce to a single struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 59bc615ed2e60c595887dcc11fe04935b49bcaff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 15:26:20 2009 +1000
dix: set the valuator mode in set_valuators
We only have per-device mode for now anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cffa3c499a0495e132557bd6b08a8c0b858cdf3b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 15:25:49 2009 +1000
dix: remove unused variable 'tmp'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8d6dd83a38020080808705a156d32ec2a135633c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 13:13:58 2009 +1000
include: fix indentation for lastSlave/master.
Yeah!
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b3412adca8b2ba3fff348bceb4f01b9e968c0afc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 22 20:53:46 2009 +1000
Xi: don't need to set the XKB settings for new core devices.
This is done by the XKB code these days anyway, so we might as well ignore it
and keep using the stanard stuff.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a180c2367974abe2ccdc88bb5c6f138c7df4d2e9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 16:38:41 2009 +1000
dix: remove ConvertBackToXI.
This was a temporary solution for the internal-events rework and is not needed
anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 26cf709e712573548990d165e71137f28271a8bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 22:39:08 2009 +1000
Doxygenify events.h and eventconvert.c
Should have done that before pushing, but oh well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 170cf1270dff38d3cce7f5ba5b940d1c0d70eff5
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Feb 24 09:22:09 2009 +0100
EXA: Handle separate alpha maps properly in Composite fallback.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=18710 .
As this can't work without new EXA_PREPARE_AUX* indices, this requires a major
version bump, so we can also drop the UploadToScratch driver hook and
ExaOffscreenSwap*(). So this also fixes
http://bugs.freedesktop.org/show_bug.cgi?id=20213 .
Moreover, introduce EXA_DRIVER_KNOWN_MAJOR to break compilation of drivers
which may not be able to handle EXA_PREPARE_AUX*, giving instructions how to
make them build again in the #error message.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit d3b355875ac46104a174966e1974e6af99e40fd6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 11:14:14 2009 +1000
dix: fix wrong condition for setting valuators on the event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef320bdd5ec3419abba77041d3a4d96a3ff87563
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Feb 23 16:49:51 2009 +0100
DRI1: Make DRICreateDrawable return TRUE for pixmaps.
GLX_EXT_texture_from_pixmap was broken since commit
a26c77ff432d2e85a2665fc36fca25143460c476 ('glx: fix retval checks when failures
occur for drawable creation.')
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 1df6716281579e2937743d840ab1079343c503ac
Author: Adam Tkac <vonsch@gmail.com>
Date: Mon Feb 23 09:28:26 2009 +1000
xfree86: don't try to UnInit virtual devices in DIDR. (#20087)
DeleteInputDeviceRequest function doesn't handle "virtual" devices well.
TightVNC libvnc.so module to X (which makes bare Xorg VNC capable) uses such
kind of devices.
Bare Xvnc (it is something like Xvfb) simply uses AddInputDevice &
RegisterDevice functions. Xvnc uses DeleteInputDeviceRequest from Xi/stubs.c
so everything works fine (now I see that DeleteInputDeviceRequest in
Xi/stubs.c should call RemoveDevice function, shouldn't it? :) )
Situation is quite different when you use libvnc.so module. It uses same
schema as Xvnc, so it simply calls AddInputDevice & RegisterDevice. Thus
device is created correctly. When server is terminated it calls
DeleteInputDeviceRequest (now from hw/xfree86/common/xf86Xinput.c) for each
device. Here is the difference - Xvnc calls DeleteInputDeviceRequest from
Xi/stubs.c as I wrote above. Thus Xorg gets sigsegv because "VNC" devices
don't have real input driver.
X.Org Bug 20087 <http://bugs.freedesktop.org/show_bug.cgi?id=20087>
[This isn't really a fix (libVNC should behave correctly) but not crashing the
server sounds like an improvement.]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a50c40be1f28467bcef7dc71fab54ebdddacffdf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Feb 21 08:09:40 2009 +1000
dix: don't apply button mappings to SDs, or the device's MD. (#20122)
Only ever change the button map on the device we actually care about, not the
attached SDs, not the current MD of the device.
X.Org Bug 20122 <http://bugs.freedesktop.org/show_bug.cgi?id=20122>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 36583a49965c0bb40a84284939b1539b3cb9fc9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 10 12:45:49 2009 +1000
mi: split EQ popping and event processing into two functions.
mieqProcessInputEvents() - pop an event off the EQ and pass it to
mieqProcessDeviceEvent() - process the event according to the MD/SD hierarchy.
This way, we can use mieqPDE() from Xtest, xkb, and others to post an event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 47f136ed6fd80310f715a2555501d1b271dd084c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 6 12:08:43 2009 +1000
mi: change custom handlers to internal events
This should re-enable DGA, but XQuartz needs to be changed to internal events
too now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bdc262701a37a0c12ead810d63fa99a26cbb82ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 22:39:37 2009 +1000
dix: remove un-used getValuatorEvents and countValuatorEvents from getevents.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 763848d3ab84b4e33a0254120c44b5a1877c819d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 17:20:17 2009 +1000
Input: change processing API to InternalEvents.
Don't pass xEvent* and count through to processing, pass a single
InternalEvent.
Custom handlers are disabled for the time being. And for extra fun,
XKB's pointer motion emulation is disabled. But stick an error in there so
that we get reminded should we forget about it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b4066c116e07918a13dc6b4159df7ac9eb92b4b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 17:18:16 2009 +1000
xkb: _XkbFilterRedirectKey needs to pass InternalEvents down.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 085d50360863ccc8280cd3eccea2bcb4f3dd9a14
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 16:56:52 2009 +1000
dix: Fix PostSyntheticMotion to use a DeviceEvent for posting.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 155986a93dc78d6aa060ca3038d5fafa3d8753c2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 16:06:15 2009 +1000
dix: CheckPassiveGrabsOnWindow moved to internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1c38abd4b136301008ba77d4e68aea34508f4c22
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:54:34 2009 +1000
dix: switch DeliverGrabbedEvent to internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fb858774b80eb75c2f8e81fe893bbbdd37065fbd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:44:13 2009 +1000
dix: switch DeliverDeviceEvents to internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3aa9404fcd161e94a80b057a77ef47afe428a56d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:00:41 2009 +1000
dix: switch DeliverFocusedEvent to internal events.
And because of xfree() macro hilarity, rename "pointer" to "ptr". Oh, how we
laughed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8c873e7f514844d1056f2b20e653f1dd75f4c327
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 20:41:16 2009 +1000
dix: Switch DeliverGrabbedEvents to use internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a3718536989fa7d3358e0b2d859c25fde0a2d93e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 20:18:33 2009 +1000
dix: Deliver{Grabbed|Focused|Device}Events API changed to InternalEvents.
With the API change, we can now purge the XI conversion from POE.
Note: this commit breaks DGA even more.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8f94ec6f788565474931cc7d5e3d4672f0f31670
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 09:58:15 2009 +1000
dix: convert passive grabs to use internal events.
deviceGrab.sync.event is now an internal event, and CheckDeviceGrabs and
friends is changed over.
Note that this currently breaks some frozen grabs. See towards the end of
ComputeFreezes().
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit daa3245c479b19d445a070b5b76ee005915b5335
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Jan 31 08:46:43 2009 +1000
dix: fix EnqueueEvent to work with internal events.
Note that we're only partially switched to internal events. The event in the
devices' event queue (dev->deviceGrab.sync.event) is still an XI event. The
events in syncEvents are InternalEvents only now.
This also implies fixing CheckVirtualMotion to work with internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 75595ba4aa9c3823ffe3b3388ce088929824816f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 15:14:46 2009 +1000
Xi: make ProcessOtherEvents more InternalEvent aware.
Get rid of the deviceValuator processing and a few other things, but still
drop back into XI before checking device grabs or doing anything else.
NoticeEventTime now needs to take InternalEvents, and while we're at it,
change NoticeTime from a macro to a function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3a02e538dbdb3cd482e01baeaf2aba2ddb7731df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 14:59:22 2009 +1000
dix: update CheckMotion to deal with DeviceEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8829d966a6bacb05d322b60531c59366b58f4514
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 13:33:55 2009 +1000
Xi: support InternalEvents in UpdateDeviceState, parts of POE and EnqueueEvent
Note that this breaks DGA. Life is tough.
EnqueueEvent is a somewhat half-baked solution, we immediately drop back into
XI and store them. But it should in theory work.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Don't let the dcce be random data.
commit 007e93c869325cafcc29d975b356dbb8e7cd2ac1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 14:35:22 2009 +1000
xkb: Switch the xkb event processing path over to InternalEvents.
Before dropping down into the DIX, convert back into XI events. This is a
temporary solution only, until the DIX is capable of handling InternalEvents
anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 64ea6078105f73d1b727619fc123920bc7e4a06c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:15:52 2009 +1000
dix: change eventconvert to always return an array of xEvents
Just alloc the memory on demand rather than doing things with EventListPtrs
etc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4026c63e4eb16481bafc1a41ad67cd2556728d40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 14:34:02 2009 +1000
mi: switch the EQ to contain InternalEvents only.
This gets rid of the nevents parameter, InternalEvents are always a single
item per event. Also remove the special DeviceValuator handling in both
enqueueing and dequeueing.
Custom callback handlers are now broken until fixed.
For bisectability, we copy the InternalEvent back into the XI required during
POE and friends. Consider this a temporary solution.
Note: Because of misc linker bonghits, Xvfb won't link in this revision.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5a827593f9517fd5593751dd8bd90c611de06c5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 29 15:26:57 2009 +1000
dix: switch event generation to InternalEvents.
GPE, GKVE, GProxE generate InternalEvents now.
DeviceClassesChangedEvents generates an InternalEvent now, but incomplete! We
need to tack on the information about the new SD in the ClassesChanged events.
Note: To make the progress bisectable, we drop back into XI events at the end of the
Get*Events functions. So the rest of the server still uses XI events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00b03683d0e5cda40fa23b9fe6a83d7227f86f5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 14:31:08 2009 +1000
dix: Add temporary conversion function ConvertBackToXI.
Until the InternalEvents are used throughout the server, we can use this one
to drop us back into XI la-la land where every event is the wire format.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 269d4d9f2e86fde8c6a28ef0293fb0e44b577886
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 09:57:27 2009 +1000
dix: add GetCoreType and GetXIType.
Convert from an InternalEvent type to the matching core/XI type. Currently
only for a few events, those we actually need in the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 656491921e17b2371057041f4551ad6165067551
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 28 15:27:38 2009 +1000
dix: add InternalEvent -> core/xi event conversion routines.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e7867d12541ef9683d5d7fc766e918c13a742981
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 23 15:37:23 2009 +1100
include: add XInternalEvent.
This is the event we want to feed into the EQ and process on the way through.
Only applies for input events for now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 10dcf3ed9c543a6811340567e586ec0e476fcf61
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 20 15:22:35 2009 +0000
Cygwin/X: Fix keyboard layout mapping for Latin American keyboards
Fix keyboard layout mapping table entry for Windows keyboard layout 0x80a
(Latin American), layout should (now) be 'latam', not 'la' which is Laos
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9531b96470a2fd812eb3fa0d1e10419331842496
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Feb 22 00:41:52 2009 -0800
XQuartz: DefineInitialRootWindow is gone
commit c7c50157b5137a147e69abb70b43a28fac4a9ffa
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Feb 22 00:29:48 2009 -0800
XQuartz: quartzKeyboard compile fixes for recent XKB Changes
Seems we're less divorced from XKB than we'd like for now... hopefully not having any rules installed will still let us override things the way we want to...
commit 61abf3189f3f97ec5228d45c035dbfd0c249f844
Author: George Staplin <gstaplin@apple.com>
Date: Sat Feb 21 22:33:10 2009 -0700
XQuartz: GL: Change from xalloc to xcalloc to potentially avoid
uninitialized data in the __GLXAquaContext.
(cherry picked from commit d3120241f9f48d21f9a6ecfb848434a4a0270855)
commit 5587f9b771f5b5427a81d4d657f403667d20f310
Author: George Staplin <gstaplin@apple.com>
Date: Sat Feb 21 22:22:52 2009 -0700
XQuartz: GL: Fix a bug with an uninitialized GLX data structure.
This was causing a crash randomly, due to random memory contents.
Use xcalloc to prevent this in the future, due to future changes or mistakes.
Set the drawableType to include GLX_PIXMAP_BIT and GLX_PBUFFER_BIT.
The new libGL supports these.
Set the max Pbuffer width/height, based on the results of a test program.
We may someday want to revisit this depending on what users need, so that
we create a CGLContextObj, make it current, and call glGetIntegerv to
gather the information at runtime.
(cherry picked from commit c7e338330943e0d03a99328c740540d03f018d20)
commit ab61033700b5383a7a15370dd054eaa80e72e811
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 19 13:57:28 2009 -0800
Add Extensions section to xorg.conf man page
Extensions section was added in X11R6.8.0 and documented in the release notes:
http://www.x.org/archive/X11R6.8.0/doc/RELNOTES2.html#3
but never made it into the man page.
Also fix a bonus typo.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 372977354c3a09ca77ca13ba0aec00a61046f60d
Author: George Staplin <gstaplin@apple.com>
Date: Wed Feb 18 21:43:19 2009 -0700
XQuartz: Fix the new ProcAppleDRIDestroyPixmap code REQUEST_SIZE_MATCH.
It had a copy and paste mistake that I didn't notice. :/
It was using the CreatePixmapReq.
Also add a missing B16 to the end of the length for the DestroyPixmapReq struct.
Now the AppleDRIDestroyPixmap request seem to work.
(cherry picked from commit 295fe25bd8fa2d141291a9d9b6ef7b75fcccb4dd)
commit 225853d51d1fb610261ab0c295b1b5a96ce177d5
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu Feb 19 06:45:05 2009 -0800
xkb: Use cached XKB keymap when rules haven't changed
Rather than compiling a new keymap every time InitKeyboardDeviceStruct
is called, cache the previous keymap and reuse it if the rules have not
changed.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 64e595d12e05c4df56b0230cc57924b9beb274d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 19 09:18:53 2009 +1000
dix: check if keybd->key is valid before getting the keyboard state.
For floating SDs, GetPairedDevice() returns the SD itself, hence keybd->key
may be NULL.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e0a451eb7cc812f11db3614b730ba0f07d6ae18c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 17 19:37:22 2009 -0800
Obsolete InputDevices keyword in xorg.conf Files section
Was only used to provide a list of input devices that XF86-Misc could use,
now that XF86-Misc is gone, was parsed and logged, then completely ignored.
(Depends on previous patch that introduces OBSOLETE_TOKEN in parser to
make obsolete keywords like InputDevices & RgbPath be non-fatal errors.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit d2cf562bbad553d7f09b70202134f5b6ada0114e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 17 18:48:52 2009 -0800
Make RgbPath keyword in xorg.conf a non-fatal error
Xorg shouldn't refuse to run just because the user has an xorg.conf that
had the previously-used RgbPath keyword in it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 344b1f2b25d627bdf7d802c5831b6a72d22ffe34
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 17 23:25:14 2009 -0800
configure.ac: Support version strings like W.X.Y.Z-XXXXXX
(cherry picked from commit 43967514cd57ad836d7fb85c8c9e58ada07e0232)
commit 67faf41b3f3e0cd66e35e3c176a9adb37ff1a759
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 17 23:24:25 2009 -0800
XQuartz: Don't need GlxSetVisualConfig any more
Fixes build failure resulting from 516f8e2cad1311a09764e2633644188d1e3c31bb
(cherry picked from commit 066b17028a35956a089815716e38571f305469c5)
commit b349a764e98f0d8f221190157ffa0904b91beca5
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 17 09:59:17 2009 -0800
xinerama: Put the proto version in the code instead using proto headers.
Proto headers updating resulting in the server advertising new versions is
broken. This should be applied to every extension.
This fixes the build against slightly-older xineramaproto.
commit 5394b7e66224d20888dd4020f5cb8ca930720fb4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 6 06:34:35 2009 +0100
Eliminate the shadow clear on transform change
When the crtc transformation changes, the entire crtc must be repainted.
This was being done by clearing the shadow and then painting the rectangle
containing the screen image; the clear being required as the screen image
may not fill the crtc. When changing the transform rapidly, this leads to
flashing. Eliminate the clear by painting the entire crtc instead of just
the screen rectangle.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 76f18b94bd2719a8199334742d021c4d0806187d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 9 13:09:11 2009 +0100
Add XkbDir to Files config file section
The XKB base directory was not configuable through the config file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 123093996507c4d3b6dc457240ce00f8ac42f410
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 17 12:59:16 2009 -0500
RANDR: Fail softly on GetPanning if the screen can't do it.
Just return a zeroed-out reply in that case. This is unambiguous, and
distinguishes "you didn't name a CRTC" from "you named a CRTC that can't
do panning".
commit b2ceea3635ec05dca9d4aa2f823b96ae9fce7fe8
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Feb 17 19:40:59 2009 +0100
Revert "exa: the extent of the valid region is probably much larger than that of the pending damage."
This reverts commit 97c1cbc70216366e92b9371de608ce94e60aa874.
- Sorry for the thinko, pending damage is often not fragmentated.
- Should the dst region become fragmentated, you actually want to copy more to unfragmentate it.
commit 3175646b10c602d17d5dd37bdace7c1c7ee92b3d
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Feb 17 19:06:35 2009 +0100
exa: exaPixmapDirty should use official damage functions.
- Otherwise other users will not be notified of damage.
commit 97c1cbc70216366e92b9371de608ce94e60aa874
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Feb 17 19:01:44 2009 +0100
exa: the extent of the valid region is probably much larger than that of the pending damage.
- Since the default has been changed from nothing to everything.
commit 4039603413f9f46d7f725463a70b4a51838e0049
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Feb 17 08:27:32 2009 -0800
glx: Inialize best_score before calculating visual scores
This bug was pointed out by Peter Åstrand.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit bac13e54b164ceff7b921a2d17c4a198b42aeccf
Author: George Staplin <gstaplin@apple.com>
Date: Mon Feb 16 17:33:19 2009 -0700
XQuartz: Add driWrap.h that I missed in the last commit.
This should complete the GLXPixmap commits for now.
(cherry picked from commit 7e99b55651bf7f6275bb227d02f203fb885a67a2)
commit 95052caa2c8a79981cdc7936888a8a47e09415e0
Author: George Staplin <gstaplin@apple.com>
Date: Mon Feb 16 17:22:18 2009 -0700
XQuartz: Add support for GLXPixmaps to the AppleDRI.
This involved wrapping some GCOps to get the proper behavior
when using X11 raster ops mixed with OpenGL (see driWrap.c).
This extends the AppleDRI protocol with create and destroy pixmap
functions.
The dri.c code has been extended quite a bit to enable this, and
to initialize the wrapping of CreateGC for GCOps.
This has been tested with tests/glxpixmap and proven to work with
the new libGL. Existing applications seem to work fine too. Redraws
all appear to be correct.
There may be some bugs lurking that I haven't found yet. I plan
to drive them out by extending the libGL test suite.
(cherry picked from commit 630518766b01022c49fe3a9e7d501808f71b06e2)
commit 970725d23e83285d41e3f7cab678a825d9cc25cf
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 16 18:44:00 2009 -0500
kdrive: Nuke dead AGP and VGA code. (#19921)
commit a932744d983845f81791045cf0dfb6a359790158
Author: Chris Ball <cjb@laptop.org>
Date: Mon Feb 16 18:27:26 2009 -0500
Build fix, remove export of pciBusAddrToHostAddr
a9d7d659.. (PCI: Remove pciBusAddrToHostAddr and associated nonsense)
removes pciBusAddrToHostAddr(), but not its prototype, resulting in:
./.libs/libxorg.a(sdksyms.o):(.data.rel+0xe64): undefined reference to
`pciBusAddrToHostAddr'
Signed-off-by: Chris Ball <cjb@laptop.org>
commit ab331aa76f0bc6a85a519b2deaafa4ce8a070c53
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 16 21:56:03 2009 +0100
xfree86: ModeDebug is a boolean, not a string
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit f5bf1fdaf36163d5c2f1b9b51df96326ebbb0e9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 13 09:56:22 2009 +1000
xkb: Fix wrong colour reference in XKB geometry copying. #20081
base_color and label_color need to reference the color in the destination, not
in the source.
X.Org Bug 20081 <http://bugs.freedesktop.org/show_bug.cgi?id=20081>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit a9d7d659a05e4b6b25e6acd2ce59926911aac0f7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 13 18:36:27 2009 -0500
PCI: Remove pciBusAddrToHostAddr and associated nonsense
This was all a glorified no-op. We rely on pciaccess to create device
maps anyway, so we should have no reason to care about what the host
address is.
Acked-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit be8c3d4022faa7d169778ea10d1f11e8f90e1c0c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 13 17:54:33 2009 -0500
Linux: Remove dead USE_DEV_FB #ifdefs
commit 51ae4d6bbfd95cac8a9cdefcd6f22fbe21a6cb9d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Feb 16 12:08:28 2009 -0800
glx: Add comments around some extension string weirdness
commit caa5310e163b040689383f6d25ccab5ef1b2e215
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Feb 16 20:41:14 2009 +0100
exa: reintroduce src rect optimisation, with a slightly higher threshold.
- I got some feedback on gtkperf line test regression.
- The increased threshold should ensure the destination optimisation is dominant.
commit 46eeaf82e228df1c5971a24dc815566516e19be9
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Feb 16 17:17:14 2009 +0100
exa: fix performance regression from 736b6fbd2c941b6276066cd1503523edebe7bf3d
- The src optimisation is more aggressive and possibly harmful in light of the new initial state of pixmaps.
- There is now actually a performance improvement by almost always keeping the number of rects low.
commit 6198373ff2a8e36113bb1dcaebe975530ff01b86
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Feb 15 18:36:01 2009 -0500
xorg.conf (5) refer to mousedrv (4). Debian #394058
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 2a8b8077d8f6001eb57deba60e1009fc99c28668
Author: Alan Hourihane <alanh@vmware.com>
Date: Mon Feb 16 11:39:34 2009 +0000
dri2: support glXWaitGL & glXWaitX by copying fake front to front and
vice-versa.
commit ddb8d8945d1f44d16adc366b6612eef20ae813f7
Author: Peter Åstrand <astrand@cendio.se>
Date: Fri Feb 13 10:23:28 2009 +0100
xserver: Avoid sending uninitialized padding data over the network
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b735a4b4951b607e614682836f24d5fd86c1f7fb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 14:29:23 2009 +1000
dix: Remove lastEventMask variable, substitute with a #define.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 772e0f9159ca3ab8fb4e03ed6feee3cc93697724
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 13:38:34 2009 +1000
dix: Don't set core events in SetMaskForEvent.
Rather, modify the two callers to call separately for the two different.
events. Unexport SetMaskForEvent too.
And while we're at it, get rid of the MotionFilter macro, because it's one
half confusing and one half pointless.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58f3127919ba5fcb3bb467b6913c28ee1127c82b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 08:37:49 2009 +1000
Xi: remove dynamic mask assignment for XI events.
They end up being the same anyway on startup, so let's not have a dynamic mask
assignment mechanism and instead just hardcode them already.
Also unexport SelectForWindow and remove the valid_masks parameter. We can
check that before calling, since there's only one caller anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7057a9a97b9316b1de954d05451e04223fdd9fd8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 22:14:48 2009 +1000
Remove two more define XKB leftovers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 736b6fbd2c941b6276066cd1503523edebe7bf3d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sun Feb 15 17:44:51 2009 +0100
EXA: Try to prevent the valid regions from growing too many rects.
This helps contain region management overhead in some pathological cases, see
e.g. http://bugs.freedesktop.org/show_bug.cgi?id=16647 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 45e14f515337159e600a47ebf349692751552af8
Author: Chris Ball <cjb@laptop.org>
Date: Fri Feb 13 20:32:02 2009 -0500
Build fix for xf86EdidModes.c
Commit 20ac314.. forgets to declare hsize/vsize/refresh.
commit ae68be312619ad3bcb2d550a6267d38cce3284f5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 13 17:25:32 2009 -0500
Input: Don't re-block SIGIO in xf86SigioReadInput()
It's already blocked on the way in, because we asked for it to be
blocked at sigaction() time.
commit c18f454e4a9cab03e5d55b6d761a4a735c943b6b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Feb 12 18:27:48 2009 -0800
Query the DDX in ProcRRGetScreenInfo.
This is the RandR 1.1 version of GetScreenResources and needs to re-query the
DDX to see if the mode pool changed.
Fixes Launchpad bug #325115.
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 660c2a7d4c6cb52fd0992e9d2008a24805dc8c02)
commit 20ac3140ce16af460992b83aa8aeff4afe28c2ee
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 9 13:36:05 2009 -0500
EDID: Hack for 1366x768 in standard timing descriptors
All you get for standard timing descriptors is horizontal size in
multiples of 8 pixels (which means you can't say 1366) and height in
terms of aspect ratio (which means you can't say 768). You'd like to
just fuzzy-match this by walking the DMT list for sufficiently close
modes, but you can't because DMT is useless and only defines a 1360x768
mode, because it's _also_ specified in terms of character cells despite
providing pixel exact timings. Neither can you use CVT or GTF to
generate the timings, because they _also_ believe that modes have to be
a multiple of 8 pixels.
You'd also hope you could find a timing definition for this in CEA, but
you can't because CEA only defines transmission formats that actually
exist. So there's 480p, 720p, and 1080p, but no 768p. And why would
there be, after all, the encoded signal is never 768p so obviously no
one would ever make a display in that format.
So instead, make a CVT mode since that's likely to be handled well by
just about everything, smash the horizontal active down by 2, and shift
the sync pulse by 1. Underscanning the hard way.
Pass the suicide.
commit bcafdfbed6f1e1f901c2459f60f94a0da506bd90
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 13 14:06:07 2009 -0500
RANDR: Validate entire mode list for interlace and doublescan
Otherwise drivers have to refuse interlace twice: once in the output
config, and once in ->valid_mode() to catch output and config modes.
If you can't do interlaced modes, asking nicely for it in the config
isn't going to suddenly make it work.
commit a26c77ff432d2e85a2665fc36fca25143460c476
Author: Alan Hourihane <alanh@vmware.com>
Date: Fri Feb 13 13:45:08 2009 +0000
glx: fix retval checks when failures occur for drawable creation.
commit a38ca0063c91ef221f20bf0c4ac0dc84ce07d557
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Feb 13 14:44:53 2009 +1030
xext: Use proto header rather than the Xext include file, this prevents userspace being pulled in causing issues
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit d62c085f36892c327785e85571bd2c7c70513ac6
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Feb 13 14:44:09 2009 +1030
dix: Remove includes which are not actually used directly
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 340f1576afcdaf883d185da356e5d6282aa65e19
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 10:44:27 2009 +1000
dix: remove DefineInitialRootWindow()
Obsolete.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c178c3f814f7666f43cbf47d24c7543b289f9b1a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 15:29:38 2009 +1000
dix: doxygen-ify enterleave.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cc696a2b7928ec497b6a0df3602fc70dec83a629
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 15:05:57 2009 +1000
Doxygen-ify bits of events.c
commit 8364bf7374aa5f6d991700f0c02921dc6c638c9f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 11 16:06:36 2009 +1000
Document the event masks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ed9d58c3c25ee1b3dedbc4c116823c263ccf164d
Author: Simon Thum <simon.thum@gmx.de>
Date: Sun Feb 8 17:21:09 2009 +0100
dix: refactor pointer acceleration
The algorithm is split in a 2D-specific and a general part.
This potentially allows to accelerate more than just screen motion.
A state machine is intoduced to make code more explicit and readable.
It also improves handling of 'phase 1' mickeys when axial correction
kicks in (corner case).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ac470dfb4fadaa0b28b6f8b57f4f13a20842b897
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 12 18:34:22 2009 -0800
Check for and report errors writing xorg.conf.new from Xorg -configure
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit bd713794ceaa1b2890522554562103c0a2d50f04
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 12 18:23:59 2009 -0800
Correct error message if specified config file is not found
By making the "Unable to open config file" header a warning, it was
not appearing with the filename when a config file was specified and
not found. Now we make it an error message again, but only issue
the error if a filename was specified - if none was specified, then
we don't even issue a warning, just the "Using autoconfig" info message.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit d229ba7068f0adf1bc8b30b7ccf2fce2c7e8b97b
Author: George Staplin <gstaplin@apple.com>
Date: Fri Feb 6 12:55:09 2009 -0700
XQuartz: xpr: The dri.c code for pixmaps was wrong in several ways. They weren't
being exported correctly by Xplugin.
This should fix a bug with the surface for a window, when an export fails.
Before the export could fail and leave behind an invalid (freed) pointer in the dix privates.
I have an idea of how to fix the GLXPixmaps now without using CGLSetOffScreen.
This work is a step towards that. The Xplugin will need a small patch to fix an
issue that this change brought forth.
(cherry picked from commit 58c4116c47543b5e30c2232e7bee8efc0b9be176)
commit b17d6bed97eddd0773d0845f93f842444b7de0ae
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Feb 12 15:33:47 2009 -0800
XQuartz: Fix copyright info in Info.plist to be prettier when viewed in Finder
(cherry picked from commit 8b607c9c507a68a6abda63831d227d0f8947028c)
commit d1ad43a8bc3a93a9cddcb4b0be1d722993bf5dd6
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Feb 12 14:05:10 2009 -0800
Enable pbuffers
If a driver does not actually support pbuffer rendering, it can just
not enable any pbuffer fbconfigs.
commit 0065896e1ae6d419a42b318b66d6e4d5f17a40ca
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:37 2008 +0000
Xming: Update keyboard layouts mapping table
An update to the keyboard layout mapping table which updates some no longer valid keyboard layout names
(e.g. de_CH -> ch -variant de) and adds a few more reported layouts
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d7c27bfe553235e55eb48799129ff9f8e7e0d4f6
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:57:29 2009 +0000
Xming: Check clipboard selection ownership after taking it
When you take ownership of a selection you should always check you got
it (X11 ICCCM gospel).
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit cb6315072ff23740bdc5fc2f95dd960601df5664
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:54:31 2009 +0000
Xming: Fix a memory leak in clipboard integration code
Free the memory allocated for ReturnData in FlushXEvents().
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d54d24dd5f25188b951b82b1c95eb9d36b5be970
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:53:43 2009 +0000
Xming: Fix prototype for winProcessXEventsTimeout() in clipboard integration code
Function 'winProcessXEventsTimeout()' is declared 'static Bool' and
defined 'static int' (correct) in 'winclipboardwndproc.c'. This has been
wrong since dot, but luckily was of no significance
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d8bae80305057acfb8e82341f68090eac0dccb90
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:52:57 2009 +0000
Xming: Improve clipboard integration startup in XDMCP mode
Improve clipboard integration startup in XDMCP mode
Stop the "Clipboard not yet started, aborting" message from spamming the log.
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7cb1622ce44754d9dcd6f405fb8403bd79c3e7e4
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:51:02 2009 +0000
Xming: Select events correctly in clipboard integration code
The clipboard should only select PropertyChange events and do this on
the correct window, the messaging window for the clipboard not the root
window!
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b997b3849d902894dd5b38673b73a23a47edf502
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:48:04 2009 +0000
Xming: Add Colin Harrison to copyright and authors list for clipboard integration files
Add Colin Harrison to copyright and authors list
Adjust license text for multiple authors
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5ff289834d7445cc6f60dbb1cf18423e7236311a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:42:54 2009 +0000
Cygwin/X: Place prototype for winSelectIcons() in a header file
Fixes warning as prototype is now in scope for the definition
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit ab2c98b86f1c3968581dfdad8b67432082feec78
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:36:58 2009 +0000
Cygwin/X: Place prototypes for winCheckKeyPressed() and winFixShiftKeys() in a header file
Fixes warnings as they are now in scope at the definition
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit cc7a4c7c6e051fceacb32997740d83fc0655414e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:29:28 2009 +0000
cygwin/X: Remove an unused variable to fix a warning
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7c2fb098b206c0fb97c18cce8f88387cd0c0e82a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:22:59 2009 +0000
Cygwin/X: Fix several prototypes to return HICON
Fix prototypes of winOverrideIcon(), winTaskbarIcon() and winOverrideDefaultIcon() to return HICON
Also use HICON type in WINPREFS stucture
Remove various casts these changes make unnecessary
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 19b3e44ce51cc2f74ba388cb2cd3a26467848e9a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:03:23 2009 +0000
Cygwin/X: Fix -Wold-style-definition warnings
Fix old-style definition warnings caused by definitions with empty
parameter lists "()", which should be "(void)" to indicate the function
takes no parameters, rather than unspecified parameters
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 734b23e5982e171031077a2d5d6b5dc2a12e1a70
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Feb 11 14:31:17 2009 +0100
fb: add fbDoCopy and fbCopyRegion compatibility wrappers.
commit 619c4d60eb3a8a51a8300ccf8ab5b98a688e6e12
Author: Eric Anholt <eric@anholt.net>
Date: Sun Feb 8 12:37:50 2009 +0100
glx: Replace broken GLX visual setup with a fixed "all" mode.
With trying to match depths so that you didn't end up with a depth 24
fbconfig for the 32-bit composite visual, I broke the alpha bits on the depth
24 X visual, which angered other applications. But in fixing that, the
pickFBconfigs code for "minimal" also could end up breaking GLX visuals if
the same FBconfig was chosen for more than one X visual.
We have no reason to not expose as many visuals as possible, but the old
"all" mode didn't match any existing X visuals to GLX visuals, so normal
GL apps didn't work at all.
Instead, replace it with a simple combination of the two modes: Create GLX
visuals by picking unique FBconfigs with as many features as possible for
each X visual in order. Then, for all remaining FBconfigs that are
appropriate for display, add a corresponding X and GLX visual.
This gets all applications (even ones that aren't smart enough to do FBconfigs)
get all the options to get the visual configuration they want. The only
potential downside is that the composite ARGB visual is unique and gets a
nearly full-featured GLX visual (except that the root visual might have taken
the tastiest FBconfig), which means that a dumb compositing manager could
waste resources. Write compositing managers using FBconfigs instead, please.
commit 7bbf05d9aa75b536a5321abf51f37852b8f109ed
Author: Shunichi Fuji <palglowr@gmail.com>
Date: Tue Feb 10 14:44:18 2009 +0900
dix: build fix if PANORAMIX is not defined.
Signed-off-by: Shunichi Fuji <palglowr@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4844bff58f296b2851be4e6b955c3a68d02437a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 4 11:50:18 2009 +1000
config: if we can't connect to HAL, listen for a startup notification.
If HAL isn't available when we try to connect, the registered NameOwnerChanged
signal handler waits until HAL is available. Once we connected to HAL, we
unregister the signal handler again.
This allows HAL to be started in parallel or after the server has started.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5b2bbffc12cd7d29e4200943f8736bd6336ae4aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:46:27 2009 +1000
dix: deduplicate SyntheticMotion.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 34820f9c1304891bebb4bff6a492288aec4fc0d1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:37:19 2009 +1000
dix: remove XineramaChangeToCursor.
It's nearly identical to ChangeToCursor now anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 942eae6868b8b0f343b6aa921ddf77e8bb70798a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:25:22 2009 +1000
dix: Remove XineramaCheckPhysLimits.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bf044f6d10ad9f2baca91a2f04e82dc1af2657cd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:14:54 2009 +1000
dix: reduce redunancy in XineramaConfineCursorToWindow.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cdce5699f085e717ee1a2ed8390746dfcb9ddadf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:09:23 2009 +1000
dix: Get rid of XineramaCheckVirtualMotion.
Yes, this is an ugly piece mess of #ifdefs, but it beats having two nearly
identical functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1cb5afdf1ef53e72e0eef28ff6197bf5e86ef758
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 8 18:59:17 2009 +0100
dix: always NULL pGC->tile.pixmap in Create{Scratch}GC.
commit 6fd8fe9cb993f9b733cf7d878bc324acd09aa48d
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 8 18:43:15 2009 +0100
exa: fix exaValidateGC.
- use DEST in the createPixmap wrapper, because stipple already takes MASK (in case someone uses swappers).
- Anticipate some of the less common situations when fbValidateDrawable will access tile related pixmaps.
commit 30daba6903378dd47f386c0012a0667fd2368f3e
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 8 02:08:13 2009 +0100
exa: All fallbacks should have a GC, remove some code.
- I did some testing with full fallbacks forced by the driver.
- I ran rendercheck, expedite and the (full) x11perf test suite.
- Thanks to ajax for pointing out this should be unneeded.
commit d591c7d1b87c61ee8add2fce689e35cf097eed4f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 7 20:47:54 2009 +0100
mi: kill a few warnings
commit 00226d0b589595cdd45c75e7e28237334a8883b1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Feb 6 20:56:49 2009 +0100
mi: clip exposures to pGC->clientClip.
commit ffa72793e25f19a388a1369708f472921f721284
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Feb 6 20:47:01 2009 +0100
exa: Calling exaMarkSync after UTS is the drivers responsibility.
commit da086901c6579e41b28b1418fa12ebb82744fc87
Author: Matt Turner <mattst88@gmail.com>
Date: Fri Feb 6 18:31:12 2009 -0500
Remove unused barrier macros on alpha.
commit 68665d78e72c4c564073d66a0f59ac8d3f5fd756
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Feb 5 17:07:31 2009 +0100
exa: don't use fbCopyNtoN
commit 2e76958d304a3c4080d62f32449724eeb9b95d93
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Feb 4 19:48:03 2009 +0100
fb: move some code to mi
commit f06bde3d4bf9a0f245dfa6c65cd98f8e0c7dfdfc
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 19:57:07 2009 +0100
exa: create ExaCheckGetImage
commit 258fc4b106dfd7b583999f97caf4d4a7a11569b6
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 19:40:48 2009 +0100
exa: wrap the remainder of exa_unaccel.c
commit 6fabf249494bf38b69e3c9c6c9718ee8b12fc6e1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 19:25:20 2009 +0100
exa: use proper wrapping in exa.c
commit 015c99a4ad572f5a1b68054efb070e1ffee1fed0
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 18:53:52 2009 +0100
exa: properly wrap GC functions
commit 5e6a06fe691db63ccf2dc7161a1f6c71c09741b7
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 16:30:31 2009 +0100
exa: add GC private
commit 5cc67ae94c066dcac78072ad8a819c3b602d8bab
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Jan 30 19:32:33 2009 +0100
exa: kill of exaImageGlyphBlt
- It serves no obvious purpose, yet it directly accesses many fb
symbols.
commit 6483834200fab90164c27c72d4710014edeb4479
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Jan 30 18:40:46 2009 +0100
exa: Remove one of the many calls directly into the fb layer.
commit f112d6bf59964f317ab236221f7bce7fe2603ab8
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 6 18:30:43 2009 +0100
EXA: Try harder to keep current pixmap copy up to date in exaMigrateToward*.
This is probably required, but apparently not sufficient, for making migration
heuristics other than "always" work correctly again. Not that I really care
about them...
commit 3948b523893d3d44b6a088340c4252e969613769
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 6 11:37:53 2009 +0100
EXA: Guard empty pending region warning by DEBUG_MIGRATE.
It isn't very useful yet while the damage layer calls us for empty operations,
mostly confuses users.
commit 9a1d07ecb74b7c3267a6910af66ada917a525110
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 20:20:24 2009 +0100
Fix "warning: cast from pointer to integer of different size"
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e15697b53c9448ce9911aa6499b2ea0bda92af6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 4 10:11:13 2009 +1000
dix: die if we can't activate or init the VCP/VCK.
If we have a busted xkb setup, the XKB initialization on the core devices
fails and leaves us with dev->key->xkbInfo == NULL. This in turn causes
segfaults lateron.
Return BadValue when the XKB configuration for a master device failed, and if
that happens for the VCP/VCK, die semi-gracefully.
The VCP init can only fail on OOM.
Reported by Aaron Plattner.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit db836715198a445dc3b32c3df0610f700930483f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 4 23:27:32 2009 -0500
Revert "Bus: Remove xf86SetAccessFuncs() and related machinery"
This reverts commit 2fe79990e31ac684637ca3c47198ee0cead10abe.
Reminder: nvidia uses this, because other parts of RAC are broken in
worse ways, and it needs to disable that.
commit 2fe79990e31ac684637ca3c47198ee0cead10abe
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:11:49 2009 -0500
Bus: Remove xf86SetAccessFuncs() and related machinery
Only mga was using this, and even then only behind an ifdef that no one
ever built. Not a great idea in the first place.
commit 9ff6180161267e71ae750498da0ec4889cd5c260
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 06:23:09 2009 -0500
Bus: Delete some obfuscatory macros
commit 8eca37cb8934e79f02291460eb7b49a5d528f391
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 4 22:48:52 2009 -0500
Bus: Remove unused xf86ExtractTypeFromList
commit b013111e98d50f5962e9b275eb28d969d5c9576e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 03:14:18 2009 -0500
Bus: make the resource list static.
commit bde028dd8d856f8d47c39e3c6d3731c34c398c74
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 22:58:58 2009 -0500
loader: Remove icache flushes on alpha.
If libdl doesn't already get this right for you, you have two problems.
commit 910a1e88d23e0b7e4ca4679ab50a883a918f2590
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:54:07 2009 -0500
loader: Remove a vestige of archive support
commit 366f23c6eb504fc23112f121769bcb719948474f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:53:05 2009 -0500
loader: Remove useless call to LoaderGetOS
We know what OS you're running on anyway, it's printed in the uname
string at the top of the log.
commit 05e415a5a3f376e28955be3bf976390e8631e25f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:52:07 2009 -0500
loader: Simplify loader magic
commit bf1ca06a1693cbe5415a152936939ce3b088a022
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:51:35 2009 -0500
loader: Make a comment slightly less stupid
commit 499908aeca9a31692c787070e23bfaa92d1b32a4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:50:00 2009 -0500
loader: code motion.
commit 28b6b1519c4c526662302fac4ed9b7f540bafd4a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:47:46 2009 -0500
loader: Simplify handle allocation and refcounting.
commit 0bad0552bfd4d10529ab51d618af8d08c5aeea71
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 4 17:20:24 2009 -0500
XKB: Remove -kb and +kb from -help text and man page.
commit 7968823cbc02615e1080c0d3f34dcebe14ea1771
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 3 20:18:37 2009 -0800
Handle the combination of panning and crtc transforms
This patch gets the shadow scanout buffer repainted on panning area changes.
It does not, however, track the mouse correctly.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 763df9eec79a867978efc5138d8635a46c1a0d17
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 3 20:15:41 2009 -0800
Damage re-used shadow scanout buffer using new transforms.
When the shadow scanout buffer can be re-used, the underlying framebuffer
area must be damaged so that the scanout will be repainted. This patch
delays the addition of that damaged area until after the transform in the
crtc has been updated, otherwise the old transform would have been used and
the wrong area repainted.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 62fc98cb88e4e8b636f343453fc1168a87c58972
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 3 20:12:42 2009 -0800
Handle matrix computation overflow in RRTransformCompute
If the computation of the composite fixed-point transform for RandR
overflows at any point, take the resulting floating point transform and
scale that back to fit in a fixed point matrix. This ensures that a matrix
will always be available, although perhaps at reduced precision. Someday we
should add floating point matrices to Render.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a3ddef3bc27982f3558183c74fc8e365cf2e7fd
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:07:02 2009 +0100
fbdevHWGetRec() doesn't return the private data
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e04d9ab999978995b06f4b702293b96f69b0e8c3
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:08:21 2009 +0100
DBUS_API_SUBJECT_TO_CHANGE is already defined on the command line
dbus-core.c:30:1: warning: "DBUS_API_SUBJECT_TO_CHANGE" redefined
<command-line>: warning: this is the location of the previous definition
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f60d127b5371f2853dcc53903c6ff8c7670ad1b
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:07:40 2009 +0100
Fix "warning: braces around scalar initializer"
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a88995dfb88719ae4a03483dc571dbbe83565285
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:03:58 2009 +0100
Make gcc happy: correct third argument of CopyGetMasterEvent()
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dd3f4e829286e62f4c5c07ee93f9f576876acbf9
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:02:24 2009 +0100
Fix "warning: cast to pointer from integer of different size"
Add parenthesis around the whole expression.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 731a907ac21a753f306b53706f689469cefeb953
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Feb 3 23:58:25 2009 +0100
Fix "warning: XXX defined but not used"
generic.c:80: warning: ‘read_legacy_video_BIOS’ defined but not used
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc57efffe654c493ceb62555cccb7926f4a646f1
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Feb 3 23:54:53 2009 +0100
Fix "warning: unused variable XXX"
events.c:4614: warning: unused variable ‘kbd’
xkbUtils.c:361: warning: unused variable ‘maxKeysPerMod’
xf86Events.c:409: warning: unused variable ‘ke’
generic.c:131: warning: unused variable ‘cs’
generic.c:130: warning: unused variable ‘size’
xf86RandR12.c:591: warning: unused variable ‘crtc’
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 111fdef74dfc7e288cef675b171b673bf64fe056
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Feb 3 21:18:53 2009 +0100
ISO C90: Move declaration to the beginning of the function
devices.c: In function ‘DoChangeKeyboardControl’:
devices.c:1768: warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9fe9b6e4ef669b192ee349e3290db5d2aeea273c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 10:20:13 2009 +1000
mi: don't call UpdateSpriteForScreen if we have Xinerama enabled. #18668
In Xinerama all windows hang off the first root window. Crossing the screens
must not reset the spriteTrace, otherwise picking fails and events are sent to
the root window.
X.Org Bug 18668 <http://bugs.freedesktop.org/show_bug.cgi?id=18668>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f80332a04d0714a74f16b2552cccf3457e6494af
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:28:16 2009 +1000
dix: for core events, pass the core filter into DeliverEventsToWindow
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01879e583b0ce0d8fddc37e36d9b69fe4f1d1e72
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Feb 3 13:49:19 2009 -0800
Don't enable XAA offscreen pixmaps with Option "XaaOffscreenPixmaps" "no".
xf86IsOptionSet is rarely the right function to use for boolean options because
it returns TRUE whenever the option is present, even if its value is "no",
"off", "0", etc.
commit 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 19:25:14 2009 -0800
Constify atom name strings
Changes MakeAtom to take a const char * and NameForAtom to return them,
since many callers pass pointers to constant strings stored in read-only
ELF sections. Updates in-tree callers as necessary to clear const
mismatch warnings introduced by this change.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6869efae74381e5305b2d6517bf286e3ef7fdcb7
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 3 09:58:51 2009 -0800
XQuartz: Accept bundle version 2.1.6 to work with our startup method
(cherry picked from commit 7f2966557374cb5ea22bc7b73d5ca04891eb5e78)
commit 43a1c91a3dac4f0c8cea5de1b9785e349e09978a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 20:44:27 2009 +1000
Xext: fix typo in GEEventFill macro
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 412e09e1e37b74421abd4dd9606536d2785da440
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 15 11:03:03 2009 +1000
dix: Use GenericEvent instead of LASTEvent to check for core events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f3c5d46f81887b2b413b3e6cc9df8282f06522c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 12:55:39 2009 +1000
Xi: initialize the device before applying button map changes.
This part got lost in bc909f71367a0.
Reported by Tomas Carnecky.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6bf6a4c47e94780bf0eef47702f21a505c336556
Author: Simon Thum <simon.thum@gmx.de>
Date: Fri Jan 23 12:06:16 2009 +0100
Xi: create well-known atoms on demand, rather than preinit them
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32adf8d34fb7db9b78859241f2670349b75c3f7e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Jan 28 20:52:45 2009 +1000
Xi: If the MD doesn't have a key/kbdfeed class, init the keyboard.
This fixes crashes on mouse/keyboard combos where the mouse is both a keyboard
and a mouse. Upon copying the SD's key info into the VCP, the NULL xkbInfo of
the VCP would crash the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit caade11b8465a743b2ecc890a4d180277e9ca716
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Jan 28 20:44:47 2009 +1000
Xi: remove now obsolete oldXkbInfo.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 5e0967f5fc2e0fcf2a55128eb03931cf6f5709e9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 12 10:49:53 2008 +1000
dix: add SetBit(arr, bit) and ClearBit(arr, bit) to include/inputstr.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit faeb18eb7eb20f15528f9c8004d843146ebc2a50
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 27 15:40:31 2009 +1000
Xext: rename shape's EventType to ShapeEventType to avoid name clashing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cfd3443fe81685e91a53063dee58e24a5684dc29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 28 13:34:10 2009 +1000
Xext: rename saver's EventType to SaverEventType.
Avoid namespace clashing with the internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8460425740c72e58bcb897557f033e2836251160
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 10 12:31:59 2008 +0000
render: rename SetBit to RenderSetBit.
Avoiding namespace collision with the SetBit macro soon to be used in the
input code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 940a7aeebc9b042b0208ee475ef162c485ac2274
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 27 15:52:49 2009 +1000
include: remove now-unused sempahore macros.
Obsolete with the new enter/leave model.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f5c7f8a3ab5723b6c1c3cd21b90a87fd7f37cb7f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Feb 2 12:30:57 2009 -0800
XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard
(cherry picked from commit 8620579483789ae9ac1b68dbefe32b70011386de)
commit 5100d829a4d71ce4a9fbc2b81694a1fb90066ccf
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 2 10:13:46 2009 -0800
glx: Don't match fbconfigs to visuals with mismatched channel masks.
This fixes at least one known bug, where the depth 32 visual would end up
with a depth 24 fbconfig attached, angering compiz.
commit 4475ae036c3d5a06a6ce88a359ce2a9a8ae9b4f1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 26 13:15:07 2009 +0000
Cygwin/X: Fix compilation for mandatory XKB
Fix a stray '}'
Update to use RMLVO interface
Remove g_winInfo.xkb.disable, can never be set since noXkbExtension has been removed
Change to retrieve modifier key state using XkbStateFieldFromRec() from Colin Harrison
Update to use XKB defaults from xkb-config.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e2b4d3d4a1994347979508fbb483cd55c2232502
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Feb 1 15:08:02 2009 -0800
XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT
(cherry picked from commit e01662cadcaa4052e3a5aa82cbaed00a2d0220e0)
commit 66a6fbbfa3a1fd0d91fe61cf2ab299d0e3df46b9
Author: Jim Huang <jserv@kaffe.org>
Date: Sun Feb 1 09:19:20 2009 -0800
kdrive: Move a close() to the right place so we don't close(-1) normally.
Bug #18343
commit 0055fe66d5f73742cafab868ccdb7a6f36ea1dd5
Author: Manuel Bouyer <bouyer@netbsd.org>
Date: Sun Feb 1 09:14:19 2009 -0800
netbsd: Force the use of ev56 instructions for register access on ev56.
This avoids 32-bit access which might affect other registers. The linux code
uses gcc flags to get this to happen, but this seems like more of a sure thing.
commit 1375c1b07df114d864a0a06786bc75a3a4f65177
Author: Manuel Bouyer <bouyer@netbsd.org>
Date: Sun Feb 1 09:12:21 2009 -0800
netbsd: Fix alpha ev6 support.
Bug #19721
commit ad8ffbe7cb50387e6a9cc4a24fea0d9c13b7bfc8
Author: John Hein <jhein@timing.com>
Date: Fri Jan 30 21:30:35 2009 -0800
Actually require bigfontproto when it's enabled. Bug #13710.
commit 29b3b88dc744f4919c6709747ddb7baac47486c5
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Fri Jan 30 21:16:48 2009 -0800
Prevent double unref of glxdrawables
Found by valgrind. Bug #18917.
commit 60bcdd687040db76490851d4b459284ce37020e0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 21:44:08 2009 -0800
x11-input.fdi: Add options needed to handle adding USB devices on Solaris
commit 4de5705545792d77c9990bbec3e263a517757a2a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 20:17:10 2009 -0800
RandR crtcs not fetched correctly when primary output is set.
Primary outputs may not have a CRTC.
Loops fetching CRTCs respecting primary output were broken.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f716e3f3445d443cbc6507d27f806e9ad387120a
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 30 20:10:21 2009 -0800
modes: Protect xf86_crtc_supports_gamma() from non-RandR 1.2 drivers.
commit 317f2b4a9fe4b606975711bc332166a82db5087d
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 30 19:06:17 2009 -0800
randr: Avoid re-querying the configuration on everything but GetScreenResources.
The new path should only re-query on the other requests when we haven't
gathered the information from the DDX yet (such as with a non-RandR 1.2 DDX).
Bug #19037.
commit c1f2be1f3fd0c80cb4c85b98140b98aa9311242b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 19:14:36 2009 -0800
RandR SetOutputPrimary should work with or without a crtc connected
The test was inverted from the protocol spec, and besides, the test is bogus
anyways.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd098501d800571e71d06ffc936635a6c9d44e05
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 30 16:17:58 2009 -0800
Move the apple fat binary hacks back to a header file, and make it apple-only.
commit 6e49fdd2c839b6244c23ce95c3ae76a1a265b986
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 15:43:04 2009 -0800
Make RandR CRTC info report panning area instead of just crtc area
This makes the RandR info consistent with the Xinerama info.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea309e47457156b60aadbf113f04e5b6851029c8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 14:19:41 2009 -0800
Make crtc_notify wrap/unwrap code do nothing unless mode code is inuse
Drivers not using the new hw/xfree86/modes code would crash in DRI due to
that code trying to monitor CRTC changes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fff00df94d7ebd18a8e24537ec96073717375a3f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 14:16:12 2009 -0800
Ignore EDID-supplied monitor physical sizes for core screen size
We report the EDID values in RandR, and we let people configure whatever
they like for the screen in xorg.conf. Reporting the EDID values in the core
means applications get inconsistent font sizes in the default configuration.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e7bc2d7a9879297aff0924febeca9bd3b6c336d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 30 03:56:39 2009 -0200
Work around inclusion of <X11/extensions/panoramiXext.h>
The X Server build only needs the macros PANORAMIX_MAJOR_VERSION
and PANORAMIX_MINOR_VERSION from that header.
Addition of extra prototypes to <X11/extensions/panoramiXext.h>
caused a X Server build failure.
commit 15ac25627e7239629be59adedda5d8a9deb330ef
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Jan 29 14:40:27 2009 -0500
Remove extra / from Loading module line
In the X log, upon module load, it prints a line similar to the following.
> (II) Loading /usr/lib64/xorg/modules/extensions//libdbe.so
The attached patch removes the extra / before the module name.
Code already exists in hw/xfree86/loader/loadmod.c:InitPathList to add a
trailing slash if needed, removing the one added by sprintf is harmless.
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit 3903e23153a0d47704050944fa83a7b31bc2eebc
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Jan 29 12:42:57 2009 +0100
XKB: ifdef XKB is dead, yet it was still present in a few places.
commit 756a2c848305aa06bfe636314e28ad7f97c1168a
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Wed Jan 28 22:18:50 2009 +0100
Fix duplicate code, off-by one in space calculation, not initialized members
commit b55db937fee5ddf34518a54f352c0ee9b8cc2c2c
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed Jan 28 17:33:25 2009 -0500
[shadow] Store the closure in the buffer
commit 82fc102568b3d6b0daeb6c5f5b3a1310a7f14fcd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Jan 28 07:51:32 2009 +1000
Disable Xnest by default.
Xneest doesn't build right now and is in the process of being removed. So
let's not build it by default.
commit f7585d020593345e7a61b1fe1a517c38da8f6d79
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 03:13:28 2009 -0200
Convert kdrive libraries to libtool convenience libraries.
Also correct a link failure due to unresolved symbols. This
is arguably a libtool/ranlib/ld bug, that "may" be corrected
by linking all convenience libraries in a single one. But in
this case, it was preferred to just add a linker option to
Xfake_LDFLAGS, to force linkage of all libraries.
This corrects #19725.
commit b43a4e2d38adb9ff16204218f24df93cfd820d1b
Author: Magnus Kessler <Magnus.Kessler@gmx.net>
Date: Tue Jan 27 09:30:37 2009 +1000
Xvfb: add missing include for new xkbsrv.h
Commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e added call to
XkbGetRulesDflts defined in xkbsrv.h
Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a7e6424d992151c504a75bb807fa34c57ad52cad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 23 17:11:57 2009 +1100
dix: remove obsolete comment. Event lists should not be allocated by the DDX
commit b137a0cdb1d517a807d081fbde8e8dc0539fb3ca
Author: George Staplin <gstaplin@apple.com>
Date: Mon Jan 26 03:02:38 2009 -0700
XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks.
(cherry picked from commit 143224405ba74929c702a95de52b56df140b0d1b)
commit 34b896e50fa154ad890a458c60932964421e739f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jan 16 19:26:07 2009 -0800
XQuartz: SnowLeopard: Help system book name changed in 10.6
(cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb)
commit c7d62d74bbd6e0067f511fd910b9e633576befb7
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Jan 25 19:19:01 2009 -0200
Explicitly add libxorg_la_LIBADD to libxorg_la_DEPENDENCIES
Otherwise, for example, when hacking config/*.c, it is required to
run make clean on that directory, to ensure the proper libconfig.a
will be linked in the generated Xorg binary.
commit 0eec7348875035792097f606487a558422774e2c
Author: Magnus Kessler <Magnus.Kessler@gmx.net>
Date: Fri Jan 23 12:11:00 2009 -0200
.gitignore: ignore sdksyms.dep
Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
commit 88efe9c76f85423d952ff38e0cfd8b690439902a
Author: Magnus Kessler <Magnus.Kessler@gmx.net>
Date: Fri Jan 23 11:25:00 2009 -0200
Xvfb: Remove unused function GetLK201Mappings in InitInput.c
Silence a gcc warning. After commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e
GetLK201Mappings is no longer needed.
Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
commit 6ef46c40e62def4841a4cff4e0b443516a2ed782
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Jan 25 19:01:10 2009 -0200
Update xnest keyboard code to match xephyr/kdrive.
Xnest was not updated in the last batch of xkb changes. This
patch is basically cut&paste from hw/kdrive/src/kinput.c and
hw/kdrive/ephyr/ephyr.c, and appears to generate a Xnest as
functional as before the xkb changes.
commit 759348f13ffa02fb1804238189ffce1c92d33e2a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 22 22:09:11 2009 -0500
Xephyr: Add some rudimentary Xnest command line compat
commit 01ffaf6834fd6a3b1ddbd33d0f0b8d086be0737e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 19 21:11:05 2009 +1100
Xi: define a range of axis labels.
This is copied from linux/input.h, presumably that's the ones at least the
Linux kernel can give us for any device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 132b464d734b077038e19b21e46d3a6258f4b998
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 22 02:11:16 2009 -0500
Remove a bunch of useless casts.
We've had void * for twenty years now people let's try to act like we
know how it works.
commit 0fb4390526bb829ab17ff4635d41a3012f63c1b2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 22 01:13:17 2009 -0500
Remove xorgcfg 'Options' list.
commit b5ece46b76c9182a077141505cc0e788c0fca3ea
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 20:07:40 2009 +0200
Input: Clarify valuator FatalError messages
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ddb46c1421a98190313b79621c0f5ae43b97d3f6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 20:03:10 2009 +0200
Input: Use previous state in valuator events
Make valuator event state match other events by using the device state
from before processing the event, not after. Also, we already check the
number of valuators in UpdateDeviceState, so no need to do it again.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 18e51911f5748f9a27a18cd6bb421c899f5b048f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 13:44:47 2009 +0200
Input: Add postdown to ButtonClassRec
This mirrors that in KeyClassRec: the state of the buttons as posted to
GetPointerEvents, rather than the state of the buttons as processed by
ProcessOtherEvent and friends.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c05f3bc935bef4d98216d38c0e98bd57ced382df
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 19:35:15 2009 +0200
Input: Don't allow DDX to generate repeat events
We always use soft-repeat at the moment; XKB posts a release/press sequence,
which admittedly needs cleaning up, but that's for another day.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6aef4e96affcc26b9415c6bc9c9bebb5af05a1a7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 13:42:46 2009 +0200
XKB: Fix logic error
Use logical or instead of bitwise or.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0ec9b1069aeeaf66fd104c09f08202f7ebccd170
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 10 14:44:28 2009 +0200
XKB: Remove unused XkbProcessOtherEvent
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7af53799ccefe27b996bdc6073075b7f12353d3a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jan 4 16:39:18 2009 +1100
Input: Remove unused CoreProcess{Keyboard,Pointer}Event
Everything goes through XKB's Process{Keyboard,Pointer}Event on its way
through to ProcessOtherEvent now, so get rid of the old, useless functions.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7c4c00649cae855e141ec9a3667bfe399e3156d0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 1 05:25:52 2009 +1100
XKB: Remove unused DDX functions
They were complete no-ops anyway.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fa3872dc2bcfd6d1fc88d0a94c7071683eea899
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 18 20:26:00 2008 +0100
Input: Remove core keysyms from KeyClassRec
Instead of always keeping two copies of the keymap, only generate the
core keymap from the XKB keymap when we really need to, and use the XKB
keymap as the canonical keymap.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc909f71367a02297e725bb5769c2bcadab22395
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 12 00:35:56 2008 +0300
Input: Centralise pointer map changing
Replace both core and Xi functions with one function that validates the
proposed map, and sends out both kinds of notification.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f06a9d2e05e13466c115fc706966a90b1fb0518e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 18 20:59:30 2008 +0100
Input: Clean up keymap change notifications
Keyboard map notifications are always generated from within XKB code,
which also takes care of copying the keysyms, etc. If you need to
mangle the keymap yourself, generate a new core keymap/modmap, and pass
it to XkbApplyMappingChange.
SendMappingNotify is renamed to SendPointerMappingNotify (and ditto its
Device variants), which still only _sends_ the notifications, as opposed
to also doing the copying a la XkbApplyMappingChange.
Also have the modmap change code traverse the device hierachy, rather
than just going off the core keyboard.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 1d1a0f67eee330a286fbdef17e967ce8ea201548
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Oct 28 16:27:37 2008 +1100
Xi: Introduce XIShouldNotify
XIShouldNotify just lets you know if you should send an event for a
keymap change (or similar) concerning a given device to a given client;
at the moment, this is only for devices which are sending events to that
client.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b5242789edb726bb539e4d42fa35bfdaca0025c9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 9 17:02:02 2008 +0300
XKB: Simplify keymap writing a bit
We don't need no temporary variable.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit feb757f384382c7782ceac55f99d54c7caadbd9d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:54:29 2008 +0300
XKB: Sanitise vmods for redirected keys
Turn two unsigned chars into one unsigned int for both vmods and the
vmod mask. As a bonus, remove broken unused accessor macro for setting
the vmods.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b5f49382fe48f0a762d9a15fb10a7d7e1183fc8d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:52:11 2008 +0300
XKB: Sanitise ctrls action
Turn four unsigned chars into one unsigned long.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1bd7fd195d85681e722161f8c636a28f11b40abb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:50:12 2008 +0300
XKB: Sanitise pointer actions
Turn two unsigned chars into one int.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61c508fa78aa08ea2666fde950fbafad95d65056
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:47:16 2008 +0300
XKB: Sanitise vmods in actions
Turn vmods from two unsigned chars into one int.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4f3078df2acf07364a17f738bc5c32f9a5962723
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 9 16:50:22 2008 +0300
XKB: Add a hell of a lot more FIXMEs
For some reason, we insist on having daft internal representations that
make no sense, that always have to be converted to be used. We should
really sort this one out.
Also, comment the hojillion members of XkbStateRec.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit edeb033f29ae2d52e86c543ccbf22fb7ae1fdb7f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 15 18:07:52 2008 +0100
XKB: Explicitly decode action data
Rather than requiring a one-to-one correspondence between XKM and struct
formats in action data, explicitly fill the action data, so we can break
API.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 699824a35791735b4b4378adf8648e3aaa599ace
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 18 16:41:29 2008 +0300
XKB: Remove descriptions from maprules
We don't use them, as they're not up to the task. We'll get a better
solution someday, promise.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1ad80678d88525159e55bb814205fd4eaca060a3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 18 16:29:35 2008 +0300
XKB: Remove support for setting combined keymaps
We don't do full keymaps anymore. Deal.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 133e0bd6f1cc147a2ddbbe1519d10300e7dbe669
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 18 16:27:57 2008 +0300
XKB: Remove 'extra' functionality from rules parsing
When we find something weird in the rules, don't stash it as an extra
freeform component, just state that the rules file is likely broken and
move on with our lives.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cc5c6d628aa0dc87c2cc9d063972e09ad747a596
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 18:45:37 2008 +0300
XKB: Remove unsupported Xi operation flags
We support every XKB operation on Xi devices, so always report that we
support everything, and that nothing is ever unsupported.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32db27a7f867b503c2840ca7b815e96d10be9210
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Apr 17 12:42:01 2008 -0700
Input: Remove modifierMap from core
We already have modmap (in the exact same format!) in XKB, so just use
that all the time, instead of duplicating the information.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f062e90a95f9b7ae5458ef2100615e8ace9b66a7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 16 19:15:30 2008 +0300
Input: Remove modifierKeyMap
Since modifierKeyMap is generated from modifierMap, just remove it, and
only generate it when we need to send the modifier map to the client.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cf6a2fc2bd94b392cfea120444d5e032d26f1d37
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Mar 30 17:25:39 2008 +0300
Input: Ignore modifiers in core input processing
Modifiers get cleared by the XKB code when we drop down into core input
processing, so just delete the dead code path to simplify things a bit.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6727ee94086d238f9f99379280d4e4827f388cce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 9 16:45:45 2008 +0300
Input: Remove state from KeyClassRec
We already have state fully stored within XKB, so instead of duplicating it,
just generate the values to send to clients when required.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 26 18:38:25 2008 +1100
Input: Overhaul keyboard initialisation process
XkbInitKeyboardDeviceStruct is now the only valid keyboard
initialisation: all the details are hidden behind here. This now makes
it impossible to supply a core keymap at startup.
If dev->key is valid, dev->key->xkbInfo->desc is also valid.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 40877c6680863bd6a8475f2bb0c54df55bcf0b0e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Mar 18 10:05:57 2008 +0200
XKB: Make XKB mandatory
No more #ifdef XKB, because you can't disable the build, and no more
noXkbExtension either.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f9da417163b6b2d6234d2542c1f375e33db7159a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 28 19:26:42 2008 +0200
Xephyr: Disable state inheritance hack
Prepare for the impending removal of the state field by disabling this hack
for a while: it's hell of nasty and I'm amazed it ever really worked.
Basically, on focus out, it should do as current DDXes do and fake releases
for all keys (not just mangle the core state) that are currently down;
buttons too. When focus comes back in, we already have a KeymapNotify that
lets us know what's currently down, so we can use this to fake the
appropriate keypresses, and send it through the event routing layer.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 5c281446d2a8c38511d45baee6f0d25a640f12e1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 28 11:56:34 2008 +0200
XKB: Remove lock actions disabling
For some reason, XKB allows clients to set a global (!) flag that simply
turns lock keys into state no-ops. Ignore this flag.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 2f7cb7306709d5266688e05a066701d309323035
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 26 18:36:30 2008 +1100
XKB: Add XkbRMLVOSet
XkbRMLVOSet is just a set of strings for rules, model, layout, variant
and options; use that in preference to XkbRF_VarDefsRec, which is a
hideously complicated monster that somehow managed to not include the
actual rules.
While we're at it, clean up xkbrules.h so it doesn't require xkbstr.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 3208eff2d7b856a4ac0d650498ccb36e7e62e034
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 21 14:45:06 2009 -0800
Update xorg-server.h.in & Xnest to use new XKB default #defines
commit cdf216aa17b776130a91fa6792c321620e810a18
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jan 20 16:50:43 2009 -0800
Fix XKB default configure options to use the right variables
commit 0d3c3dad21857ef502fe0d0235620a1228248e13
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 20 23:46:48 2009 -0500
Don't include fontmod.h
commit 4f004ab9a83e209943760e1faa39f06c8eeb27af
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Thu Jan 22 01:36:31 2009 +1030
XNest: Fix the build caused by __XKBDEFRULES__ -> XKB_DFLT_RULES in 23862ede59a9ce11a06ec5151bde460fb836c603
commit e45a8a498d1ee8e40fc334805c38c05cb04b49d0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 20 22:07:07 2009 -0500
Remove CreateUnclippedWinSize from window.h
This is utterly wrong, but then, so is sdksyms.sh
commit 20d2117eb82fb7ce91afd4f01fe1b9d4b1bf0459
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 20 00:17:42 2009 -0500
Move CreateUnclippedWinSize to mbuf
It's the only user, so.
commit e1611d8d55ade35bf8c2e1da7bc2dbf05b011301
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 27 13:34:05 2008 +1100
XKB: Be more verbose about XkbCopyKeymap failure in debug mode
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5ee504cae5f17d16ee7599beaa4b1944a9a8aee6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 27 13:31:18 2008 +1100
XKB: Trying to copy to the same keymap is not fatal
Humour the user if they run XkbCopyKeymap(foo, foo).
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d929ba6886c6f121b101c0bf0f7c63ef9d851a3e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 26 18:32:41 2008 +1100
XFree86: Input: Fail NIDR if we can't enable devices
If we can't enable a device, bail out of NewInputDeviceRequest rather than
blithely continuing. Also, be more verbose when initialization failed. Also,
be more verbose when initialization failed. Also, be more verbose when
initialization failed. Also, be more verbose when initialization failed.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 534669b376a6a703fbc97269d279a5418cf60c98
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jan 4 16:24:44 2009 +1100
XKB: Remove unnecessary prototype
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 27ea1a7e4e7eca394e052791c64bc6be515e075e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jan 4 16:40:46 2009 +1100
XKB: Only Xi events are processed
Core events aren't run through these functions, so don't bother testing
for them.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2762cafc321166ac48f80146720709b1011e6894
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 27 13:35:42 2008 +1100
XkbCopyKeymap: inputInfo.keyboard is not a special case
The device-walking code is still depressing, though.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 07c3bb922b8c1ae8fe28198f6c451430b836f21e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jan 4 14:12:19 2009 +1100
XKB: Move XkbCopyKeymap definition to xkbsrv.h
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4f35a34f3cd3df3c8af129936d1808dcc063d8a7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 17:26:02 2008 +0930
dix: Remove traces of CoreDevicePrivateKey
Obsolete with MPX.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 58a6b5b9eff25b1b9c6de239d6f5a952a31dfd15
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 17:21:28 2008 +0930
Xi: don't care about CoreDevicePrivateKey when copying keys
If we get here, we must copy.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 23862ede59a9ce11a06ec5151bde460fb836c603
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 10 14:36:16 2009 +0200
XKB: Allow build-time configuration of XKB defaults
Instead of hardcoding base/pc105/us, allow users to change the defaults at
./configure time. Change the default model to be evdev on Linux.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 57a5eb2583bdf1069861fe2184de9739c0d0c7c1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 17:40:54 2009 +0000
Xming: Update .rc file to tidy About and Exit dialogs
Tidy up About and Exit dialogs, add keyboard accelerators
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit df3f701ef2d41ff4be4839f473ae71d33777bea3
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:17:23 2008 +0000
Xming: Ensure we dont try to print a null value when displaying xkb configuration
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c612f0df45d388c98108e1e0c80afdfae05e338e
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:41 2008 +0000
Xming: Add styles keyword and attributes.
Add handling for style keyword and atttributes in .XWinrc
Update man page to document these additions
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 847a91ad2e8c9b0992c09f0ec38466885d6d25d4
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 19:57:56 2009 +0000
Xming: Notify X when the keyboard focus is lost to a pure Windows window in -multiwindow mode.
Fix internal WM to notify X when the keyboard focus is lost to a pure Windows window in -multiwindow mode.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6c3e7e4d0568ecb7d10b814593bbbd817b7d2aab
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 18:28:34 2009 +0000
Xming: Only allow WM_MOUSEWHEEL messages to act on the client area of a focused window.
Fix internal WM so it only allows WM_MOUSEWHEEL messages to act on the client area of a focused window.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d84e0e387764236c7e97509baf4606d96cfc19d4
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 18:20:44 2009 +0000
Xming: Correctly parent XA_WM_TRANSIENT_FOR windows in -multiwindow mode when a windows window is created.
Fix internal WM to correctly parent XA_WM_TRANSIENT_FOR windows in -multiwindow mode when a windows window is created,
and to de-iconize parent windows when a child window acquires focus.
XXX: Perhaps we should also shuffle parent(s) forward through Z-order when a child acquires focus?
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 8d82d806ee38d45ec7cdbf8b1f671ec1e4437567
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:38 2008 +0000
Xming: Correct the way display and screen number is reported in window titles and tooltips
Correct the tooltip text for the toolbar X icon to be strictly correct, 'display-number:screen' should be ':display-number.screen'.
Also for the default window title.
Adjust the style of the Windows title in XDMCP mode from 'Xming - hostname' to 'hostname:display-number.screen'.
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 656f92e247f2f257105daf1e0e6998e1b3d10eba
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 20:17:02 2008 +0000
Cygwin/X: should also use GetTickCount(), just like Xming
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7f781e780ee2b261c5cb688a8e6c5dc1a53bdb6f
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Dec 17 19:13:30 2008 +0000
Cygwin/X: Cygwin doesn't have RTLD_LOCAL
RTLD_LOCAL is not defined on Cygwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5630ff809676ab6b4833757060e48e201e8768a5
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 22 13:53:43 2008 -0800
Ignore generated dmx manpages
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
commit 64f924fbf513b5f91b3f2bcf5767f6fe927d3f7a
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 22 13:43:30 2008 -0800
Kill off --with-mesa-source completely
There were a few spots left in the source that were using the
--with-mesa-source defined headers or the now removed $(top_srcdir)/GL
directory. These aren't needed anymore as all the necessary source for
GLX is in $(top_srcdir)/glx.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
commit e1c8ee215797fa8c6a3a5421bb6f99b58064248b
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sun Dec 14 14:18:58 2008 -0800
Don't reuse PKG_CHECK_MODULES identifiers
Using GL for the PKG_CHECK_MODULES identifier multiple times means only
the first call will actually be used. Later calls will be skipped due to
GL_CFLAGS and GL_LIBS already being set. This changes DRI to using a
different identifier and DMX to just reusing GL_CFLAGS.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
commit ca46c01869768a8661a9d8a71493ed5f0760a8ab
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jan 16 13:58:20 2009 -0800
XQuartz: mieq: Wait for the server to finish initializing before letting other threads mieqEnqueue
Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
(cherry picked from commit 94e417ac87a98cd5c6bf2d7c495d702748398931)
commit b33905234025f005819c7e2acd653a3a0ecfeb82
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 9 14:32:14 2009 +1000
xfree86: always force RAW mode under linux.
The previous check for AEI on left us with the possibility that AEI is forced
off in the config, but devices are added through evdev nonetheless. A keyboard
added this way can CTRL+C the server. Even when we use kbd, we can set the
mode to RAW, so it's safer alround to to so.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 646add4eb47c01c045ef64405510a08ecfb5bfd6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 16 16:04:07 2009 +1000
dix: remove XineramaCheckMotion, merge into CheckMotion.
For 5 lines difference, we don't need to duplicate the whole function. really.
commit e76f904abe530df9ddaa09510088c545298b0b91
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 16 15:53:50 2009 +1000
dix: remove "notyet" conditional compilation.
If it's "notyet" for 3 years, then "yet" won't arive anytime soon.
commit 5c41b3f9c8b72f0115019237f812d74610b82c24
Author: George Staplin <gstaplin@apple.com>
Date: Mon Jan 12 19:30:43 2009 -0700
XQuartz: xpr: Cleanup some of the code and possibly fix part of the GLX Pixmap problem.
Split DRICreateSurface into 3 functions.
Make CreateSurfaceForPixmap use xp_configure_surface. I suspect this is partly why
GLXPixmaps never worked.
It will require some more work and thoughts for pbuffers, unless we fake those with
pixmaps and surfaces.
(cherry picked from commit 9cf264e67744262b9f45079e6cd752eb3e3b0e08)
commit c5d52d4c37ebec92cb668b0653bf3de2bdfc5782
Author: George Staplin <gstaplin@apple.com>
Date: Mon Jan 12 14:14:44 2009 -0700
XQuartz: GL: Make indirect.c build and work in the 1.6 branch.
Reorder some header files and provide some types earlier on.
Remove the static __GLXextensionInfo __glDDXExtensionInfo; that isn't
used in 1.4 or 1.5, and seems to have been removed from 1.6. Remove
the data structures associated with that too.
Remove __glXAquaDrawableResize. The GLX structure doesn't use
it anymore, and the Apple version did nothing useful before.
__glXAquaDrawableSwapBuffers(): base no longer contains a drawGlxc
member. Now provide the the Apple/Aqua context in the __GLXAquaDrawable
struct. Add the context member to the __GLXAquaDrawable struct.
Remove the fallback configs. They aren't used in 1.4 or 1.5 either.
Remove init_visuals(). It's not used in 1.4 or 1.5 either.
In the drawable constructor initialize the state properly, including
the new context member.
Remove glAquaResetExtension() -- it's not used anymore.
This has been tested remotely and proven to work with glxgears,
fire, various texture programs I wrote, and various Mesa demos.
(cherry picked from commit d514152195452ae11ec7769c76489651620ad380)
commit 1c504dff8a84804888f18ee9b184f0c4584185d7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jan 15 21:03:27 2009 -0800
XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
commit 717a961528ec69a6e630d536e15568670e0b398a
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Dec 20 16:17:02 2008 +0100
Don't release grabs unless all buttons are up
Previously, only buttons <= 5 would count here, but the core protocol
allows for 255 buttons.
http://lists.freedesktop.org/archives/xorg/2009-January/042092.html
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f7f85f696570541e2dd43462675de9e6ee46f545
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Mon Dec 22 00:55:09 2008 +0100
Count the number of logically down buttons in buttonsDown
This fixes the following bug. Assuming your window manager grabs
Alt+Button1 to move windows, map Button3 to 0 via XSetPointerMapping,
then press the physical button 3 (this shouldn't have any effect), press
Alt and then button 1. The press event is delivered to the application
instead of firing the grab.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6f065a26db62aaf1d7aab9f9a3d0e6cd09d1c1dd
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Jan 15 21:42:26 2009 +0000
Xming: Reduce MOUSE_POLLING_INTERVAL
Reduce MOUSE_POLLING_INTERVAL from 500ms to 50ms
In -multiwindow mode, this determines how quickly X windows can track the mouse
when it is outside any X window... Move the cursor around an xeyes, and you will
see what this timing effects.
commit c745db1674c3cb55249c9eb6e74939b74c42409c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 5 13:52:45 2009 +0000
GLX: Avoid a crash when we have an uninitialized GL context
If the GL dispatch table pointer points to glapi_noop_table,
(due to some kind of GL initialization failure), DoGetString(GL_VERSION)
(for example as invoked by glxinfo) will crash as it tries to
do atof() on the null pointer returned by the noop dispatch function
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e30032d0bbbf0bf71e1b53a4ac388f3bd6f68e53
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 21:14:01 2008 +1000
Xext: clean up XGE macros.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 1ae529bef50a8ccc4a8a264ed120aeae544b21e7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 14 14:56:10 2009 +1000
dix: replace manual check for event types with IsPointerEvent()
commit 1d54479cb3c8b4f75b7564f8b5e1c5da940b20f4
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Nov 25 14:12:02 2008 +1000
xfree86: init properties when ptraccel configuration is found.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Simon Thum <simon.thum@gmx.de>
commit 19275ea8e9dd93d5e61906943706dfe49003dd9c
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Nov 19 16:01:21 2008 +1000
dix: add property support for pointer acceleration.
Note: properties don't need to be cleaned up, the DIX does it for us anyway.
Data that is stored in properties is cleaned up by the property system.
Handlers, etc. don't need to be unregistered while cleaning up, as they get
deleted when the device is removed anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Simon Thum <simon.thum@gmx.de>
commit d645721170b1196e5064b397cfbffd1da8c79bb1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 8 11:53:30 2009 +1000
mi: ensure chained button mappings from SD -> MD (#19282)
After copying the master event, flip the detail field to the mapped button of
the SD, not the physical button. This way if the SD has a mapping 1:3 and the
MD has a mapping of 3:4, a press on button 1 on the SD results in a core event
on button 4.
X.Org Bug 19282 <http://bugs.freedesktop.org/show_bug.cgi?id=19282>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 639f289dcdbe00a516820f573c01a8339e120ed4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jan 13 13:05:32 2009 +0100
EXA: Declare glyph cache picture as component-alpha when necessary.
Without this, rendering component-alpha glyphs may break without a mask.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=19233 .
commit f4e00b783d3f824058a5f140e6462142688f5116
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jan 13 11:03:27 2009 +0100
Fix build with --enable-visibility --disable-xdmcp.
commit d36adf52a2b2711d22b11105f7bd907d4493fb9b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 12 15:29:36 2009 +1000
dix: fix WarpPointer calls for devices with custom valuator ranges (#19297)
If the MD's lastSlave was a devices with custom axes ranges, then a
WarpPointer would position the cursor at the wrong location. A WarpPointer
request provides screen coordinates and these coordinates were scaled to the
device range before warping.
This patch consists of two parts:
1) in the WarpPointer handling, get the lastSlave and post the event through
this device.
2) assume that WarpPointer coordinates are always in screen coordinates and
scale them to device coordinates in GPE before continuing. Note that this
breaks device-coordinate based XWarpDevicePointer calls (for which the spec
isn't nailed down yet anyway) until a better solution is found.
X.Org Bug 19297 <http://bugs.freedesktop.org/show_bug.cgi?id=19297>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 488d45295105daf10ccd17ca93ae6a6f4d0104f1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 12 16:16:24 2009 +1000
dix: EnqueueEvent and PlayReleasedEvent need to handle DeviceMotionNotifies
No MotionNotify events in the processing anymore, so let's have them treat DMN
instead.
Reported by Thomas Jaeger.
commit 1e470645983ad18fa38c0885d674bc9d1dc1e560
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 13 00:12:56 2009 +0100
require randrproto 1.2.99.3
commit a48c81dcdf569a3f634ac23e08d2491354de6a36
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 5 16:24:57 2008 +1000
Xi: add XATOM_FLOAT to server-defined properties.
This property is used to denote type float for input properties. Such
properties can be accessed easily through the XIPropToFloat() function.
Code originally written by Simon Thum.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 669f6810af9a89187d6149841925fe765f3988ff
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 19 15:50:57 2008 +1000
Xi: add XIPropToInt() auxiliary function.
Converts an XIPropertyValuePtr to an integer, provided that type and format is
right.
Code originally written by Simon Thum.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 56efbc0986e782da45addb05ece9f456d41d7a90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 9 13:46:20 2009 +1000
dix: drop x/y back into last.valuators before updating the history (#19285)
positionSprite needs to scale to screen coordinates and in the process of
doing so alters dev->last.valuators[0:1]. Drop the real coordinates back after
finishing and before updating the motion history. This way, we don't push the
screen coordinates into the motion history.
X.Org Bug 19285 <http://bugs.freedesktop.org/show_bug.cgi?id=19285>
commit 67710ad1d172cc4d53e28e5cc7dab2efb57a9a85
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 16:34:36 2009 -0800
XQuartz: Don't need explicit Activate/EnableDevice in InitInput
(cherry picked from commit b1d29784410b3b93037e5636f336ba608d8ad6e3)
commit dde5c591be74139ec6f2a90a3fdc7904d7342554
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 16:10:45 2009 -0800
mieq: Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
This is more of a hack around the problem. This is something that will need to be addressed in a
more structured manner with the multi threaded input efforts.
(cherry picked from commit 3c596c061e75848cfa76dd9259c23a3f3a67444c)
commit 0720816aea20971ee94b5df3faa9cb9f16e93f82
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 14:49:39 2009 -0800
XQuartz: Only call DarwinUpdateModKeys when needed
Previously, we were calling it on almost every itteration through sendX11Event
(cherry picked from commit 6461729647ff4441d80811e73f0c0d2f108f2700)
commit c8bf582db8111f71b9250a602a9d5aa7bd828136
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 11:41:22 2008 -0700
XQuartz: Comment explaining the 0x10 flag for [e data2]
(cherry picked from commit 3c695280641c1205b97d3bb9f1d5e15a19cfa45f)
commit 5339c22a8ca8bce6cd2b51e97c904292e7c40e74
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 01:56:45 2009 -0800
XQuartz: Add locking to make mieq thread safe on OSX
(cherry picked from commit 7a8d2266861e74176b5310b83652a9c10a170494)
commit 1beff89810cd193e45d437846929b3938cee6d96
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 01:55:26 2009 -0800
XQuartz: misc 1.6 updates (still --disable-glx)
rlAccel is not longer compatable, and it's not worth fixing
Don't override DeviceCursorInitialize with a noop
Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place)
(cherry picked from commit c137f681680e1d04b1513a8be68aeda4d1c56fd5)
commit 2d917cfe56af1e74205f80ddbaddfb5c6ce82f0a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jan 10 01:39:08 2009 -0800
Apple: Don't use DRI2
(cherry picked from commit a1d35cee5907a76977ee43c49cb55c8f411c9794)
commit 7a8abb9c8554d7967d912dcd427804f65906dc5c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jan 6 15:32:44 2009 -0800
XQuartz: Bundle version 2.4.0
(cherry picked from commit 3a3ccf5354e4275abe9d01f41a92602df5d690dc)
commit 63ff7d236f67e159943312e1a551fcf5bb3f463a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:45:24 2009 +0100
os: don't mix declarations and code
commit f43a3c61ab1eab8aecdc0e4bdee9f3bae2cab234
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:44:53 2009 +0100
os: backtrace() returns int, not size_t
commit 5321ae76cffc5fcfe4bebcfb10e08eecaf640503
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:44:29 2009 +0100
os: ANSI cleanups
commit 47438a2161a92fec08081d2de28966cf8d31654a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:43:48 2009 +0100
randr: RRSetPrimaryOutput can be static
commit 7f82114b1dc738f98b9f22f6e61d6d5191383b67
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:43:35 2009 +0100
xkb: ANSI cleanup
commit 46f3c1b937002f9a860878b359dcf5756a82dcf2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:42:57 2009 +0100
mi: don't mix declarations and code
commit 5aa9483d3ee306a79a9235610ce6b2754d697585
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:42:28 2009 +0100
mi: ANSI cleanups
commit 359ed32c9b013ed88e14c99aa7fd7a617a85e2c5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:40:58 2009 +0100
xnest: only define ddxBeforeReset if needed
commit 9651cd8d7ac26635b6fb1826806ac9f4e2bddb63
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:40:47 2009 +0100
xnest: ANSI cleanups
commit 31439195c51f183f5a8989a8d4f95b3e6326eda0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:37:06 2009 +0100
xfree86: linuxPci.c needs a prototype for xf86AccResFromOS
commit a00dbd0015845e08ef2af9480cc3833819cf86f5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:36:16 2009 +0100
xfree86: use %zu to format size_t arguments
commit 17c8cb50990a9ad20bbd3f8ce14c149dac9d72ad
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:34:56 2009 +0100
xfree86: don't mix declarations and code
commit aec4c0caca41a06832536ba82ba5bcdccf4a0aea
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:33:18 2009 +0100
xfree86: ANSI cleanups
commit dba3b1944d04232f88bb310277639f2c1adcbe08
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:28:23 2009 +0100
Xvfb: ANSI cleanups
commit a2a760e33c17e211650b1f53c05a89c013916cf3
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:25:39 2009 +0100
dix: don't mix declarations and code
commit 466dddbb83aa37ae93fb32976d51ecaa947c3616
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:25:17 2009 +0100
dix: fix cast from pointer to integer
commit 54332e4732577dc49e440d9c9f8dd7d791f03f8e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:20:06 2009 +0100
dix: ANSI cleanups
commit ef9902652b8a1c716ea3851565d6e2a98bd30eb0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:18:56 2009 +0100
config: ANSI cleanups
commit e64473b14e091e4b75e6ac2bf9a35e9aaa907258
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:17:41 2009 +0100
Xi: fix missing declaration of XkbSetRulesDflts
commit 6e20a4ae731b7bc72266e5809faa0ecfde2bdfe4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:16:55 2009 +0100
xsync: make SyncAlarmCounterDestroyed static
commit 292311b421e53ead53c7df67d735a3d6d3e5b515
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:16:12 2009 +0100
Xext: ANSI cleanups
commit 7a05c8b1e70680ddd3b3e09ad448788f8d70a428
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 23 13:08:49 2008 +0100
xfree86/linux: fix log flood on acpid open error
When we can't open the acpid socket, warn once, not once every second
commit 0d8184de591c75794083c8a8ca3fb8459e9394bc
Author: George Staplin <gstaplin@apple.com>
Date: Fri Jan 9 16:08:26 2009 -0700
XQuartz: GL: Set the __GLXconfig renderType to GLX_RGBA_BIT.
(cherry picked from commit 3c14546f58f8a138fe67c9cacc3bd0b7fa90c29a)
commit 9c3975d63e129ad7230cae585f08a962d45fb861
Author: George Staplin <gstaplin@apple.com>
Date: Fri Jan 9 15:53:39 2009 -0700
XQuartz: GL: Make many more fbconfigs and visuals available for the 1.5 branch.
Use a __GLXconfig linked list struct to store the configurations for the
fbconfigs and visuals in a pGlxScreen.
Also, remove the __GLXvisualConfig/GlxSetVisualConfigs code that isn't used
anymore. There is more code we can remove later, but I want to do that in
separate commits.
(cherry picked from commit 94162b0f8a25267aca280d25e216cc6bde47da6e)
commit a68373994f4957a73f4eab52c90ebcfb96f285f8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jan 7 18:27:21 2009 -0800
XQuartz: Update padding in appledristr. This shouldn't change how the struct ends up in memory, but should make it more obvious for human eyes
(cherry picked from commit f7b6c1907c326a1befd8b5c8a1d311d551e8670f)
commit 5f3188228eb988bd8f08b62c84f98a8ff66ee283
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Tue Jan 6 10:03:19 2009 +0800
avoid a potential endless loop.
Previously it is possible that creating rotation data, then cleaning
up and creating again so that pScreen->BlockHandler and
xf86_config->BlockHandler all point to xf86RotateBlockHandler.
See bug #19343.
commit b2756a71a432f7cf7c870a48676c98625512558d
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Fri Jan 9 02:02:38 2009 -0500
Xext: Send out correct events in ProcXTestFakeInput
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9bf77569cc8f9b0cc25c99487672d375d7c32f99
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 8 16:32:24 2009 +1000
Xi: call CheckMotion for floating SDs too.
CheckMotion updates the sprite position so we need to call it for all devices
that have a sprite - including floating SDs (which have an invisible sprite).
commit 83eb863e3cfcd62549b836f3195107d8908b36d0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 9 11:39:02 2009 +1000
Xext: don't accept DeviceValuator if the dev doesn't have valuators (in xtest)
Reported by Chris Ball.
commit a3f9e887d9ff5fdee6c35ccc0f7b324723a83a46
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 9 11:40:18 2009 +1000
dix: don't accept Button 0 presses in GPE.
commit 0c6987df3b9b3a37d201d740d8248c326449835e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 17 16:10:51 2008 -0400
XAA: Disable offscreen pixmaps by default.
Say Option "XaaOffscreenPixmaps" to turn them back on.
Apropos of bugs #13795 and #15098. But this still isn't correct.
commit eb2d7b3d700952ba88c77deacf687b251300e660
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 19 21:05:47 2008 +1000
dix: move focus handling into enterleave.c.
This commit moves the focus handling from events.c into enterleave.c and
implements a model similar to the core enter/leave model.
For a full description of the model, see:
http://lists.freedesktop.org/archives/xorg/2008-December/041740.html
This commit also gets rid of the focusinout array in the WindowRec, ditching
it in favour of a local array that keeps the current focus window for each
device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 673eb23aac578dcdc04e2a99d1fa5c2987eb58b8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 19 21:05:09 2008 +1000
dix: add a few auxiliary functions for the updated focus model.
SetFocusIn and SetFocusOut, including the static array to keep all focus
windows.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38b28dcadd0990cb43f50db4300eebb8f044db96
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 18 15:55:11 2008 +1000
dix: reduce FirstPointerChild complexity
Instead of keeping a flag on each window for the devices that are in this
window, keep a local array that holds the current pointer window for each
device. Benefit: searching for the first descendant of a pointer is a simple
run through the array.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 72ad4a85cc0ffe60a90011d65ef718d5852beae4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 18 15:43:18 2008 +1000
dix: remove now unused "exclude" parameter from FirstPointerChild
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0aa4460c3b4f9bb17d5412d76fa8c4c501132429
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 17 16:14:41 2008 +1000
dix: re-implement enter/leave model.
The old model was implemented based on a misunderstanding of NotifyVirtual and
NotifyNonlinearVirtual events. It became complicated and was broken in some
places [1]. This patch wipes this model completely.
A much simplified implementation is provided instead. Rather than a top-down
approach ("we have a tree of windows, which ones need to get which event")
this one uses a step-by-step approach. For each window W between A and B
determine the pointer window P as perceived by this window and determine the
event type based on this information. This is in-line with the model described
by Owen Taylor [2].
[1] http://lists.freedesktop.org/archives/xorg/2008-December/041559.html
[2] http://lists.freedesktop.org/archives/xorg/2008-August/037606.html
commit f8ecc2f08fc375b14d60a74e2fdd7830bfdcd74f
Author: Christian Beier <beier@informatik.hu-berlin.de>
Date: Tue Jan 6 11:31:03 2009 +1000
Xi: fix typo in WarpDevicePointer handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d549438c29004d78032ecc50ab45ca0e3f49623
Author: Thomas Jaeger <thjaeger@gmail.com>
Date: Mon Jan 5 01:26:42 2009 -0500
Don't alter device button maps in DoSetPointerMapping
Currently, if a device map differs from the core pointer map, then the
request may return MappingBusy, even though all the affected core
buttons are in the up state.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b72c6b083baeadfd7b18b6025df054be502d6e28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 6 09:01:48 2009 +1000
dix: remove inputInfo.keyboard reference in QueryPointer handling.
PickKeyboard() is to be used instead.
commit 30d2cfcd3851870178d62e5067211aa36f87fbd2
Author: Kim Woelders <kim@woelders.dk>
Date: Mon Jan 5 19:35:18 2009 +0100
dix: Fix handling of do_not_propagate_mask window attribute.
This was broken in 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2.
Signed-off-by: Kim Woelders <kim@woelders.dk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 515ce3e4ba42605a1ee9979e8bb5acd3cf6470a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 5 15:48:45 2009 +1000
xkb: fix typo - missing negation when checking button state.
Introduced with a85f0d6b98237d8a196de624207acf1983a1859a.
Reported by Thomas Jaeger.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9a313fb03153eb764aab3e9cb9988b6603541637
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 7 23:07:01 2009 -0200
Don't call free, use xfree macro.
There are several other direct calls to free, check
% egrep '\<free\(' `find . -name \*.c`
but they are free'ing memory from explicit malloc calls.
This one was not intended, and corrected, so that it would
both, follow the conventions everywhere (and work on some
libc that doesn't like free(0)), and make it easier to use
malloc wrappers.
commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 7 19:37:03 2009 -0200
Default to use standard bitmap fonts, with builtins as fallback
The builtin-fonts configure option was removed, as it at best should
have been a runtime option. Instead, now it always register all "font
path element" backends, and adds built-ins fonts at the end of the
default font path.
This should be a more reasonable solution, to "correct" the most
common Xorg FAQ (could not open default font 'fixed'), and also don't
break by default applications that use only the standard/historical
X Font rendering.
commit 4f004231871c830e16c4525cfaab183fad0aee86
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jan 7 10:55:08 2009 -0800
XQuartz: Fat binary buildfixes
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
(cherry picked from commit f54736c2b0b537c8322ecb2db8e9cee5eea68165)
commit fbf44d85bd59bfa629193d6494b16812a7343cab
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 5 23:18:11 2009 +0000
Cygwin/X: Tidy up an unused #define
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 1badeb78b0b974a381e563e3d4f4cf37debd4266
Author: Rémi Cardona <remi@gentoo.org>
Date: Wed Jan 7 09:31:17 2009 -0500
Include Xmd.h from edid.h
commit fc14d52297f8f408693ed867ab649ea5b210b0b3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 16 15:35:17 2008 -0800
XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
(cherry picked from commit 91f3c3435716195e6d606c8e2f6b0de52eb5972d)
commit 4c326c4d342bede0de57e71c1431f56188f812ce
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 6 08:36:39 2009 -0800
Make cvt complain about invalid arguments more often.
cvt doesn't correctly parse 'cvt -vr 1920 1080'. This patch doesn't fix
that, but it does at least generate an error message now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1da4a41b0881b605c7cfa4c4bf637efa132c58fc
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 6 05:01:32 2009 -0200
Add sdksyms.sh to EXTRA_DIST to correct make distcheck
Thanks to <vehemens at verizon.net> for noticing the problem.
commit 200230535fa80c04faaa562bbbd8272713e2763b
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Jan 5 16:49:57 2009 -0200
Update sdk headers to export new symbols.
All symbols in installed sdk headers should be explicitly tagged
as exported symbols. Otherwise, to ensure it is not a mistake, one
could write it as something like:
extern /* NOEXPORT */ type name ...;
but the proper procedure really should be to use a non sdk header
(or a "noinst_" one).
This patch also removes prototypes to some functions that existed
only temporarily.
commit af6152499654a7146250d4ad0df89f611345434e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Dec 17 14:15:34 2008 +0000
Cygwin/X: Add *.exe pattern to .gitignore
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 8428b92fcb478b041f778c0e8c66fdeb96c807f3
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 20:12:16 2009 +0000
Xming: Fix a couple of warnings
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit f6f97419bd2db651384ecaec0b296840810463a4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 5 18:35:52 2009 +0000
Cygwin/X: Add -static back to linker flags
Add -static back to linker flags to avoid screwing things up for
people who don't know that they need to avoid dynamically linking
with libXfont, as weak symbol handling requires static linking to
work correctly on Cygwin...
commit 2ec0ac08addb938a3d5aa5b9888ce7c79a0daada
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Dec 17 19:18:38 2008 +0000
Cygwin/X: Fix some remaining build issues
Fixes for a few remaining build issues, omitted from commmit 6e85a8304b50c0bfd16a400a05d257f0168fb99b in error
Provide VENDOR_RELEASE in XORG_VERSION_CURRENT for XWin
Remove -static from linker flags for XWin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e351d10773742d1570e1111976b7c8b6adda5ae6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 5 17:41:38 2009 +0200
RandR: Only export Xinerama symbols when building Xinerama support
Otherwise compilation fails due to sdksyms.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 3387cbb7c13636eb62b22640d28df7011c2268f0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 5 11:25:57 2009 +0200
XFree86: Xv: Add ClipNotify helper
Add a ClipNotify helper that lets the driver know about changes in the
clipping of an Xv backing drawable.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 55c4ec0a1ef78481b4d82153c19c20fbf88f1624
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 5 11:24:24 2009 +0200
XFree86: fbdevhw: Add helper function to get fd
Most devices need to do custom weird ioctls, so let them know what the
fd is.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 7da4e901e078e5597b8dbcb7ee39b949edf7ef03
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 5 11:23:39 2009 +0200
XFree86: Fix build with DGA disabled
It's optional, so we might as well work when it's disabled.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 13ce7b98d48261b061da5768a6405bdbe9caa1fb
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 22 14:31:03 2008 -0800
dmx: Require newer libXi for XQueryInputVersion
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 27011254c4de4e573a0851bf46892fb488db6522
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 23 09:59:28 2008 +1000
xfree86: If an input device failed to activate, return immediately.
Devices are only activated once - right after they've been added to the
server. If a device failes activation, it's dead. There's no reason to
continue. Return the error code from ActivateDevice() without setting up
sprite information or even sending a event to the client.
Then - in the DDX - just remove the device again.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 23 10:00:34 2008 +1000
xfree86: don't call CheckMotion if a device hasn't been enabled. #19176
X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=19176>
commit af820259a06a6e8dbd299fe22347aa83b0c985b0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jan 2 11:06:12 2009 -0800
XQuartz: Copyright Update... happy new year
(cherry picked from commit 9f1c26ae8d9ccf81cba0ab946326968a701f8c36)
commit d8c9ba37abd0d63ea2c5394af434b46ec3b647fd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jan 2 10:58:40 2009 -0800
XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock
(cherry picked from commit 49e59d32b88e4fad070f230b5efaa261b47f78db)
commit 2f361186f93a791e446c4a9471bb0c3b9b818d98
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 31 12:40:02 2008 -0800
XQuartz: Don't use NX_SECONDARYFNMASK, NX_NUMERICPADMASK, NX_HELPMASK
We don't have keycodes for them, so don't try to use them
(cherry picked from commit cb912aca3a2834c4ad8e386c8a0d05c1bb31b0e7)
commit a2abaa9fd3a5ad713c1f946e9d7f598825ad3a84
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 31 11:57:49 2008 -0800
XQuartz: Make sure to reset the saved key state when deactivating X11.app
(cherry picked from commit 3eef78eb321f4f7dbca5a10c80666c621e28a1e0)
commit 3986b683adc4f6f967cc5f643e973d89764234c7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 31 12:44:43 2008 -0800
XQuartz: Honor system key repeat rate
(cherry picked from commit 4303c9be39a86f5a21de108f72b90a989435905e)
commit 1a69d56afda082298edc76271d2cb71af00526ce
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 29 19:54:12 2008 -0800
XQuartz: Better avoid stuck keys on context switches
(cherry picked from commit e9963f1a4f4f12f253eae9d4f01694b6cabe35ad)
commit f464b5a9164b24f74adea198bcabe9affaf5552c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 29 19:38:31 2008 -0800
XQuartz: Workaround OSX VNC server bug for modifier key state
A better approach which ensures we have a L modifier key down if we are told neither are down and atleast one is down... =/
(cherry picked from commit bc13dda345f716bf4de9bfe4e1d85969263b60c2)
commit 3ead9aa2602cab9c883aa7bcbd2a8d82c5c88f5a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 29 00:30:31 2008 -0800
XQuartz: Updated man page fullscreen_hotkeys fullscreen_menu
(cherry picked from commit 00f3a2e33c8e91da5f855821313a04ea97445656)
commit 48dbaf173a82693fd72953983da9fc556cd1c6ed
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 30 12:17:14 2008 +1100
XKB: Also copy keyboard feedback when copying the keymap
When updating the XKB keymap, make sure the keyboard feedback is also
copied, to preserve autorepeat settings etc.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit cf85a32b5f80694f3c2f434e91cf77edb33a7c17
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 28 15:57:59 2008 -0800
XQuartz: pbproxy: We explicitly need libX11 for pbproxy
(cherry picked from commit 32824120da0749b8369c2592f851bb1030dea9f1)
commit 997e8c321bb11067591785ba38103a3a5029301d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 28 01:53:38 2008 -0800
XQuartz: Try harder to get the user's login environment
(cherry picked from commit 6bedaddd78aa04bd303df434a4c49bb87bd7deaa)
commit ae8dc47fd910ec4b9edd64bf3b7ba33e212c5942
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 24 00:39:06 2008 -0800
XQuartz: Reposition windows when we enter fullscreen to ensure our root window
(cherry picked from commit 7617d3659b5481ef85aecc1f936e7dd2662bdfbd)
commit 895186e026881196ac9383aa165e123055d9cf09
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 23 20:33:27 2008 -0800
XQuartz: Re-enable rlAccel
It was incorrectly blamed for some crashes a few months ago, and it should be
safe to use until we get an EXA driver to replace it.
(cherry picked from commit 8121f30bd29591fc74fbc680fbbf20210271fa58)
commit dc4498ec5cb7f25f710bdec8793746da2d2324ed
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 28 22:16:52 2008 -0800
Updated .gitignore
(cherry picked from commit 06964c322e4da81f3146022049a2de13f6b2892d)
commit 3534a5e5d9c5af85149c799f324257f89507fa23
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 26 16:38:27 2008 +0100
exa: Allow drivers to set non-NULL devPrivate.ptr for !offscreen pixmaps.
commit 027b440d4f9f0cdd46addff46fd2d5c44cd5c847
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 26 15:51:55 2008 +0100
exa: preparing as source and finishing access as mask is a bad idea
commit 89bbd07e9ddd688df81405151f9c6284fa3367a8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 23 21:40:21 2008 -0800
Remove obsolete XF86_DATE & xf86Date.h
commit 8dc3a7d6817b7371bbfece1108ef856788256853
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 23 14:59:46 2008 -0800
Remove unused CLOG_DATE (leftover from pre-git ChangeLog)
commit fe05a46f191ebd36251dda7a9703d90c25efec11
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 23 14:55:26 2008 -0800
Remove powerpc load/store functions from export list on other platforms
commit a1b201bcb01e702f8f0a5889a3d49317503b9475
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 23 12:39:38 2008 -0800
XQuartz: Use depth=24 instead of FatalError if we can't figure out our depth
(cherry picked from commit 80b65c5b78d125c4ad3620b87b121c9e666299c3)
commit 86dc660588a615baefb1799d78a501c95a931d77
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Dec 23 18:07:54 2008 -0200
Improve sdksyms.c automatic generation (Fix #19245).
Since it is already parsing cpp output, create a dependency file
in the same process. This will cause sdksyms.c to be regenerated
whenever a sdk header is modified.
This also uses the gmake 'sinclude' directive (don't fail if
included file doesn't exist). This should not cause any problems
given that gmake only constructs are used in several other Makefiles.
commit 477c32708718f4470ac2e786b2446d7a44e45b9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 19 08:56:35 2008 +1000
dix: don't disable uninitialized devices.
If a device hasn't been initialized, it doesn't have a cursor yet. So don't
set the cursor to the NullCursor, and don't try to DisableDevice either.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 25aac8b5793caa92116b766d5a9e12dbecdb0290
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Dec 2 16:16:58 2008 +1000
xkb: don't treat groups with different no of symbols as identical.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit f141c1b4bb9482f188783dd6f161d3c7960a3329
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Dec 2 14:54:50 2008 +1000
xkb: explicitly check for group replication in the core representation.
Single-group keys may get replicated amongst all groups. Check explicitly for
this case and squash it down to one group.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 70a977c021e107c4fabe46ec2f619be9fb55abeb
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Dec 2 15:36:51 2008 +1000
xkb: don't replicate past the number of groups we have.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a157575eeeb523cd43197c5caeb00cb3d56f9988
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Dec 2 13:31:58 2008 +1000
xkb: ensure enough symbols for core Group1 replication.
A single-group key on a multi-group keyboard has to be replicated across all
three groups (see Section 12.4 of the XKB protocol spec). Ensure that there's
enough symbols available to actually do that.
e.g. a key ABCD on a 3 group keyboard needs to be replicated as ABABCDCDABCD,
hence requiring space for 12 symbols, even if maxSymsPerKey is less than that.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit b5736d237a21d5e65d839c4d213dd3bda5a11e9d
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Dec 22 19:53:14 2008 +0100
randr/xfree86: Fix initial gamma computation.
- The previous version overflowed sometimes.
commit ba9dc353a60e9a6bba64e854b23271011bff7015
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 21:03:59 2008 -0800
XQuartz: Don't use keycode 0 to determine !swallow since our most common key to swallow is actual keycode 0 (a)
(cherry picked from commit 33f43a7f03023bfbab25a957cb81fc25b4afa4ca)
commit f0cdccd1e22198f4f5e1aa0d0617441b79ffbc44
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 20:40:36 2008 -0800
XQuartz: Update our "screens" when we toggle rootless rather than when we toggle fullscreen
This old behavior was used as a workaround for the menubar behavior in the older server,
but we handle it better now and need to update our screens when we toggle the rootless
state instead.
(cherry picked from commit 508aa95bc2cd3fdc3dff448ec090919bf807d153)
commit 8f04a5237384fa97ff960b4607a79b688ea03fc1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 14:54:11 2008 -0800
XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
(cherry picked from commit 67455e716e3ecffd528930479192785958d37988)
commit 029d255a654eca6401c374d145f63bbb923554b5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 14:43:12 2008 -0800
XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
(cherry picked from commit 22f664ab95a0cae981e9cefad6f075d051583ca5)
commit b1f166f2981595aea6f8e2a336d6d25436f8a07d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 14:42:26 2008 -0800
XQuartz: update quoting in case X11.app is moved to a directory with a space.
(cherry picked from commit cc805dc799efa37c8dcefa3db04d87e9b835ffbd)
commit 2f47bda645eb43c60b71315e8d265190acce481d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Dec 18 09:14:16 2008 -0800
XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells
(cherry picked from commit b62ed1f8eaf041a946bb591165bb18ee481dedbf)
commit 83edcc08de4c815c5cbe815f521b3b728441cad6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 17 15:09:35 2008 -0800
XQuartz: Get rid of white rectangle bug
(cherry picked from commit 3269959033ed0c675a3a906666454df34086896a)
commit 1335a300b9cd03208a583acfdb7f7153eaef4ea6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 17 14:43:02 2008 -0800
rootless: Make expose_1 static
(cherry picked from commit 60c8d2697036a125ca5381df8e2eaedabad4d242)
commit 22b2811e6aa0bdbfa6a0682ac862063e52ec0c62
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 17 13:54:53 2008 -0800
XQuartz: Name the startup shell script X11 for better compatability
(cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf)
commit 82fba7697fbbb6f66cc22424ba99755b99ff482e
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Dec 22 00:33:55 2008 +0100
xfree86/randr: Avoid a crash when xf86CrtcConfigPrivateIndex is -1.
commit 1567b7243f4799808ab93fbd962df14ce3af2d49
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Dec 21 00:08:56 2008 +0100
exa: A more correct fix.
commit 2db7b66863ae6055c3ce13c88b36d620de8a4d75
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 19 23:12:37 2008 +0100
exa: a few cleanups
- Some warnings silenced.
- Some whitespace cleanup.
commit aedd2f566df585db7a1614f302cc8d3feda54275
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 19 19:10:23 2008 +0100
randr/xfree86: Fix a one off error in the panning calculations.
- Example: mode 1280x1024, panned area 1281x1024
panned_area.x2 = 1281
mode.width = 1280
If you substract 1280 from 1281, then that leaves you with one.
Which is the one pixel that you need to move to actually see the last pixel collumn.
Substracting 1 from this will consistently prevent you from seeing the right and bottom edge.
commit 332d65ec7a6e94d75efe95d53742f137835274de
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 19 18:59:27 2008 +0100
randr: Consider panned crtc's when calculating xinerama screen sizes.
- This will allow window managers and applications to actually use the panned area.
commit f2d1de6c2a3e6e50db6d9714c293eb26324fbd3d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 19 10:27:37 2008 -0500
xv: remove useless XVCALL macro
commit 5a072c55350f4b73d911ea6a2aeddad844924834
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 19 09:51:52 2008 -0500
dmx: Fix calloc macro confusion.
commit 8c488ac3b3990cd203baed7f2127b9bed8aab534
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 18 19:47:49 2008 -0800
Fix linking of Xorg with dtrace probes on Solaris
commit 396433d0da721951e6e7abc02dc3b2f682495154
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 18 18:49:47 2008 -0800
Fix sdksyms.sh to work with Solaris/Sun compiler builds
- Pass $(CPP) & $(AWK) settings from configure to sdksyms.sh
- Only reset sdk variable (tracks if header is part of sdk) if
a filename is included on the cpp # <line-no> <filename> line,
since Sun compilers omit filename when it is unchanged from
previous line.
commit aea6f19f25e13768b1d09fac4991d6a5e6c2cdac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 16 17:10:03 2008 +1000
xfree86: don't restore the TTY mode if we didn't initialize it ourselves
Restoring it unconditionally means we restore to whatever tty_mode has as
default value (i.e. 0). K_RAW happens to be 0x00, so we always restore to raw
mode if allowEmptyInput is off.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 5d065a889074558634216eebd4bba35a60db9a09
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 18 13:59:36 2008 -0500
xselinux: Use xace Xtrans wrappers instead of the now-inaccessible wrapees.
commit f87e66486c3610c56888915b66ae5ab0af03da8b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 18 13:58:35 2008 -0500
xace: Export wrappers around two Xtrans functions used by modules.
Don't know a better way to do this, since Xtrans isn't a library that
can be linked into modules.
commit 777408914dbf395e9969e3f34720286e6f740369
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 18 12:35:57 2008 -0500
Add xace headers to the SDK when enabled and export the XaceHooks symbol
to modules.
commit 9e4ef3cfe5ee178c266edd64a8edd767827aa0d7
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 18 15:00:25 2008 -0200
Use regex pattern understood by all known awk variants.
Ubuntu uses mawk by default, but it doesn't understand posix character
classes (which are locale dependent, and this patch uses only valid C
identifiers).
Also make sure awk runs with LC_ALL=C to match the regex patterns.
commit 3d3c234b434a3443a00c3be9f32c698bcced111c
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Dec 18 16:26:38 2008 +0100
randr: add some notes about the stuff that changed in driver ABI 2
commit 1b244feb4cf11d1cdba79fbead50035965535552
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Dec 18 16:11:21 2008 +0100
randr: check for malloc failure
commit 21a2df9f359584e634dc12d8602401d54defd7db
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:44 2008 +0000
Xming,Cygwin/X: Fix crashes when using the DirectDraw '-refresh rate-in-Hz' option in -fullscreen (#11128)
fd.o bugzilla #11128
Fix crashes when using the '-refresh rate-in-Hz' option in -fullscreen mode and using a DirectDraw engine.
On failure (typically 0x80004001 DDERR_UNSUPPORTED), use the default refresh rate for the driver, instead of the
entered value.
Also fix some nearby error reporting
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b0ed1567c1782041cf3d14ec6dd4d622915c7d0c
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Dec 17 17:16:02 2008 +0000
Xming, Cygwin/X: Tidy up warnings, headers and unused variables (#11132)
Tidy up various warnings, include headers and unused variables, etc.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 15c4a6e088039e14b4f2387ff204cb5448916b39
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Dec 17 16:44:07 2008 +0000
Xming, Cygwin/X: Fix crash in function winMultiWindowGetTransientFor() (#11147)
The function winMultiWindowGetTransientFor() crashes, due to a bogus pointer
dereference, but this fact was previously hidden by the function not being called!
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 08a3d6928c87032998b6113d67f69b79b09eecee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 16 14:19:12 2008 +1000
dix: Allocate the space for the DCCE when the last SD is removed.
This still doesn't fix reset the MD's classes (a TODO that's been here for
ages), but at least we don't segfault anymore when detaching the last SD.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 689be0cb4b259840208c17f974066a942196793a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 16 14:19:38 2008 +1000
dix: set the correct length in CreateClassesChangedEvent.
Fallout from aeff14d5f208d02f211b8b2a1a98999624e8c2cf. Yes, we don't malloc
anymore because we are inside a SIGIO and the memory is already there anyway.
But we still need to set the event length correctly, otherwise
mieqEnqueue/mieqProcessInputEvent don't know how much memory to copy.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1001403301001fcc84ce6833938590956df40d2a
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Dec 18 00:19:06 2008 +0100
Forgot to fix a comment.
commit 9fa15bef59881bdcf087889f16ab3c8d953da8f1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Dec 17 23:42:30 2008 +0100
randr: some improvements, fixes and crtc abi bump
- Add active field to crtc.
- Set gamma (only) whenever a crtc becomes active.
- Check for xf86_config being NULL.
- Increase crtc abi to 3.
- A few other fixes.
commit bf65523ab0b39774f07a7ae478ff3f5653fad469
Author: Joe Krahn <jkrahn@nc.rr.com>
Date: Sun Nov 2 20:17:03 2008 +0000
Cygwin/X: Fix for mis-aligned icon data creates bad background masks (#4491)
fd.o bugzilla #4491
Transparent icon backgrounds appear with black stripes as mask data is incorrectly aligned.
Modified the icon DDB bitmap data alignment to 16 bits
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 91f73b79b7ae64e5b846d1efeb470bb61a913720
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Dec 17 16:56:26 2008 +0100
randr: Improve per-crtc gamma support.
- The Gamma values from the monitor section are now used during initial config.
- The old colormap system is disabled when gamma set hook is available.
- Gamma values are now persistent for the lifetime of the xserver.
- This requires no driver changes and should be driver ABI compatible.
commit 1556815d34cecb4b4b62d2a4ce813b1435a937ec
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:18 2008 +0000
Cygwin/X: Initialize native HWND atom when built !XWIN_MULTIWINDOWEXTWM
Fix the native HWND atom identifier to be initialized correctly, when built without external WM support
This is neccessary for native window naming to work correctly in multiwindow internal WM mode.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 92082a0a00f05ecdc90814a8104828853c9c8f29
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:15 2008 +0000
Cygwin/X: update to use standard DPMS stubs
Bring Cygwin/X up to date with DPMS API changes by using the standard stubs
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 2850f26bb2999ef3fb2a10adb80fe358463aecb5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:14 2008 +0000
Cygwin/X: update for changes to shadow framebuffer
Bring Cygwin/X up to date with the change to damage-based shadow framebuffer.
Register the screen bitmap as the shadow framebuffer after screen resources
are created.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 35d76028304f910edeaf642376df71b8134ec02c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:13 2008 +0000
Cygwin/X: enqueue a pointer motion event on mouse movement
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 816e0d243df068bc06d328874b5655d4530fe16a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:12 2008 +0000
Cygwin/X: update for changes in mieq API
Bring Cygwin/X up to date with mieq event API changes
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit bca7483c4e95ad450fb09048a3b85bb3056a0518
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:11 2008 +0000
Cygwin/X: update for MPX device changes
Bring Cygwin/X up to date with MPX device API changes
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 829a8a970dd17623ef3cb5022d34190744f74741
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:10 2008 +0000
Cygwin/X: update for MPX cursor API changes
Bring Cygwin/X up to date with cursor API changes
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d61e902aab92c262e6c8ee9cd70aec4493cf6cae
Author: Francis Giraldeau <francis.giraldeau@revolutionlinux.com>
Date: Wed Dec 17 09:49:39 2008 +0200
Don't log audit messages when -audit 0 specified
make the auditTrailLevel check more general and don't log when not
using DTRACE and -audit 0 is set.
commit 295a3fa721ee2f2226891de308c0c4b0ee26fe72
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Dec 17 02:04:12 2008 -0200
Ensure symbols required by swrast_dri.so are visible.
commit 6d8ea5104cf97dbf64612f58fc06f94f869ed5ec
Author: Colin Guthrie <cguthrie@mandriva.org>
Date: Tue Dec 16 17:44:27 2008 -0500
Fix compilation with -Werror=format-security
commit 1bb5a919f4bf38ac96c73077021b0cdc82965f31
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 16 13:46:59 2008 -0500
config: Add vboxvideo and tga to the magic driver list
Also sort the list while I'm here.
commit 8511a964f81b3b06a526f0fca4232afb2152f405
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Dec 16 18:21:20 2008 +0100
randr: Update EDID_ATOM_NAME to reflect RandR 1.3 name change
commit a058192d970f7417b06334aa666c17e9891795c6
Author: Owen W. Taylor <otaylor@redhat.com>
Date: Wed Oct 22 16:12:53 2008 -0400
Xephyr: Fix crash with control-shift and GLX (#18185)
When we are looking up the screen for an event, we need to take
into account the fact that the event may have been delivered to the
"peer window" that we create when implementing GLX. Since we only
ever create one such window per screen, just add a single peer_win
field to EphyrHostScreen.
commit 6e85a8304b50c0bfd16a400a05d257f0168fb99b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:09 2008 +0000
Cygwin/X: build machinery fixes
The Cygwin/X build has been broken for a long time, probably since modular X
This patch fixes up configure/makefile and some general build issues (#18568)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7aa29b9d66c3cd0f8af4fafbe92efd0c0556d225
Author: Robert Noland <rnoland@2hip.net>
Date: Tue Dec 16 00:07:42 2008 -0500
Support -sharevts on FreeBSD
Bugzilla #11179
Submitted-by: Nathan Whitehorn
Signed-off-by: Robert Noland <rnoland@2hip.net>
commit 063eb6743cd0d98dd52d1a9559b804381ee5144d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 15 19:53:45 2008 -0800
Patch brown-bag fix for bug 19017 (scrn->virtualX/virtualY 0 before PreInit)
When a driver uses a crtc during device detection, the scrn has not yet been
configured and virtualX/virtualY are still zero. This caused the X server
to try and allocate a shadow frame buffer, which couldn't work.
Detect this by checking for zero virtualX/virtualY values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fde2f961035609cfff8761ef1e0f23e6a9761be2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 15 11:39:24 2008 -0800
Use scrn->virtualX/virtualY in xf86CrtcFitsScreen. Fix bug 19017.
pScreen->width/height are not initialized when doing initial mode setting,
which makes this function incorrectly fail. Using scrn->virtualX should work
in all cases though.
Bug 19017 reports a crash in xf86CrtcSetModeTransform when doing a modeset
for output probing, long before the screen array is initialized; that was
caused by a work-around to set pScreen->width/height so that xf86CrtcFitsScreen
could find the right values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 29a5b0596b396d3e4a8a014cacd3e3ef77467ab7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 15 11:38:00 2008 -0800
When disabling SIGIO tracking, use SIG_IGN instead of SIG_DFL.
This avoids a race condition for drivers which mis-order the fd close and
signal disable.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1ba4cbb15919759aadd71960c5c057af9ba94fe3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 15 11:36:43 2008 -0800
Clean up rotation data when crtc is turned off
The shadow frame buffer and other data used for rotation need to be freed
when the crtc is disabled, not just when rotation is disabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2a61397d17339113b9e37995b06ca543589814ce
Author: Cooper Yuan <Cooper.Yuan@amd.com>
Date: Mon Dec 15 10:29:34 2008 -0500
Fix typo in xf86PickCrtcs()
commit 3db60add6671f766f9360e7d03492dfd51eba225
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Dec 15 12:42:10 2008 +0000
Cygwin/X: Update the native icon to one based on the X.Org logo
Update the native icon for the X server to one created from the X.Org logo by Colin Harrison.
commit 450739efa904a0fce5024372da7236bb7b84b67a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Dec 13 00:45:27 2008 -0800
XQuartz: Updated menu item ordering for better HIG compliance
(cherry picked from commit 4c9bb241ce5fb856fab20ae96fa89bd2b71ef242)
commit aee27be2785d8b09ac10f5be040b4d573190de0e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 10 23:04:30 2008 -0800
XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe.
(cherry picked from commit 748d9e5bd756513d42c4046f3b31e1fdc55bccb6)
commit a939368ab8140d48c1da4ba0bb229d13b221189c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 15 03:18:13 2008 -0800
mi: Reuse memory in mieqProcessInputEvents rather than making excessive calls to calloc()
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f1c9b5ab230cbb4124d8d476ae4886d05022adcb
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun Dec 14 18:58:33 2008 -0800
GLX: Changes resulting from changes to Mesa generator scripts / data
Several recent Mesa commits (listed below) make modifications to the
protocol generator data and scripts. This commit represents the
changes to the generated files resulting from the previous changes.
- 0f73302d24f4201813da2939742c5bcb6964b3b1
GLX: Fix protocol for glTexSubImage#D
- 1709ab01ef24279c782e420568e9257b4b92b224
Return 0 as the request size when the pixels parameter is NULL
- 63cca2ba10ce7dcc8481cfa4be3872dfc269dded
GLX: Include glapi.h before glapitable.h
This is the server-side part of the fix for bugzilla #11003.
commit 6383bc93b2ae76361a58653bc7e291df0d6ddfec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Dec 13 15:44:52 2008 +1000
dix: Init DeviceEnterLeave event's type before FixUpEventFromWindow (#19064)
X.Org Bug 19064 <http://bugs.freedesktop.org/show_bug.cgi?id=19064>
commit 49d38ab2328c409b2a98465b52677af057121513
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 2 15:09:57 2008 -0800
Warning fix: Remove dead glXDisp{,Swap}_DrawArraysEXT definitions.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
commit 2c5bfffc832e3818bbf0c0a96522865ce1ef2653
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 2 14:59:04 2008 -0800
Warning fix (GL likes to call strings GLubyte * instead of char *).
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
commit 7be6520d94df874c6bbd46d06a1830a12d0967f2
Author: Stuart Bennett <sb476@cam.ac.uk>
Date: Fri Dec 12 00:08:44 2008 +0000
dolt: allow older versions of bash to compile the xserver (#19031)
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit aeff14d5f208d02f211b8b2a1a98999624e8c2cf
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Nov 25 20:23:50 2008 +1000
dix: don't alloc in ChangeMasterDeviceClasses.
We mustn't realloc as we are inside a signal handler. With
SetMinimumEventSize, this code should never be hit anyway, as the event list
should have the required memory before this code is hit.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit fb2a8d0e59a3d187255538f6add22ec67551507a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 8 15:58:15 2008 +1000
Xi: silence compiler warning
Don't mix declarations and statements.
commit d961abb59f0a8bee4bd11b1540aa43ff83cddbb8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 11 15:54:15 2008 +1000
dix: fix compiler warning (mixing declarations + statements)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cb95642dc8edebb2935dd471f8b339cb98aa8481
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 22:28:32 2008 +1000
Remove #define NEED_EVENTS and NEED_REPLIES
A grep on xorg/* revealed there's no consumer of this define.
Quote Alan Coopersmith:
"The consumer was in past versions of the headers now located
in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h,
all the event definitions were only available if NEED_EVENTS were
defined, and all the reply definitions required NEED_REPLIES.
Looks like Xproto.h dropped them by X11R6.3, which didn't have
the #ifdef's anymore, so these are truly ancient now."
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 920b7622be4a68ebb5d8432f55c5362fbe964fce
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Nov 25 14:28:26 2008 +1000
xfree86: dump the ptraccel filter setup to the log on init.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit fbb57a2c54b141ccbb50833143b0b7cb2c4cb903
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Nov 25 13:43:28 2008 +1000
dix: ptraccel - Add GetAccelerationProfile()
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit beb749c87f383a62172a9ffa36373438e7a12d8e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 11 17:04:37 2008 -0500
Fix syncsrv.h guard define
commit 9fba808b4f43f5dc69d85a48fa40cb83dd4d9f9d
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Dec 11 13:22:53 2008 -0500
xsync: Prototype fix.
commit dce887ff53222652c397bc96a1dd3566f5847745
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 11 13:16:02 2008 -0500
xsync: build fix
argh protocol header disaster
commit d41b8960be8ad316504ef5657c0abfe6d76d3b5e
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 18:48:02 2008 +0100
randr: Fix initial panning border copy
Thanks to Julien Cristau for finding this.
commit fd77ce9f884f5ac4d36736f3a99ba86101f133ea
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 17:51:20 2008 +0100
randr: Oops, miscalculated panning rectangle's coordinates
commit f8e52f1b6d7c59d007de99a1c9c69c053d4f3cbe
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 16:48:40 2008 +0100
randr: Update initial screen size if panning information is present
commit 24d6b7d1c5fc5d07c2eb06a9fc4406e393d59b17
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 16:48:11 2008 +0100
randr: Fix error message for bad panning config
commit fdbbe65a7e777b7777bfae5a161efb89d4fb9a8d
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 14:56:51 2008 +0100
randr: Add monitor option "Panning" for initial panning configuration
commit 27261a950d91c352eac25a3036656c3e4f81fb12
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 11 14:43:04 2008 -0200
Modify sdksyms.sh to receive $top_srcdir as first argument.
If the basename of header file processed by cpp matches $top_srcdir,
check for extern symbols in the output, and add to the xorg_symbols
vector.
Possibly a better solution then using this script would be to somehow
tell the linker to not drop any symbols from the binary being generated.
commit 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 10 16:13:20 2008 -0500
xsync: Fix wakeup storm in idletime counter.
Wakeup scheduling only considered the threshold values, and not whether
the trigger was edge or level.
See also:
https://bugzilla.redhat.com/show_bug.cgi?id=474586
http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup
commit 1a99110f0c221b79045ea26d61c4a1ec1e0d7341
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 10 14:18:59 2008 -0500
xsync: ANSI cleanups
commit e0d8f6a8084a3fe6c549c1dee11e4502e316c382
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 10 13:32:04 2008 -0500
xsync: Use a local header for server API definitions
commit 1208a1dbcaecbc218a77bf51068f9c0c768e16c5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 10 11:47:35 2008 -0500
xsync: remove cast abuse.
commit 119d9c46e841f5fa35610f557e6fa1ec58587c24
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 10 01:56:01 2008 -0800
XQuartz: Fix path to executable
(cherry picked from commit 7e9d3698e070a0c63dd2556651373c3aca58e2fe)
commit c46b564c47fde3474e948aa1b188a975836cba47
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 10 00:00:29 2008 -0800
XQuartz: fixed make dist
(cherry picked from commit 2d52367ab92429e58596d1a1ed3ef52a0a38a7aa)
commit 23156a21d8e2f1be7d19d69cb91dae1b885ef671
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 9 23:48:18 2008 -0800
XQuartz: Make debugging output for invalid depths a bit more detailed
(cherry picked from commit 609fb166b7062c76f0561df12ffe893811f6ac8f)
commit 76351d2faf9ceb79aaa00b374c203b8b279c58f3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 9 23:47:32 2008 -0800
XQuartz: Avoid using login /bin/sh blech. Just use a bash script to start the app, so it will inherit the right environment
(cherry picked from commit f4b7ad9cc6b0c99fc7ee8516c4bf858ece938148)
commit e5ce6e198f4c245f4dc840c5e9e90a7ef80fb6e9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 8 21:59:49 2008 -0800
XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
(cherry picked from commit b959727f38733009c6381cc8ca06b5984257bdac)
commit ecaaf0462d6c70cabfcaf6868a526e5415505e2c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 8 21:00:11 2008 -0800
XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e96581a883e30323c840b71004aa0747169)
commit ea94995982d1cc585768d52fec75cae018457fa5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Dec 6 12:01:28 2008 -0800
XQuartz: Removed some debug spew
(cherry picked from commit 370dcf11b360b87aa24cace35eb615419057fda0)
commit 86c64ddf21763972aa7fc8c5770259123c9907b3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 17:42:47 2008 -0500
randr: clear primaryOutput when the output is deleted
commit fe65f400ed16cb39db8c9518b9446f590c34db1a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 17:40:07 2008 -0500
randr: use primary output for RRFirstOutput()
commit cdcb516e561e2f65eb2fa523ca001c57674d5caf
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 17:37:17 2008 -0500
randr: Mangle GetScreenResources sort order based on primary output
commit d7b316e82bc7051f8829b4f4a640f50ae91c2db9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 17:28:55 2008 -0500
randr: Mangle compat Xinerama reply based on primary output
commit 9d58d2a319059989ccdfa758f586149ccdc16df6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 9 10:51:37 2008 -0500
randr: Add [GS]etOutputPrimary
commit d281866b74f7067f2704c278fe9720eafc0ee5ef
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 21:20:48 2008 +1000
mi: Clean up CopyGetMasterEvent, re-use the memory.
Alloc an EventList once and then re-use instead of allocing a new event each
time we need a master event.
There's a trick included: because all the event processing handlers only take
an xEvent, init a size 1 EventList and squash the events into this one.
Events that have count > 1 must be squished into an xEvent array anyway before
passing into the event handlers, so we don't lose anything here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 0b4fef6337d88ae8ef05b8b73941350a9007565c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 10 11:35:09 2008 +1000
dix: move MAX_VALUATOR_EVENTS into include/input.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b36c398b11321a908cfe217108b26a32ffc1d850
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 8 16:41:20 2008 +1000
dix: purge dead device-based window access code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa71ac1dd4697738752c73fe4c106b665ea3ec25
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Dec 10 00:32:34 2008 -0200
Add dependency tracking to sdksyms.c and export composite wrapper.
Thanks to David Miller for noticing a make problem with sdksyms.c
not being regenerated when sdksyms.sh is updated. This is not yet the
best solution; automake generates dependency for sdksyms.o, but the
build really should also regenerate sdksyms.c when sdksyms.o needs to
be regenerated.
Export the symbols in miext/cw/cw.h. These symbols are in libxaa, and
at least the nvidia driver uses them. Maybe cw.h should be installed
in the sdk.
commit 090f63123975220819d531f569df6e5787607ec6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 8 11:53:20 2008 +1000
mi: always update the sprite for master devices.
Follow-up to 9ce995373e4a. This re-enables cursor rendering if the MD is
controlled through software (e.g. synergy).
Reported by John Tapsell: "I use Xorg with no mouse attached, but use synergy
to control the mouse. The commit means that I no longer have a visible mouse
cursor. The mouse cursor is still 'there' in terms that I can click buttons
etc with it, but it's just not visible."
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7c8720c1433d2c3b85bbf4b811cc54c2df4c0080
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Dec 8 22:11:50 2008 -0200
Correct wrong symbol reference on sparc.
The awk script was incorrectly referencing the struct name, and
not the struct variable.
Also added some comments to sdksyms.sh, for the reason it generates
the "symbol table" and add a message to the generated file, telling
is was automatically generated.
commit 58a27d2932164e43c0db42b1286ec2f95250b420
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 16:28:00 2008 -0500
Default to x86emu even on i386 linux
vm86 mode is a bad idea anyway, and using the emulator everywhere
means we get a consistent set of bugs.
commit bbf811514d3cdf84790bad5b852942a4e636902b
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Mon Dec 8 12:24:39 2008 +0100
ddxCtrls.c: XkbDDXUsesSoftRepeat always returns 1 now
We'd like to do soft repeat in the server for all keys. Remove obscure check, that'd
prevent the server from autorepeating when delay is set to exactly 660ms and rate is
set to exactly 25 (interval=40).
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 8c1dd40a04693f09f4fcea6e7f905af34c7589de
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Mon Dec 8 14:49:38 2008 +1030
Don't use gnu specific extensions to awk when builing symbols
Traditional posix awk doesn't know about \W and whilst we check that
awk exists in configure.ac we don't check which awk we are using.
This corrects symbol generation for posix only awk.
commit 39db182b637041255ed6dac739ff77c8e4e07c30
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 8 12:12:39 2008 +1000
xfree86: init EQ before trying to initialise the devices (#18890)
The kbd driver may send events during device initialisation, and these events
need the EQ set up already.
X.Org Bug 18890 <http://bugs.freedesktop.org/show_bug.cgi?id=18890>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 78a62d7713c708d067d8824ec41b0a0225c1997f
Author: Tom Jaeger <ThJaeger@gmail.com>
Date: Mon Dec 8 11:38:12 2008 +1000
Xi: XIGetDevice needs to ignore the MORE_EVENTS flag.
Reported in X.Org Bug 18882, Comment 5.
<http://bugs.freedesktop.org/show_bug.cgi?id=18882>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ee1a6c28418a6dad6c89f79a994f27bfbaa77368
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Dec 5 10:12:57 2008 +1000
dix: fix calculation of valuator events.
Follow-up to 4971315296cb. countValuatorEvents was copied from GKVE where it
was obviously broken but nobody noticed. GPE had the correct version, but that
one got lost during de-duplication. Restoring the correct calculation - if we
have 6 valuators, we want 1 valuator event, not 2.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 13de7511b17b57a28668e1a60b196ccfe61dbcbe
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Dec 4 10:30:02 2008 +1000
xfree86: Only use the evdev ruleset on linux.
As suggested by Julien Cristau
This is an follow-up to
commit 9c5dd7337fa93fb1650cc017e523b939dcbf482a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 14:24:25 2008 +1000
Let the DDX decide on the XkbRulesDefaults.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Acked-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 8e3279134987a45f2a89c963ef2d33bc3d3c8179
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Dec 4 09:47:25 2008 +1000
xfree86: fix compiler warning (use of uninitialized variable)
drv and idev are only set for SDs, but are only dereferenced for SDs too, so
initializing them to NULL is safe.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 22d4ddcc3d63b7fbf2a23f5162075e4ee06db781
Merge: d2dad38 c3bf15b
Author: Matthieu Herrb <matthieu@crux.(none)>
Date: Sun Dec 7 23:56:15 2008 +0100
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit d2dad384f5725a36e593fd75f03d712f53b20620
Author: Matthieu Herrb <matthieu@crux.(none)>
Date: Sun Dec 7 23:52:26 2008 +0100
Fix build in separate build directory.
commit c3bf15ba85fd3ab2e1fe809428b75bf34db25cc8
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 18:52:23 2008 -0200
Require macros 1.2.0 or newer for XORG_CHANGELOG and XORG_CWARNFLAGS.
commit 5a8068b390b7d30eb526e954443d8e43a199b971
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 18:31:32 2008 -0200
Convert libx86emu.a to a "libtool convenience library".
commit ed4a17274015ecd8040ae85bd5cd9d1dbcc9460a
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 14:59:25 2008 -0200
Export some symbols from libxf86config when installing it.
These are private symbols, but used by the X Server.
The newly exported symbols were not added to the sdk headers.
Optionally, libxf86config could be compiled without hidden symbols
when being installed.
Thanks to Maarten Maathuis for noticing the problem.
commit bf4c29ab48a166eb158cf4be7c597982d65ef214
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 05:12:41 2008 -0200
Correct xf86acpiDisableFlag symbol.
It is declared as
<hash>ifdef HAVE_ACPI
Bool xf86acpiDisableFlag = FALSE;
<hash>endif
in hw/xfree86/common/xf86Globals.c
but not protected by the ifdef in the sdk header xf86Priv.h, what
caused a build failure in the tinderbox, due to the address of the
symbol being taken (to ensure it is available) in sdksyms.c.
commit b1dac41fb3853ca8182048ea57b88b6e84ecceb3
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 02:22:19 2008 -0200
Use libtool convenience libraries and better "symbol" table.
All .a libraries were converted to .la, and instead of linking the
Xorg binary with a mix of .a and .la, and adding some libraries more
then once in the command line, etc, now it generates a single libxorg.la
from all the required convenience libraries, and links with a dummy
xorg.c (that should usually be the file with the main function...).
This removes the requirement of some things like libosandcommon and
libinit, that existed to circumvent problems when linking multiple
.a and .la in the final Xorg binary.
The "symbol table" is now generated dynamically, by a shell script,
with an embedded gawk parser that parses cpp output. The new file
sdksyms.sh is generated by hand by analyzing all Makefile.am's and
making it create a sdksyms.c file, that includes all sdk headers that
will add symbols for the Xorg binary. Module headers aren't read, and
a in 2 files it was required to add a "<hash>ifndef XorgLoader" around
declarations shared between the Xorg binary and libextmod. A few
other changes were added to other sdk headers, like preventing
multiple inclusion, or including other headers to satisfy dependencies.
This should be a lot more portable, and better (hopefully properly)
using libtool to generate convenience libraries.
commit ccd2c668c13863ed704f86b29fc6b3ee628e56a2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Dec 6 14:11:52 2008 -0800
XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
(cherry picked from commit a41e7f75decd340d064fdc0d2c4fe6c88d7dbc82)
commit 7ebd0c7e8d42a13079957d9bacf5cb30d7855a59
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Dec 5 12:42:31 2008 -0800
XQuartz: Corrected name/command labels in the customization widget
(cherry picked from commit a689c23f17eb445c36b97eb617ef4b8bd157985f)
commit 027ff97a1354ab4c83fecb615f6bc2a6b739b871
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 5 12:00:08 2008 -0800
Make sure _X_EXPORT is defined in edid.h
Fixes build error in xf86-video-intel utilities
commit 466b0fca9ba5d5e7fb36e47a6d1bd60218f51c75
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Dec 5 17:01:09 2008 -0200
Add back a simplified version of the loader static address tables.
If not taking the symbol addresses, linkage will break badly, as not
all symbols will be present, and it also requires changing library order,
and/or making some changes like the "libosandcommon".
This table should be modified to be generated automatically, as
it is required to "fool" the compiler/loader into adding all required
symbols to the X Server.
commit 44bef8b850c5a78a3d3eca5f0d92b71bdd0a87e2
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Dec 5 15:37:15 2008 +0100
randr: Update SProcRandrVector for panning
commit 44c8c3cf7de589fb8e987f4ab931294eaf0b405f
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Dec 5 04:26:57 2008 -0200
Remove static symbol address tables in hw/xfree86/loader/*sym.{c,h}
Those tables were once used to decide what symbols are visible to
modules, but they were outdated. The only real usage was that, since
it was taking the address of symbols, linkage should fail if the
symbols were not available.
Now the proper way to make symbols available to modules should
be to use the _X_EXPORT macro, or not compile with hidden symbols,
so that all symbols would be available.
All symbols in the tables were revised to ensure they are exported,
and only symbols that were not exported are ClientSleepUntil() and
DuplicateModule(), that were not in the sdk for quite some time
already, and should not have any users outside of the X Server
(and/or builtin modules).
commit 091a50d1260c70055aba1fa6a2d1b1a36de1114e
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 4 18:23:25 2008 -0200
Move _X_EXPORT attribute to header file.
The attribute should be set on header files to make it easier to
manage what symbols are available to modules.
_X_EXPORT should be used in sources only for special cases, like
symbols that must be visible by non video/input driver/modules but
should not be "advertised" in the sdk.
commit e5ab9e66628cde081757cf2a1013a78e927a622e
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 18:13:40 2008 +0100
randr: Allow panning to be disabled per axis
commit bad118ace6c5bae5a5ed8a35129c90c38f1c1932
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 16:55:14 2008 +0100
randr: Rework panning area verification
commit 219c26ce0c65625d55cfd943ec66fe94a1a0ddfd
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 16:28:40 2008 +0100
randr: Don't change panning parameters if verification fails.
commit 18a8bac1a1567b6215928f96870554ea63f39aab
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 16:30:38 2008 +0100
randr: Rename pan() to set_origin(), and xf86CrtcPan() to xf86CrtcSetOrigin()
commit 825b2c2f4a59ac4852f90bbbddf18ab832297fdd
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 16:11:21 2008 +0100
randr: Nuke config-timestamp for panning
commit eeeb98d1df59baaaec954b6318d788a37e388d11
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 28 17:51:20 2008 +0100
randr: Protocol bits for panning support
commit b929d721efdb17bcc94b9984c4f34d0df3d267d5
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 28 17:49:31 2008 +0100
randr: Panning support
commit 834cbc16f3eb539704faade7bff347b161ce69d9
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 28 17:39:23 2008 +0100
randr: Crtc interface update for panning support.
commit a475eb9feec75e9ce1e316da0f1679acd7dd3aa8
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 28 17:38:52 2008 +0100
randr: Weird enough, crtc->version was never set upon creation. Fix that.
commit 9db84fac0cc767e23986223d22bc085cde0cc86f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 2 14:54:10 2008 -0800
Removed unised option from configure.ac for launchd
(cherry picked from commit 87e4de0a9a8af6e5e0cbba74e585761f1160a6ab)
commit fa4f2527a5002711fe47c02b14097032fd845dc4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 2 14:53:21 2008 -0800
XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc)
commit 126d8a4c8a72b039903023dce0da64b251080e1d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 4 02:43:29 2008 -0200
Update .gitignore.
Add files left by make distcheck and remove files that no longer
are generated.
commit 9826b95c198e74f89680cc247b9bd9dd884d72be
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 4 02:05:05 2008 -0200
Correct make distcheck by removing dolt files.
commit 5dbe70dd52fd8daf8d0797951cc5a758d2c3b44c
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 4 01:57:46 2008 -0200
Remove dummylib.
Only cvt required it, and only used XNF{,c}alloc
via xnf{,c}alloc macros.
Based on patch by Eric Anholt.
commit f841d4e3cccbde02e91c948f5ffb9e32c8c3b3cc
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 3 23:02:03 2008 +0100
Move RELEASE_DATE closer to AC_INIT so it's more likely to be updated
commit 75b02dd0be2ef64c0f8e3138c90b5c5e48b17913
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Dec 3 14:46:30 2008 -0200
Include <X11/Xfuncproto.h> if _X_EXPORT is not defined.
commit dd128ddcdcbe254a9cdd973590f6a979a7f0427e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Dec 3 18:40:29 2008 +0200
If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'.
Signed-off-by: Timo Aaltonen <tjaalton@cc.hut.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 0b5ecabfb803cd820338fb0364521fe39b05578b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 26 21:19:55 2008 +0100
randr: add swapped dispatch for RR[GS]etCrtcTransform
Fix a memory leak in ProcRRGetCrtcTransform() while I'm at it.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Cc: Keith Packard <keithp@keithp.com>
commit 110a71d11ab7a1a55a6a24d792457fdef0b0746d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Dec 3 11:22:38 2008 -0500
Test for DRI2 extension in dri_internal.h and only enable AIGLX DRI2 if found.
commit fd2d40b7ec5d685dac55453eb1f2da672dc83126
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 11:31:48 2008 +1000
Xi: change XIUnRegisterPropertyHandler to XIUnregisterPropertyHandler
CamelCase can be taken too far, and AFAICT there's no consumers of that
function yet anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 49f77fff1495c0a2050fb18f9b1fc627839bbfc2
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Dec 3 05:43:34 2008 -0200
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
commit 0b8f8b24f718820a72ebdc52423c2e6a44e848c5
Author: Stuart Bennett <sb476@cam.ac.uk>
Date: Tue Dec 2 22:52:53 2008 -0800
xf86Cursors: xf86_reload_cursors shouldn't unconditionally show hwcursor (#14820)
Also, no need to call ShowCursor when SetCursorPosition already does it
Based on a previous patch by Maarten Maathuis
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9c5dd7337fa93fb1650cc017e523b939dcbf482a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 14:24:25 2008 +1000
Let the DDX decide on the XkbRulesDefaults.
Rather than assuming rules in the CoreKeyboardProc, init the default rules in
InitCoreDevices, then re-use them later.
In the xfree86 DDX, set the rules to "base" or "evdev", depending on whether
we'll load kbd or evdev.
If we create a new MD, use pc105,us as default and re-use the rules file used
previously.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 463e02e7de5da3e582a3a049110a476713c7210e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 15:06:37 2008 +1000
xkb: Allow NULL as rulesFile in XkbSetRulesDflts.
If no rules file is given, simply re-use the previous one. If no RF is given
the first time this function is called, use the built-in default.
This includes fixing the built-in default to something that actually exists.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit e670fd889607fa712876218882cd4a9b46937661
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 11:55:13 2008 +1000
dix: fix GetMaximumEventsNum(), may return a DCCE event too.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 85d84c7cf2d368d1803dc2cdd03d6c9df8cc0430
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 2 17:33:43 2008 -0800
Fix GLX after 180bad84774493d48f2793a6281d825560944863.
Sigh.
commit 4a61ad427c634bcc38a31ce0f14ff5c2d3f706c7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 14:35:45 2008 -0800
Update sample xorg.conf file
commit c1db925d10fd37077bed90612ed95c3fd20cd2e2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 14:32:48 2008 -0800
Add atKeynames.h to libdmxinput_a_SOURCES so it's included in tarballs
Reported by geearu in #xorg-devel
commit 8561514574b3540c729bcc3acca9c943adcdc778
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 13:32:34 2008 -0800
Don't need to check uid/euid for every commandline argument
Check uid/euid only when handling the arguments that are restricted
to root/non-setuid users
commit 6de6ffff35ac03d49fa61de195d4a0605e0ef8bf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 13:19:08 2008 -0800
Remove unused config flags from FlagValues & FlagOptions
FLAG_DISABLEMODINDEV, FLAG_MODINDEVALLOWNONLOCAL, & FLAG_HANDLE_SPECIAL_KEYS
commit bb072019fa8dd292a50ef433d05caeefd1304a73
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 16:57:06 2008 +1000
xfree86: don't render SW cursors for devices attached to VCP (#16805)
When leaving 3D games such as quake3 or sauerbraten, a cursor may stay on the
screen. This is caused by one run of SW rendering for the SD, even though the
SD was attached to the VCP and thus has HW rendering capabilities.
Check for the SD's attachment (like in all other functions) before deciding on
SW or HW rendering.
X.Org Bug 16805 <http://bugs.freedesktop.org/show_bug.cgi?id=16805>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 3a690598cf18c4cdc6aadd10a1ecf0772cacd34b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 12:59:57 2008 -0800
Remove unused HandleSpecialKeys config option
Was only used by "keyboard" driver - the last place the value was checked
was in xf86PostKbdEvent, which was removed in commit
60ea7b51fe2b8a19a08b63db48504971a7a50ee6
commit 1dfed222e93f4684c2a450944a9a0ea9e085c43f
Author: Bernhard Rosenkraenzer <bero@arklinux.org>
Date: Tue Dec 2 09:01:56 2008 +1000
Xext: fix MultiBuffer compilation error with TryClientEvents. (#18835)
X.Org Bug 18835 <http://bugs.freedesktop.org/show_bug.cgi?id=18835>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 9ce995373e4aa4b1bf51b4adafa2324f781ec1cd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 21:32:39 2008 +1000
mi: UpdateSprite only if the device is attached.
commit d507f60689f4e14383b0d24e63afc8cf836360d5
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 26 14:15:04 2008 +1000
xfree86: don't FatalError on "too many input devices".
Just ignore devices after MAXDEVICES has been reached, but warn the user that
the devices are ignored.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 9bf761468fa3baf4c5fa40efa717b4b581d920f9
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 11:44:58 2008 +1000
Xi: fix xi_filters size.
commit 260e48c252c95fd1b1ba9ad7478791f6b9a67e2d
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 11:29:06 2008 +1000
dix: remove confusing (and wrong) comment. VCP is not the only pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 5d02e580d7c4144ea6f0984240fc913e05fec877
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 11:46:15 2008 +1000
dix: use UpdateFromMaster in GetProximityEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 95fc59a199f99bf167fbb09297a9bb0e33e31869
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 14:55:15 2008 +1000
xkb: Extra sanity checks to prevent dev->key == NULL dereferencing.
commit a425abf0eaa61ee5ccb2f32a1af24edd190f7889
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 26 12:20:00 2008 +1000
xkb: don't attempt to filter events for devices without key classes.
Reported by Magnus Kessler.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit a85f0d6b98237d8a196de624207acf1983a1859a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 26 11:15:05 2008 +1000
Xi: fix use of button->down - bitflags instead of int arrays.
The device's button down state array was changed to use DOWN_LENGTH and thus
bitflags for each button in cfcb3da7.
Update the DBSN events to copy this bit-wise state.
Update xkb and Xi to check for the bit flag instead of the array value.
Reported by ajax.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 180bad84774493d48f2793a6281d825560944863
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Dec 2 02:50:45 2008 -0200
Add visibility flags to XSERVER_CFLAGS.
This is done to actually change DIX_CFLAGS, as not all "modules" use
XORG_CFLAGS.
Also export the symbols that are required by other modules after
the change.
commit 8c560422b44e012053612754430d2b87dc44ed59
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 1 20:02:34 2008 -0800
More man page updates for 1.6 release for Xorg, xorg.conf & exa man pages.
- Remove remaining references to XFree86-Misc options AllowNonLocalModInDev
and DisableModInDev.
- Remove remaining references to grab-breaking keys & associated options.
- Update description of Ctrl-Alt-Backspace to new -retro/DontZap defaults.
- Add description of new options -modalias and -showopts.
- Update list of modules loaded by default.
- Update input driver references from keyboard to evdev & kbd.
- Update list of driver man pages to match xf86-*-* drivers with man pages.
- Add See Also section to exa man page.
and various formatting/typo/etc. fixes.
The Xorg/xorg.conf sections on input device selection could use further
updates to better match the current state of HAL-enabled configuration.
commit 6a1850b8c677e2a2993f6f6b731ee3d35aa55d09
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 1 19:19:04 2008 -0800
Correct warning for unknown GlxVisuals option in conf file
commit afeacb8e74b2a1e366e5ca9f0e58805d8d96c457
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Dec 1 20:53:17 2008 -0500
Bump dri2proto requirement to 1.99.3.
commit ad01e86b5c7c528adec8a1f95ecaa294f58a8922
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Dec 1 20:52:41 2008 -0500
Drop unused DRI2 vblank infrastructure.
For this first iteration of DRI2 we don't have any vsync functionality
in place yet, so back out the support in DRI2 and the protocol for now.
commit 24c562f04b41d219c34f5fa3f963564accf329f2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 1 16:28:45 2008 -0800
Update See Also lists in Xorg & xorg.conf man pages
Remove xorgconfig & xorgcfg
Update driver lists:
- Remove vga
- i810->intel
- via->openchrome
commit bd147e6f4b03f344c967c88fd433877b14fe1912
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 1 16:08:55 2008 -0800
Remove hack to only load font modules if magic strings appear in font path
commit 5f3f14179edf48aad518f6f707bfdc37c27267c6
Author: Jay Cotton <jay.cotton@sun.com>
Date: Mon Dec 1 16:06:09 2008 -0800
Sun bug 6618220: Xorg server core dump in xf86RandRModeRefresh(NULL)
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6618220>
commit 09df7cc5ad7b72d8a23c3e22fc718aad8c16f4d3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Dec 1 12:41:10 2008 -0500
Avoid dereferencing NULL pScreen in xf86CrtcSetModeTransform().
We can get there during PreInit as we set a mode for load detection.
At that time there's no pScreen anywhere, so just skip the optimization
then.
commit b0d371ab0a6efd4956c3677faa20b2ac15c33765
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 1 11:36:06 2008 -0500
randr: Don't send output property events on server exit
If the Window resource type is already gone, there's no point in trying
to send events, all it can do is access already-freed memory.
Relevant thread:
http://lists.freedesktop.org/archives/xorg/2008-November/040443.html
commit 16b11cd03d8c5def07f0e598f237f71a37883a46
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Nov 30 02:59:34 2008 -0200
Correct static symbol XkmReadTOC and first pass on compile warning fixes.
The warnings corrected were only the ones that should correct
real problems. The most common one is 64 bit integers as
"printf %l" arguments.
Note that there is a patch related to this at:
http://bugs.freedesktop.org/show_bug.cgi?id=18204
commit fb22d4d928bc5d1a893494a059359da2ed2ac639
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Nov 30 01:33:20 2008 -0200
Remove declarations of symbols that are never defined.
These symbols were removed from the X Server, or never declared.
One symbol that may need special attention is XkbBuildCoreState(),
that doesn't have a prototype anywhere, but is called from
xkb/xkbEvents.c:XkbFilterEvents(), and also used by the macros
XkbStateFieldFromRec() and XkbGrabStateFromRec() defined in
include/xkbstr.h.
fb/wfbrename.h also may need some cleanup, as it makes several
"renames" of non existing symbols.
commit d6cbd4511e35a89a0353f11834c6fdb8d4d2189f
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sat Nov 29 23:56:06 2008 -0200
Export symbols defined in the sdk.
This is the biggest "visibility" patch. Instead of doing a "export"
symbol on demand, export everything in the sdk, so that if some module
fails due to an unresolved symbol, it is because it is using a symbol
not in the sdk.
Most exported symbols shouldn't really be made visible, neither
advertised in the sdk, as they are only used by a single shared object.
Symbols in the sdk (or referenced in sdk macros), but not defined
anywhere include:
XkbBuildCoreState()
XkbInitialMap
XkbXIUnsupported
XkbCheckActionVMods()
XkbSendCompatNotify()
XkbDDXFakePointerButton()
XkbDDXApplyConfig()
_XkbStrCaseCmp()
_XkbErrMessages[]
_XkbErrCode
_XkbErrLocation
_XkbErrData
XkbAccessXDetailText()
XkbNKNDetailMaskText()
XkbLookupGroupAndLevel()
XkbInitAtoms()
XkbGetOrderedDrawables()
XkbFreeOrderedDrawables()
XkbConvertXkbComponents()
XkbWriteXKBSemantics()
XkbWriteXKBLayout()
XkbWriteXKBKeymap()
XkbWriteXKBFile()
XkbWriteCFile()
XkbWriteXKMFile()
XkbWriteToServer()
XkbMergeFile()
XkmFindTOCEntry()
XkmReadFileSection()
XkmReadFileSectionName()
InitExtInput()
xf86CheckButton()
xf86SwitchCoreDevice()
RamDacSetGamma()
RamDacRestoreDACValues()
xf86Bpp
xf86ConfigPix24
xf86MouseCflags[]
xf86SupportedMouseTypes[]
xf86NumMouseTypes
xf86ChangeBusIndex()
xf86EntityEnter()
xf86EntityLeave()
xf86WrapperInit()
xf86RingBell()
xf86findOptionBoolean()
xf86debugListOptions()
LoadSubModuleLocal()
LoaderSymbolLocal()
getInt10Rec()
xf86CurrentScreen
xf86ReallocatePciResources()
xf86NewSerialNumber()
xf86RandRSetInitialMode()
fbCompositeSolidMask_nx1xn
fbCompositeSolidMask_nx8888x0565C
fbCompositeSolidMask_nx8888x8888C
fbCompositeSolidMask_nx8x0565
fbCompositeSolidMask_nx8x0888
fbCompositeSolidMask_nx8x8888
fbCompositeSrc_0565x0565
fbCompositeSrc_8888x0565
fbCompositeSrc_8888x0888
fbCompositeSrc_8888x8888
fbCompositeSrcAdd_1000x1000
fbCompositeSrcAdd_8000x8000
fbCompositeSrcAdd_8888x8888
fbGeneration
fbIn
fbOver
fbOver24
fbOverlayGeneration
fbRasterizeEdges
fbRestoreAreas
fbSaveAreas
composeFunctions
VBEBuildVbeModeList()
VBECalcVbeModeIndex()
TIramdac3030CalculateMNPForClock()
shadowBufPtr
shadowFindBuf()
miRRGetScreenInfo()
RRSetScreenConfig()
RRModePruneUnused()
PixmanImageFromPicture()
extern int miPointerGetMotionEvents()
miClipPicture()
miRasterizeTriangle()
fbPush1toN()
fbInitializeBackingStore()
ddxBeforeReset()
SetupSprite()
InitSprite()
DGADeliverEvent()
SPECIAL CASES
o defined as _X_INTERNAL
xf86NewInputDevice()
o defined as static
fbGCPrivateKey
fbOverlayScreenPrivateKey
fbScreenPrivateKey
fbWinPrivateKey
o defined in libXfont.so, but declared in xorg/dixfont.h
GetGlyphs()
QueryGlyphExtents()
QueryTextExtents()
ParseGlyphCachingMode()
InitGlyphCaching()
SetGlyphCachingMode()
commit ffb484f7ef84099019b196ef97bfb2355eb6d52a
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Nov 29 14:30:55 2008 +0100
randr: Avoid needlessly creating a shadow framebuffer.
- pScreen->width and height were zero, so it didn't "fit" the screen.
commit 01eaebdc98f30fdf543af6337cdf012d3ff16f09
Author: George Staplin <gstaplin@apple.com>
Date: Fri Nov 28 13:57:45 2008 -0700
XQuartz: GL: Make various changes to makeFormat, so that it works better. Now glxgears looks normal with the old libGL.
Add various GLX extensions to the list of supported extensions.
Reformat the oddly formatted code in some areas.
Use xalloc and xfree instead of malloc and free.
(cherry picked from commit 755f53eb40c4329d8c82a31cb910c31fdd4ea12e)
commit 3d527b91b4bfa31e78d5fc7a1447a4026876f14e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 28 12:59:09 2008 -0800
XQuartz: Added option to enable/disable test extensions
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3723d5f3422cf6a6530172eafc556d9)
(cherry picked from commit 635019ad18db921fec99256294debd8571074abf)
commit 71d3df7cc37403b5842227a035d9b995fd920e0b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 28 11:18:14 2008 -0800
XQuartz: Avoid some warning messages being spewed to system.log by AppKit
(cherry picked from commit 780eff230ce41ad785e54d61a82c731269ae0446)
commit a9796c7bc43223df44f12a7be08e361aea963ec1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 28 01:45:37 2008 -0800
XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
(cherry picked from commit cbae2b447357b3fed6ff19414c60dd3792045600)
commit ef4179f43a84d90f867b95ee5974ad26884253b5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 26 12:15:58 2008 -0800
XQuartz: Fix dead-acute on Greek keyboards
(cherry picked from commit 807f2ec35c5f95b56b3e2b5eac51aec300fe5cb6)
commit 800f5c681bed300d8caf99935e8f80ea6c1993ba
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 26 12:07:52 2008 -0800
XQuartz: Fix Czech keyboard dead-acute
(cherry picked from commit 771df2786bc60389489f0967e705c7c95bdda085)
commit ac57bb36d56a7a4d41add8d5a206ff37544a1819
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 20:14:37 2008 -0800
XQuartz: Fix an uninitialized keyboard_type on Tiger
(cherry picked from commit 27b1a5eb3482052253ebdce1a09aedf05ac1b099)
commit 45c8bd0fe54273039fdaa1eeeafb81b5774f2c75
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 28 02:01:57 2008 -0200
Enable compiling the X Server and modules with hidden symbols by default.
Note that it checks if support for symbol visibility is available by
the compiler, not if it is functional. It may have problems on non x86
architectures.
To disable the feature, just pass the option "--disable-visibility"
to the X Server configure script.
Unless using an alternate build schema, drivers built from a git
checkout will use the same "visibility" related CFLAGS used to compile
the X Server.
commit 31285d063ec4623cb0764437d6d57e244f20460d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 28 01:55:11 2008 -0200
Make visible symbols required by xorg modules.
This patch exports all symbols required by the compilable
(in a x86 linux computer) xorg/driver/* modules.
Still missing symbols worth mentioning are:
sunleo
miFindMaxBand no longer available
intel (uxa/uxa-accel.c)
fbShmPutImage no longer available (and should have been static)
mga
MGAGetClientPointer (should come from matrox's libhal)
This is not a definitive "visibility" patch, as all it does is to
export missing symbols, but the modules that current don't compile,
may require more symbols once fixed, and third party drivers should
also require more symbols exported.
A "definitive" patch should export symbols defined in the sdk.
commit 6f18ea7e656b79e58f66f51067334414767b413f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 26 19:07:04 2008 +0100
Typo fix
commit efefc03f9b26738b69abb570c1af2167cc99c4d8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 13:19:48 2008 +0100
Add missing include
../../../../hw/xfree86/xaa/xaaTables.c:9:14: warning: symbol 'byte_expand3' was not declared. Should it be static?
../../../../hw/xfree86/xaa/xaaTables.c:53:14: warning: symbol 'byte_reversed_expand3' was not declared. Should it be static?
commit 74bc792e1814849b8eee9e448e36c3568b821e6c
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Nov 27 05:34:14 2008 -0200
Export symbols required by the vesa and fbdev drivers.
This is a minimal set of patches, to have an usable X Server when
compiling it with symbols hidden by default.
commit 74e2669103b59d51b24ddc48f378b1d04a3effd4
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Nov 27 04:33:44 2008 -0200
Export symbols also defined in libXfont.
libXfont has stubs for these symbols, so, when compiling with hidden
symbols by default, these symbols must be visible in the X Server, or
the stubs in libXfont will be used.
commit 87a7fb7438b70d07ebf240c530b8548a01021d48
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Nov 27 00:12:59 2008 -0200
Rework code using return value of LoaderSymbol as a function pointer.
The patch removes all macros in the format
define xf86_sym ((type (*)(argument-list))LoaderSymbol("sym"))
creates a new macro in the format
define xf86_sym sym
and ensures "sym" is a "visible" symbol.
The patch doesn't add or remove features, and is source and binary
compatible with previous shared objects (with the difference that it
requires the dlloader).
These symbols are a special case, as, due to the fact that LoaderSymbol
was being used to reference them, they are not easily found by "automated"
tools that check for missing symbols. And now it also have the benefit
that the compiler/loader "knows what is going on".
commit fc708394318ed92c612e2938b335c08c1ffebb28
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 26 15:49:02 2008 -0800
Add server support for RRGetScreenResourcesCurrent
This depends on randrproto 1.2.99.1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f710ce269c020a39f58b2bfbd0fe5192a3279c72
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Nov 26 20:02:44 2008 +0000
bump master to 1.6.99.1 (now the 1.6 branch is created)
commit f3edc1fb0210149f35eab4e413700b5c4ac48214
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 25 23:15:35 2008 -0800
New version of dolt
commit 4715f079b9c61362755c95c1ebf89c97cc6fff2b
Merge: 9ffc671 ed597f1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 25 22:19:08 2008 -0800
Merge commit 'origin/master'
commit 9ffc6719390df8fdd0a5295a7a7a0eaea792be45
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 24 13:08:48 2008 -0800
Move matrix operations from X server to pixman 0.13.2
pixman 0.13.2 now holds all of the matrix operations. This leaves
the protocol conversion routines and some ABI stubs in place
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ed597f19fdc3017dde6d1452b5cdf8ddcd69a5b1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 25 19:36:31 2008 -0500
xselinux: use "raw context" variants of getpeercon() and getcon().
commit ec1d08442f69353cb0e73ac4eaf0346ebb975594
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 21 15:13:00 2008 +1000
dix: Enable core devices in InitCoreDevices already.
Updated patch, see
http://lists.freedesktop.org/archives/xorg/2008-November/040540.html
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2b45602e828a07a0817691b2838cd34ffee531bd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 26 10:42:52 2008 +1000
Revert "dix: Enable core devices in InitCoreDevices already."
I merged the wrong patch. See correct patch at:
http://lists.freedesktop.org/archives/xorg/2008-November/040540.html
Not activating the device before attempting to enable it would leave the
sprite unset, crashing the server when enabling the real devices.
This reverts commit e078901a4eca02bd3e7a80d9462dafbca939a187.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 416685c295353b5816689994c7c58ae7db3e878d
Author: Jeremy Uejio <jeremy.uejio@sun.com>
Date: Tue Nov 25 16:26:44 2008 -0800
Refix Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>
This is a refix of the previous fix for CR 6685465. In the first fix
I was shifting the colors to match the mask by the bits_per_rgb amount
in the visual structure. That field has nothing to do with the # of
bits to shift by. I should just instead shift the bits to match the mask.
commit d5f9a131a2d5bd33f82fdd4e809880b0ff792b45
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 25 15:46:39 2008 -0800
Fix const-mismatch warnings for DisplayModePtr's
Includes fixes for:
"xf86Config.c", line 2434: warning: argument #1 is incompatible with prototype:
prototype: pointer to struct _DisplayModeRec: "xf86.h", line 351
argument : pointer to const struct _DisplayModeRec
"xf86EdidModes.c", line 312: warning: argument #1 is incompatible with prototype:
prototype: pointer to struct _DisplayModeRec: "../../../hw/xfree86/common/xf86.h", line 351
argument : pointer to const struct _DisplayModeRec
"xf86EdidModes.c", line 438: warning: assignment type mismatch:
pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
"xf86Modes.c", line 701: warning: assignment type mismatch:
pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
commit d5ad296869c38ab30136b5a293a0125b76aad994
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 25 14:12:26 2008 -0800
Remove duplication from code paths in XkbDDXCompileKeymapByNames
commit 2538fc0d893a150e978355d281750f0a989728a7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 25 18:18:46 2008 -0500
xselinux: don't pass a NULL key string to selabel_lookup().
commit c8472a74441838e16d0d3414db1fa7fe996868a9
Author: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue Nov 25 19:35:17 2008 +0200
Do not send VisibilityNotify events when MapUnmapEvents are disabled
This prevents a protocol visible side-effect (XVisibilityEvent) on
XCompositeRedirectWindow() followed by a XCompositeUnredirectWindow().
The problem shows up in gnome-screensaver with compiz and "unredirect
fullscreen windows" enable. A VisibilityNotify event is generated (first
with obscured and than with unobscured) when the window swithces from
redirected to unredirected.
https://bugs.freedesktop.org/show_bug.cgi?id=18133
http://launchpad.net/bugs/278112
commit 88297558aada44bc714ad57adbeed3740aaadee5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 14:20:58 2008 -0500
Dead code cleanup over DBE.
No DDXes have explicit DBE support anymore, so the init registration
table never got used. Just nuke it all.
commit e5eaea599ab16428c69912b6b3427ebe46707d7c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 14:05:51 2008 -0500
Warning fix
xf86info.c:11: warning: initialization makes integer from pointer
without a cast
commit 37072500f7bcf39e0d6aa2ceb5d1f2aeeab0b26b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 14:04:44 2008 -0500
Warning fix
helper_exec.c: In function ‘port_rep_inb’:
helper_exec.c:219: warning: implicit declaration of function
‘DEBUG_IO_TRACE’
helper_exec.c:219: warning: nested extern declaration of
‘DEBUG_IO_TRACE’
commit d96bffce2dcf209e76be9b36ca1ede7e0c976d77
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 13:59:00 2008 -0500
Warning fix
Init.c:139: warning: no previous prototype for ‘ddxBeforeReset’
Just declare the prototype always, seriously.
commit 09ea671cbff605fd2b2af71619e7db5002108bf8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 13:40:47 2008 -0500
Warning fix
lnx_bell.c:37: warning: no previous prototype for ‘xf86OSRingBell’
commit a9853c7d337b3b1ad49793e9b4b90e313b6fa536
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:53:55 2008 -0500
Warning fix
Pixmap.c: In function ‘xnestPixmapToRegion’:
Pixmap.c:93: warning: ‘Box.x1’ may be used uninitialized in this
function
commit 81eafe9f93a272b06aa9f9235ec5676b9aa3ee3e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:45:07 2008 -0500
Warning fix.
vbe.c: In function ‘VBEReadPanelID’:
vbe.c:1145: warning: return from incompatible pointer type
commit 09bfb25e031772611a2f0902d4ba77b587e4bdb2
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:43:36 2008 -0500
Remove unused XAAAvailableOptions
commit 8b9253f6383df3fefe38bde43a5f892b158a77c4
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:38:47 2008 -0500
Code motion: subsume xf86DoProbe.c into xf86Init.c
commit fbabb1c5c243cfd8c954dec4c060dff1a0b81015
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:34:28 2008 -0500
Warning fix.
In file included from l3-xaaStipple.c:4:
./xaaStipple.c:35: warning: no previous prototype for
‘XAAGetStippleScanlineFunc3LSBFirst’
etc
commit cbaca6ec666d7349c4680b8affc13b5c9cae1fa5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:14:24 2008 -0500
Remove dead FreeModuleDesc.
commit eb474adf98229a43bbe17ab98ff084371cb9fa09
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 11:25:58 2008 -0800
XQuartz: Simplify the xquartz_resetenv_display path
(cherry picked from commit d2e0624dd30eb234bb25595ceedfa51d48ca1724)
commit 94df1ab7f09a64f57c1e1453e3640462e984619c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 01:30:03 2008 -0800
XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
(cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f)
commit 0b314c50a2a0ca1afbdc06663c3b719b05ebb851
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 01:13:35 2008 -0800
XQuartz: Removed hardcoded org.x.X11 from MachIPC as well
(cherry picked from commit b4add7826d485600a13eba6a9c7be533f2c02d51)
commit 065d2afb0ca34f89806e0936c51cd27805bc5123
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 00:51:01 2008 -0800
XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard
(cherry picked from commit 7a8c6665949d7804a97ef2539a74ec4aa682e1cc)
commit 13df49dca28cf680a4d104630cd675de25d3e944
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 00:39:52 2008 -0800
XQuartz: Use the environment to pass the bundle's prefs domain on to xinit/quartz-wm for Tiger or no-launchd-LEOPARD
(cherry picked from commit fbf4b0d33fa5dc618c3191a4e823232dfa33cd95)
commit 40187f782beae4ae751824ef511c9f56a80357c7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 00:20:57 2008 -0800
XQuartz: Dead code removal
(cherry picked from commit eeb323612e0adbea37befed31bbaa1d295728385)
commit b55cad4569e34e3c10e9a327e20b91ea87d9dd98
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 00:15:53 2008 -0800
XQuartz: Don't hardcode values of org.x.X11 for the preferences domain
(cherry picked from commit 3a500d9247cf34686ec17b4a88c34d51ecd38ecd)
commit d508a3dcca2f160021aced872715e1ded23cef97
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Nov 24 23:33:54 2008 -0800
XQuartz: More dead code removal
(cherry picked from commit dcb0f6a2e62823a671051874d14a33ce59505892)
commit 41fbdf72f2154a3fca8cf484a611501e3c174fbe
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Nov 24 12:33:20 2008 -0800
XQuartz: Disable some error spew on Tiger (where it wouldn't be an error)
(cherry picked from commit 73ec6d3dfe0086d352f4eca25f1df5ae1884bb18)
commit 09c3f6e04c273ffafcb547c252137fb17c8ce016
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 20:23:46 2008 -0800
XQuartz: Dead code removal
(cherry picked from commit 46c077d9b4a883fc809c32077ce40f33a70d268b)
commit ab12c7516207908f3e063a78904d68e2db14208e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 15:47:14 2008 -0800
XQuartz: More Tiger cleanup: bootstrap_strerror
(cherry picked from commit 37f535aff3e9a7a02711daa98152cdff97745622)
commit 208f091bfc657e9ee57b988f035d3aac7e9e173a
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 12 00:07:56 2008 -0400
Remove xf86IODelay
commit 47478aa10adb20b6e48335ac8c4ef31f3fdfe68c
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 23:59:24 2008 -0400
Remove xf86{En,Dis}ableInterrupts entirely
commit c7680befe5aebd0f4277d11ff3984d8a7deb9d5b
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 23:35:24 2008 -0400
Remove the remnants of Jensen support
As being an EISA-only machine, and as ISA support is gone now...
commit df14682a31b92751091571ed82f6095f55f19cca
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 22:48:51 2008 -0400
Bus: Remove ISA support.
No, really. PCI is old enough to drive now. If you want this, get the kernel
to expose a framebuffer device.
commit a8bcab2d3b224e4d4d5b6a097ea530beee920213
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 22:14:23 2008 -0400
Bus: Remove yet more unused overlap processing.
commit 994b7c034fc20d76651cf7f6a285526d9aff8770
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 22:11:12 2008 -0400
Bus: Don't pretend to care about IRQs, DMA, or PCI config space
commit eb5ae45127fa9f08f0badec7e21f8c26c9c7c969
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:44:16 2008 -0400
Bus: Simplify a failure case (that pretty much never happens)
commit ee8b5cf94c2a9f8526a3bb5011ebb10f3246a4d9
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:41:47 2008 -0400
Bus: Trust the kernel when registering driver resources
... everywhere, not just (linux && (ia64 || alpha)).
commit 8397df89456558e3c85b05e0acfccb9f6af6b695
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:36:14 2008 -0400
Remove unused MIN macro
commit c251c0baae59714a6ac83b69cd106c08baa3613e
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:34:27 2008 -0400
Bus: remove special handling for init-only resources
This isn't used by any driver, nor has it ever been as far as I can
tell.
commit 3e5281af17841cf50d0e52a728b12c6ab56e61df
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:16:45 2008 -0400
PCI: Unexport xf86scanpci
commit 6b198daa46f2f609aff7900761cf82cc2fb4e0b4
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 20:51:39 2008 -0400
Bus: remove useless isaConvertRange2Host
commit a96db74c2a95bb1dce132cf47ea720ae939dfad7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:43:26 2008 -0400
Bus: Don't try to find an ISA bus just for fun.
commit b21311a99d58997cd1fc68726d0848242e9c34fc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:34:42 2008 -0400
Bus: Remove unused RemoveOverlaps
commit 41be6b3f0dc0baa1c6ae8d2b41a6be73ca0e7268
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:33:28 2008 -0400
Bus: Remove the notion of estimated resources.
commit 095ba1435501776c8c8a34e767b89f89e5dc949a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:27:33 2008 -0400
Bus: remove the "reducer"
This code effectively didn't do anything anymore.
commit 4457e31710af90f9ac295bb686c841e9473fb767
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:14:54 2008 -0400
PCI: Remove unused ia64 platform code.
commit 86cfe0ee236bfd3613e5f9ba589211db42d009eb
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:45:40 2008 -0400
PCI: Simplify OS PCI function registration a bit.
commit 2d427b9cb1594f8f2f66b463033fff5b459962fd
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:38:23 2008 -0400
PCI: Remove config mechanism details.
pciaccess handles this for us now, no need to remember PC arcana.
commit 5bb86bafd6fda296011cbcd5d15a85a6d770ae29
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:34:41 2008 -0400
PCI: Remove non-pciaccess path for x86.
commit a67360e79fa7e17c3d907771694009c57c1cd195
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:31:38 2008 -0400
PCI: Always build domain support.
commit 51e105ccc3d0ac8c0fe74efd029ffbddb80b140e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:12:31 2008 -0400
Remove xf86GetResourcesImplicitly
commit 599a0f3f1e3ae92676e3648471576c0001cfd9ae
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 24 20:37:58 2008 -0800
Fix typo in 5bf2c88d2317230b95b2904cb975167d03ee13a2
Amazing how these things hide until you see the diff come back from
the commit list.
commit 5bf2c88d2317230b95b2904cb975167d03ee13a2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 24 20:34:46 2008 -0800
Simplify filename generation code for Xorg -configure
commit 75784e1e53ad78e21518696dd9d297bc08c17d54
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 24 20:32:20 2008 -0800
Solaris: Make KDSETMODE failure non fatal, and retry it on interrupts
commit 3e6da1636093d7dc98baac40544c0b0fb7fd8aec
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:55:57 2008 +1000
include: remove ENTER_LEAVE_SEMAPHORE macros.
commit b292a7a2d7e259177e1cc37346c2bee27a018630
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:44:29 2008 +1000
dix: updated enter/leave core event model.
As proposed by Owen Taylor [1], the enter-leave event model needs to adjust
the events sent to each window depending on the presence of pointers in a
window, or in a subwindow.
The new model can be summarised as:
- if the pointer moves into or out of a window that has a pointer in a child
window, the events are modified to appear as if the pointer was moved out of
or into this child window.
- if the pointer moves into or out of a window that has a pointer in a parent
window, the events are modified to appear as if the pointer was moved out of
or into this parent window.
Note that this model requires CoreEnterLeaveEvent and DeviceEnterLeaveEvent to
be split and treated separately.
[1] http://lists.freedesktop.org/archives/xorg/2008-August/037606.html
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 724f83b87bb16472d4c328e35d2a477384b29f84
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:29:01 2008 +1000
dix: add FirstPointerChild, FirstPointerAncestor auxiliary functions.
FirstPointerChild: Return the first child that has a pointer within its
boundaries.
FirstPointerAncestor: return the first ancestor with a child within its
boundaries.
These are required for the updated enter/leave model.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 7d3e595f93dcd3d334e766a9dea602c05affdbaf
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:27:19 2008 +1000
dix: Add EnterWindow, LeaveWindow, HasPointer auxiliary functions.
These replace the ENTER_LEAVE_SEMAPHORE_* macros. Unused currently.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 6bdc963cdabb4a2e77de7f00a1d062aa2b873f9b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:37:35 2008 +1000
dix: split enter/leave event handling into core and device handling.
Device events always need to be delivered, core events only in some cases.
Let's keep them completely separate so we can adjust core event delivery.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 5e48f5e2dd2dec7cfd1fa40b61e25123dfca515e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:41:59 2008 +1000
dix: remove unused EnterLeaveSemaphoresIsset.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 868fd503b7aeab31dba72046b59061008d8b7501
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:18:56 2008 +1000
dix: move Enter-Leave related functions into new enterleave.c
Preparation for the new core enter/leave model.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit c4b9ab6bf56139fdd8c7c584a6f523c6766cddd6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 29 08:29:42 2008 -0700
Handle transform failure when computing shadow damage area.
PictureTransformBounds can fail, when this happens, damage the entire screen
so that the shadow gets repainted correctly.
commit 9c7679240ad90367693a462e288308b3fdc08f26
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 30 19:05:07 2008 -0700
[randr] don't try to compute crtc transform when no mode is set.
Dereferencing the NULL mode pointer would cause a crash. As these transform
matrices won't be used while the CRTC is disabled, just leave their values
alone.
commit 315b6d0a425d0257f226ee7032aca3ca31665e59
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 27 11:46:39 2008 -0700
Update RandR global transform when driver notifies of transform change.
Need to compute and save the global transform when the driver changes it.
commit 5d9282fde919c936816a85c2a9c5734dc9d57cc2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 27 11:45:53 2008 -0700
Export rrtransform.h as needed by randrstr.h
When the transform management was moved from randrstr.h, the associated
header file became necessary to build drivers. Include it as a part of the
sdk headers.
commit 7236fd9dd4e9f5c4cb5bafa5c2a18cff12a0444c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 03:16:09 2008 -0700
Be careful about copying transforms around; they have allocated memory.
commit 7e69e364d2ef146d8ec3651d04bdd6d641017449
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 03:15:00 2008 -0700
Fix rotated/reflected cursor positions.
Doing projective transforms required repositioning the cursor using the
hotspot, but that requires relocating the upper left corner in terms of said
hotspot.
commit 93179c214fc6ed88f72955a11c69ae0a47316d8c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 03:14:47 2008 -0700
rrtransform needs randrstr to get RANDR_INTERFACE defines
commit 7c61db66a470a8306e346ed8bf8934f014dada42
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 02:39:49 2008 -0700
Create rrtransform.[ch]. Add RRTransform argument to RRCrtcNotify.
Instead of using a separate function to notify DIX about transform changes,
add the transform to RRCrtcNotify so that the whole Crtc state changes
atomically.
commit fa6a1df209bd74da1d545982cca437afc2198cc1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 02:35:28 2008 -0700
Avoid overflow in PictureTransformPoint. Fix PictureTransformIsIdentity.
PictureTransformPoint computes homogeneous coordinates internally, but fails
to handle intermediate values larger than 16.16. Use 64 bit intermediate
values while computing the final result at 16.16 and only complain if that
result is too large.
PictureTransformIsIdentity was completely wrong -- it was not checking for
identity transforms at all.
commit 6fe9c15731be5f5afabacb3aa3ed71b840f4238b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 19 12:15:39 2008 -0700
Allow drivers to set crtc transforms.
Track curent transform down in the mode setting code so that it may be set
separately from RandR.
commit 49db14e4ac26070ed86088419483888dda18b603
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 19 00:46:35 2008 -0700
Handle RandR transform matrices in floating point.
RandR matrix computations lose too much precision in fixed point;
computations using the inverted matrix can be as much as 10 pixels off.
Convert them to double precision values and pass those around. These API
changes are fairly heavyweight; the official Render interface remains fixed
point, so the fixed point matrix comes along for the ride everywhere.
commit 6f734aecaec4f5c6152c3ebca197ef65bb4523da
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 16:06:06 2008 -0700
Eliminate inverse matrix from randr transform protocol
It is easier, and potentially more precise, to compute the inverse in the
server where everything can eventually be kept in floating point form.
commit 197aa784694992f6bcfd194932309e440334c237
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 15:35:44 2008 -0700
Report whether transforms are support from driver through extension to client
Add APIs to xf86RandR12 support and randr extension to record whether the
driver supports transforms, report that value in the RRGetCrtcTransform
reply.
commit e86c34663ef97e946a1129450105efa89a123af6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 15:25:31 2008 -0700
Clear shadow pixmaps before using them.
This eliminates some ugly flashing, as well as clearing the borders when the
shadow will not be completely painted.
commit 97ab0c6eff870b52c0383b63a78cec49059b2545
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 15:15:40 2008 -0700
When converting from double to fixed, round carefully.
This reduces the matrix representation error after inverting a
transformation matrix (although it doesn't eliminate it entirely).
Perhaps we should extend Render to include 64-bit floating point transforms...
commit 6d3a9e40a4b9ec455af11cce31e4aa616c93db32
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 23:04:49 2008 -0700
Compute matrix inversion instead of using wire version in RRCrtcTransformSet
It doesn't make sense to have the client invert this matrix when the server
can do so reasonably efficiently. This avoids weird fixed point rounding
errors when testing the transform against its inverse. Now to fix the
protocol.
commit 160252d94f04acc95f0a4e0f884ff565a5aa0744
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 23:03:56 2008 -0700
Add matrix inversion function (uses doubles)
The obvious matrix inversion function, coded using doubles to avoid fiddling
with fixed point precision adventures.
commit 8fd82c88e3f2060fda4ba30376900ece77668c63
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 16:14:43 2008 -0700
Adjust transformed cursor position to account for hotspot
commit eb222e64128034df8361d5a82d4f4aa1318923ce
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 16:14:15 2008 -0700
Actually use filter kernel size to expand transform redisplay box
commit 3fdb963f6e8287edeb4c5bc7bbadbc02eb8bb910
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 16:13:25 2008 -0700
Correct bilinear filter kernel size (should be 2x2)
commit ee6326a6b89b2d223f6e1eaf02aac1fe8aebfaf6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 15:22:06 2008 -0700
Handle filter widths in xf86Rotate
commit ddc8466137d229fdc100cc403f492c7d61a1ba89
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 15:21:26 2008 -0700
Initialize and cleanup new filter fields in xf86Crtc.
commit 16c093afd4f6b30d889cacdc994b0024f9bd83d5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 15:20:52 2008 -0700
Pass filter kernel size through transforms
commit 1df02d7ddd44f84bcaefd6583af1a9141cb3c78b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 15:19:17 2008 -0700
Add kernel size to Render filters.
This width/height value lets filter users know how far the filter spreads
into the source image.
commit 40f3dff6b350fe0be55ebf7dbca88a0ef8f6380f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 13:57:47 2008 -0700
Use transform when computing scanout size of modes
Report transformed crtc sizes through RandR and Xinerama. Test screen size
against transformed mode sizes when configuring the Crtc.
commit f50349e1930e620cacdf27a6f8585fcb9cb5199a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 15 00:36:45 2008 -0700
[RANDR] Support filters in CRTC transforms.
Create new RRTransform datatype to hold all of the transform related
information, use that in lots of places to pass filters around.
commit acda790e430b2a18c7c35379f6e538f3d01ff221
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 14 13:46:30 2008 -0700
[render] Split out filter finding from filter setting.
To prepare for RandR using filters in transforms, split out
code paths so that the RandR code can validate the filter name and
parameters during the transform set operation so that use of the filter
later will not have unreportable errors.
commit e3d6f279d5c305dfb81ca109fbfb665870712d2f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 21:31:12 2008 -0700
Wire up RandR CRTC transform protocol, bump server to RandR 1.3
This involved removing a pile of matrix code from the DDX,
as well as moving a bit of transform logic from DDX to DIX.
commit ff9d1cd843a9b0aba69a3d788b21d5f6af702590
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 21:30:18 2008 -0700
Add funcs to convert between protocol and pixman matrices
commit c2f254da694731ea573aa8bbc2707c083743f2d4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 21:29:19 2008 -0700
Randr now depends on Render for matrices
commit f547650328287545a7a4d96df8d6a6c606dd95a9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 14:50:13 2008 -0700
Export a bunch of matrix operations from render.
The render extension uses many matrix operations internally, this change
exposes those functions to other parts of the server, drivers and
extensions. The change is motivated by the 'transform' additions to the
RandR extension but will likely be useful elsewhere.
commit e063162e80e51ed4368874b3af7ba690ea280d9e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 14:26:01 2008 -0700
Add projective transforms to RandR DIX/DDX API.
New RRCrtcGetTransform function in DIX that DDX can use to get the pending
transform. The DDX code should be complete; the DIX code is just a stub at
this point.
commit 9c7ac47b871a71e42d2f6933749ca462f1a65b40
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 4 00:10:08 2008 -0800
Notify DRI when crtc regions change
Drivers that care about crtc positions on the screen to ensure that vblank
works correctly need to be notified when crtcs are changed.
Provide a hook in the mode setting code that is invoked whenever any
configuration is done to the screen.
Use this new hook in the DRI code so that DRI clients are notified and
receive updated information.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 554592cd70543f87cd8bee5ff47cc8281511e041
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Nov 24 11:50:38 2008 +1000
DGA: silence compiler warning.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 0dbcbd35f63db14734199a0beb2a91b6937f3838
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 21 12:02:02 2008 +1000
xfree86: Split the working code of NIDR into new xf86NewInputDevice.
The xfree86 server previously hat NewInputDeviceRequest and InitInput, and
both basically did the same thing. Reduce NIDR to parameter checking and use
xf86NewInputDevice from both InitInput and NIDR to actually create the device.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e078901a4eca02bd3e7a80d9462dafbca939a187
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 21 12:39:55 2008 +1000
dix: Enable core devices in InitCoreDevices already.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d939f2482e71ad20bac28b7aa4b2e8c8196e9d65
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 21 12:21:45 2008 +1000
dix: fix false comment.
VCP and VCK are always present, this comment is a leftover from earlier MPX
days.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 387563b77743d92be83420d982eaf57f5459a883
Merge: 85f650c f6e01fa
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Nov 23 13:15:46 2008 +0100
Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver
commit 85f650c9b76ab2e244f01908a7941c320635becd
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Nov 23 13:14:27 2008 +0100
missing action in if statement.
commit f6e01fa1b87ea190ea5ad723ce46893784ea1de4
Author: Stefan Dirsch <sndirsch@suse.de>
Date: Sun Nov 23 11:16:03 2008 +0100
Added '-showopts' option to print available driver options (#5564).
commit 8964b8d0ec2b7b3b6bf540cd647b14a20e8f64a5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 14:23:23 2008 -0800
XQuartz: More 1.6 server API updates
commit ad0f232165fe1a25ca4fb6da817da02b6ce31779
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 14:04:28 2008 -0800
XQuartz: Fixed --disable-glx
commit 8e2287c220694953e972cd5119c2b0cd256b7a30
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 13:57:45 2008 -0800
XQuartz: Updated some code to use newer server API
commit 6eb33bc0cb2e62339d323e1f1894015d7e3142f3
Author: George Staplin <gstaplin@apple.com>
Date: Sat Nov 22 11:37:08 2008 -0700
XQuartz: GL: Remove the inclusion of glcontextmodes.h.
Add some commentary about future directions needed for the GLX drawable
creation and destruction code.
Match xalloc with xfree.
I made some minor formatting improvements.
(cherry picked from commit b772d64fce31d16b498c621096e39d5203994d6e)
commit 429b4b20d5708d608fd55f91dd5bcd4ac0b51a12
Author: George Staplin <gstaplin@apple.com>
Date: Sat Nov 22 10:57:58 2008 -0700
XQuartz: GL: Add a branch to prevent a NULL DrawablePtr structure access.
In attach() check for pDraw being NULL, and also print an ErrorF message,
because we eventually want to track down why this is occuring.
It's unclear how this occurs, but as I noted in the 1.4 branch, I believe that
the DrawablePtr/struct _Drawable -> id is the member being accessed that causes
KERN_PROTECTION_FAILURE at 0x0000000000000004
This passes my tests using: env LIBGL_ALWAYS_INDIRECT=1 ./sometest.
I fixed a warning: caused by initializing the screen->base.visuals with the
configs. It is a ** not a *. It seems that some other part of GLX will
initialize this for us.
(cherry picked from commit 17f6a261fca6d5856069dce28bb4838261afc6bc)
commit bc0c7075e29b1719409cf7de8a4ab9ae1315aa67
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Nov 22 19:10:09 2008 +0100
Remove the old libusbhid copy from os-support/bsd.
This has been replaced by in-kernel support for USB mices several
years ago and hasn't been enabled in build since X.Org 6.8.
commit 76fcfc480133726112049e5bd9c3082d46825918
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 20:25:55 2008 -0800
XQuartz: GLX: sync up indirect.c to match George's updates in the xorg-server-1.5-apple branch
commit 1a717779b67b9c1cdf734eef64135ac38829f726
Author: George Staplin <gstaplin@apple.com>
Date: Fri Nov 21 17:28:11 2008 -0700
XQuartz: GL: remove glcontextmodes.* from the Makefile.am. It has been replaced.
The new replacement is __GLXconfig.
(cherry picked from commit 3bed9b65c807a1aeb662b8042826cbb54280181d)
commit dacad9ae0bdaedff9403fbe84a5c5a4b4eef3542
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 21 17:16:22 2008 -0800
Xephyr man page typo fixes.
Also trailing white space removal to clear git warnings.
commit ca64b5949d229a60a3c62b6d29d51873b7694bd6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 11:20:31 2008 -0800
XQuartz: Don't use LS to find X11.app on Tiger.
(cherry picked from commit e62107e55261ef252a2a24dd26a60e5dd295d560)
commit 701f8e3a94d2b659ebcfffd09acd1d66f9e797b8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 11:08:00 2008 -0800
XQuartz: Update applewm deps
(cherry picked from commit 0ad91c59be8759a9c9e9d4f639056d8c689a3bc5)
commit 393325f908f8bd6648e466183f3683a2d80b264e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 10:57:31 2008 -0800
XQuartz: spewCallStack is noop on Tiger now...
(cherry picked from commit 56c469a68b92c6cf003802f418ea00bd596a41c3)
commit 5d47a5d6526b7e52387647a15a580dfcafd1733f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 10:54:55 2008 -0800
XQuartz: pbproxy: Added some typedefs for types not available on Tiger
(cherry picked from commit 0947aa7911f1de44bfe16e505a757b659c5ab2a8)
commit b262788401715787c68cea4ca79f4b270307afee
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 10:53:39 2008 -0800
XQuartz: More Tiger ifdefs
(cherry picked from commit 803509072f2c039e5cd555c4ac14d672f0e698c5)
commit 510744444329170f702d31d43997a6bbc1591b44
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 10:44:11 2008 -0800
XQuartz: Resurrect the old audio path for Tiger
(cherry picked from commit a61a8d9047e8765faf3892f4f2148c8553fd192c)
commit d7ee76f9dd84da05b59591a971b96bf990136767
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 19 11:42:59 2008 -0800
XQuartz: pbproxy: Push the pbproxy Xevent processing into its own thread
and just have the AppKit thread wake it up.
(cherry picked from commit 799715b8f3327c8da59ab45706e85af2d2c438e4)
commit a9e20306fbe3262602f21b876a52a1ef38cdf20a
Author: Egbert Eich <eich@ovid.suse.de>
Date: Fri Nov 21 18:50:01 2008 +0100
int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ranges.
When the linux kernel sets the NX bit vm86 segfaults when it tries to execute
code in memory that is not marked EXEC. Such code gets called whenever
we return from a VBIOS call to signal the calling program that the call
is actually finished and that we are not trapping for other reasons (like
IO accesses).
Use mprotect(2) to set these memory ranges PROT_EXEC.
commit a54153e669fd293a47f0077bf25505dd545ddce2
Author: Rémi Cardona <remi@gentoo.org>
Date: Fri Nov 21 16:39:00 2008 +0100
xfree86: don't reset Auto(Add|Enable)Devices, use defaults from xf86Globals
Without this, commit ace38fafb062372dcd3d56378b5b8f86525c6241 is useless
when HAL support is disabled.
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 6a1b2fed7e465a9c652e8ee250b8eab440945862
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Sep 28 12:18:16 2008 +0200
Add a man page for Xephyr, with information from the README file.
commit 10d472bf9d61bef32d0a383b2e3783e7a1d7621f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 05:15:30 2008 +0200
Support for BSD apm
XXX check amd64 pci init
commit f4e725f248870a2de10449cc8f53de32e7840d45
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Nov 20 13:51:15 2008 +1000
dix: memset DeviceVelocityPtr to zero.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7f818776b7a19bd6100596d327ecaa69be317bc6
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Nov 19 15:05:50 2008 +1000
dix: fix typos in comments, one formatting fix.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 037ec5a3c496b07f885a128828ef804b3aa8eee2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 19 15:12:04 2008 +1000
gitignore: ignore .patch files
commit ace38fafb062372dcd3d56378b5b8f86525c6241
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Nov 18 08:19:45 2008 +1000
xfree86: without CONFIG_HAL, Auto{Add|Enable}Devices and AEI is false.
There's little chance that we'll get the input devices at runtime without HAL,
we might as well force the server to add mouse/kbd devices automatically -
just like in the olden days.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 1cd894173ee7fa3d1a78d330c12453ea53e7b908
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 19 13:44:26 2008 -0800
Always use server-<display>.xkm to avoid races when multiple servers start
Previously each server starting ran xkbcomp with the output set to
<keymapname>.xkm, read it, then deleted it - which led to races if
two servers were starting at the same time with the same keymap.
Sun bug #6773816 Xorg uses the same xkm output file for compiled keymap file
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6773816>
commit 1e4412abc499b9938bbac8a3ecd82f7f12d448d9
Author: Rémi Cardona <remi.cardona@lri.fr>
Date: Mon Nov 17 09:56:49 2008 +0100
drop unused HAVE_LIBDRM_2_2
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit c4ec71b405fcb5132d5089e3f8dd7b00c235265a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 16 17:57:46 2008 -0800
XQuartz: pbproxy: nuke RCS Id, update header license/copyright
(cherry picked from commit 477c6968a88429bb9c10222a5836bdc936d10ab1)
commit 42f330cf9ef44aea7428a67d282dfb1a60196e55
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 16 10:42:03 2008 -0800
XQuartz: pbproxy: Remove thread-main.m
it got accidently added and isn't used.
(cherry picked from commit cb6ffce68a2d10022fa92725d2d1837da4b3b89f)
commit 19aac4274bbac55ce944acfaf3274a4403fe392e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 19 10:55:29 2008 -0800
mi: Push screen-saver/DPMS handling to after the EQ pop operation.
This way we on't need to hold the mutex during the dixSaveScreens() call.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 56d1793c435abbaababab031860f1160f09fff06
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 19 10:54:57 2008 -0800
mi: Only increment tail (push) when the event data is actually in the queue
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 570835b9a89187a36e08defbccc56051bb349b52
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 19 10:19:20 2008 -0800
Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
Depends on commit 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95 to get
definition of xf86InitVidMem on Solaris.
commit 3932a848572f4eaf8b7f1d91d9b74aeafab069a2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 18 14:21:01 2008 -0500
Xinput: use floats for ConstantDeceleration and AdaptiveDeceleration
These values need not be constrained to integer values.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 08cd361234ed0410f67342f46ae01120c4fe3331
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 17 10:28:48 2008 +1000
exa: avoid doing prepare/done without intervening copies in exaFillRegionTiled
This does a precursor check to make sure the copies are required before
entering the prepare/done code.
commit 8f8a9c19ad58768b07461a3f4bccea98f7c4f958
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 17 10:24:39 2008 +1000
EXA: avoid copy operations if no boxes in use
Simple fix for now, I'm sure damage shouldn't be calling us with nbox = 0.
commit 03f7a66a1ae3f522a49bcc783066d53d69c97262
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 15 19:45:49 2008 -0800
XQuartz: Don't use TIS on Tiger...
(cherry picked from commit be8ac84c15e7e76c581b9e75cda74139394aa4c7)
commit e8112784e8ef80a96ed54eca7e148b424001a38f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 15 19:52:34 2008 -0800
XQuartz: Integrated xpbproxy into the server.
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 42944936326ef8732f622db9f75b79a92980550d)
commit 24928b85dc996c8d0a052ddf383df25718ee5305
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Nov 15 13:28:53 2008 +0100
DRI2: Don't crash in DRI2ClipNotify when DRI2DrawablePtr is NULL.
commit e5271c374715dd4e9a724ab3e5f77108d4ce8c23
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Nov 15 13:27:42 2008 +0100
Set libdrm flags correctly even when only DRI2 is enabled.
commit bc4f804cd86497655f6765b0954e64dc959939e3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 14 15:13:22 2008 -0800
XQuartz: Actually add glcontextmodes.[hc]
(cherry picked from commit 763195d338345e3637d112279bdbe002b6e7791a)
commit aedafbea0e1c7bc780ebe7ae878f62525769aca8
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 20:21:24 2008 -0700
fix compilation on systems that don't have
XP_EVENT_SPACE_CHANGED defined
(cherry picked from commit 6e833e41e2f3a84f7e5164b918737b3975517c12)
commit b0789365719f48c0b477b4703f2072f932246b76
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 14 14:57:09 2008 -0800
XQuartz: Initial work on readding GLX to the 1.5 server
(cherry picked from commit a186cab6ae82340770c13b37ff5df731ce2a0ceb)
commit 1d7049f8fd3c0798250b9213149d3ce0b37ab77f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 13 12:45:35 2008 -0800
Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
(cherry picked from commit 7dff93ec1ac92aeaf3b70d5cfe787fa4a28c0dba)
commit 3c124832642f1ec3228a57bea3d1eda68a188ff3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 10:37:17 2008 -0700
XQuartz: Made X11Application.m a little more tidy.
(cherry picked from commit 3520386261b838196a8918e8bee16bdccbc9781d)
commit e917806fc556c2054b2835c8f85770b554c78092
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 14 10:56:21 2008 -0800
os/connection: TRANS_NOXAUTH bit comparison brainfart fix.
https://bugs.freedesktop.org/show_bug.cgi?id=18524
commit 17bccff4ce905f46c074fd8ee7c6567b1371a0a1
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Fri Nov 14 12:36:20 2008 -0500
[dix] Remove a duplicate statement.
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit ba4e08244ed3923eecf26842dfc1df17c696e053
Merge: 81fd17f 5bad5d2
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Nov 13 15:04:18 2008 -0500
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/./xserver
commit 81fd17f5f49cdd2c10d0bf3b7ddeb8b5953886a5
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Nov 13 15:00:30 2008 -0500
Only add default modes if EDID supports continuous-frequency
When an EDID is present, only add the default mode pool if the
continuous-frequency bit is set in the EDID. Should fix bugs
like 18512.
commit c232f3d673fb00d7fceb8e82741349d64e5ac0ad
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Nov 13 14:58:21 2008 -0500
xf86TargetExact should try harder if there's only one monitor attached.
If there's no preferred mode, but only one monitor, pick the
biggest mode for its aspect ratio, assuming one exists.
commit 5bad5d2abea2f51cbf53dc8dd016e90ccb086220
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 13 11:32:40 2008 -0800
XQuartz: Fixed XBell() when not using system alert.
(cherry picked from commit aa0e9ab1c7a226cdcb3c5e62be159355a290faf8)
commit 0fca8588a238c91580b305c3671567e910150a02
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 13 11:10:15 2008 -0800
XQuartz: Added more debugging to handoff spew
(cherry picked from commit acefa7e3c8706ffedc052effd50b36ce10e72c22)
commit 47d38218706564d1437dc3ff9d1bba3511db063c
Author: George Staplin <gstaplin@apple.com>
Date: Wed Nov 12 17:17:25 2008 -0700
XQuartz: GL: Handle the alpha differently when the alpha is equal to GLCAPS_COLOR_BUF_INVALID_VALUE.
This prevents visuals with odd sizes. The machine I use didn't have
this problem, but it shows up on some others.
(cherry picked from commit ed181382ddeb77019577d39b9c06b1cd839e18e4)
commit 6b501d7cc55f1d06966cdf3caf36bcfc6cf18939
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Nov 13 13:57:30 2008 -0500
Add missing newline when printing edid info
commit 33edd32702d963802e64d382124eabb9d0352fa8
Author: George Staplin <gstaplin@apple.com>
Date: Sun Nov 9 18:35:10 2008 -0700
XQuartz: Disable 2 calls to miSetVisualTypesAndMasks that seem to be unnecessary, and possibly wrong (with regard to masks and bits per RGB).
Use the settings queried from the system in xprScreen.c, rather than those 2 calls.
The 2 calls increased the total number of visuals a great deal (when using GLXEXT),
and not all of the visuals were usable with GLX. Some of the visuals aren't usable
with GLX still, such as DirectColor, but that seems to be acceptable based on my
understanding of the manual that states "a subset of visuals are made available
for OpenGL rendering."
(cherry picked from commit 373b8a5f32509722e06d8776109e6c3f06645ee0)
commit 1523476afa6657c20eba112e3ee051d45e721164
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 8 23:32:40 2008 -0800
XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
(cherry picked from commit 54d20f6d33c347bcb37a0a8287c2d92fed2b9092)
commit 1f301a0051d65296189248b2529616d9b33276b3
Author: George Staplin <gstaplin@apple.com>
Date: Thu Nov 13 01:27:33 2008 -0700
XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
It was returning inverted values in comparison to the 1.4 branch. This resulted in
the windows not drawing due to a deep path of: RootlessReorderWindow ->
SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow ->
AppleWMDoReorderWindow.
(cherry picked from commit d1d398db762fe7d5720f9b5fafa2bbe8372fceac)
commit f5841e96487234df5ead5f5c0fb3c587c418cb46
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Nov 11 22:50:35 2008 +1000
dix: don't store enter/leave and focus semaphores in a devPrivate.
We need them for each window, every time a window is allocated. Storing them
in a devPrivate is the wrong thing to do.
This also removes the unused ENTER_LEAVE_SEMAPHORE_ISSET macro.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 26f701704b4e536cd91bd8a9f7d2194793471998
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 12 16:53:29 2008 +1000
dix: remove duplicate line in EnterLeaveEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 8ff62ea5ba1bc331c886840b2b1e101cb4f2ebed
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Nov 12 15:19:09 2008 -0500
CopySubBuffer expects GL style coordinates.
commit d91243beb63008fff2ce6affa7db091786e8c49a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 7 08:39:38 2008 +1030
dix: formatting fix.
commit dde09076c5c0c36a4a9321cd23a2c7922c4c755b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 5 12:52:03 2008 +1030
dix: remove superfluous variable devgrab
grab == devgrab anyway, this is a leftover from the time when we had two
different grabs per device (core and XI grab).
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit fc3e8bfb82323477b54181c6d546c90f53f1ebd8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Nov 4 15:27:30 2008 +1030
mi: clean up mieqProcessInputEvents, copy all events before processing.
Copy the EventRec's information into local variables before processing them,
this should make it safer for upcoming threading and also makes it easier to
read.
Simplify the event allocation code from the abyss it was before.
This also fixes a potential bug where a custom handler could scramble the
event before the same -now scrambled- event was then passed through the
master's custom event handler.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 31005efb1bb6be5a892ff905f754109dc3fa8fe6
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Mon Nov 10 13:23:45 2008 -0500
input: Remove useless conditional.
commit 24383056d0513cc588cee5cee78f1cba2c0fbe89
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Nov 8 13:04:20 2008 -0500
Don’t recommend fixing HAL if HAL support is disabled.
As reported in http://bugs.freedesktop.org/show_bug.cgi?id=18438
the server suggests reconfiguring HAL if AllowEmptyInput is enabled
and no input devices are known.
Instead of that notice, if HAL is disabled at configure time,
AllowEmptyInput is enabled in the config and no input devices are
found report those facts and recommend disabling AllowEmptyInput.
commit b3c7e62664457a3802ebc23785446051624a8c2f
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Nov 8 12:18:13 2008 -0500
Remove some null statements.
Remove several doubled statement-terminal semicolons.
Reported by Fernando Carrijo.
commit 21c116219cd5c6845a0955f2d88fdb5fab5c17cf
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Nov 8 01:25:14 2008 +0100
Fix typos which caused exaCompositeRects() to use an incorrect damage region.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=18065 .
Also, it can bail if either width or height of the bounding box is <= 0, not
only if both of them are.
commit 59f9fb4b8c031df69b3592a26b77e744ff4a556e
Author: Luc Verhaegen <libv@skynet.be>
Date: Fri Nov 7 19:11:11 2008 +0100
XAA PixmapOps: Sync before accessing unwrapped callbacks.
When using any XAAPixmapOps, we call into unknown but freshly
unwrapped callbacks (like fb ones). Unlike the XAA*Fallback calls,
we did so without syncing first, exposing us to all kinds of
synchronisation issues.
I believe that the rendering errors appeared now because *PaintWindow
vanished (e4d11e58), and we just use miPaintWindow instead. This
takes a less direct route to the hw and ends up at
PolyFillRectPixmap, which very often left drawing artifacts.
We now sync accordingly, and no longer get the rendering artifacts i
was methodically reproducing on radeonhd, radeon, unichrome...
Also, in order to allow driver authors to remove extensive syncing
or flushing to hide this issue, create XAA_VERSION_ defines, put
them in xaa.h and bump the patchlevel.
(novell bug #435791)
commit 991c88b7542164194be73573e7644164416ea90c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 7 17:36:38 2008 +0100
xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags
When setting the depth to 24, leave bpp unset so the logic to pick
a supported value is used instead of ignoring the driver's preference
and forcing 32 bpp.
commit d3d6be4948fa19947fd3b03e6694247109cc0ffb
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 7 18:36:00 2008 +0100
mi: Fix infinite loop on regen when swrast_dri.so is missing
The swrast DRI provider gets pushed on the glx provider stack at every
server generation, so the stack turns into a circular list on regen.
X.Org bug#18388 <https://bugs.freedesktop.org/show_bug.cgi?id=18388>
commit f59352881f315a634f60c9aac885b2764b28b167
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 6 14:41:55 2008 -0800
XQuartz: Make LS parse our version properly... it didn't like our CFBundleVersion
(cherry picked from commit 980df1b4ff7d4dab9dc1462dc086542265b1fb1b)
commit b4ca9dc2393ace2415163094b916f0d17ecba9ee
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 5 21:58:04 2008 -0800
When HAL returns a NULL property, print "(null)" instead of a NULL pointer
They've promised to fix Solaris printf soon to check for NULL pointers
instead of segfaulting, but that won't help people on existing releases.
commit 13d06f5aaf6120c902a323649615c1ce3d1b5359
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Nov 4 12:53:12 2008 -0700
XQuartz: GL: Add capability detection for depth buffers, and multisampling.
GL/capabilities.c: Add handleDepthModes(), and extend
handleRendererDescription() for the various depth and multisampling flags.
Add initialization of the new config options to initConfig().
GL/capabilities.h: Add depth and multisample config members.
GL/visualConfigs.c: Add depth and multisampling support to the visual config
setup.
(cherry picked from commit f527381eea6a8ae6cd791475b2060d21fcf8efb2)
commit 34bb06b292dc8b07d8602941aab3e69a73811314
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Nov 3 19:52:48 2008 -0700
XQuartz: GL: Work around problems with really deep visuals.
GL/capabilities.c: #if 0 (for now) any capabilities above 8 bits per channel,
because they introduce drawing problems.
GL/indirect.c: Comment out some visual setup code that shouldn't be running, and
actually seemed to cause some problems. The current visualConfigs.c code seems
to do a reasonable job of setting up visuals for XQuartz.
GL/visualConfigs.c: Make use of the proper visual .class. Eliminate depth 0.
It seems we really just want 24 for now, and 0 I think was a flaw in the original
code.
(cherry picked from commit 1e5f63f15e13a40a6e69a1505934d10d6990b6a2)
commit 39e82a9b1250b23768136f3c397377a97f8b908c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 2 15:52:22 2008 -0800
XQuartz: Replace deprecated API usage thanks to Robery Murphy
(cherry picked from commit 71dd052412400362793f2f0c7c02bf4f4309738c)
commit b4db46320a437ba8894cb8cfd4ee3abdcc894b01
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 20:18:27 2008 -0700
XQuartz: version string updated for 2.3.2_beta3
(cherry picked from commit 81bb4128570b44d779126a8dffcd3c5620747383)
commit c9051b684b524549eab6d5b88ee3e195a6f6fbe8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 5 18:25:57 2008 -0800
Use OsSignal in Popen/Pclose to avoid SysV signal() stupidity
commit d63ea510138c8b6de66184c78cda39ed9981fc1f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 5 14:52:29 2008 -0800
Non-Linux OS'es should default to kbd driver, not now-dead keyboard driver
commit 446d9443cea31e493d05c939d0128a8116788468
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 5 11:51:06 2008 -0500
linux: Drain the console fd of data when using evdev for keyboards
Works around a silly bug in the kernel that causes wakeup storms after
too many keypresses. Should fix the kernel bug too, but this at least
keeps the idle wakeup count below 1000/sec.
commit 6d21fbf00648307208146aca0837ec63ea490659
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 5 11:39:46 2008 -0500
kdrive: Bye bye Xvesa
commit 9a874a71a791c6110fd57b8a5c083f777a446d0f
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Nov 4 21:31:27 2008 +0100
DDX/RandR: When positioning outputs assume width/height = 0 if no modes exist.
When a user specifies the position of an output for which no modes exist
(for whatever reason) assume that the width and height of this output
is 0. The result will be the same as if this output isn't taken into
consideration at all and thus should be sane. It will prevent a segfault
when trying to determine the width and height of a non-existent mode.
commit a4d62bbf215894bad8e19d99f7330c637d3d49e3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Nov 4 11:27:53 2008 +0100
AIGLX: Reinstate call to driver texOffsetFinish hook.
It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this
is a regression fix and should probably be backported to server-1.5-branch.
commit 27f1ad466cd9662d638f4a8e59beafc32a8b2a8f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Nov 4 11:26:03 2008 +0100
AIGLX: Don't truncate offset returned by driver texOffsetStart hook on 32 bit.
commit de1a8b68eb10c39a0d4a197107d68d7cc009edb2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Nov 3 11:30:48 2008 +1030
xkb: extract the correct device in XkbFilterEvents.
If the event is an XI event, we need to work on the correct device, not on
the VCK.
Adds XIGetDevice(event) function to extract the device from an event.
commit d97239956667f8181f30271759573b75bf455fbb
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:40:41 2008 +1030
Purge device-based WindowAccess code.
Really, this was a bad idea. It's not security, the UI features that would
have been cool (e.g. clicking through windows) aren't implemented anyway, and
there's nothing you can't achieve just by using plain XI anyway.
Requires inputproto 1.9.99.6.
commit cbc6f983959595aa21c9dd72fac6a7070a650ef7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 14:36:48 2008 +1030
xkb: when faking mouse button events, fake them on the correct devices.
When MouseKeys are activated, keyboard devices may generate fake mouse button
events through XKB. Let's get then running through the appropriate paths, i.e.
as XI events on the correct device.
To make matters more fun, ProcessOtherEvents drops events if the DIX device
state cannot be updated accordingly, i.e. all button events from keyboard
devices.
Hence we need to get the paired MD for the device in XkbDDXFakeDeviceButton,
and post the event through the paired MD (usually the VCP).
Removes now-unused ddxFakeBtn.c.
Note: this patch only half-arsedly fixed button events, motion events are a
more complicated matter.
commit 4971315296cbf868dd738c1c0c1c504fcfe1b619
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Nov 3 17:47:36 2008 +1030
dix: clean up GetPointerEvents and GetKeyboardValuatorEvents.
Split into several functions, remove some stale comments.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 6bb0e0a53656db6168a053fb51b242a8640c1461
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 24 16:22:09 2008 +1030
xnest: I'm sure xfree works fine, even if we're 64 bit.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 67b7e06c4fa4e8dafb64d9f3eb976836d0cc5889
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:39:48 2008 +0300
XKB: Remove pointless macros
These weren't even being used, which isn't overly surprising, given that
they were already in the struct.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit d9ff20e323ba9fb309629ac21946e85709625589
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 23 16:48:15 2008 +1030
DIX: Remove unnecessary prototype
We don't call XkbCopyKeymap from getevents.c anymore, so axe it.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 064ee458c7183eb91ef2e0f262b312ba1e3ad6e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 9 15:54:56 2008 +0300
XKB: Tiny cleanups to _XkbLookupAnyDevice
A couple of coding style cleanups, a warning fix via removing a
now-unused label, and also put an else so we don't spuriously trip a
condition that should admittedly never occur anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 97c9e6a7139e07a0761be05034fae42fcd65ba36
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 28 17:10:28 2008 +0200
XKB: Fix thinko, causing warning (erroneously fixed in 5544c51447)
newTypes is a local variable which always has an address. newTypesIn,
on the other hand, might be sus.
See also 5544c51447f551dfc6df64438873a7ce64743976.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit caf1e6a1c92a2e70de9159f93d6f5b48c202dd81
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Mar 18 10:05:00 2008 +0200
XKB: Move XKBrules.h to the server too
Get our own local copy of this, so we don't have to define XKB_IN_SERVER
anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit f4036f6ace5f770f0fe6a6e3dc3749051a81325a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 22 22:40:44 2008 +1030
Remove XEvIE
It's unmaintained and has been broken for quite a while; MPX finally
smashed it completely.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 8c3753a0b711b5708b61f64ab4010ca01608d679
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 22 22:29:54 2008 +1030
A bit of whitespace cleanup in include directives.
It's #include <foo>, not # include <foo>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 889a8dc02bbd3926eaf16dce8f844dc58558e982
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 22 22:29:54 2008 +1030
Xi: XINPUT has been mandatory for ages
Ditch all #ifdef XINPUT, since it's always built.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 4cf2f4172abc4bf848c1726e6dac535713e08f0b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 3 12:50:28 2008 -0500
Add xf86MonitorIsHDMI() helper.
commit a7951a4dad902edea76a5cd68f833f0e48ae804b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Nov 3 10:00:54 2008 +0100
AIGLX: Allow 2D driver to prevent zero-copy texturing of a pixmap.
The driver can return ~0ULL to achieve this, e.g. if the pixmap doesn't fit
into offscreen storage or if its pixel format isn't supported by the 3D engine
for texturing.
See http://bugs.freedesktop.org/show_bug.cgi?id=17723 or
http://bugs.freedesktop.org/show_bug.cgi?id=12385 .
commit f8af66ddb21b4fb1ae5b4f7f852418ca7b0e7aec
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 20:03:34 2008 -0700
XQuartz: Add option to allow access to the menu in fullscreen mode
(cherry picked from commit 637a9f4bd1ff2b55c870a08ead4940df0f9818e5)
commit c5086badf0387d4d5af10882de90a1faa180550f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 18:58:57 2008 -0700
XQuartz: LP64 related casting fixes from Bob Murphy
(cherry picked from commit ea71710aaa7166ab510abe70f2dc47942de0ead7)
commit 20239a4deebccc9f86586ef6b8ef61311a6fa6a0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 18:58:25 2008 -0700
Rootless: LP64 related casting fixes from Bob Murphy
(cherry picked from commit 40441c4e31167932721a79d7ca572caaa1d36e72)
commit ecd55bc859eb5d7c639d5a6d531d9df524124247
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 15:10:34 2008 -0700
XQuartz: displayScreenBounds uses quartzEnableRootless rather than !quartzHasRoot
(cherry picked from commit c883a78ef0c2e7e29437881db85d3815a89ab874)
commit 4e762b8aa37b588e6cffcdd4a0152090190005e2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 14:39:54 2008 -0700
Rootless: Force initialization of static variable before use.
(cherry picked from commit cece29317269385aa7a0d3047e6f90e6a17d01eb)
commit 9f49f5172d10070ebd4a9e72ac3c5227c6f35853
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 13:00:01 2008 -0700
XQuartz: Silence pointer debug spam
(cherry picked from commit 9ca099e928653b5a0fb745186e17bfcc3d74ccc0)
commit 93298c7f8f73bdb9892da0e41d2c2a67719dc736
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 12:55:46 2008 -0700
XQuartz: Don't map the menu bar to the screen area.
(cherry picked from commit 1115917ada127a1cd6a8b61efe7fd134e2ea85fd)
commit 31907986a6d4dc726d8ce0071f5884ce6cfea33b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 12:37:32 2008 -0700
XQuartz: Fixed Xplugin thread safety issues, so rea-enable background window check
(cherry picked from commit 5fc73b1141eca8b678e54412ca33afa31a76d088)
commit 227d782a1bddfa1393cddd0c73c0288e18645c47
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 30 13:44:55 2008 -0600
XQuartz: GL: Mark visuals that are slower than others, due to lack of acceleration.
This is used in libGL to determine a preferred visual. glxinfo -v will also
report "visualCaveat=Slow" for such visuals.
(cherry picked from commit d5c17f585a240be9f9135975738e62951cde3353)
commit 5287602a4161cd036e3125cda09ba750190a0b47
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 29 17:20:11 2008 -0700
XQuartz: if 0 out a block to avoid thread-unsafe lockups
(cherry picked from commit 60d7359a67900ad4601dbc73e07bcd8c803100a5)
commit 93d7cd31c527afbf26f4e039afb6adbb6a60fab7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 29 17:18:05 2008 -0700
XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
(cherry picked from commit 490756c7fbe0792c4bd6ae434e7a48e0beffa5c7)
commit 0a076b6a7f3c97ff712412eee32e013d3bfd7364
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 18:32:26 2008 +1030
xkb: remove unused label "out", clean up program flow.
commit 971aef64416058665bc903fee39fea1619cd3727
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 17:05:40 2008 +1030
dix: FreeDeviceClass() and friends can be static.
commit 3c3a47d0f5ce7fb9548a3eefee9e72488d3ac279
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 17:00:21 2008 +1030
include: remove unused declaration for RegisterPairingClient().
Matching functions got removed in 004876355b43fb4d3c2bc5653a7dc1bfd3f985ee.
commit 7c5dec9f716962a6e67dba99418061cebe10e1d2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:56:49 2008 +1030
dix: remove unused GuessFreePointerDevice().
Not used since the MD/SD hierarchy was introduced many moons ago.
commit 12599af285a610fb429245798330f2317c75ac2c
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:50:28 2008 +1030
dix: NextFreePointerDevice() can be static.
commit 5d0a945a030cd7626046e9f6c8d5c6bd170649d9
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:29:42 2008 +1030
dix: SwitchCorePointer is long gone, bury it.
commit eb014021c2b3604fc67daebd6860b5dc959fabb6
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:27:58 2008 +1030
dix: PairDevices() can be static, remove from input.
PairDevices() is only ever called in EnableDevice().
commit b6b26560d65d9468c89dd046396d9aeb14e1b227
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:23:34 2008 +1030
Move EXTENSION_BASE and EXTENSION_EVENT_BASE to misc.h.
commit f781a752e642cfe7d08f841b332c3ae507315598
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:16:18 2008 +1030
Move MAX_DEVICES to misc.h, rename to MAXDEVICES for consistency.
commit 245d1c162c7b13c98a9a28dc7ad441366d7e8006
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 11:50:47 2008 +1030
xkb: ProcXkbSetCompatMap should do dry-runs, then normal runs.
Was doing only dry-runs, which kinda explains why changing the compat map
didn't really have any effect.
Fallout from e8c2a3d7c996cb41c4c44ba67acae5ff9438fc06.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 30 20:38:34 2008 -0700
Refactor Solaris mapping code to work with standard shared/vidmem.c
Also merge sun_bios.c into sun_vid.c and upstream Solaris patch to
keep aperture device open, to allow mappings to occur after X server
has given up uid 0.
commit 2809a56b4bc7f09f132c70dc39c6695495351c4d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 30 16:05:40 2008 -0400
xace: Fix an incorrect call to the RECEIVE_ACCESS hook.
commit 0f2fd0577fe2740a32d3a2749e2c3582f891417c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 30 15:35:33 2008 -0400
xselinux: send more specific message types to libaudit.
commit 4ce19b4477057a724b548e342d4c6da2b6721824
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 30 16:02:13 2008 +1030
xfree86: fix xf86ScaleAxis once again.
Maybe one day I stop doing stupid patches like
a3a7c12fcf8e4ac1418f9ea53f76091f309a721b.
So, if X < low, reset to low, and _not_ to high.
If X > high, reset to high, and _not_ to low.
commit f12d7ad1647d12ccf92291ebc0607defe6a634a1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 28 12:38:05 2008 -0700
XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
(cherry picked from commit 183ca5d68b4f34e248749f304ce140de11bd451b)
commit 273df54685768f74ed29926e88a63dc9f86744f1
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Oct 27 22:07:00 2008 -0600
XQuartz: pbproxy: Fix a bug that prevented nedit CLIPBOARD from being proxied.
It seems that we were calling copy_completed: too soon. Now we return instead
of falling through to the free_propdata, and copy_completed:.
(cherry picked from commit 5797d5b662817a3369a74a673f4a7c995cde75cf)
commit 313d87341aff2396645d2c315086d487c0073d27
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Oct 27 20:44:02 2008 -0600
XQuartz: pbproxy: Work around bugs in some apps that aren't ICCCM compliant.
Eterm ends up setting the type of the property to TARGETS, instead of ATOM.
That's why it wasn't working.
(cherry picked from commit 9be5998ede7427f14dd9597e117b3d6b427ba4e5)
commit 9007d3beea2e2d8b271f696d433cb30e32cda401
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Oct 27 16:34:24 2008 -0600
XQuartz: pbproxy: Add code to handle PICT conversion to PNG and JPEG.
This may work, unfortunately I don't have test apps that fail.
The way it works is by using an NSImage class initWithPasteboard:
method, which we then get the TIFFRepresentation of, and convert
to PNG or JPEG.
The TIFFRepresentation uses NSTIFFCompressionNone; which should be
lossless.
(cherry picked from commit 8d048cfa956f4a0860250cc836a6748912b37ad8)
commit b742da0b719198a42a086049771792af84f470ca
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Oct 26 13:17:49 2008 -0700
XQuartz: pbproxy: fixed blocking
(cherry picked from commit bb330a1b1c480e89727fb75ff5aeb71f4afc5ee3)
commit c885110aedc19e551de22a526397d77013c3dfcb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Oct 26 10:22:12 2008 -0700
Xquartz: pbproxy: Some debugging about unhandled mime types... this will spam up quick, but will be useful for a while...
(cherry picked from commit 3647215310f5a52126661b9ec473dcfeed25b40f)
commit e7c26964eef6732c9603b26b7396f95443c5ba8a
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Oct 24 19:12:05 2008 -0600
XQuartz: GL: Fix several error handling mistakes in handleRenderDescriptions, that were leftover before the final code evolved.
(cherry picked from commit fe35a3639081dc78ac6cc4123cde37770f6a39fd)
commit 21ea9d82aab8ff0e0d1904d188f96f9cfb2b051d
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Oct 24 18:11:46 2008 -0600
XQuartz: GL: Add feature detection of color sizes, and accum sizes.
This gives us a *lot* more visuals, and they should be more accurate.
Some of the visuals may have been wrong before. This may enable more
OpenGL programs to behave correctly.
I also suspect libGL needs a little work to handle some of these correctly.
(cherry picked from commit 98a084ce9c455260ecdb5f8eecb67f33dbb53b69)
commit c264826da96ad1859dd112b17eb8aa9e5278478f
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 16 11:22:29 2008 +1030
xfree86: If AEI is on, disable "kbd" and "mouse" devices.
This consists of two parts:
In the implicit server layout, ignore those drivers when looking for a core
device.
And after finishing the server layout, run through the list of devices and
remove any that use mouse or kbd.
AEI is mutually exclusive with the kbd and mouse drivers, so pick either - or.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 6c451859552e1fc78f6589617482f9ff96d7ed8a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Oct 20 12:19:55 2008 +1030
config: don't add duplicate devices through HAL.
If HAL is restarted, the device list is sent to the server again, leading
first to duplicate devices (and thus duplicate events), and later to a
FatalError "Too many input devices."
dev->config_info contains the UDI for the device. If the UDI of a new devices
is equal to one we already have in the device list, just ignore it.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 102c4dac7c521941f52652152b1660cd7f559d56
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 13:17:31 2008 +0100
x86emu: fix sparse warnings
ops2.c:113:18: warning: Using plain integer as NULL pointer
ops2.c:207:18: warning: Using plain integer as NULL pointer
commit ffaaa1a198a77eb6800c08d4613ee1cc0b068ba0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 13:13:21 2008 +0100
xfree86: fix compiler warnings in DoModalias()
The precedence of == is higher than that of &, so that code was
probably buggy.
xf86Init.c: In function 'DoModalias':
xf86Init.c:300: warning: suggest parentheses around comparison in operand of &
xf86Init.c:304: warning: suggest parentheses around comparison in operand of &
xf86Init.c:308: warning: suggest parentheses around comparison in operand of &
commit 66fd05acd6118102aaaebc230d5c03e0758c6089
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 13:11:41 2008 +0100
xfree86: Silence compiler warnings about function prototypes
xf86Init.c:136: warning: function declaration isn't a prototype
xf86Init.c:243: warning: function declaration isn't a prototype
xf86Init.c:249: warning: function declaration isn't a prototype
commit 4b96ba8ddf36f84d4b8c0f2964535bd90477a742
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:56:35 2008 +0100
Nuke unused miBankNewSerialNumber
commit e85d5d707d51d6a1558dfcf0ebd50183b84be39d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:55:50 2008 +0100
Ansify declaration of FontToXError()
commit 30a7a06a9e91a91b8517f67897831c1407713e57
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:38:44 2008 +0100
Nuke prototype for nonexistent function
miDoInitVisuals was removed in commit
94825ad3c72a1c3f6a61199c302841f63241cf87, but its prototype was left.
commit 5244690a5e0285b6243ee1f28ae6c8287a32b73d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:37:11 2008 +0100
Add prototypes for strlcpy/strlcat
commit eadf90aa65d1ea63ddcd74e60e66a79ad567c7e8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:20:33 2008 +0100
xaa: Fix compiler warning (implicit declaration)
xaaInit.c: In function 'XAAInit':
xaaInit.c:201: warning: implicit declaration of function 'miInitializeCompositeWrapper'
xaaInit.c:201: warning: nested extern declaration of 'miInitializeCompositeWrapper'
commit aee514cfb5e5a59b7770699765ccdad8fe42f904
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:16:05 2008 +0100
xfree86: Fix compiler warnings (implicit declarations)
Add missing includes to fix the following warnings:
xf86DGA.c: In function 'DGAProcessKeyboardEvent':
xf86DGA.c:1050: warning: implicit declaration of function 'UpdateDeviceState'
xf86DGA.c:1050: warning: nested extern declaration of 'UpdateDeviceState'
xf86Xinput.c: In function 'xf86ActivateDevice':
xf86Xinput.c:303: warning: implicit declaration of function 'AssignTypeAndName'
xf86Xinput.c:303: warning: nested extern declaration of 'AssignTypeAndName'
xf86Xinput.c:311: warning: implicit declaration of function 'DeviceIsPointerType'
xf86Xinput.c:311: warning: nested extern declaration of 'DeviceIsPointerType'
xf86Xinput.c:324: warning: implicit declaration of function 'XkbSetExtension'
xf86Xinput.c:324: warning: nested extern declaration of 'XkbSetExtension'
commit add946daed531e29935593fb2e7ee70286185baf
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:14:40 2008 +0100
Nuke unused variables
commit f2bda61c03f64133ef68dd1557b26ae7dc5beb0e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:05:13 2008 +0100
Xext: Fix compiler warnings
Make GEClientGone static and include registry.h, to fix the following
warnings:
geext.c:225: warning: no previous prototype for 'GEClientGone'
geext.c: In function 'GEExtensionInit':
geext.c:280: warning: implicit declaration of function 'RegisterResourceName'
geext.c:280: warning: nested extern declaration of 'RegisterResourceName'
commit 24e863b0eb6ff11010a14cfd252a39df87a09d0e
Author: Bernhard R. Link <brlink@debian.org>
Date: Sun Oct 26 00:19:34 2008 +0200
Bug#16501: autodetection of sbus graphic cards
Add automatic detection of the graphic driver to load for sbus devices.
This allows xorg to work on those devices without a "Device" section.
Debian bug#483942.
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit fd97ff1bdd30c358525068a4c833f681e00719a2
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 25 22:54:15 2008 +0200
Bug#5851: Document the "Log" option in xorg.conf(5)
commit 80b6768536fa439bfc5ce948bc8845a6f4af857b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 17:32:32 2008 -0700
XQuartz: Do check_xinitrc() later to avoid possible deadlock.
(cherry picked from commit af95174a088dc787d124ec548b1005f5b67c9e8d)
commit d837d4e2af35a83c7932e4d0422097ebd1f6ba2c
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 23 17:56:46 2008 -0600
XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building. Fix the build.
(cherry picked from commit 6bcbb9ba85d95d7df63811a482abc39c4d595366)
commit 6a2693b2f9cfdec6f30e2ca4c4176f986f97249e
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 23 17:40:23 2008 -0600
XQuartz: Remove the enable_stereo default. We now use feature detection to enable stereo visuals.
We need to revisit the GL/indirect.c changes. I think indirect.c should
be using the same feature detection and GLX visual config code. The
indirect changes will require testing...
(cherry picked from commit 49b7a7c6f20ca85d4d624444eb83db2f91344591)
commit b015a021b28623b7b734833dc9b8269c41db4e8a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 21 20:30:35 2008 -0700
Allow non-gcc compilers to build xf86Xinput.c
commit b7cc6ca22a4ff7a94abee6962a07fdd0b563d26a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 16:33:11 2008 -0700
miext/rootless: Silence some warnings by using proper C prototypes.
(cherry picked from commit 050e46e09efcc7e6f090fa4a749e9076c972b760)
commit b397cc727787a854417b11b482cce4807fc8ab58
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 23 16:19:58 2008 -0600
miext/rootless: Fix the usage of DeleteProperty so that this builds again.
(cherry picked from commit 3de250e28a9a86bcae4464a15c2025805877ce1e)
commit 28d4f71193d2be26d1dcae724067539ac9db1123
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 15:01:03 2008 -0700
XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
(cherry picked from commit 6622efca216663c99d112c7a226bde691d1f3215)
commit 40f9b6bf0dc62098680235a958e0733770902cca
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 23 17:33:52 2008 -0400
Argh, macros.
commit 8b3c278fe7502f9343355f09213837622b0d9ca0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 11:39:04 2008 -0700
Rootless: Properly typed expose_1
(cherry picked from commit 78e874fe17174ac8f61586573edaf7f16ece7b21)
commit 3e999d35c26b0ffb894c257a3057d44b949744bd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 11:37:13 2008 -0700
XQuartz: Honor the Spaces preference for "When switching to an application, switch to a space with open windows for the application"
(cherry picked from commit bf561a06b2bf60395d26026ac7627d0cb254bc07)
commit 75067d12e4f4daa080dfb0209a9abf9c5654271f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 19:36:48 2008 -0700
XQuartz: Added missing semicolons to Localizable.strings
(cherry picked from commit e9fe3f36d9529f00daeefa1379cdd6f01a88f410)
commit a003932dccc438c4500d383982cee2376e808bd5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 11:23:42 2008 -0700
XQuartz: Default dpi to 96 instead of 75
(cherry picked from commit 08a5a333d7fea68146cd9cf50682b811378ab3ce)
commit 2d764e21f278ea26bae135db6dae07b94651951c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 11:19:06 2008 -0700
XQuartz: pbproxy: SIGHUP reloads preferences.
(cherry picked from commit cbc0935ef74ebd76ed3db16d6ab86043eeed42a3)
commit 0b695262176e96f508921905ee7f9cc086c7daf0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 23 15:01:58 2008 -0400
Change some #define foo() -> static void foo()
commit aab73d719a8de6b830e47c7f47860b7990ea8d03
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 23 13:20:59 2008 -0400
Fix previous cherry pick for API changes
commit 8767fc8d47276c7489ae50dd556a446a462776ea
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 4 12:11:14 2008 -0700
Wrap AddTraps in exa and damage.
This fine (and unused) function wasn't ever wrapped which made it not work
under exa.
(cherry picked from commit 06e7e1d0486e8c516a9b3219a2c86026f88825fc)
commit 4c926dbac65ceb699b91bb0d3fd0005a5854572d
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 23 22:07:37 2008 +1030
dix: fix two more endian issues, correct initial "enabled" value. #18111
EnableDevice and DisableDevice both change the property too.
And enabled must be set to FALSE in AddInputDevice, the device is not enabled
yet.
X.Org Bug 18111 <https://bugs.freedesktop.org/show_bug.cgi?id=18111>
commit 084ae9e38812f19751a086eea7ce555761ae5a17
Author: Jerome Glisse <glisse@freedesktop.org>
Date: Thu Oct 23 11:28:53 2008 +0200
dri2: fail at context creation if driver fail to create it's context
commit ff60e592f003d8bc45789a1a14e86be22f5242b2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 23 09:19:41 2008 +1030
dix: don't allow VCP/VCK be disabled through properties.
commit 98f01c2abe4771d76febf8fe70111b2bddfab776
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 23 09:13:41 2008 +1030
dix: fix endianess issue in AddInputDevice. #18111
dev->enabled is a Bool. Bool is two bytes.
BOOL on the other hand is a protocol type and always 1 byte. So copy the value
into the one-byte type before passing it into XIChangeDeviceProperty.
Found by Michel Dänzer.
X.Org Bug 18111 <http://bugs.freedesktop.org/show_bug.cgi?id=18111>
commit f6cbe0326c57e3c9897f17baef78199b06537c44
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Oct 22 18:16:12 2008 +1030
dix: init remaining three xkb fields to zero in a new client.
commit 0b56b44addc323a00eb7cd86240cb0dd4275bcf8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Oct 20 17:06:40 2008 +1030
xfree86: AllowEmptyInput is true by default - update the xf86Info defaults.
Also set AutoAddDevices and AutoEnableDevices to their defaults.
And in doing so, switch the rest of the defaults over to named intializers.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit d72cd753b99fae147ef4c189700fc697f1ea7fb0
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Oct 21 22:32:57 2008 +0200
Close well known connections in ServerAbort()
commit 81e197b2a5457bb9f7ed72f82c2d33fd8dbfc202
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 21 16:00:32 2008 -0400
Bug #18159: Spell "anisotropic" correctly
commit 3891dd892449fcdb7a514e3c5e7e763ba7e74003
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 21 13:10:44 2008 -0400
exa: Add exaDrawableIsOffscreen() to the driver API.
commit c837d182c4674c01296bb7efd7d834d9dfd55f83
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 09:11:59 2008 -0700
XQuartz: Only send mouse events while in the background if we're over a visible window.
This "breaks" xeyes but gets rid of annoying tooltips.
(cherry picked from commit 10090a132a0110fe24c8c886d9f53e6e947f8038)
commit 2a9613980f93959eedf9396735785d4c50546e2d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 09:07:08 2008 -0700
XQuartz: More fullscreen fixes
Start in rooted mode when enabled
Make the hotkey cmd-alt-a behave
(cherry picked from commit 22a54e46176c9cbdfaaa59ef33a6ae6a9c4969ef)
commit e4ea1494debda4d3da03864c2640921fe0430694
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Oct 20 12:23:04 2008 -0700
XQuartz: Cleaned up keyboard init and map reload.
(cherry picked from commit f78c9fc06cac2cc6ddfd6e9ba435dd26a57d1f51)
commit ebb2e1449cfb382a806e04c52d42240670717069
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Oct 20 09:46:34 2008 -0700
XQuartz: Fixed follow-keyboard-layout
≈
(cherry picked from commit a9f9fbf512c9fd5a773fce402182486edc71d5ab)
commit f67cd31d2cf1b8ad850bd21dbed5a975d77b4c54
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 09:29:37 2008 -0700
XQuartz: More progress towards fullscreen...
(cherry picked from commit 628cae86b4ad02c49d20df1e1afdcb7abcabb649)
(cherry picked from commit b47b7ab6d6d0a7f6cbf678a5755124d6b7516d3e)
commit d434ed400986653771bbd60c224a2275bd6147ef
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 17 09:25:26 2008 -0700
XQuartz: Fixed missing key-equiv for Hide-Others.
(cherry picked from commit 2c4b0f9615b646712609ebef3c0851c9a22e781b)
commit 3695f62d072e7864fdcee385c8b5ca40f2018101
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 16 22:36:00 2008 -0700
XQuartz: Require applewmproto-1.1.1
(cherry picked from commit ed235e3406e603a8a92c4b72f9f9018bae72ad65)
commit f935c11398b93860461672e88814026d75b71689
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 16 13:09:21 2008 -0600
XQuartz: pbproxy: Fix 2 bugs with the preferences.
Add dump_prefs() for instrospection.
Make prefs_get_bool a little more clear.
In get_property don't assume that the Mac realloc(NULL, 0); returns
non-NULL. We shouldn't depend on implementation-defined behavior too
much.
Add more commentary in various spots.
Add TARGETS in the TARGETS response. I don't know why some X11 apps
do this, but it could be something that some weird toolkit/app tests
for.
In reload_preferences add preferences synchronization, so that xpbproxy
reloads the preferences, and picks up any changes.
Fix a typo/misspelling of the sync_clipboard_to_pasteboard preference.
(cherry picked from commit 165cbbb90c793d9335ea76f0274b1f60ad295903)
commit 4d978af5c71430f0043b1272f8dc6344b8f03f12
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 15 21:26:58 2008 -0700
XQuartz: Fixed window levels.
(cherry picked from commit ef4d37c73f31048dd74efee2c63fa08b92608f87)
commit 58eacf0b7beb8c6f1971570ede0bfd3976a84665
Author: Rémi Cardona <remi@gentoo.org>
Date: Tue Oct 21 10:07:24 2008 -0400
Force LC_ALL=C when building xf86DefModeSet.c
Fixes build in not-quite-latin locales.
commit 2188582e5ea90edb432a2f421d0a267439ba08f9
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Oct 20 09:55:24 2008 -0400
EXA: Avoid excessive syncing in PutImage
commit 8d0cb507ae568c8da92f10ff1188d797bcaa3d1a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 17 09:59:29 2008 +1030
dmx: avoid hilarious #define Xcalloc xcalloc game.
commit 8a23707b866c11807e01056db97afec56e9b19c8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 17 09:15:39 2008 +1030
dmx: change remainder of manual EQ allocation to GetEventList().
commit 8de26770a41ec87c46eed2eddfde6f867d71fe1f
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Thu Oct 16 14:28:14 2008 -0400
RANDR: Fix output property event delivery.
commit d936a4235c9625bd41569cef3452dd086284e0d7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Sun Oct 12 21:58:30 2008 +1030
xfree86: if AllowEmptyInput is true, enable RAW mode on the console.
Usually, the console is set to RAW in the kbd driver. If we hotplug all input
devices (i.e. the evdev driver for keyboards) and the console is left as-is.
As a result, the evdev driver must put an EVIOCGRAB on the device to avoid
characters leaking onto the console. This again breaks many things, amongst
them lirc, in-kernel mouse button emulation and HAL.
This patch sets the console to RAW if AllowEmptyInput is on.
Use-cases:
1. AEI is off
1.1. Only kbd driver is used - behaviour as-is.
1.2. kbd and evdev driver is used: if evdev does not grab the device,
duplicate events are generated.
2. AEI is on
2.1. Only evdev driver is used - behaviour as-is, but evdev does not need
to grab the device anymore.
2.2. evdev and kbd are used: duplicate key events are generated if evdev
does not grab the device.
1.2 is a marginal use-case that can be fixed by adding a "grab" option to the
evdev driver (update of xorg.conf is needed).
2.2 is an issue. If we have no ServerLayout section, AEI is on, but devices
specified in the xorg.conf are still added [1], resulting in duplicate events.
This is a common configuration and needs sorting out.
[1] 2eaed4a10fe5bf727579bca4ab8d4a47c8763a7d
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 84ef8ed6fbefd8d6c0aaa3c862879f9804299bd8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 15 14:11:18 2008 -0700
XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard
(cherry picked from commit bcb83eea729a01026d99d1cfc2b77385b5b275fd)
commit 0195d318465d5a6a9039091bcb252202471df5a4
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 15 21:46:27 2008 +0200
GLX: fix build when dri2 _is_ available.
Caught by Julien Cristau.
commit 398cdf959afadfa964aece13cc9d89b2dd589930
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 15 18:24:10 2008 +0200
GLX: fix build when dri2 is not available.
commit 2e60ebbd254290e19492b97c960d9678513c94bf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 15 14:10:51 2008 +0100
XFree86: Simplify DontZap/-retro interaction
How hard could it possibly be, right?
commit 66a87517bd80b21e107df9d57968d81a92f91fd5
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Oct 15 12:00:16 2008 +0100
re-enable DRI2
commit ced6690284fd334f225bbc94685c114ad3ab96d8
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Oct 7 13:49:28 2008 -0400
dri2: Update to latest protocol draft.
Mainly rename SwapBuffers to CopyRegion, which adds the xfixes region
argument and the bitmask argument to let us extend it in the future.
commit 87a016ae00feac3fbaa7e7a518076a3852d49554
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Oct 15 00:02:13 2008 +0200
exa: restore {x,y}{Src,Dst} to their original values when !done
commit b677bff97b62c3931df853bae25ab485892ae173
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 14 14:30:19 2008 -0400
int10: Degrade the checksum warning to X_INFO.
I've seen about one case in three years where this has actually been
correlated with the real cause of failure, and we've trained people to
freak out about X_WARNING, so let's be less alarmist.
commit bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 14 14:04:01 2008 -0400
EDID: Catch even more cases of encoding aspect as size.
Very cute, Samsung, not only do you claim to be 16cm by 9cm in the
global size record, you also claim to be 160mm by 90mm in the detailed
timings. Grrr.
commit ad677238bc96a8578113bbe76d605d7a87aca44c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 14 13:00:50 2008 -0400
Add backtrace definitions to dix-config.h.in
commit 8e368cf5b964f1d29fda0a463f9510457619b14d
Author: Nathaniel McCallum <nathaniel@natemccallum.com>
Date: Tue Oct 14 09:50:29 2008 -0400
Xorg: add -modalias option
This scans the installed video drivers and prints a Linux-style modalias
listing of the devices each driver claims to support.
commit 3eb52de7f28b0050582f9ac4c28bc894d3f06f4b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 14 09:45:19 2008 -0400
kdrive: Hardcode a different wrong value for number of mouse buttons
This should really come from the input driver directly, but, kdrive.
commit f3f6ea89aa9e0ffe9e37bc059e5e6bf75be4ee9f
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Oct 8 14:12:21 2008 +1030
Xi: check all handlers before applying property changes.
The current code exposes to inconsistent updates, i.e. if handler N succeeds
but handler N+1 fails in setting the property, an error is returned to the
client although parts of the server now behave as if the property change
succeeded.
This patch adds a "checkonly" parameter to the SetProperty handler. The
handlers are then called twice, once with checkonly set to TRUE.
On the checkonly run, handlers _MUST_ return error codes if the property
cannot be applied. Handlers are not permitted to actually apply the changes.
On the second run, handlers are permitted to apply property changes.
Errors codes returned on the second run are ignored.
commit ad67e3f063aa79247270f29e989bbfe5f62c9ed7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Sun Oct 12 10:19:36 2008 +1030
dix: remove duplicate code in ReleaseActiveGrabs
Spotted by Colin Harrison.
commit 3fc4f40b6c6cb416c9dc4bdb35c91b4f32c03ccc
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Oct 12 16:08:26 2008 -0700
Restore xf86{Enable, Disable}GeneralHandler.
These were useful as part of the generic handler ABI, and are used by the NVIDIA
driver.
This reverts part of commit 50081d2dfb79878cb931a15c265f0d60698dfd39.
commit 2217d22a76cdb2460f9683a6bf74c7248612889d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Oct 12 16:07:24 2008 -0700
Revert "xfree86: xf86{Enable, Disable}InputHandler can be static."
These were potentially useful as part of the input handler ABI, even if nobody
currently uses them.
This reverts commit 278c11f01fbc6d6bd91c5a7127928c9ef5d29fca.
commit 5b336585a4cdf11d20831a9536ad581e959ea7f1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Oct 10 23:23:02 2008 +0200
dri: don't set the dixPrivate key to NULL, as this is a staticly set variable.
- This breaks on the 2nd server generation.
- No other subsystem seems to NULL their key.
- This should fix bug 17982.
commit b736f477f5324f79af30fc0f941ba0714a34ccda
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 16:33:24 2008 -0400
mieq: Backtrace when the queue overflows.
Since we're probably stuck down in a driver somewhere, let's at least
try to point out where. This will need to be rethought when the input
thread work lands though.
commit 94ed0ba1b5043ad9fc33b42756af447d5ab15bbd
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 15:53:48 2008 -0400
Move xorg_backtrace() up to the OS level so we can call it from DIX.
commit f650c1aeb06e957626bb0a74eddbb133f59dbecb
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 14:07:28 2008 -0400
Revert "Don't leak EDID_block"
This reverts commit 05cdef18ca668ffc86b71033f71cfbd262cdd994.
http://lists.freedesktop.org/archives/xorg/2008-October/039305.html
commit 0660dd9d7009147c395b9ea904539f76f55b9a7f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 13:41:50 2008 -0400
EDID: Catch monitors that encode aspect ratio for physical size.
This is not legal in either EDID 1.3 or 1.4, but hey, when did a little
thing like legality stop anyone.
commit 956a4ba40b28251ab2d88b5d5b0796e01afd2bdd
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Oct 10 00:28:34 2008 +0200
pixmap: Add some notes to devKind and devPrivate.
commit 4808bdec45775342eb9a6352b41e4919e1a69279
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 16:23:24 2008 +1030
Xi: don't memcpy the KeyClassRec from SD to MD. #16167
Most of its component get copied during CopyKeyClass anyway.
The ones that aren't:
postdown - never changed for virtual devices anyway.
down - shouldn't change that without sending events.
memcpy'ing the struct also copied mapWidth, which means we didn't realloc
during SetKeySymsMap lateron, overwriting the memory assigned to us.
X.Org Bug 16167 <http://bugs.freedesktop.org/show_bug.cgi?id=16167>
commit 18cdd733ad3dd36fa0a23dfbf18c7d99b86c0276
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 17:26:00 2008 +1030
kdrive: fix dixflags so they're always defined before enqueuing events #17734
If absolute events were posted, dixflags got set conditionally on whether the
valuators are different from the last posted set of values.
If dixflags are undefined however, the DIX interprets them as relative
valuators. Fix this by making sure defining dixflags is always defined.
X.Org Bug 17724 <http://bugs.freedesktop.org/show_bug.cgi?id=17734>
commit d58f2c30c64e8b2d8179dac06e0a54be06099da6
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 16:50:54 2008 +1030
kdrive: lastx/y needs to be set to the event coordinates #17728
X.Org Bug 17728 <http://bugs.freedesktop.org/show_bug.cgi?id=17728>
commit decec14219bcd992ec426e202ff3c8681b520b74
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 15:10:21 2008 +1030
dix: silence "unused variable" compiler warning.
commit 0b4b683f3eeec43536e73be302a4c396fe4d9894
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Oct 7 18:44:42 2008 +1030
xfree86: export NewInputDeviceRequest/DeleteInputDeviceRequest
NIDR should be used to create a new SD from e.g. within a driver.
DIDR should be used to remove a device from the server.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 5e213fe1022bf96747834a3ac227929b23136ee6
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 11:29:11 2008 +1030
xfree86: cache dev->isMaster before freeing the device.
commit 05cdef18ca668ffc86b71033f71cfbd262cdd994
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Fri Oct 10 13:45:51 2008 +0800
Don't leak EDID_block
commit 2d9da7a5f384d5f38b2be79b1ea0df5a3deb52d1
Author: Luc Verhaegen <libv@skynet.be>
Date: Thu Oct 9 22:22:53 2008 +0200
DGA: Track client state even when using old style DGA.
This fixes the issue that a badly killed DGA will keep on hogging
mode/framebuffer/mouse/keyboard.
commit 322335d5b5b6f155f56fe3c1cbe372f13dc20932
Author: Luc Verhaegen <libv@skynet.be>
Date: Thu Oct 9 22:21:05 2008 +0200
DGA: Mash together xf86dga.c and xf86dga2.c.
This in preparation for an upcoming client state tracking fix.
commit d13c3cbd43bc5e6b459c7df822292cf02ad2c9c4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 8 18:39:41 2008 -0700
XQuartz: Some motion made towards supporting fullscreen.
(cherry picked from commit 99be3d68b64059caada739a373e5e01844c776e0)
commit dc166bf6423f4243ea05f17340ff9ff99ecad74b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 7 11:39:08 2008 -0700
XQuartz: Fixed EXTRA_DIST for new GL files.
(cherry picked from commit a11c9052030b44045f037050a5825256b539ed50)
commit 803327929445256e159c10894e6305fbaa389982
Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
Date: Tue Oct 7 12:12:38 2008 -0600
XQuartz: GL: setVisualConfigs() copied the behavior of indirect.c which is wrong, with regard to the handling of xcalloc failure.
Use ErrorF for an error message after an xcalloc failure, and return instead of falling through to GlxSetVisualConfigs, or abort()ing at the test branch.
(cherry picked from commit 1056700971fd5c034396ed6dbea15e092f0c6332)
commit f1fec6f323b27a0165325d8fcf6af7ae163bde14
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 8 18:45:04 2008 -0700
XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
(cherry picked from commit 97173d4eda142c73bb975cc05225b791778f85af)
commit 52accec7dbc613a521e40449b8bb5f0c92ddb105
Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
Date: Tue Oct 7 11:31:48 2008 -0600
XQuartz: GL: Add the proper license information to the new files, and add more commentary to setVisualConfigs().
(cherry picked from commit 190a3d5e5de9915931928fb8e6da88bb9644cda4)
commit 63abdf61151cc90f769ed1708ee19b6c434c27c9
Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
Date: Mon Oct 6 18:05:12 2008 -0600
XQuartz: GL: Add the new C code to the Makefile.am.
Commit the darwin.c changes I missed in the last commit, for calling
setVisualConfigs().
(cherry picked from commit eb3c014e1710bf0b93bda10ddb9b795cd150d02d)
commit a8f5d422c9c0a39f55e80bbd180439b6ec3a805c
Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
Date: Mon Oct 6 18:01:23 2008 -0600
XQuartz: GL: Provide code for getting the capabilities of the underlying system's CGL.
Add a setVisualConfigs that is called before the fbScreenInit, to setup the __GLXvisualConfigs.
(cherry picked from commit fc86f9e4482043eca76d9d7a96e166be1aabf674)
commit 2998e48be343ab2a11d6d328fc961ab5b8eb9292
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 21:25:50 2008 -0700
Xquartz: Fix parallel builds
(cherry picked from commit 1fe7298a3b9a2ed82c612292f9e547cf78f99ae5)
commit 7aa535708f1f33173bf05abc17b75e0841ffc385
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 16:25:59 2008 -0400
Fix more xcalloc stupidity.
Did I mention the hate? Pretty sure I mentioned the hate.
commit 4fe80aa14a24df6d0611c47fc5654c3c4f56fdb1
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 16:22:35 2008 -0400
I hate you xlib. Please die in a fire.
commit 2c5332872f808e7a646a63ae7ec63a2b80f83ee7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 13:39:49 2008 -0400
s/kdDontZap/kdAllowZap/
commit 1feb69eb63e6739ff5db255ad529e84adf941a10
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 8 14:55:29 2008 +0200
DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
Fixes a segfault when trying to activate a DGA mode without checking
whether DGA modesetting is at all possible.
commit d1bb5e3b47ab71aa2f18f69daaf2a4c5ce06d800
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 03:19:45 2008 -0300
mi: functions here are carrying 'time' without need.
commit 4964a9ca6c3f26376469b6d8217815a47231f0a9
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 03:06:32 2008 -0300
mi: remove deprecated and unused functions.
miPointerDeltaCursor, miPointerGetMotionBufferSize and
miPointerSetNewScreen.
commit adf3e296e2b00164fb22e89ad4f44acbd2e3deae
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 02:12:49 2008 -0300
Remove unused declarations.
AvailableClientInput (LBX debris) and xf86XinputFinalizeInit.
commit bca9fa2efe97d2816a2e9412cdff08a0145c8f96
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 01:38:27 2008 -0300
Everyone knows that the loader is present. Silence it.
commit 56c615368c5a8e7acb0398434c2c68578626aa38
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Wed Oct 8 13:33:55 2008 +0800
Check nextEnabledOutput()'s return in bestModeForAspect()
In case no enabled outputs, we will reference wrong index of
output array.
commit 278c11f01fbc6d6bd91c5a7127928c9ef5d29fca
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 01:18:49 2008 -0300
xfree86: xf86{Enable, Disable}InputHandler can be static.
commit 50081d2dfb79878cb931a15c265f0d60698dfd39
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 01:11:38 2008 -0300
xfree86: remove xf86{Enable, Disable}GeneralHandler and others unused.
commit 54294e15ecf4a8ec0fd9fa8b6ed1a1b2d912ec7e
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 00:43:22 2008 -0300
xfree86: fix wrong function name message errors.
commit 57dbb90f198116dcaf17c8111a7f80644d7ebe7f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 20:36:45 2008 -0400
Document zap/-retro interaction more.
commit 617933e8c259ad12388c0dd13421846a873975e3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 8 02:45:59 2008 +0300
XFree86: Fix DontZap interaction with -retro
-retro will now _not_ override (No)DontZap, if it's set in the config
file.
commit d80bae2237e555025465d4d761a5cc537cc2bcdd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 8 02:43:27 2008 +0300
Update docs to reflect new DontZap default
commit 42e7b64bf90604e0099702f5447163be80a2efb6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 20:32:02 2008 -0400
-retro enables zapping
commit 9d135ac10a7374c7ccda705f1eeb02cc53076c34
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 8 02:30:05 2008 +0300
Input: Make DontZap the default
If you need to bail out the server, use Ctrl-Alt-Fx, or enable zapping
if it bothers you that much. If Ctrl-Alt-Fx is broken, nag me until
it's permanently fixed.
commit b574365fca954a999ebaeb7203d1e0ea6d99b3ea
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 7 13:09:11 2008 -0700
Revert "Unexport (and unimplement) xf86SetAccessFuncs" for now.
The nvidia driver currently uses these hooks to work around problems where RAC
will disable access to the hardware at unexpected times. This change restores
these hooks until we can come up with a better API for working around RAC.
This reverts commit c1df4fbede8058c15ce3a5759a7758fecafbb9e7.
commit fe85ec34ec2b58188633dac4464a1e9e9977652b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 7 13:08:38 2008 -0700
Revert "Remove unused server state change callbackery" for now.
The nvidia driver currently uses these callbacks to work around problems where
RAC will disable access to the hardware at unexpected times. This change
restores these hooks until we can come up with a better API for working around
RAC.
This reverts commit d7c0ba2e9eae7044ef4c31d9c3cbb9a71ee0f9f9.
Conflicts:
hw/xfree86/loader/xf86sym.c
commit 94919480d8bb66e1807b4fe87b8f326ef6e012c6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 13:41:25 2008 -0400
int10: Fix a nasty memory leak.
commit a57b2f172c1291f22f7ba2780c1b2f55e353c3e9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 13:39:10 2008 -0400
int10: Don't warn when scanning for devices we don't have.
Some BIOSes (hi XGI!) will attempt to enumerate the PCI bus by asking
for the config space of every possible device number. This despite
perfectly functional BIOS methods to enumerate the bus exactly.
commit a65e36a873cd1ba9896cd0f9a3e94dd933666005
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 13:38:12 2008 -0400
int10: Remove useless check.
If you have more than one PCI device with the same d/b/d/f, you're
already in trouble.
commit 6dbfca571f6d214dc456710a60ebbbbd204cdbbd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 7 10:07:03 2008 -0700
Depend on xtrans >= 1.2.2 for TRANS_NOXAUTH
commit 30193fbff9d9284fbbd81fe5f7b6c4d102daf1d1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 10:36:12 2008 -0400
Reinstate cursorScreenDevPriv
commit e7cd5d84ed1fb3637dce6e9e6ef58c8611818c4e
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 7 16:09:17 2008 +1000
fixup another calloc build issue
commit 60cfaa45a532bd3cfcfb4bd57b2f657c0a8b6a6b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 6 18:47:06 2008 -0400
Build fix.
commit c6d6d3e87a472b641d883a6c000f96e5bdf48532
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 6 16:18:21 2008 -0400
Loader: Unexport a handful of consumerless symbols from dixsym.
commit 8a5b89e8e184f4cbf33c6dee0b06e61d8f857576
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 6 15:36:51 2008 -0400
xalloc+memset(0) -> xcalloc
commit 0b7b89fbac0b3865b2cf51295c68a5f4c7523f28
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 6 14:19:30 2008 -0400
xalloc+bzero -> xcalloc
commit 9187f6ad9ec7ba9569a93d92561aac17eaa83491
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 6 12:21:20 2008 -0400
RANDR: Delivery output property events.
commit 717c7492a0f6ba3fb3eabda33515881eef314155
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Oct 7 02:38:44 2008 +1000
exa: don't call composite routines with no buffer.
We can get a case with gnome-terminal + links, where we get two arrays
of glyphs all with 0 width and 0 heights in them. If this happens
we manage to get to this case without any buffer setup and segfault.
commit aacac3edac7c6b82a0a0e3bc500f563d187e5df3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 21:07:31 2008 -0700
XQuartz: Bumped bundle version to 2.3.2 for beta1
(cherry picked from commit 2021c4c4e726a6b8f27f19f16ed3d86e37dbe448)
commit ed3134918dcbbd58a5ef8359a77e8024c98396e6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 21:06:58 2008 -0700
XQuartz: pbcopy: Re-enabled some code I commented out for testing
(cherry picked from commit 9b5d11409264080e394c8f18e06237122de80014)
commit b3a971d8b5df5ab4af0be49105ef32f67d010901
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 18:54:15 2008 -0700
XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management.
(cherry picked from commit f7673bb4de3c1f71eb390a3279eed3589efc3df4)
commit fc35c7a2e2888cb767413f5e85a79c7f422a6284
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 21:16:54 2008 -0700
XQuartz: GLX - enable_stereo defaults option should work now
(cherry picked from commit 3a6898f48756fdb2898292679301ef3dc109b4f6)
commit 7818aba1d1e74f4ffe68b7d6806622b94ae8a230
Author: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Sat Oct 4 15:50:35 2008 +0200
dri2: fix compilation (remove no longer existing include file)
commit a29af6465883796a6acf04b72ce812a0632b2186
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Oct 3 23:54:10 2008 +0200
exa: remove "direct" case for exa{Trapezoids,Triangles}
- By adding a small hack to the xserver i was able to easily test the performance of the normally rare direct case (using cairo).
- It turned out to be 70% slower for me (large test on an otherwise idle computer), which seems enough of a reason to remove it.
- AddTraps could also use a 2nd look, but since noone is using that it's a bit hard and less useful to test.
commit 416870d8c9e7e383b87c8513c2296a0cb66e7ef4
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Oct 3 22:59:40 2008 +0200
exa: remove some excessive whitespace
commit b72a217ad59cc527327d7b1fc81898677b977d8f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 18:30:37 2008 -0400
Dangling use of miDestroyGCOps
commit f5bbc54a93f53cd4ba124712159bb44c93282a8e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 18:18:02 2008 -0400
Fix compile for miSetScreenPixmap prototype.
commit 9dbfcd89214241626ac2704d1ffffff1cc0c67ae
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:40:30 2008 -0400
Delete unused miModifyBanking()
commit 94825ad3c72a1c3f6a61199c302841f63241cf87
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:39:34 2008 -0400
Remove unused wrapping for visual initialization.
commit 4791f8e2ba9a0e318b7f13c83618ece036dd53ed
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:23:58 2008 -0400
staticize mi{G,S}etScreenPixmap
commit 14d98b4a2fdea4a4f5cc9b751151672cb392fba3
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:21:16 2008 -0400
miFindMaxBand is dead code
commit 48b47928133bc462947104bd0f4204f00b993862
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:16:28 2008 -0400
mi{Create,Destroy}GCOps are unused, nuke 'em.
commit bd0e87c74789bd5447ec731aa2d2d6e05dd54abc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:13:10 2008 -0400
Remove a bunch of unused API from the mi export list.
commit ee5e07bc22f0c3af7a412b6bc430eae6a1dafe16
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 16:58:01 2008 -0400
loader: sort the mi symbol list
commit 77d0b0ecfa3c67ff8d11e773a7f083721cf4c6d7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 16:53:08 2008 -0400
Remove unused pciNumBuses
commit 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 16:05:19 2008 -0400
Remove the Must_have_memory hack.
Also remove an astonishing amount of misunderstanding of how casts work.
commit e6b1c1fada19268af559d89375989973729fdb19
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:47:50 2008 -0400
const cleanup
commit fe616f9230b672edb89fca7516e750dc1b20c690
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:42:58 2008 -0400
Drop the never-called SkippedRequestCallback list.
commit 31136b9467c2a17bbed4a51d6a6c41e3290bd236
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:33:47 2008 -0400
Unexport MakeClientGrab{Imp,P}ervious
xtrap used to use these, but it's gone now. xtest still does but it's
linked statically.
commit eaf3fdf97014c27aececa8505c2713e7c9a537fc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:24:35 2008 -0400
Unexport xf86NoSharedResources
commit d7d9edb506bfea1c10516b6c4eb72dee3559863c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:17:44 2008 -0400
Unexport xf86DeallocateResourcesForEntity
commit 49673b43584928c22d699d1968ed6813b272aefe
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:13:39 2008 -0400
Unexport xf86SetEntityFuncs
commit 949ef6b79a36d6f6bbc192c20ef0f13cc95d4f28
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:10:26 2008 -0400
Unexport xf86ChkConflict
Also remove the unused internal ChkConflict()
commit d7c0ba2e9eae7044ef4c31d9c3cbb9a71ee0f9f9
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:06:42 2008 -0400
Remove unused server state change callbackery.
commit 9ada146a16bcf220b2dd2936fb3a0349a31e99d3
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:40:18 2008 -0400
xf86RegisterResources: Always print any failed registrations.
commit a5d3fa90f3de763a5dcbb0ff4987562449819323
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:38:48 2008 -0400
Typo fix.
commit cc3335858508ffbc52123eb5bb0c34f42800c8c4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:37:59 2008 -0400
Remove the old implementation of RemoveOverlaps
commit 8fbf1185f5d6a1836b3e4265de6f605d82478e0b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:32:32 2008 -0400
Internalise some resource list API.
commit 0ca4f3cee7e42a393cdd32d3a772a190ae68abc5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 13:29:55 2008 -0400
Unexport xf86EnterServerState
commit c1df4fbede8058c15ce3a5759a7758fecafbb9e7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 13:08:43 2008 -0400
Unexport (and unimplement) xf86SetAccessFuncs.
Because, no.
commit 44269e604eb60ebaa6189fd4409d39a4ec6b9f4b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 13:02:50 2008 -0400
RAC: NO_SEPARATE_*_FROM_* are useless.
If anyone can come up with an example of a bus where:
- both i/o and memory resources are addressable
- access to them can be controlled
- but they can't be controlled independently
then by all means, reinstate this logic.
commit 51fcb58f45824c7cde88b8b4ccbd6bdcf760280e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 12:39:49 2008 -0400
RAC: AccessEnable() and AccessDisable() are mandatory.
commit 9c5fc7762e9ca09847965e67e247d95dfc197266
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 3 11:24:34 2008 -0700
Partially reverts commit 505c216d030a8eb6e9fa757ecebed9597a850c88.
I don't know how the hell git-cherrypick messed that up to delete fbwindow.c
commit 7bb73a9513710feaebc127998950e9f472bfcc0d
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 30 23:53:12 2008 -0600
XQuartz: pbproxy: Possibly fix a memory leak by using an [NSApp run] loop,
instead of calling CFRunLoopRun() directly. The leak wasn't reproducible on
this machine, but someone was able to produce a leak trace with Instruments
that indicates it was leaking in the CFRunLoopRun() path.
x-input.m: dequeue and ignore events when pbproxy_active is false.
x-selection.h: add an is_active method that is used by x-input.m to ignore
events.
x-selection.m: Handle nearly every preference, except for primary_on_grab,
which I don't really understand yet.
(cherry picked from commit 4d51ad851e64da83cbdfb0a4a22428418a7bcf75)
commit 2a5ce41f0371ad5df52586b8d4072578b6206321
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Sep 30 13:54:08 2008 -0700
XQuartz: Use "pointer" and "pen" for device names to please GDK.
(cherry picked from commit 00ca0f4d839abf47e9573a1552473e039cf787e6)
commit d3f597a986dcbc7e4164f350300dbd2e438949d8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Sep 30 11:10:58 2008 -0700
XQuartz: Workaround for initial pressure/tilt being sent as 0 with motion during the proximity event
(cherry picked from commit 9a91d770a6411dd876187e64a8bda1f0745169ae)
commit 1657dfb843c0127ea31bfd0a8ef81d0c394cbc7b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Sep 30 08:46:08 2008 -0700
XQuartz: Using absolute ranges for pointer location to increase resolution and better support tablets.
(cherry picked from commit d79ccb45f68b65d65718b5b77efe2fae6eeda762)
commit 88bb8c6f485a7aaf40f684d484a33cfedfa74a70
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 29 22:33:02 2008 -0700
XQuartz: Removed resolved comment about localization.
(cherry picked from commit 8ed5faf058ac7b0782a9cc13a2c58b80168358d2)
commit b1d0b196617643619d24ed520b0a1161e26b66c6
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 30 13:04:35 2008 -0600
XQuartz: pbproxy: Make the signal handler safer by using _exit, and only exit.
Remove some unnecesssary headers.
Remove some dead code that was never called or used in pbproxy.
Make use of an NSAutoreleasePool in x_init. It could potentially cause a leak
on a startup without this.
Start adding reload_preferences to the x_selection class, as well as event
handling for that.
(cherry picked from commit 602e8ba8f7ee196696bc9e3cea6ecdf3200dcf5c)
commit ecd260143cf9f012f033ba029ad04cb49567c89a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 29 22:32:24 2008 -0700
XQuartz: Added some localizable strings that were missing.
(cherry picked from commit 2c8205ea8b709c5859412b466e83aec7a94acdcf)
commit aae878b89081ffba16386e8d4987469313049bea
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 29 22:26:20 2008 -0700
XQuartz: Actually send the pointer event from the pen even if it happes to actually have 0 pressure and 0 tilt.
(cherry picked from commit f41583761955cb9c92c43239bfaa8ae0e5d95e33)
commit b7ad86ff8a9115147c0cf02af9e80ec464129392
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 27 15:30:10 2008 -0700
Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread.
(cherry picked from commit c2012138a520560f8a2160518ea73fced410c3b7)
commit 5446adebfb085dd05471729bf5c55bf820b1cbe3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 3 11:12:49 2008 -0700
XQuartz: Send AppleWMReloadPreferences where appropriate.
(cherry picked from commit 490cbe9888e2c1080495b003c429fdb1659444e1)
commit 6020c3fbfe06530cb2b90178d17a7d63beae028a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 3 11:09:26 2008 -0700
XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
commit 505c216d030a8eb6e9fa757ecebed9597a850c88
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 3 11:11:37 2008 -0700
Added dep on applewmproto 1.1.0
(cherry picked from commit b350b066740a2e72585153e35478538cf1bca9ef)
commit 1c1a6e965da412e767ad8bc15a5362116d64c6b0
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 22 22:09:19 2008 -0400
Remove an utterly, utterly ancient changelog.
Wow.
commit 9c8a2be2c73abf06245b1eb7f05f93e104dcfe42
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 2 08:55:14 2008 +0930
dix: fix axis scaling.
For two axes [a, b] and [x, y] (inclusive), the formula to scale point P(ab)
to (x,y) is:
(P - a)/(b - a) * (y - x) + x
And the whole end result rounded of course to get the integer we need.
commit 93ef72fa26b27cf90bf5c64ec19ac295a113aaae
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Sun Sep 28 21:47:21 2008 +0930
dix: don't lose subpixel precision when scaling.
Only scale x/y back from screen range if we have crossed screen, otherwise
leave it as it is.
commit 5ef5e89f0e4b9b8820093e072430e295efce32fa
Author: Simon Thum <simon.thum@gmx.de>
Date: Sun Sep 28 22:32:44 2008 +0930
dix: fix non-initialization of pointer accel in master devices.
Init MDs always with PtrAccelNoOp.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 036d424827726b0c804ae1532109253270744207
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 26 17:01:12 2008 +0930
xfree86: don't let DGA steal key events outside of [9,255].
commit 56a24cf894a142b18c7f18e294074c32031f3d14
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 17:56:31 2008 -0400
xorg.conf.man: We don't look in root's ~ anymore, don't say we do.
commit 7921c4a0bfc843c772dcb2fc185d4bcab1316330
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 17:08:48 2008 -0400
Remove some stale IPv6 debugging
commit f836e1f11b7bf3449c3e469cc7799c4ed28d2356
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 17:03:54 2008 -0400
Unifdef ISC
commit b1a31734731a768d586b4cb18317d4a5c5e20fa8
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 17:03:21 2008 -0400
Fix bad preprocessor line
commit 00f01f39454001846869496d9124f62c01e5691a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 15:48:18 2008 -0400
Don't inherit XAUTHORITY from the environment.
It's not especially obvious, and unpleasantly overloaded for the Xnest
case. Typically this gives you a server that looks for its auth data in
the authority file you were using for the running X session, which
generally doesn't have an entry for the display you just started.
All the major dm's, and startx, pass -auth explicitly, so this shouldn't
cause too much upheaval.
commit eb8be3e90a9c90a428696026d1e3b2152d7eefb4
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Sep 25 14:16:20 2008 -0600
XQuartz: pbproxy: Fix another STRING bug.
Fix the usage of the NSString cStringUsingEncoding: - it doesn't NUL
terminate the string, which lead to a bus error. So, we use
lengthOfBytesUsingEncoding: to get the length in bytes instead of
strlen().
(cherry picked from commit 6333d619e747c3b6bd3ba7557e35c0e5f6daa40f)
commit edfa3f8233fde490cb4255f21473684e96d595a3
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Sep 25 12:29:57 2008 -0600
XQuartz: pbproxy: Fix a bug that rxvt brought out in STRING copying. Now I can copy and paste to/from rxvt correctly.
(cherry picked from commit 82a4dc5f0f31a7911ee1cce5d1b162077befa811)
commit 12a59c44cb68843a60fc43257930d1cbeb971b7a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 24 22:51:03 2008 -0700
XQuartz: Fixed threading issue with TSM.
(cherry picked from commit 93ab4e0071670bb80bfa1170dd97ed9d6d51c67a)
commit ee87c9b02401a7a08b396884ba412a503b078bbd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 24 18:57:36 2008 -0700
XQuartz: pbproxy: Removed stray SPI include.
(cherry picked from commit 2fb2bc77b804d7b63002c1423cb0bfc658eeee45)
commit 591cc57627a9137159fb5a13287c1d61d8d2fc8c
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 23 13:59:25 2008 -0600
XQuartz: pbproxy: Fix 3 paths that could leak memory.
2 of the paths leaked, when INCR transfers were done. Now we
are leak free according to the leaks program for all transfers
I have tried so far.
(cherry picked from commit aa98db576bc02f0765cb35d0282a894ba3778213)
commit 586fbc91df731150ff5e39170efe33f3cfac28a2
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 23 12:39:32 2008 -0600
XQuartz: pbproxy: Fix NSObject memory leaks by properly using the
NSAutoreleasePool. Now the usage is consistent. In x_input_run()
we create a pool, and release it after processing the XEvents.
Add some getpid() output to main for debugging. It needs a bit more
testing before the next release.
Don't retain the NSPasteboard as the old code did. That may have
contributed to the leak, and it made it so that we needed the
NSAutoreleasePool created in main().
Remove the _known_types, and _pasteboard instance variables from
the x_selection class. They aren't needed anymore.
The leaks program now indicates 0 leaks after some usage. I want
to test further, but this seems much better, and my memory usage
graph indicates it's not growing.
(cherry picked from commit b245d84a72ee3929546cd11a6eba3c60fb4a4d95)
commit 238999cfc99dbf306184f0e846465a8707bcc9d2
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 22 17:36:21 2008 -0600
XQuartz: pbproxy: Add a comment to pbproxy.h about how the DB()
macro causes a leak (according to the leaks program).
Attempt to fix several other leaks with release method calls.
For some reason the process still grows more than it should...
I will need to use some better methods than leaks, and malloc_history
I suspect. Whatever is leaking, it's hard to find. I need to isolate
the cases more.
Add a missing image/jpeg branch.
Remove read_prop_32 - it's not used.
(cherry picked from commit 63a680354dcb545fef935ac97596dd35ceaed960)
commit 106eb37e0214bbd864a59119b491abfc54f32629
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 26 13:05:10 2008 +0930
Require inputproto 1.9.99.5
Pull and rebuild your input drivers, while you're at it.
commit fbd09486c6e6c64db28d81caa5ef04821e49f2eb
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Sep 23 16:55:04 2008 +0930
Push server-known properties into xserver-properties.h.
commit a2d83b9dc8387ec7e70689db1371cf6500b2f68e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 18:21:03 2008 +0930
Xi: add "deletable" flag to properties, add DeleteProperty handler.
A property can only be deleted if any of the following is true:
- if a property is deletable and all handlers return Success.
- if a property is non-deleteable and the all handlers return Success AND the
delete request does not come from a client (i.e. driver or the server).
A client can never delete a non-deletable property.
commit 22e90472681ebc7bdd28f82bbf2753a5b259e931
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 16:12:02 2008 +0930
Xi: allow Set/GetProperties to return a status, and honour this status code.
If a property handler now bails out, return the error code to the caller. This
allows to be slightly more specific with the errors.
commit 1e24e7b9df3d02350c7ea18e9379e87fe4d00026
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 15:58:46 2008 +0930
Xi: remove configure/query device property calls.
This removes all the meta-information about device properties (pending,
fromClient, range, valid_values, immutable).
commit feaa5fa6712c8c6f4ca97766e2ac0338253cf3b8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 25 11:03:22 2008 +0930
xfixes: realize the invisible cursor before displaying it.
AllocARGBCursor realizes the cursor but can only do so if we have devices
there already. If we don't - then the cursor needs to be realized elsewhere.
This is usually done in InitializeSprite, but since xfixes just hard-swaps the
(realized) cursor to the InvisibleCursor, we need to manually realize it
before trying to display it.
commit e58be0f3425fb3e946a222077672c3c01308f887
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Sep 23 10:01:30 2008 +0930
config: print error code if NIDR fails.
commit 30c3c13f1030268aaa6a3598d538fafd0592d77a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Sep 22 11:10:46 2008 +0930
xkb: squash canonical types into explicit ones on core reconstruction.
If we update key types from core, and groups 2 - n have a canonical type but
the same symbols as the explicit type of group 1, assume that it was a core
sym duplication according to Section 12.4 of the XKB Protocol Spec.
Ignore the canonical types and pretend there's only one group for the key -
with the explicit key type.
The protocol spec does not cover this case, so we have to guess here.
commit ae986d1c73d2f720bd0309d8c33328d14e8eed25
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 19 18:27:24 2008 +0930
xkb: fix core keyboard map generation. #14373
According to Section 12.4 of the XKB Protocol Spec, if a key only has a single
group but the keyboard has multiple groups defined, the core description of
the key is a duplication of the single group across all symbols. i.e.
G1L1 G1L2 G1L1 G1L2 G1L3 G1L4 G1L3 G1L4
The previous code generated G1L1 G1L2 G1L3 G1L4 G1L3 G1L4, leading to
"invented" groups when the process is reversed.
Note that this creates wrong key types on reconstruction from core to xkb,
i.e. any single-group key with a key type that is not one of the canonical
four (Sec 12.2.3), will get the assigned type on group 1, and a canonical type
for the other gruops.
X.Org Bug 14373 <http://bugs.freedesktop.org/show_bug.cgi?id=14373>
commit 5bf3f0fd4e00f96cfebd14b58580c3c8733626fb
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Sep 25 15:40:19 2008 +1000
exa: make sure pixmap devPrivate.ptr is NULL at create time
commit 82f150d73cc9a7d8eaf7241a51b03af05bcec159
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Sep 24 16:56:45 2008 -0700
GLX: Make sure GLX_SGI_make_current_read is enabled when possible
commit 8d9defe8c2a685709318c1d43379443df3d2322a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 24 10:11:00 2008 -0400
Fix un-suppressing the initial cursor.
The intended behaviour was "show as soon as someone calls
XDefineCursor". What you actually got was, uh, slightly less well
defined, since the screen's ChangeWindowAttributes hook would run after
DIX handled the cursor change. Oops.
The trivial way to turn the cursor on is:
% xsetroot -cursor_name gumby
Refer to /usr/include/X11/cursorfont.h for cursor names.
Thanks to anholt for catching this.
commit a39377cbcbd3091095efbeab25bec18ae520147e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 23 09:22:07 2008 -0700
Revert "Render: Use built-in SHA1 library"
This reverts commit d3bd31fddff7894f89ba80a3cdddff49aff08db8.
X.org should not be providing a custom SHA1 implementation.
commit 10a9bac0257b381367cedff395b40425d584bf59
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 23 09:21:37 2008 -0700
Revert "Update COPYING for SHA1 code"
This reverts commit 64387c8573ca8b3909667e32d7a9fba9567b21d3.
X.org should not be providing a custom SHA1 implementation.
commit 64387c8573ca8b3909667e32d7a9fba9567b21d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Sep 23 19:05:14 2008 +0300
Update COPYING for SHA1 code
commit d3bd31fddff7894f89ba80a3cdddff49aff08db8
Author: John Tapsell <johnflux@gmail.com>
Date: Tue Sep 23 18:56:32 2008 +0300
Render: Use built-in SHA1 library
Getting an external library for SHA1 is a mess, so just use our own,
regrettably. Public domain implementation.
commit 991ed2949ba682684952fe323f8f0f51ebdca98e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 23 10:22:22 2008 -0400
Rename SaveSetMap() to SaveSetShouldMap().
Avoids preprocessor collision with xfixeswire.h
commit ca9fae00795a114bca4397c32b543d6326a4c547
Author: Owen Taylor <otaylor@redhat.com>
Date: Mon Sep 22 12:42:41 2008 -0700
Change 'remap' to 'map' in saveset functions/macros
Now that the code has been fixed so that Unmap means unmap and not "don't
remap", 'remap' was confusing to have in the function names/parameters, so
change it to simple 'map'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ad14239a358cf65e5702ec7d054aa1db4f1cdd68
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 22 11:26:49 2008 -0400
Upgrade GLX Public License 1.0 to FreeB 2.0.
According to the press release:
Previous SGI contributions to the free and open source community
are now available under the new license. These contributions
include the SGI® OpenGL® Sample Implementation, the GLX™ API and
other GLX extensions.
[...]
"SGI has been one of the most ardent commercial supporters of free
and open source software, so it was important to us that we continue
to support the free software development community by releasing our
earlier OpenGL-related contributions under this new license," said
Steve Neuner, director of Linux, SGI. "This license ensures that all
existing user communities will benefit, and their work can proceed
unimpeded. Both Mesa and the X.org Project can continue to utilize
this code in free software distributions of GNU/Linux. Now more than
ever, software previously released by SGI under earlier GLX and SGI
Free Software License B is free."
"The GLX API" is here read to include the original GLX source release
from:
http://www.sgi.com/products/software/opensource/glx/download.html
ftp://ftp.sgi.com/sgi/opengl/glx/glx1_2.1.tgz
which includes glxext.c as included in XFree86, from which our copies
in glx/ and hw/dmx/glxProxy/ are derived.
commit 722c51960dd4948b8a64f8eff115fa69da597ef9
Author: Owen W. Taylor <otaylor@redhat.com>
Date: Mon Sep 22 11:04:26 2008 -0400
Don't remap windows for SaveSetUnmap
Since ReparentWindow() does a unmap/map pair for windows that are already
mapped, for saveset windows with SaveSetUnmap, we must unmap the window
before calling ReparentWindow() to avoid the generation of MapRequest
events, and so forth.
commit 0bb317a78b96fddcdac319c9706b3a12f931ea44
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 22 10:51:51 2008 -0400
Default to -br. Add -retro option for the nostalgic.
-retro also reverts to the classic cursor display behavior, meaning,
the cursor will be visible before anyone calls XDefineCursor().
commit ab17f88506a2dde32c50ff72b03743cd9c384ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 22 01:59:31 2008 +0200
Don't use our version of ffs() if the system has one
commit af0d5e2ef7b1b3f42e3522568c5f56850823c102
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 20 19:41:46 2008 -0700
XQuartz: 64bit crash fix ... don't pass pointers through xe.
(cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
commit 852a0b0dde34e7179394d96d09122b99bf7fe904
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Sat Sep 20 17:49:16 2008 -0600
XQuartz: pbproxy: Add an X error handler that returns 0.
Move the struct atom_list into the x-selection class, so that it's
no longer a global variable named atoms. This may ease pthread
integration and reduce the chances of symbols conflicting.
(cherry picked from commit c1403c713ca80104ae3736bd2ed1eb6ffa5192b6)
commit 7fa6fc5ad0b12bc52a1c22906709fbb003782d11
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Sep 19 21:28:46 2008 -0600
XQuartz: pbproxy: Fix a bug that occured when a PICT format was available.
We may need another branch to convert a PICT to a PNG or JPEG. For now
TIFF works well in all of the test image copying apps when converted to
PNG or JPEG with an NSBitmapImageRep class.
(cherry picked from commit adf339d8f948fc1e308dbcae38fcfce504b5b0ab)
commit f67490ceb5b9ddf25e734cc331705103599f3ed8
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Sep 19 14:29:37 2008 -0600
XQuartz: pbproxy: Make the proxy handle copy request races, and PRIMARY
INCR transfers mixed with a CLIPBOARD change.
Fix a bug with some UTF-8 transfers. I can only guess that my UTF-8
tests before were inadequate. I can now copy/paste any characters between
uxterm and Textedit.app.
(cherry picked from commit 7ca1532e8e6e2c733c9c508eee0de73d09ecb947)
commit b666ffd78155db228174041e9d7460b8a07dde0f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 19 13:15:07 2008 -0700
XQuartz: "Disable" the text when syncing is disabled.
(cherry picked from commit 7713d7ab66e74b212a6c0d634a3ad82373e178db)
commit dba290ec231422740f453b69b187f80df3f50e4b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 21 17:40:35 2008 -0700
XQuartz: Added a preferences UI for pbproxy options.
(cherry picked from commit d76cca5e1eae86450aa236e49a2024881d0bac01)
commit a928cae57b47625c9e3d136840d3e5d17fd3c51e
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Sep 19 00:18:44 2008 -0600
XQuartz: pbproxy: Add a missing include of Xutil.h. Another header
seems to have done this before, but correctness matters.
(cherry picked from commit 1b4987e779d97b90669bac2405a4672085677f7c)
commit 749bdf19b2a50201fddd04207e31122470f435e3
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Sep 19 00:02:48 2008 -0600
XQuartz: pbproxy: Add COMPOUND_TEXT handling. Do misc. cleanups with testing
to verify that the behavior didn't change.
main.m: XInternAtom compound_text, and atom_pair.
pbproxy.h: Add compound_text and atom_pair to the struct atom_list.
x-selection.m: Add an #include of Xutil.h. Refactor the reply struct
initialization to be done in a common place. Add send_reply: to simplify
the code a bit more. Add send_compound_text: which handles the
COMPOUND_TEXT type. Add the beginnings of a send_multiple:. Change
handle_image:extension: to handle_image:. The extension: message isn't
needed anymore.
(cherry picked from commit 1e9460abdf5bafe46215966bbef3e796cb1c33e0)
commit 00bfbee59fe3b0c8d1a55d1851206857ca563ece
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Sep 18 13:10:41 2008 -0600
XQuartz: pbproxy: pbproxy now responds to selection request events.
We can now copy and paste images to and from X11. Text copying and
pasting works as well.
The NSPasteboard can contain TIFF or PICT images, and pbproxy will
translate to an image/png or image/jpeg request, and list those in the
TARGETS.
I added a description of the basic design at the top of x-selection.m.
I removed the request_data x_selection class struct. It's not needed.
(cherry picked from commit 4a8daf884694c9c420c45d427f1f84e608e7e48f)
commit 811e9f5e9e9c07f4b8fb1e9a4d9df91a2e359221
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Wed Sep 17 11:59:36 2008 -0600
XQuartz: pbproxy: Use an NSBitmapImageRep to convert an "image/png" selection
to a TIFFRepresentation for use with NSPasteboard.
This has been tested with the Gimp and works with some minor quartz-wm changes.
The Finder clipboard shows the image updates after an Edit -> Copy.
(cherry picked from commit 12912adaeea759d30f96d8ae51a84fd1659ea0ac)
commit d8d555bac77509248d1145e928a2edf500b326b9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 17 10:11:00 2008 -0700
XQuartz: Don't enable 8bit visuals in the TrueColor server, since it's not working yet
(cherry picked from commit 1317c8ff94c4bd32617a5398e929f667bd87da58)
commit 23ec8261b6a746cb84e1328284fdc5587bca6faf
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 16 21:09:22 2008 -0600
XQuartz: pbproxy: The greedy CLIPBOARD handling now works for text.
This change adds some [self own_clipboard] calls in the necessary places to get the proper greedy behavior.
UTF8_STRING and STRING properties seem to work well now with the test cases (PRIMARY, and CLIPBOARD). I can copy from several different X apps, and have the behavior be correct when pasting. I also verified that quartz-wm isn't doing the copying, by disabling the quartz-wm paths.
(cherry picked from commit 934669f732c28f07b9d934d8f8f0b63ccfebd900)
commit 7c2eb3d41af33d1c52500111d0d34f9aab8a4542
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 16 15:21:18 2008 -0600
XQuartz: pbproxy: return the TARGETS list as a 32-bit list to fix a bug that was in the original.
Add TRACE() calls where appropriate to try to figure out why we are losing CLIPBOARD at times, after transferring PRIMARY to the NSPasteboard.
Use the new pbproxy_clipboard_to_pasteboard where appropriate.
(cherry picked from commit 40190675a6c1889cca3574e5d1a9c16ab74315a7)
commit 81c836902dc5b0b83cd95262d48cbc4c81ff3ae2
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 15 13:35:46 2008 -0600
Rename reclaim_clipboard to claim_clipboard.
Convert the puts usage to use DB().
Add the initial handle_image method.
Check for nil in the NSString instantiation in various places.
Add some commentary to enhance the clarity of why I did some things.
(cherry picked from commit 37361567b65241eab64e8b30cd9729d0e71a86d2)
commit 85e23affea7bf9aa7615b0292e67f170266d85f8
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 15 13:31:19 2008 -0600
Add an image_jpeg Atom.
(cherry picked from commit ea9dc27977c5eab666f2aa2d914e4e28d36758c7)
commit 6b42f40ff9b9ff3e74ccbb2ce5cfad65016934de
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 15 13:28:50 2008 -0600
Rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit d333a8e2b5514b8b76a78c6a13a3f5149ea8de27)
commit 2ab56981b1a64138d6c1f9ecfb75655477b3e575
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 15 13:27:08 2008 -0600
Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit 32b175ef62b68a971784e51e937e358cb10e20ac)
commit cbd32645f7d1054f79ad137a16766da1076c610e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 15 09:33:55 2008 -0700
XQuartz: pbproxy: Added global variables to customize how pbproxy behaves
(cherry picked from commit 21a2d0b8d03faf1c66ec0c5c11fbd2ab24547727)
commit 5b397642cdc29920245ebe64cc85243cac893e0e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 14 09:23:17 2008 -0700
XQuartz: pbproxy: First round of updates to pbproxy from George.
(cherry picked from commit 5c8b956f8f3f17e8d577d97cb66424954be72684)
commit dac9e91870f9c787eac97c9d7d0607979c57eb5b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 21 17:32:24 2008 -0700
mieq: Made custom event handlers safer for nevents >1
commit 8c46505d7d91e0644b19cccc4b342fceb6f86cab
Author: Kim Woelders <kim@woelders.dk>
Date: Mon Sep 22 08:37:29 2008 +0930
xkb: fix use of uninitialized variable.
And some cosmetic changes to use stuff->change consistently.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 2b266eda6e23d16116f8a8e258192df353970279
Author: Peter Harris <peter.harris@hummingbird.com>
Date: Thu Dec 20 15:58:01 2007 -0500
Fix panoramiX request and reply swapping
Fix panoramiX request and reply swapping
Set window and screen values in panoramix replies
Prevent buffer overrun in ProcPanoramiXGetScreenSize
commit 03ab8f11d25b0ca39a3b37b5350bca4c1028768e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 18 12:17:05 2008 -0700
When resizing a window with redirected descendents, don't expose them
Bit/window gravity computations need to recompute exposures to manage the
bits which are saved by gravity during the resize computation. That's easy
for non-redirected windows where the bits are all within the parent's
pixmap. For redirected windows, we don't need to deal with this at all, so
just skip the whole re-computation adventure.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d26083fe02658e7312a8da6a5b11652f9fe57bc8
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 18 12:14:58 2008 -0700
Switching from Automatic to Manual redirect needs to unmap/remap
When changing a window from automatic redirection to manual redirection, the
parent clip list needs to be recomputed; the easy way to get that computed
right is to unmap/map the window, just as when redirecting the window the
first time.
Thanks to Owen Taylor for helping diagnose this.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8bfd88ca61a1747714781a090d1c9dd8f3ad5dfc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 19 12:13:43 2008 -0400
Revert accidental edid changes from previous commit.
commit 69b79c1a6648f0d04a1b37a728b2e3d76233530f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 19 12:02:28 2008 -0400
Update to SGI FreeB 2.0.
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
commit cc20112a65d3f641ce0261c86a541f94fae5215c
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 19 08:44:04 2008 +0930
Xi: don't include client-side headers.
Spotted by Mikhail Gusarov.
commit e76b5b5e731e2d6c61ff6e6e9b2f42b20ac473d5
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 14:51:15 2008 +0930
dix: calloc, not malloc, ValuatorClassRec.
For master devices, the ptraccel code could segfault on free since we'd be
dereferencing random memory. Callocing the valuatorClassRec is the easy fix.
commit f789408f7dbfe57a0111e185ac83d1c70f262ba8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Aug 25 14:52:35 2008 +0930
Xi: remove broken SDeviceEnterNotifyEvent, replace with ...Leave...
The event format is the same for both (bar the type), so one is enough.
commit 97b9374a8af5a4cc52f9074feb4ce40cf0b90796
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Sep 17 15:48:56 2008 -0700
Conditionalize Composite-based backing store on pScreen->backingStoreSupport.
(cherry picked from commit 37876602957924c7cff759a800eddd574ee2385a)
commit b4762c0245ed2966606171cf27f40aa745fdc76e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 16 17:13:42 2008 +0200
exa: disable shared pixmaps
They got re-enabled in ee7c684f21d220d5e046bab31ae617a7d64d60f6
("Reimplement ShmPutImage.")
commit 52bbfc5bfa64fd09ef625f35a2fb4a0518003825
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Sep 15 10:43:46 2008 -0400
scrnsaver is optional at build time.
commit b6ab114212c0e4c3346ceb5b207f14c526ab81e7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 12 19:11:53 2008 -0400
Array-index based devPrivates implementation.
Note: DevPrivateKey is now pointer-to-int, which means
each key now needs to point to some global storage of
size at least sizeof(int).
commit 999f3362d50a753c1801d565766219808efdb1a5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 5 17:32:16 2008 -0700
XQuartz: Dead code removal
(cherry picked from commit 43184cd379c4fb7254391b8a362016cbf89b5529)
commit 6548a55ebdf43231a3c48debf54aa5aa2f1aa956
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 5 17:05:03 2008 -0700
XQuartz: 256 color support
(cherry picked from commit 8dd6d5c825d457f26b41b79d02d57ed4a5ecf1f5)
commit bad7cd14c2021b14971b3f707f927803a053003e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 5 10:46:36 2008 -0700
XQuartz: Dead code removal
(cherry picked from commit bf10fb0b1f776e72db7c76db11f764e26f9d62c4)
commit 1119fe136f8731f26fc6f50b92f5ddf78f3f83be
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 5 10:46:20 2008 -0700
XQuartz: Changed around fd handoff model to be more robust
(cherry picked from commit 4fe605c2bc62d50e0b5764d9edda245af227630b)
commit 183233b27beb441742a53e440c3389b4ea125b8a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 12 15:25:44 2008 -0700
XQuartz: Don't warp the pointer on server start for XQuartz
(cherry picked from commit c0da576d4921c246a9ac747921b48ab9e718347f)
commit 7a46dd30d332bc1d42f82b0391e806d3b067ebbd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 4 09:18:40 2008 -0700
XQuartz: Dead code removal
(cherry picked from commit 2e45344870f5d17181df6407da3448991036d783)
commit 1c70e53f2560cb877c8b149034f296232de67a4e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 4 08:55:22 2008 -0700
XQuartz: Fixed proximity logic errors for tablets.
(cherry picked from commit d942849f248c368b92ca73e145e8a5bc339112d7)
commit c661c6ae7a9cd981f914484aa4c3007922280def
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 4 08:07:32 2008 -0700
XQuartz: Remove decls of crashtracer strings that we don't use anymore in here
(cherry picked from commit 4a653c6bfd270f2960a8c7e726e7628cfc3c9051)
commit 54162aca404a7de2e560cc2aea01445e14742efe
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 4 05:18:31 2008 -0700
XQuartz: Fixed a crash in RootlessNativeWindowMoved
(cherry picked from commit a16048cec08e173ce42a78a77704f5fdfcb4480f)
commit ce781cac1b52003da6c025cd29e2c2ad97dbb324
Author: Eric Anholt <eric@anholt.net>
Date: Thu Sep 11 16:24:20 2008 -0700
Fix distcheck.
commit 31c62495f1de6e9ba41e1f6d7fa263eeb849129b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 13:11:09 2008 +0800
Drop a reference to user mode after create
User mode has no customer when create until assigned
to some output.
commit 079625570d51e41569b73b2fd9237eb8f967f408
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Sep 8 08:50:52 2008 -0700
Bump ABI major versions for the TryClientExceptions change from commit 883811c.
commit 4e004c68283828660f2259a4a4120a84667dcafa
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Mon Sep 8 09:16:59 2008 +0800
Revert "randr: fix user mode create initial reference count"
This reverts commit 7c5ca85a9e6d49ab572831b3e0c08bb4cafb395e.
commit 40a9482f8c5b3eac86c221ccce78510e850f4d2b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Sep 5 06:09:51 2008 -0700
Add cscope files to .gitignore
commit bf333c2f9833a178887e7bdd7fc338f1e09c387f
Author: John Tapsell <john.tapsell@john-desktop.(none)>
Date: Wed Sep 3 12:20:17 2008 +0100
fbdevhw: Remove pixclock check.
The check can fail because the output from FBIOGET_VSCREENINFO is used to set
Clock in fbdev2xfree_timing(). Then in fbdevHWSetMode(), xfree2fbdev_timing()
is called which sets the pixclock based on Clock. The resulting circle results
in slight rounding errors, causing the comparision check in fbdev_modes_equal
to fail.
commit 47bf269d5922a4998c33908a53ad1affa8de96c0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 12:54:56 2008 -0700
mieq: Fix my broken cherry pick.
commit 1669308be6d4cc6265e5fa8ef47fbf2cbef6f093
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 09:23:06 2008 -0700
XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
(cherry picked from commit 1f842c71c35db031a24de646429834d6054adf1d)
(cherry picked from commit 144746223d8dc3f6ff2a0e805aa27a6e57df558a)
commit 46168b3b404164c1f2e7876031e70fb77192fe75
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 09:11:25 2008 -0700
XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor
(cherry picked from commit 6bca78760951cb5cb57ea66b7631a2dc230dc27a)
(cherry picked from commit fafcafd6de39cf6b5967793f03b30b49db36fec5)
commit 7f5318131ddf86bed5797c0d9641f6ff34f34be0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 03:54:42 2008 -0700
XQuartz: Removed "Done" button from Applications Customization. Now properly save on exit.
(cherry picked from commit 2f1e163d5db6063e54fcaa045ea67c29ce3e46aa)
(cherry picked from commit 7542c00b96461c3474b8c23545171c4b6ddfd29d)
commit 9e70a3cf58c205948f6a415e203d825e9b660d9d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 09:33:39 2008 -0700
mieqProcessInputEvents: Check custom event handlers first.
commit 700e8bf33f9b1c3921de912b8110fadf5e0626da
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 02:41:20 2008 -0700
XQuartz: Updated man page
(cherry picked from commit 6932d0d19ea75c64ed38b82a246b68c6bbfb8cec)
(cherry picked from commit 8e3da36b6b0a261975808bc67b5caca733a1a23d)
commit 7430bb9093ea8cf9589d745742c7353e53a144f8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 02:37:09 2008 -0700
XQuartz: Removed dead code (unused option definitions)
(cherry picked from commit 3d74f77490105c0704c0b10dc7a6eb859bf6e985)
(cherry picked from commit c1e5ea9ba058f6a13f564165a3d6862335729630)
commit b3836e5bdd7e2e04e563246d90f385e1b4741baa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 02:36:39 2008 -0700
XQuartz: Cleaned up our sleeping before adding the launchd socket.
(cherry picked from commit ebfe49dfca6e04d66232bad760f522629397cc35)
(cherry picked from commit 2cf74a76d54d795cfc3c0380a526b9177327782d)
commit 7c5ca85a9e6d49ab572831b3e0c08bb4cafb395e
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Wed Sep 3 09:41:00 2008 +0800
randr: fix user mode create initial reference count
Don't need extra reference count adding when creating user mode.
This fixes user mode destroy, otherwise we get BadAccess error.
commit 4e1f9f51a9eea115ce2a073824e9c5cef4e2f364
Author: Daniel Drake <dsd@laptop.org>
Date: Tue Sep 2 16:20:40 2008 -0400
Don't try to destroy a NULL pixmap.
commit 613ce0955032fb032de0a3940752828d314f057a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 2 15:43:15 2008 -0400
Fix strict-aliasing silliness in XAA.
commit b5cdcfa55c399e83d51242e93d4f25d8bc4fec1f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 1 19:45:30 2008 +0200
Xevie: swap replies as necessary
commit d3ae193f4ac87530f2745f8cb5e7b70dd516881e
Author: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Mon Sep 1 19:36:56 2008 +0200
Xevie: always initialize rep.length (bug#17394)
The XEvIE extension doesn't clear the rep.length field for any reply but
the version check. Hence, if there is junk data in it and that is sent
to the client, it hangs.
X.Org bug#17394 (http://bugs.freedesktop.org/show_bug.cgi?id=17394)
commit 0466b8811ce8ebc1d993f177cbb7a22e997640f1
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 1 09:57:25 2008 +1000
exa: drop cw.h inclusion
this doesn't seem to be needed, at least I can't see any warning without it.
I'd like to build EXA into a driver and cw.h isn't exported
commit 881bd15f445bb62c3fdea863c968c95217408b6e
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 31 18:07:22 2008 +0200
xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
- Fix is courtesy of math_b.
commit f4e9a1a98f97155de62908309e87c10487125926
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 31 17:45:08 2008 +0200
damage: choose less ambiguous function names
commit 0cd6709db5febbe7fbd073e429421fcd81041e08
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 30 16:13:58 2008 -0700
XQuartz: Fixed editing of Applications menu
(cherry picked from commit da647f1add4c1ae7854c0fbfbf972666ce5d12c8)
commit c4d290fc54542ccba7c3a46bc75b0c3322d0ca48
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 30 14:19:47 2008 -0700
XQuartz: Fixed missing symbol in quartzKeyboard debugging
(cherry picked from commit 8ad55e484f0ba9073ce07a03de660cc546a7b668)
commit 5d7d959b1143979c3445639c9d108e02da0c1475
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 30 14:18:07 2008 -0700
XQuartz: Don't even build with GLX support since swrast now depends on libdrm
(cherry picked from commit 3739525d57dff2b3b034b5768f357b1c25577909)
commit 45def7f0a342f4733cafb06adbfed14932f0e01b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 29 22:16:03 2008 -0700
Removed dead glcontextmodes
(cherry picked from commit c6d0ac7471209d835e8d9a25adcbda893ddfa1cb)
commit d01c5ca7935a8340a3cd68c325da6dfec005c952
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Aug 30 15:35:32 2008 +0200
Xserver.man: Typo (the the).
commit 229e60db8f95232afc8cdcb7cd0572d117c84b90
Author: Thomas Bodzar <Thomas.Bodzar@quest.com>
Date: Sat Aug 30 15:34:29 2008 +0200
Xorg.man: typo (the the).
commit 1885582444fb06da73dea1f118a777bea26e1dc1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 29 21:18:26 2008 -0700
XQuartz: Placate automake which doesn't like escaped newlines even in comments...
(cherry picked from commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1)
commit 8abcc12fdd5bd9edc0288a1ab8f75e65ffcb8c71
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 29 20:55:25 2008 -0700
XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew.
(cherry picked from commit aaf0f71db197526b6b866cc1b39fbdfe051879ef)
commit aee19c7b5542aa147b89b1ae8340e9931d81729f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 29 03:54:55 2008 -0700
XQuartz: xp_is_symbolic_hotkey_event catches the input menu, but not our mainMenu, so we still need to do that the old way.
(cherry picked from commit 25eccf12c89d73b8bce2c9be14841efb230acedc)
commit 974db58f5b730c3770ee461665a02dd4334d1dea
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 30 00:37:11 2008 +0200
damage: initial attempt at a damage marker mechanism
- This should allow drivers to recieve post submission events for X<->opengl synchronisation.
- Lacking a testcase, i'm open to suggestion how to do it better.
- The idea is:
- driver recieves event
- driver creates personal identification and inserts marker into X fifo.
- when something wants to use an X pixmap, it checks if something is pending.
- If so, it synchronizes the 2nd fifo using the initial identification.
- Driver is not required to use interrupt based systems (price too high).
- Lower latency is ofcource better.
- If this is somehow unusable for you, then come up with improvements.
- For that reason i wouldn't consider the api fixed for the moment.
commit 454cb0802eec3c2c2cdbcc17971bced868462b83
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 29 22:28:02 2008 +0200
damage: DamageReportRawRegion should set pDamage->damage
- I found no evidence in the protocol, that it should be differently from all the other modes.
- It seems to have been like this from day 1.
- If anyone has evidence to the contrary, please enlighten me.
commit ae6ca434104405302f30a58bde8738d9579d9dc9
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 29 22:21:54 2008 +0200
damage: internal functions start with a non-capital letter
commit 1861250cd7e84b05e8298b74e3c7e97da72ddfba
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 29 22:15:23 2008 +0200
{damage,exa}: sanitise damage
- Redo damage naming for more consistency.
- Call post submission functions only where appropriate.
- EXA can now live without it's odd damage workarounds.
commit 5af77d43fe812e127d5d335527fa940ab9d95f38
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 11 16:59:17 2008 -0400
DRI2: Drop sarea use, implement server side swap buffers.
commit 60ad8d5d05485339e89d7f1f9f1ded75de7c7ea1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 28 23:45:17 2008 -0400
Attempt getpeercon() on remote sockets as well as local ones.
commit ebea78cdba0ff14a397239ee1936bd254c181e1b
Author: Tomas Carnecky <tom@dbservice.com>
Date: Thu Aug 28 18:05:40 2008 -0400
Prepare for array-index based devPrivates.
TODO: static indices can be made just an int; some indices
can be combined.
commit ec7907f8fa04dcff2649cc4846975844314f737e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 27 19:27:13 2008 -0400
Add an array of integers for use as per-screen cursor private keys.
Replaces the use of the screen pointer itself as the key, which was
nice but won't work now that an array index is being stored.
commit 86898491497a43814caf42013651086e62fe6162
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 27 19:17:15 2008 -0400
Remove unused GetGlyphPrivatesForScreen.
commit 90b178cc7feda1f9c4995b98364739e71233fff3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 28 19:36:22 2008 -0400
Don't need to request space for Xnest pixmap private.
commit 835b532d6f51d08998d7ab49fcb41db8266487ce
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 28 14:49:35 2008 -0400
Build fix.
commit 040212ee60af9d043c4c3f98bba5120c3b8e33f7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 28 13:49:35 2008 -0400
MIT-SHM pixmaps, if they exist, are ZPixmap.
commit ee7c684f21d220d5e046bab31ae617a7d64d60f6
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 27 16:05:47 2008 -0400
Reimplement ShmPutImage.
There's no reason to not just dispatch this straight into the GC. As a
bonus, if you do so, damage wraps correctly, and thus swcursor works.
The side effect is it's no longer possible to override ShmPutImage with
ShmRegisterFuncs().
Also remove the (broken) damage tracking for same from EXA, since it didn't
work right, and is now superfluous.
commit 2db1afbf2e56d8743c701d81a5797001ce9e5c52
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 26 23:09:20 2008 -0700
XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
(cherry picked from commit c8244177b0dbcb28d2f5509e6f2a3e8057889790)
commit 319405fa4a530804c19fb7d0fcece5c912e41c9d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 26 21:11:35 2008 -0700
XQuartz: Fixed needed xplugin version. ><
(cherry picked from commit 01b3a99dff79e0d2b316e02658c19fa79d9144ae)
commit 3350770bd6d90fefa1133ac738c1d4eae2d568a6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 26 19:13:56 2008 -0700
XQuartz: Use new Xplugin API to determine if a keypress event corresponds to an OS-X hotkey that we should dispatch to Appkit.
(cherry picked from commit e7658e745f8a3eaf5cec9f54a8a1b7e5a7708e09)
commit 7930ea9116f232a3762f0085e5ca65e06d1142fc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Aug 25 22:10:46 2008 -0700
XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it.
(cherry picked from commit 54a882dcbdccef3f3eb4e6398e13c88185a8986c)
commit dc1171df5baa0c4aa366ff2b07af5b8eb44dae12
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 22 01:12:37 2008 -0700
XQuartz: Fixed bogus args to debug ErrorF
(cherry picked from commit f0351c2b80f30ae31f041798b84139141fc3d5a5)
commit ac936525afe46bad329387232f8d48e77f6a4175
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 22 01:11:33 2008 -0700
XQuartz: Cleaned up mouse event translation a bit more.
(cherry picked from commit c286f2a718fdaf6ad10249b59abb20731da8d904)
commit 1b42f550001c11c93d5a2144df98a5c687c010c2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 22 00:45:12 2008 -0700
Xquartz: Added missing ev_type for NSTabletPoint event.
(cherry picked from commit 07548f13947a212dcc020d52fe0ad679255121e2)
commit 13a89f19208cf998808ff2896b7711310768f94c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 10:21:23 2008 -0700
XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam.
(cherry picked from commit fcdc9f8b5abd724d75f53d48fdadbed9859e9e79)
commit dd1e54d6eed0bce289517b3cb95e6b1a187ca6e0
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 20:02:55 2008 +0200
exa: fix thinko from 988725f32e082aee9392a71464125157a83d1e67
- the drawable of the pixmap is not the same as the original drawable (possibly a DRAWABLE_WINDOW)
commit 7c14fdbacfcd2f4d56a346e6c72e44e4ba9909c1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 17:21:43 2008 +0200
exa: some minor cleanup
- Fix compile warning
- Order exa.h by source file that exports the function.
- Move the function i created earlier to private headers.
commit de79edbd9f67762950eaac2dc79668035239897c
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 17:03:12 2008 +0200
exa: report damage manually for exa{Trapezoids,Triangles} when needed
- Plus a micro cleanup of unused variables.
commit 988725f32e082aee9392a71464125157a83d1e67
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 16:54:29 2008 +0200
exa: move destination damage for internal calls to a special function
- This should improve clarity for someone who isn't familiar with the code.
commit ce193476808f54d946351458361c62132d81b62f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 13:18:58 2008 +0200
exa_glyphs: remove useless offset
commit fd94651fc3a6f49ec153ffb823b86c1d125bb298
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Aug 26 10:58:35 2008 -0400
Fix driGetConfigAttribIndex unaligned access to GLboolean.
We don't actually send the float mode so just drop it. Drop a couple of
other unused or redundant fields from GLXconfig.
commit 41bd8d5dfe27d5c91fe7e4cdba1475a2a0741b1c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 25 11:27:26 2008 -0400
EDID: Build fix.
commit 76ed409acd772f2c041239345c6dc64cbef0e5b2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 25 10:44:45 2008 -0400
EDID: Publish the whole block on the root window if we've got it.
commit 5724f7fb5bea6fa1a354c64c0972c53d70e2f27b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 25 10:39:36 2008 -0400
EDID: Publish the whole block in the RANDR property if we've got it.
commit 668f89eba3e8f9da7843f5cb350f8dc1e5d7efbe
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 22 10:32:18 2008 -0700
Remove unnecessary #ifdef __SOL8__'s
commit cc78d977cac74fcfb7c9b27e7109a1e369018dd8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 22 10:14:11 2008 -0700
Convert Solaris #ifdef's for <sys/kd.h> to AC_CHECK_HEADERS check
Upcoming virtual terminal support changes in Solaris kernel will provide
<sys/kd.h> on SPARC too, so this gets us ready for them.
commit 95b466e457542bfe08b0ed2bbb5db8d28a961cfd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 21 17:24:40 2008 +0930
Xi: don't include .c files.
commit c696da75c7326c5e1f1cd48292c0519ddc22e11b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 21 17:23:11 2008 +0930
Xi: swap devices property replies.
commit 01264f17925005969c3b71ca945fc1014bcd8c8e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 21 01:32:03 2008 +0200
Add swapped dispatch for randr 1.2 requests
commit e02f864fdf19a5ab1682336be343c57fdb69ef43
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 20 13:24:03 2008 -0400
Suppress cursor display until the first XDefineCursor() request.
Yes, this means the server will start without showing a cursor. Pretty
much any application that wants to interact with the mouse will define
cursors, so this essentially just delays showing it until gdm (or
whatever) loads.
commit 64ef7ed072007b1d0b4de5ff1e5eababa418c794
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 20 13:14:03 2008 -0400
Centralize declaration of ConnectionInfo.
commit f1f44940f10b0209946ec0f08104a372d7d945a0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 09:50:54 2008 -0700
XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.
(cherry picked from commit 81187364e512606a6aebb95ab2967d9d420f57f2)
(cherry picked from commit f2ec79e4a159dec6481691e4dd615db01770dd7a)
commit 6c5612c2e1df1e89388ffff97251f5328558f8e8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 09:21:44 2008 -0700
XQuartz: Added window_item_modifiers defaults item (and option to localization) to change the modifier keys used for the windows menu.
(cherry picked from commit e4110861d307a55d9032cb83cf024ec1f294e8d7)
(cherry picked from commit fcfc05482a88696cb713c7a2ddfcf935ae8378a6)
commit bdc277c9b3dc6b3b95f74b20a49ce163c5fae980
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 09:58:48 2008 -0700
XQuartz: Just cleaned up formatting of event processing code... no "meat" changed...
(cherry picked from commit 745bc8ab387d6794f47d8b9dca33b4c81f6dd39c)
(cherry picked from commit a28a2be52478a1557a363140f7bd70ececf144dc)
commit ed42108920cc695b96ed57bf9dcfea1470e74669
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 19 02:02:11 2008 -0700
XQuartz: Added appkit_modifiers defaults option which users can set to 'rcommand' to get access to the input menu with right command
(cherry picked from commit 02af74d7a5a7225f408915254c40856159dc7f19)
(cherry picked from commit 2da32894dff8340f6ca7c980277fca7ec835a193)
commit be06961312e2111778bfd97b2c8a927acc61f43d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 09:56:06 2008 -0700
XQuartz: More input fixes
stuck-modifier fixes (capslock)
3button-emulation now doesn't send the modifier key with the click
Added other options to fake_button2 and fake_button3 defaults options:
({l,r}{control,alt,command,shift})
(cherry picked from commit 8fb6a1cf44c35a20dfb0c05c9824f94898f88da7)
(cherry picked from commit ae9c1b3cfb3874b4d1251681c24bda91c398bcab)
commit 436b659091dd17bb3e316377ba31f5d2a5dfa12e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 14 09:34:12 2008 -0700
XQuartz: Updated bundle version to 2.3.1
(cherry picked from commit eedecba0b882bb07931e8d9168589f5be7a08a69)
(cherry picked from commit 7d9d864461858b25c5eb5858fdf4b53771795f11)
commit bc4cef1d0ae7cbb8f5fe16d576db45abd4330370
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Aug 18 16:28:33 2008 +0200
exa: remove useless cache{X,Y}off from UploadToScreen() arguments.
commit 38bdc34d555f956a1ff1e1bb8eef95e3ba2bac64
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:12:39 2008 -0400
Remove redundant check.
commit 47b31233c26f710be70ffcca17e5402d03d5733f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:10:12 2008 -0400
Simplify driver setup.
No point warning about missing driver hooks, that just means the person
who gave you the driver is inept. Might as well just crash. Also,
just name anonymous screens as screen%d instead of failing after the 36th
screen. Bonus points if you can figure out what the failure mode would
be on the 36th screen, and what the effective screen limit was.
commit b99fc65b53769400821a2bd8f691ece35a5b8847
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:06:53 2008 -0400
Simplify calling xf86EnableIO() a bit.
commit b1f2c7a89ace1f6e5750783f3c43c4c5a6d24374
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:06:11 2008 -0400
The ->Identify hook is not mandatory.
Best comment ever though. Mad props.
commit af5125968a738ec8f496d04eb65acb7c8f812115
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 14:47:10 2008 -0400
Refactor misprite a bit.
No variable declarations in header files, please.
commit 41b68e0dea9305d66bca2fc4ad96db01f5342c6d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 11:02:31 2008 -0400
Remove unused -co option.
What did this even do anyway?
commit 1f416fba994ed7a7e072a9f0a86b515855ea3bac
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:56:45 2008 -0400
Remove unused -bestRefresh option.
commit 5a72c45d42abc7227c6cf3d14fd7043ea7527c54
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:54:11 2008 -0400
Remove unused -showunresolved option
commit 9f08ffc557b52e2e8cd54fb692b66700c83d61c6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:29:23 2008 -0400
Remove unused xf86Info.pMouse
commit f227fbf74f0c619ecf3275cdb4c10b1a4b3a8cfc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Aug 19 11:36:12 2008 +0200
EXA: Inline Prepare/FinishAccessWindow into only caller, ChangeWindowAttributes.
Also check the requested mask in addition to the GC state before doing work.
commit 825b3fe11d1b813bf8d5b24a880ed04b78ae1acf
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Aug 19 11:22:40 2008 +0200
EXA: Don't use exaGlyphs if the driver doesn't provide a PrepareComposite hook.
It's buggy without Composite acceleration (leading to cropped glyphs) and not
really useful in that case anyway. The bug probably still needs to be found and
fixed for drivers that provide a PrepareComposite hook but can't accelerate
text rendering though.
commit 75e495a4cd823b6fa42a8d167ecc9f4723320dea
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:58:08 2008 -0400
Remove unused xf86Info.mouseLocal
commit b3dfd7e3e4deef21b40c885f8e7eae34b55888b2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:56:18 2008 -0400
Remove unused xf86Info.sharedMonitor
commit 5e43cd28692bc05cac80f38b47104a26c0524385
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:46:42 2008 -0400
Remove the remainder of grab deactivation and closedown.
commit cd1e8f26147919227e7624ac4c6b313d972a4d35
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:40:46 2008 -0400
Remove unused EstimateSizesAggressively option.
commit faaf0046155abbd15415d5a6b62ead4f58935c28
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 18 17:23:26 2008 -0400
Remove xaaTEGlyphBlt.S
Should have been removed in 593144dddd977f53bcd1a115f9544eeece46df4c but
ajax was asleep at the wheel.
commit 562462e78dd6a5e2ed5b36aa22be52f31d55485d
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 18 17:05:24 2008 -0400
Remove dead {bsd,lnx}Resource.c
commit e3e47b35e369bf4abb0fe15865acca0b34600b1f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:03:22 2008 -0400
Remove MAX_PCI_{BUSES,DOMAINS} and some associated #if 0.
commit 593144dddd977f53bcd1a115f9544eeece46df4c
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 18 16:46:36 2008 -0400
Remove some unused assembly code and assyntax.h
commit 2d3e478384ef8af2a760f39792e35e4a6174c967
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 15:09:44 2008 -0400
int10: Fix int1A for %ax == 0xB101.
pciNumBuses was pretty much always 1 post-pciaccess. That ain't good.
commit 539717fe1f08a000d1eef9f345d24cb49e3663b5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 14:50:33 2008 -0400
Remove (unused) pciMaxBusNum.
commit 3c03d9f1efbbacec6e8be58da99bf0977a8e0fec
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 14:37:42 2008 -0400
Remove sparcPci.c
There is no way this code can have been building for anyone since pciaccess
was merged. BSD and Linux were already using OS code on sparc, the only
people who could want this are Solaris, who should be using pciaccess
anyway.
commit 9a39b6cfbda306eb594e87ce828afa01cd7aa01e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 14:26:01 2008 -0400
Remove XF86SCANPCI_WRAPPER.
commit 470b05a610e641094d46742393684acd786d78a8
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 14:03:36 2008 -0400
Remove vestigial MAX_PCI_DEVICES.
commit 244a635fcdc9e0a7212d51b26d74f49d8e1b071f
Author: Fredrik Höglund <fredrik@kde.org>
Date: Mon Aug 18 19:27:34 2008 +0200
Fix the tile offset in miPaintWindow for ParentRelative windows.
commit fdf7c747a8e1bc59dfb31b7f90dd5eab2687315b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 13:13:03 2008 -0400
Remove PciProbeType and associated weirdness.
This code was effectively only used in ix86Pci.c to select PCI config
access type. Nobody should be using that path anymore, in the glorious
pciaccess world; kernel services should get it right for you.
commit 95bb6f53624a3e6f4d62a2f789982c5544d2fc70
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 18 11:47:19 2008 -0400
Remove ancient unused inline hack.
commit e1ae8db625b5e8c298a557592ef23656b3da4886
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 09:53:48 2008 -0400
Drop dead PowerPC PCI code.
Also add a warning for anyone still using legacy PCI code.
commit 99583b43a9a202d047ff417d47485e4c0e0c9670
Author: Jie Luo <clotho67@gmail.com>
Date: Sun Aug 17 23:13:22 2008 +0200
glx: avoid possible NULLptr deref, fix #16884
commit 421b7e8f12083e9518fa7deda968a2f73c9a0006
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 17 19:57:02 2008 +0200
exa: fix assert logic thinko from 361a9eb953aaa38f8ebc057185de29e50f9eef26
- I guess failing PrepareAccess is rare, since this a 3 year old bug.
commit 1e62e773273539352bc21b2da5262678dd3fc7df
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 15 15:19:44 2008 +0930
Require inputproto 1.9.99.4
commit 609c04b62bdb0e86f33860069033c7142eecf210
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 15 14:51:59 2008 +0930
dix: stick a warning in about loss of subpixel precision.
commit de1573172ad2c2e98c101727930a468213295783
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Aug 13 13:11:44 2008 +0930
Backport device properties to XI 1.5 instead of XI 2.0
commit 8b9ed7dec2954d4890ddcc7c874fc0832b16495a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 14 09:08:14 2008 -0700
XQuartz: Fixed a stuck modifier key bug.
(cherry picked from commit eeb6e5a9e98dcf045ec230f160d5992080dceba6)
commit 1770c85374883229ec5e9685229b2333e62705e6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 14 07:32:37 2008 -0700
XQuartz: Made 3-button mouse simulation a little more consistent.
(cherry picked from commit d207b037d2ae213369e5627a17d8831c9bc16ad8)
commit f51f77d25e69b51fa3fd557ffdb5573b61759706
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 13 19:09:05 2008 -0700
XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs.
(cherry picked from commit b287c481e1cbe77ff84d10a708505f148a0c8434)
commit 04956b80431169e0ae713a3e6ba4cdc157ce3a66
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 9 10:07:32 2008 -0700
Transport/Apple: Add TRANS_NOXAUTH to incoming connections when the listener is flagged as such
(cherry picked from commit ba4a7924261070ad0aff7211b7a1c9581fad4646)
commit e6813e8de65eee854bbffe6ab0f8ba158f43b10b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Aug 13 14:24:45 2008 +0930
Xi: byte-swap device property requests.
commit 0ce687634fa5e0d955e896a0d0d5f584a4cfd1a4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 13 17:28:08 2008 -0400
Eviscerate save-under support.
Use a compositing manager already. Plus I really wanted to use 'eviscerate'
in a commit message.
commit f456f32cd97684052cab4712e7f4c827132c554b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 13 16:21:28 2008 -0400
Build fix.
commit c1e9b7dc6f4600fe6c301aecd7d67461cb884df0
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 13 14:13:55 2008 -0400
Sledgehammer off the DRI2 build system.
commit 544bfd06663ff71bc5275459cf74a3557530544f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 13 11:09:54 2008 -0400
Remove xf86Version.h and related API.
We haven't meaningfully been API-compatible with xf86 modules in ages,
let's stop pretending.
commit 139c3ab7b754dc425a09d5f7b6d2a8fb2b88138a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Aug 12 17:49:49 2008 +0930
Xi: return the state from the correct keyboard in QueryDevicePointer.
commit 998375f4154b000f75b2bafd4e276c0237d24dc7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Aug 12 17:49:16 2008 +0930
dix: remove superfluous check.
commit 9f9268821b13038556fbc029df54ab0e9b2aa77f
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 11 13:52:38 2008 -0400
The smart scheduler is not optional.
commit 2e2ce817ce404a5e000c9750fa96f656fed370b8
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Aug 10 23:07:46 2008 +0200
Move strcasecmp(), strcasencmp() and strcasestr() prototypes to os.h
And make sure os.h is included in files that use it.
commit 02efa78ce2da470b252289ff2af598d06bc84ece
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Aug 10 18:29:35 2008 +0200
add libXinerama to the list of dependencies.
Now that panoramiXext.h is installed bt libXinerama, it becomes required
to build Xext.
commit be2210b69defa225d8bc4bb90d94bfd740ef8b1f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Aug 9 23:43:50 2008 +0200
remove OpenBSD/amd64 specific mtrr API.
The old code never worked anyways and was removed from OpenBSD.
OpenBSD/amd64 4.4 and later support mtrr with the same API as
OpenBSD/i386.
commit 6e33e6f355f7f04e77a165eb67b1414724c1fba3
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Aug 9 23:43:03 2008 +0200
Move string comparaison functions to from dix/ to os/.
commit 5968634996c08656a0c5e2fa35705cf7afac87e6
Author: Dave Miller <davem@davemloft.net>
Date: Sat Aug 9 16:45:59 2008 +1000
glx: fix crash in driGetConfigAttribIndex
Don't access GLboolean via int pointers
commit 4212599c922373a224d2235c74672a3a3aa8e0b1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 8 12:17:58 2008 +0200
EXA: Make sure damage tracking code is inactive if the driver manages pixmaps.
It was always supposed to be like that... It was only recently pointed out (in
a rather convoluted way) that it was not in fact the case.
commit 073116cc44859e96374cde46325df8540621d5ee
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 8 12:15:27 2008 +0200
Remove commented out lines that make automake 1.9 puke.
commit 666781cd9b62207e45eebd3eb55a930f3a345f72
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 8 01:41:28 2008 -0700
Removed rogue #include
(cherry picked from commit af238e99da45a4dd8d8cbb6564bb8d0a3d79d590)
commit 4a0947bf06deacc3ae716730cfbbbeda1311bae3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 8 01:53:36 2008 -0700
XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
(cherry picked from commit 4545ba91e9d6ad62b6cafde3c73a672d3ded91a2)
commit 5accc9b3ce1af539150d59b1800b66783fd3e947
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 8 00:19:41 2008 -0700
XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew.
(cherry picked from commit 5854e712e9ebc210d2f8de6f5d4fb650944f314a)
commit 465a9bb96e8a90e53e655b3245e22910201786d7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 8 17:37:06 2008 +0930
dix: don't try to create events if we don't have a screen. #16898
A NULL screen may happen during server shutdown, when the output has been shut
down but the devices still generate events.
X.Org Bug 16898 <http://bugs.freedesktop.org/show_bug.cgi?id=16898>
commit d684f5760f40b682a8b879641300abe689a263c5
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 8 14:18:01 2008 +0930
xkb: actually initialise sli before using it.
commit e00cd54c1ac57ea6e7767e90592200f343d9d08a
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Aug 7 11:06:21 2008 +0200
dix: remove misleading comment in ptrvelo.c
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 6ca34549b89e73e3e0ec3cb7585686b880534cef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 7 16:27:57 2008 +0930
dix: remove obsolete FIXME comment.
Thanks to Simon Thum for pointing this out.
commit 2c3645581ee3f180d34e32c8016d5e4e1af4dca4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 7 11:55:10 2008 +0930
dix: SetModifierMapping should only apply to the ClientPointer and it's SDs.
commit e1b286d495b760cf67ddf936eca11da50fba847a
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Aug 6 09:42:32 2008 +0200
dix: simplified debugging helper for pointer acceleration
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d95136e1510a48cc3ad066d880d56061fc6a42ee
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Jul 31 00:39:03 2008 +0200
xf86: don't replicate dix defaults for pointer acceleration
the defaults from InitVelocityData() or hypothetic driver-side changes
are now respected, not overridden.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4f333d53510b82db57cfac1bfea22422cbb7be79
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Jul 31 00:33:38 2008 +0200
dix: simplify velocity tracking filters
prefer fp-mul over fp-div and remove rather pointless check
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bf084a0769eee36ff799e5e5f2d1e875c1ebcc51
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 6 13:36:43 2008 -0700
glcontextmodes.[hc] were not added with the removal of the meas symlinks patch. Copied from mesa head 2008.08.06.
(cherry picked from commit 409e1dd1e9524b5c1a1ae58a759da77e587e3780)
commit e72b1d21e44712e90595b1c31e67db6786d0d1bd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 6 10:23:31 2008 -0700
XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
commit d1b96cdea96f5321e0d254abde81cdaab2eca979
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Aug 6 10:37:32 2008 -0700
Add an xf86PrintBacktrace wrapper around xorg_backtrace to aid driver debugging.
commit 26d31ad1c7f4c550d73419ecf76912d844186b30
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 15:14:08 2008 -0700
XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.
(cherry picked from commit a8f0d32216e321b8ae6da182be9b1ea792f6e004)
commit 0ef3243fb59fa993a7a07a08debbd4329254c265
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 18:45:54 2008 -0700
XQuartz: More fd handoff cleanup.
(cherry picked from commit 199d2dcb708c9f9d6b9ede149ea0fe9fba6c007c)
commit e7dd3dd8f311d3872e0c4c9c2ca22c00f9d11f59
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 14:33:03 2008 -0700
XQuartz: Fixed some errors / typos in the preferences pane.
(cherry picked from commit e1e0c398bbb50394b164394e1f1870016489c25b)
commit 6836f9aac801c3add0ae4aece05b32e85a0c5f85
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 14:24:25 2008 -0700
XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize
(cherry picked from commit d3157ca45c1f88edd040d721c1e944b9d2c090aa)
commit c06e27b2f6fd9f7b9f827623a48876a225264132
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:42:15 2008 +0930
xkb: ProcXkbSetDeviceInfo should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit d9ca9819e975e0f6832a320f8be5958e5d942f85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:41:40 2008 +0930
xkb: ProcXkbSetGeometry should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit 5ba87c3327786dd7c6e8e265a19c858e8faae8fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:41:08 2008 +0930
xkb: ProcXkbSetNames should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit 7e45c80204e06562d4475741caea65bc8758f3c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:40:25 2008 +0930
xkb: ProcXkbSetNamedIndicator should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit a609dbed7cf854a6ee9d33c7cf45615db9da1fb9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:38:59 2008 +0930
xkb: ProcXkbSetIndicatorMap should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit e8c2a3d7c996cb41c4c44ba67acae5ff9438fc06
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:37:39 2008 +0930
xkb: ProcXkbSetCompatMap should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit 3c7740aa8f21c1fda4190a1bf5d6ce089db5e35b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:36:00 2008 +0930
xkb: ProcXkbSetMap should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit 31afd51dd49c0d0db2465fbc987044fab8b89f22
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:32:37 2008 +0930
xkb: ProcXkbBell should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit de4936d7482f820728efeef338a2041c7a9186d2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Aug 4 20:11:45 2008 -0700
XQuartz: Fixed proper processing of tablet button presses
(cherry picked from commit ca0babafa4e9cf1b67ec460655bffe569ac9c3e9)
commit b70a8ba3dc52b277194ab267a101a3fd15062685
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jul 15 17:48:29 2008 -0700
XQuartz: Nuke Sparkle.
(cherry picked from commit 4991f54a8d84a9a8df89a99dbfc09391195578f8)
commit 30851efdd4313506e92aeb6d3e5099dea99ab99c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 12:54:51 2008 -0700
XQuartz: Fixed first-client-can't-connect bug
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153edc5ab4ca010e8ce82d5c3fc0ddb72c)
commit 277a74bcbb7d0a93c4f2e1de11daabd8c5f93ee8
Author: Tomas Carnecky <tom@dbservice.com>
Date: Mon Aug 4 23:26:00 2008 +0300
Redefine clients as a fixed array
This removes yet another xalloc() each server generation. Also, I
couldn't find the corresponding xfree() so I guess that used to be a
memory leak there.
commit 5532d63488ec45953ff7f925cfb4f87adb3b04a0
Author: Tomas Carnecky <tom@dbservice.com>
Date: Mon Aug 4 23:06:08 2008 +0300
Redefine WindowTable as a fixed array
Instead of xalloc'ing it every server generation. The array is always
the same size (MAXSCREENS), anyway.
commit e882ee7056f370e0619d137b4ec3973ecb4e3479
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 29 17:52:11 2008 +0300
EXA: Remove unnecessary #includes
There wasn't actually any font code here, so no problem.
commit 6c1bb64c6f2efd81856ca00591df37916713b142
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 4 15:19:45 2008 +0930
xkb: break up XkbCopyKeymap into bite-sized chunks.
commit 3c6a9c531f673b7a0cb9ca01860b4dbe79686363
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 15:52:07 2008 +0930
config: protect against potential out-of-bounds indexing.
commit 92c51b183c2ff06361dad7f918daed6577ba4935
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 14:24:54 2008 +0930
config: support type strlist for XkbOptions property.
For backwards compatibility with server 1.4.
commit 35b14519b4a3158592a089170ec039bbc219603e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 29 12:59:57 2008 +0930
config: add parsing for input.x11_options.XkbOptions. #16874
X.Org Bug 16874 <http://bugs.freedesktop.org/show_bug.cgi?id=16784>
commit d762c08aebe3b7e8c88e2e7a6fcf66057a21b403
Author: Simon Thum <simon.thum@gmx.de>
Date: Mon Jul 28 14:07:48 2008 +0200
dix: export driver-side functions for acceleration
also add additional safety for accel driver api
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 18e9fd69fe01298d825b46415b9c6bd86c75dfe5
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Jul 29 10:07:43 2008 +0200
dix: use average of pointer accel profile
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 25882af6d3359e5ae42c927c555f5b257ba5665c
Author: Ivaylo Boyadzhiev <iboyadzhiev@nvidia.com>
Date: Sun Aug 3 18:55:12 2008 -0700
Fix a longstanding XAA CopyPlane bug.
TmpBitPlane is a plane mask, not a plane index.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit d980913f3145cdc34baab27ff818c9631c4c8571
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 1 16:15:04 2008 -0400
Erk. Actually check all the BARs, not just the first.
commit 82d51e6df2bf677bdf24376092bcaa79b534f6e5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 1 13:17:55 2008 -0400
Silence the "No matching Device section" warning in some harmless cases.
If the device doesn't have any BARs then it's just a stub for some
lame operating systems that need one PCI device per output for
multihead. No point in warning about it.
commit 9643e8d3482a35d355a243db7aa397ad47f29be0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 1 11:35:47 2008 -0400
Handle XGI cards in autoconfig.
It's all a bit wonky since both sis(4) and xgi(4) claim to support the
Volari Z7 and V5/8 (0x0020 and 0x0040), so let's side with xgi(4), why
not. Note that the V3 (not V3XT) identifies itself as a trident chip.
commit 63bdd4c27d47323b3282bf0b6eaecae91c79b45c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 31 17:31:36 2008 -0400
Unifdef XIDLE.
Seriously how was this still here.
commit 8d214bc26f9b7ab6a5c54d7749cd4b6811cb0b96
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 31 15:46:52 2008 -0400
Document more of the OS and library assumptions.
commit 2198e237b2ed85857c671eee2cd04dfc032befee
Author: Tomas Carnecky <tom@dbservice.com>
Date: Thu Jul 31 13:46:06 2008 -0400
Cosmetic cleanup to Xvfb/Xdmx configure check output.
commit 148175fb8b365dcf00b13539b3f03ce33f3df707
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jul 31 16:54:33 2008 +0200
EXA: Do still return FALSE if the driver PrepareCopy hook failed...
Thanks to Stuart Bennett for pointing out the problem on IRC.
commit 68fd6604a15b653d1fa244633eaaee9608a03ab3
Author: Tomas Carnecky <tom@dbservice.com>
Date: Thu Jul 31 10:03:56 2008 -0400
OutputPropertyNotifyMask is a valid thing to select for.
commit 64ebeeb5265a4c425b9397fdc86a6d81521a856e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jul 31 10:58:52 2008 +0200
EXA: Fix exponential growth logic for GXcopy tiled fills.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16908 .
commit 8405c25d9ddbfddb6b155a436f07ccad689e53bd
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jul 31 10:55:44 2008 +0200
EXA: Simplify exaFillRegionTiled() control flow.
Also only call REGION_TRANSLATE() when necessary.
commit b37b1e66996f8335dafc97b12d25aaec452b931e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jul 30 18:48:27 2008 -0700
Make shmint.h part of the SDK.
This includes ShmRegisterFuncs, ShmSetPixmapFormat, fbShmPutImage, and
ShmRegisterFbFuncs. Note that fbShmPutImage was already exported.
commit a3afa6f2fb80489f7b6a88d12def09281d32ed94
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jul 30 18:30:37 2008 +0200
EXA: Optimize GXcopy tiled fills.
commit 37087bc10630ee7740df1369b3e56a44fd2ad2b0
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jul 30 18:27:33 2008 +0200
EXA: Replace open coded CopyArea logic with GC op call.
commit bb2cacd33eb85f39b9e7fa554545611957df677d
Author: Xavier Bestel <xavier.bestel@free.fr>
Date: Tue Jul 29 13:06:10 2008 -0400
Cosmetic fix to EDID decoding.
commit a70754a9fdb019d85fbfca1898699f3c6f609fdd
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue Jul 29 14:16:25 2008 +0100
require inputproto 1.9.99.3
commit 591ef3c047ab3597fef9d687205e99c254ff2040
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 29 10:00:01 2008 +0930
Xi: ChangeDeviceControl presence events should set the appropriate devchange.
Requires inputproto 1.4.4 or higher.
commit 25dd5ce0770c5ff91a79c12223fd4af52759900b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 28 12:33:58 2008 -0400
Add atKeynames.h in hw/dmx/input and drop evil cross-ddx #include.
commit e39a16aa58456aaecee54edc64f189c958db0902
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 26 16:35:19 2008 +0200
xfree86: don't output a spurious newline to the log when loading a module
commit 2eaed4a10fe5bf727579bca4ab8d4a47c8763a7d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 26 15:35:42 2008 +0200
xfree86: use xorg.conf input devices if there is no ServerLayout
If xorg.conf has no ServerLayout section, use the first mouse and
keyboard sections as core devices, even with AllowEmptyInput.
commit 805f28e96ceb20bc53792ae3cf17f9c26564ae0e
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 12:10:52 2008 +0200
some trivial changes regarding C compat, indentation, etc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3209bd21d00b8673d321f70afb65720588ddacb3
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 12:06:34 2008 +0200
xfree86: perform pointer accel scheme selection by name, not number
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a17cb29f5acdfcdeac929d8c6be3600d44d038ef
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 12:03:17 2008 +0200
dix: preparation change: make runtime exchange of filter chain safe
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1a9f9ac50f2b0db735789905cc29572a50c8ae4c
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 11:49:36 2008 +0200
dix: optimize precision in device velocity estimation
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c184b91d9aa72031c2bac9f379f56633957ded30
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 11:33:25 2008 +0200
dix: improve the driver interface to predictable pointer acceleration
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 87aa5298576ed335ac31347e14fb30430288157a
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 11:28:09 2008 +0200
dix: introduce defines for accel profile numbers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e32e6fb38d19c9993de86188e4f7e7916a028e2
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 11:10:22 2008 +0200
dix: rename classic accel _scheme_ to lightweight to avoid confusion with
classic accel _profile_
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d40183c665d458ac0a6e7952fbe986776a17fda7
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 09:28:06 2008 +0200
dix: add legal statements to ptrvelo.{c|h}
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ec10eccd56be8b947cd63cae0687b8319857fe60
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 28 09:33:04 2008 +0200
GLX: Unreference drawables bound to the old context, not the new one.
Apart from the obvious reference counting issue, this fixes
http://bugs.freedesktop.org/show_bug.cgi?id=16867 .
commit 6ab8d6010adfd5ad6f1e1094a26c84f0aff934b1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 28 09:32:59 2008 +0200
AIGLX/DRI1: Pay more attention to return value from DRIGetDrawableInfo().
Could have crashed otherwise if the num(Back)ClipRects variables referenced by
the caller weren't pre-initialized to 0.
commit b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 28 09:32:54 2008 +0200
Fix Makefile.am crack.
Looks like an artifact from early modularization.
commit 3575d9584edf35ec1720bc3755b6576a56613685
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 25 16:46:44 2008 +0930
config: note that HAL options must be strings.
Only strings are parsed by the server, all others are ignored. Doesn't matter,
specifying int options as strings works fine anyway.
commit 54651ff5ec54f4c621e060b19f31d77d519ef158
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 24 17:41:48 2008 +0930
xkb: remove superfluous inputInfo.keyboard treatment.
Really not necessary, we can just walk the list and spare us the special
treatment of the VCK.
commit 70bd8261223366dae9dfdbb999691328d85f093c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 24 17:38:16 2008 +0930
xkb: use PickPointer/PickKeyboard in _XkbLookupAnyDevice.
commit 47160edec7f0d9129576d83f1593a5549879a893
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 24 12:12:45 2008 +0930
xfree86: warn some more about potential missing input devices.
Put out a warning if xorg.conf has InputDevice sections, but these aren't
referenced in the used ServerLayout. This is only performed if AllowEmptyInput
is enabled.
The reason behind this is that the server used to auto-add the first
mouse/keyboard sections if none where referenced. Now, with HAL and AEI
enabled by default, setups that relied on this auto-adding break and are left
without input devices. The least we can do is warn them.
commit f30b0823dbfc5902e54b337b5b6b570ebf216584
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 24 09:56:00 2008 +0930
xfree86: if AllowEmptyInput is on, warn the user that we rely on HAL now.
commit ad4cd2e241691427689591f7769a1184c8c1c7f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 23 17:40:28 2008 +0930
xkb: don't send core events on SlowKeys.
Core events don't happen until later in the DIX, so pump device events down
instead. This makes modifiers work again when SlowKeys is enabled.
commit 7d9dece74fc2bf130ceb8818ced5d9e3ac526900
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 21 22:12:45 2008 +0930
dix: fix up enter/leave system once again.
Two corrections
1. the "detail" field has NotifyVirtual, etc., not the "mode" field. This was
a clear bug.
2. don't set/unset the flags for NotifyGrab or NotifyUngrab. Clients are
expected to deal with multiple enter/leave events per window if the mode is
not NotifyNormal.
Testable with TCL menu boxes (such as used in gitk):
tk_optionMenu .menu globVar Val1 Val2 Val3 ValJunk
pack .menu
Thanks to Michel Dänzer for pointing this out.
commit 2ce434f54bc0d6050ef115e310df62c035e84bf2
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 24 18:44:16 2008 -0400
Clean up unused definitions from glx headers.
commit ae67508392261ae47858692668a0c192ef4a9d7b
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Fri Jul 25 10:05:30 2008 -0400
Fix AddExtension now that CloseDownProc can be NULL.
commit eff25430b4a391409e39337962ff7697165d23c7
Author: Daniel Drake <dsd@laptop.org>
Date: Thu Jul 24 21:06:34 2008 -0500
Don't abort if swrast library is not present
GLX is enabled by default, but the current swrast behaviour causes X
to abort with fatal error if the swrast dri library dlopen fails.
Handle the case where the swrast library is not present, and do not
register the GLX extension unless at least one screen has a usable
GL provider.
commit 62b5690415786c4a6e8bac464aa8db578beb74f5
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 16:13:10 2008 -0400
Remove some more MEMBUG garbage.
commit 036822584b26854e2f486f1bea84d8d19d9324de
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 24 16:03:58 2008 -0400
Drop xf86CommonSpecialKey() and atKeynames.h
These are AT scancode specific, should really be part of xf86-input-keyboard.
Remove from server, move to xf86-input-keyboard.
commit f3ff2386016ced7e677817e9761a535f0f385813
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 15:28:07 2008 -0400
Sync is built-in and mandatory.
commit 3fcf4d3eb89fecaa2be7b5ac4933b693c9c3d97e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 15:09:05 2008 -0400
XC-MISC is built-in and mandatory.
commit 9757106bba8f7bea99c5211817fc6b5fde4e6f66
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 14:59:14 2008 -0400
Remove all empty extension reset hooks, replace with NULL.
commit 6bcde69585fcc8f8dbfe81c115649f19274922fa
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 09:13:26 2008 -0400
Allow extension closedown hook to be null.
commit f65c50c4e902c7b5619fb7bbee8462434d809ec7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 09:07:42 2008 -0400
Bigreqs are built-in and mandatory.
commit d6228cb22aa89b90834d80d98b91862c1fc01b54
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 09:00:22 2008 -0400
Shape extension is built-in and mandatory.
commit 990fc643ae90c034187707e7de414d80640ec6da
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 24 15:02:40 2008 -0400
Ugh, remove trailing backslash.
commit 806e8cf3c01f955411445a7095f0957ea9a9b22a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 24 14:25:24 2008 -0400
Remove SPARC muldiv code. Was used by ELF loader, which is no more.
commit dff1a609bb4c0171e2abb92b54c16e739aec9ca2
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 21 18:29:08 2008 -0400
Drop the glx resize hook and stop chaining PositionWindow.
commit 24dddcd0ef845f4120f8588dc63ec754338ffac8
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 21 18:16:38 2008 -0400
Drop unnecessary linked list of contexts from GLXDrawable.
commit 5c1e254cc85e9ad409b0217780545c29f62d5feb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 24 03:01:45 2008 +0300
Remove xorgcfg
Us shipping a GUI configuration utility (especially as part of the
server!) was pretty pointless. There was pretty much nothing it could
configure which wasn't already runtime adjustable: if you could get a
server up with functioning input and output, there wasn't much xorgcfg
could do for you.
Au revoir.
commit b74927c3844bc2650d95f604fe782d95ade067f1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 24 02:42:13 2008 +0300
Remove ioport
I don't know why we would possibly be shipping this.
commit 8c0518379089d230060e9ff672ba5eba34198325
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 24 02:40:02 2008 +0300
Remove kbd_mode
We only built this on BSD and Solaris, and if such a tool is generally
useful, ship it with the OS.
commit 0d785bd635d135fcd67b4c9c88f5c8217e9b9240
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:43:09 2008 -0400
Unifdef hpux.
commit 5035741fd4cb4918957064a8c9ded9c7c31b4e22
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:38:38 2008 -0400
Unifdef __osf__
commit bd8bd2c700e6ccac53b47c45766c0a3a08a59344
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:36:35 2008 -0400
Unifdef AIX.
commit 5f5eed7f790db2f0ae0cd0f5c5ee5a312079c0b0
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:27:24 2008 -0400
Unifdef DGUX.
commit 856db05b58b71c5ff22af727aba435a8c356abfa
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:25:37 2008 -0400
Unifdef sgi.
commit ab6557fcd4bb4fd580bb1727dc8764f7dfb2cb30
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Jul 23 13:17:33 2008 -0400
Optimize commit 331cc3f0799a54910a99484264f76569beeee55a
Reorder to minimize comparisons
commit b699364b1c807d29666633523f5b5a608a07a8ee
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 11:43:59 2008 -0400
Unifdef VXWORKS.
commit 2e3c43d306616f8accdeaffec9c108ba88324805
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 11:35:06 2008 -0400
Assume __GNUC__ >= 3.
gcc 3.0 was seven years ago. Get with the times.
commit 0c1c9d75089aac0cf673820db83801d3cab5bfc7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 09:11:40 2008 -0400
Remove some broken debugging scaffolding.
commit 0ff5bc404842f7264a8e77f9e2a0bd8d0b051356
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 09:09:11 2008 -0400
Unifdef QNX.
Again, hasn't worked since at least 7.0.
commit 331cc3f0799a54910a99484264f76569beeee55a
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Jul 23 00:01:43 2008 -0400
Fix LookupColor
Using strncasecmp(3) with the lenght of the user-supplied colour name
will result in a false positive when the db key starts out with the
same string.
Eg, blue will also match BlueViolet (aka blue violet).
Since the shorter strings occur first in the database, avoid such
errors by treating a 0 result from strncasecmp(3) as a positive result
when the key’s length is longer than the supplied string’s.
commit bc3c03a3f3c091026310f0e8d55321cec570a0c5
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Tue Jul 22 17:34:37 2008 -0700
Don't return BadAlloc when trying to set a PictureFilter with no parameters when a filter with parameters was previously set.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 92fdd01d8e46dd4b41338754e1a34e9d3c387d4a
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Wed Jul 23 01:07:29 2008 +0200
[Xephyr] various X86_64 build cleanups
commit 5de1867fbb0a336ff3fdc92cbf734849f6111b1b
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Wed Jul 23 01:00:26 2008 +0200
[Xephyr] Fix #15839
Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
commit d692e1a63e4718d3b6d486582c19f30259b813a7
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:21:22 2008 -0400
Build fix.
commit d8937ce58137ad675f1ead8f2345eaed0ca63c8a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 22 16:52:50 2008 +0300
autogen.sh: Pass --force to autoreconf
Ensure we get all files installed when running autoreconf by passing
--force to overwrite previously-generated ones, which fixes running it
from tarballs.
Also revert Peter's local changes to pass arguments to configure, all of
which are the default now anyway, AIUI.
commit 880625eef5d8b168df3e42836fa1b763c51a91b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 22 14:34:28 2008 +0930
xfree86: plug memory leak, free driver's private data when deleting the device.
commit 67d7821ae783d3f123b6ba7203abf847374a1e36
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 21 11:48:24 2008 -0700
dix: reset potential lastSlaves when disabling an SD
Unplug a mouse, then warp the pointer and the warp pointer code will try
to update the position of the last slave device associated with the
master. That pointer will be stale and the X server will crash.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8c8c4fdf34bfc9d54ebea99fb0af14cad167b4a0
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 16:39:43 2008 -0400
EDID: Various reduced blanking fixes.
- Use a single common function to compute reducedness.
- Call it from both the old-school and new-school mode validation paths.
- Define monitor reduced-blanking support in accord with EDID 1.4.
- Attempt to filter RB DMT modes away from the "standard" EDID pool if
the monitor doesn't claim RB support.
commit e8cd77e14d3fa40e5cf1174acaf925362b2e0a11
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 16:15:03 2008 -0400
EDID: For standard timing blocks, prefer DMT timings if they exist.
commit 6ba70091e2325f534a37ef185fea568d2c43edec
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 15:40:34 2008 -0400
EDID: Correct DDCEstablishedModes to conform to DMT.
commit facb255fa9267e343cbc91f841f1b64e5dc99e98
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 21 16:05:53 2008 -0400
Need to unref pixmaps backing pbuffers too.
commit d5ae85b5b722821499d5796cf0973ecb6ec125f1
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 21 15:28:50 2008 -0400
Fix embarrasing GLXPixmap leak.
commit c74ddc87c995c73109827717a49f14846c7c4024
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 15:10:20 2008 -0400
EDID: Add quirk to clamp max pixel clock to single DVI link speed.
On some panels you end up with all of:
- No range descriptor
- No description of physical connectivity
- Native panel size mode in standard timings list
In principle you're supposed to use the timings for that mode from the DMT
spec, but in practice the DMT spec has timings for both 1920x1200 normal
and 1920x1200RB, and the standard timing field gives you no way to
distinguish. And, of course, the non-RB timings don't fit in a single
DVI link.
commit 55803473adb0a0975fea81035402bf6b4ec0e30b
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon Jul 21 10:32:57 2008 +0100
Bump inputproto to 1.9.99.2 for XI_PROP_ENABLED
commit 69de40ee45a6e046be79b735cd1540f63b87aee9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 21 17:05:04 2008 +0930
dix: shift the duplicate button mapping check to ProcSetPointerMapping.
XI 2 allows two buttons to have the same button code.
commit 0dbfe0ebc69c307c0626ba824de15d03de1251d4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jul 21 03:50:15 2008 +0300
Revert "Try nvidia before nv under the assumption that people who install it usually want to *use* it, too."
Per mailing list discussion.
This reverts commit 66fb253082ea42179180303393e48846208987fa.
commit 6b5206e7cb8e5279816b48f014d47d3f03f16972
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 18 15:38:10 2008 +0300
dix: Remove insane BC hacks
If your DDX needs a 1bpp mode and doesn't set it up, your DDX is
incompetent.
commit 66fb253082ea42179180303393e48846208987fa
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jul 8 02:39:00 2008 -0700
Try nvidia before nv under the assumption that people who install it usually want to *use* it, too.
commit 376620460ec50cb98a1e3746629b7f73c2e926d7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 20 16:53:01 2008 +0200
Drop some more configure-generated files from the tarball
commit 35346a42271dfe65fe0a86dc522701028bf6daf6
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 20 16:40:59 2008 +0200
Don't put xf86Build.h in the tarball (bug#9277)
This file is generated by configure, we don't need to ship a stale
version in the tarball.
X.Org bug#9277 <https://bugs.freedesktop.org/show_bug.cgi?id=9277>
commit 43c6d5a6f83dfdf8596c8d0faf8ac1a64f73a8c1
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 20 16:30:24 2008 +0200
distcheck fixes
Still seems to fail because hw/xquartz has too long filenames
commit 92b0a04ffd630a89705fc73d587182a62c34cd84
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Jul 19 18:21:37 2008 -0400
Fix compile failure
This fixes a compile failure by ensuring that mouse-cfg.c
can see the MTYPE_ constants.
commit 0b45ba488d8a3e901b83e445d17e7e9a67047b6c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 18 10:54:10 2008 -0400
Drop the FONTCACHE extension.
This appears to have been dead code since X-TT was merged.
commit b85392e66b4cbfcc95897ac342f19ac8ab04d4cc
Author: Søren Sandmann <sandmann@redhat.com>
Date: Thu Jul 17 23:10:11 2008 -0400
Give priority to clients that are receiving expose and configure events
commit 3b687ffe1649449b3d182f5e7690274c6c96916a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 17 18:16:59 2008 -0700
Make xstrcasestr prototype return value match the implementation
commit f7bfa4ae971b43c3ed81cc84e6d1e071c413f04c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 23:03:57 2008 +0300
configure.ac: Remove non-existant directory
Oops.
commit 16e40ecf43ea7df349e54f757db0223764d752ee
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 22:37:31 2008 +0300
Remove dead code, useless #defines, et al
commit b0a99fb02bb7290266d7dddee4de0b9959fb3c52
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 21:42:17 2008 +0300
configure.ac: Fix release date
Instead of putting something that's always wrong, at least just put
unreleased, which will be more obviously wrong if it's, well, in a
release.
commit 711720650cc192022f0d91f5cf94292d48dbc891
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 21:39:46 2008 +0300
Everyone has urandom
If you don't have urandom, please just add a fallback to /dev/random,
rather than building our own random generator.
commit 446fe9eecddd1337f9d5164dd7c301e1ba3dfe32
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 21:37:50 2008 +0300
Dead code removal
Remove a whole bunch of code that was never built, be it entire files or
just dead ifdefs.
commit 0564b5454ac101d9e1218767bbbc2c2d9f3e0696
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 20:46:27 2008 +0300
XFree86: Restore AllowMouseOpenFail usage text
This was incorrectly stuck behind the XFree86-Misc define, so got
deleted with the rest of misc: restore it unconditionally, as it should
be.
commit 6c7c0ffeb71610ee00fc92b32fd2b1cc70383e38
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 20:45:01 2008 +0300
KDrive: Delete rafts of unused code
Most of this stuff was gone with the last real hardware drivers that
used it. Au revoir.
commit ad7a7ae290b05f007062161418c929d9cebeef78
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 17 18:51:05 2008 +0200
XF86BigFont is disabled by default
3c19ec47b434d4ca84db58363cc053cc0b6aa413 did that,
but pretended to make it 'auto'.
commit 058100fd19ed33a3100d18a9ca56fdcffac361b2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 17 09:35:30 2008 -0700
Remove more Lynx leftovers
A couple #if defined(Lynx) && defined(sun) had become just if defined(sun),
resulting in wrong settings for Solaris builds, so they're now just deleted.
commit 47833eef35b20a2eb0a74782edbb0877fd491c4c
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Thu Jul 17 11:59:24 2008 -0400
Drop a bunch of #ifdef Lynx.
commit af2138bfce34a28312b26106eaf9561d96712ee0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 17 10:39:29 2008 -0400
Nuke some ancient code for commandline-challenged OSes.
This appears to have been dead code even in 6.7.
commit b9a0cee026361189dce63b87c738bd1d17e02830
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 17 10:32:35 2008 -0400
Drop hw/xfree86/os-support/lynxos/
This has never worked in any modular release, clearly no one cares.
commit d87f170bd99f7908eb14272ac42c8963d089f54f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 17 10:29:52 2008 -0400
Remove XF86Misc code from xorgcfg.
commit e3ff8501749209ee2dd324d35ae16e37510e0574
Author: Jie Luo <clotho67@gmail.com>
Date: Thu Jul 17 10:27:24 2008 -0400
Remove duplicate load of freetype font renderer.
libXfont will do this for us in FontFileRegisterFpeFunctions.
commit 8441e26266701776f1416bec864ae2949355da76
Author: Jie Luo <clotho67@gmail.com>
Date: Thu Jul 17 10:23:37 2008 -0400
Remove freetype from the list of autoloaded modules.
commit 5d11ae7a69e3a7611c667be4628a15a4b514f72c
Author: Jie Luo <clotho67@gmail.com>
Date: Thu Jul 17 10:22:29 2008 -0400
Fix color lookup.
OsStrCaseCmp returned inverted comparison sense from normal strcasecmp.
commit 478d3918d5b23fba1a7e3aaea766dfa785e5a0a6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 03:29:26 2008 +0300
XFree86: Remove remnants of XFree86-Misc
HandleMessage: dear god, no.
commit 95000e34df9ba066905430eb0eb39a616567183e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 16:37:14 2008 -0400
Build fixes
commit affec10635343668839994ea2bac16c1d4524200
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 14:44:33 2008 -0400
Remove loadable font renderer support.
commit acc91054316208844742495dea0b80a860ef02bb
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 14:24:47 2008 -0400
Remove font module support from xorgcfg.
commit a82e6efb7b9b2ab9a1597b002f375c5ee105e7f5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 14:19:04 2008 -0400
Remove the numVideoScreens xprintism.
This was to account for cases where you had video and print screens in
the same server. Lunacy. Leave the slot in ScreenInfo, but rename it,
and stop looking at it.
commit 1a573e402ec112913a404f092b5b97d8d9210f94
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 13:41:53 2008 -0400
Update the Allow*Grabs documentation for xf86misc removal.
The API to turn the grab-break keys back off is gone now, so don't
say it exists.
commit 55644d2f1cddf1777587f213ed581b6087d9fdad
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 14:23:34 2008 +0300
Make --enable-debug usable again
Enable region debugging causes assertion failures (should really look
into that, though), and I don't need four messages every time I move my
pointer.
commit 22e64108ec63ba77779891f8df237913ef9ca731
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 06:25:26 2008 +0300
XFree86: Remove XFree86-Misc extension
Its last remaining purpose in life has been destroyed by input
properties. Au revoir: it's been fun, by which I mean awful.
commit b8dd07f855c555af56cbf0f69df799f424da2cca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 03:00:25 2008 +0300
HAL: Remove grotesque open-coded strcasestr
Not only was this pretty ugly, but it didn't even work on systems
without strcasestr anyway, due to the define not being in dix-config.h.
Lack of strcasestr is handled transparently with the version from
FreeBSD now anyway, so, huzzah.
commit ad87c72edcc0d1f56658e0c4e73af335c8d5a516
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 02:59:51 2008 +0300
DIX: Add strcasestr from FreeBSD
Add strcasestr for use on systems which don't have it.
commit c3c901cf44cf16bb33c4176494361b429099a372
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 02:54:41 2008 +0300
configure.ac: Fix SHA1 handling
Fix and marginally simplify the SHA1 handling. First, we allow people
to override it. Secondly, we try for libmd. Then, we try for OpenSSL
with pkg-config. In a last, desperate move, we try libcrypto on its
own. This allows the server to, y'know, _link_ when using OpenSSL,
instead of failing because we only have -lcrypto, and not -lssl.
commit 69b57dc651e12a0d9a5a4295b185c62d5c0df63f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 02:03:36 2008 +0300
dix: Actually build str(n)casecmp if we don't have it
Remember to add stuff to dix-config.h when you add new AC_DEFINES,
people ...
commit dcf6293030126509d7d6c61d131222037d5ed7db
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 01:57:00 2008 +0300
strcasecmp: Actually use the right license
Forgot to update the license when I committed the FreeBSD version, so it
still had an old SGI license. Sorry. Sorry.
commit 441f084bfe87a6ea1c94ec63f82888b8b3d81d89
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 2 19:52:58 2008 +0300
config: Don't attempt to use D-Bus when not strictly necessary
If we have D-Bus but have explicitly disabled it, don't build it.
commit 35c89f3f5b8fa222e37b799d5bb01595e8f30d0c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 01:43:58 2008 +0300
XFree86: Remove mysticism from Makefile.am
The variables were always the same, so just shove them in with the rest
of the plebs.
commit b89a59248a4a0ff06b9a0ddee45881efc6063063
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jun 27 12:20:56 2008 +0300
XFree86: Delete OSMouse code
This should be moved into the mouse driver, if anything.
commit d0de5ea96d084fc5da87d8f323ddfc08fe9c03ba
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 25 17:56:28 2008 +0300
XFree86: Remove useless debugging code
Also remove documentation which told you how to use a non-module-aware
GDB, albeit only with old, non-shared, modules.
commit 4b1273c9c2da113f634be80caa28e81df3beae98
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 25 17:51:12 2008 +0300
XFree86: Delete empty file & function
xf86InitXkb() has been empty for as long as I can remember.
commit 3a54f3f48fa1c0d60604c3ee767c569b5ec23430
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 12 01:05:04 2008 +0300
XFree86: Clean up init a tiny bit (no code changes)
Reshuffle and delete.
commit ddcefb50dda9e398647d1c84c7153127ed26a4d2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 11 15:14:26 2008 +0300
XFree86: Remove trailing whitespace
commit e6f35f28fb3526b911101bde4aa761de8b055aef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 11 15:13:21 2008 +0300
OS/KDrive/XFree86: Sanitise colour initialisation
OsInitColors always just returned TRUE, so just remove calls to it and
insane special-case logic. Remove unused kcolor.c implementation, and
merge oscolor.h into oscolor.c since it was the only user. Remove
open-coded strncasecmp in oscolor.c.
Since we no longer need to call OsInitColors after reading the config
file, just call PostConfigInit() from one place, and move PM handling to
one place so we can install the signal handlers earlier.
commit 11f9e3520249a603b95e64503ee759998ff17feb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 11 15:09:46 2008 +0300
DIX: Add strncasecmp from FreeBSD, make strcasecmp args const
Add strncasecmp (as we're now using it) in case someone doesn't have it,
and also change strncasecmp args to be const, in accordance with
everything else.
commit ae38151ddda9984effca5bb7c582540061201dce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 19 08:35:05 2008 +0300
configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest
This fixes the linking for these two when using DRI2, which requires
DLOPEN_LIBS.
commit ccec16e519c143f4c0017a37e93ebc52ac472e4e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 15 11:24:08 2008 -0400
Bug #7300: Move xf86RAC to hw/xfree86/common
commit 9111944b292355f7478b4ae75bead8dc25edbbcb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 15 10:36:38 2008 -0400
Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0.
commit 3f3f66de669caf3606eec8c5f8d405a283cbf12d
Author: Brad Smith <brad@comstyle.com>
Date: Mon Jul 14 22:20:41 2008 +0200
Fix the configure tests for swap16/__swap16 macros on OpenBSD.
BSD systems need <sys/types.h> included before <sys/endian.h> for
macros to work.
<https://bugs.freedesktop.org/show_bug.cgi?id=16531>
commit 11ee0ae9390a608a232ff94abcc0cbcf9ed7b70a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 14 10:20:11 2008 +0930
xfree86: append, not prepent, new input devices to xf86InputDevs.
If devices are prepended to the list, their wake-up order on resume is not the
same as the original initialisation order. Hot-plugged devices, originally
inited last, are re-enabled before the xorg.conf devices and in some cases may
steal the device files. Result: we have different devices before and after
suspend/resume.
RedHat Bug 439386 <https://bugzilla.redhat.com/show_bug.cgi?id=439386>
commit 5bcc45e07e8726a5442567472dd29cfb5c901f2d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jul 13 18:40:53 2008 +0930
Xi: expose Enable/DisableDevice through XI_PROP_ENABLED property.
commit c9eb0e870c87d291311491452adf7f91a911e24b
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Jul 10 22:33:39 2008 +0930
Add support for multiple pointer acceleration schemes. #8583
Available acceleration schemes:
- xorg classic scheme.
- the new "Predictable" polynomial accel scheme.
X.Org Bug 8583 <http://bugs.freedesktop.org/show_bug.cgi?id=8583>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e7abe1676a6a4e4249504b8c9660cbad70569199
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jul 13 18:41:53 2008 +0930
Xi: protect against NULL handlers, don't try to dereference.
commit 2bbb12c355308d10bf123911044fbdf6ae7fb59c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jul 13 20:23:14 2008 +0930
Xi: remove ChangeDeviceControl for CoreCtl.
If you want to set a device to core, attach it to a master device.
commit 18ff17756c988b6c21b76bf898e45685649d07bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 19:23:14 2008 +0930
Xi: GetDeviceProperty reply includes deviceid.
commit c3267106fb599213555829cb76df7848c4ebe23b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jul 9 10:02:41 2008 -0700
XQuartz: Use CFEqual to compare keyboards
(cherry picked from commit 5538e43b9ae7d06d2f48842b065810ce74286eb6)
commit 90dd2de845ae12153296f6f1bff0c87f79c57854
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Jul 7 10:55:58 2008 -0700
XQuartz: Some fd handoff cleanup.
(cherry picked from commit 9c20a4804d97e67a988f00f49866997209cce518)
commit 26d8030c3836816de8c12b2cb9d67315e5c887eb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 4 19:23:21 2008 -0700
XQuartz: Remove deprecated keyboard code.
(cherry picked from commit 69cfc1a21e12bb38a6130dea2e5f20f1e6a3ee7c)
commit 5cfcbd54d98cc77ee02a3a099ebbad9af511a0ee
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jul 2 00:47:08 2008 -0700
Set machine dependent defaults for ppc64
(cherry picked from commit 0733ef2e8abda99cfd62966e73017949e9cd507f)
commit e69b9f9ca45c0c6bfb93ea9143737116bf1f2453
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 25 11:51:27 2008 -0700
XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
(cherry picked from commit 49668e8a88137e9f258eae970826883b88b7d8ba)
commit 8d2e2e1d856efec4459de2a20af642dc1ec9b8a5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 11 11:44:45 2008 -0700
Xquartz: Removed include directive for removed header
(cherry picked from commit e65a36d57f338410c5a5b02cb5ae1214a81d072d)
commit ebd70c82fdbe483d149ac9bdb5a64cc6e0c10e0a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 10 14:38:34 2008 -0700
Add LoaderShouldIgnoreABI to allow drivers that roll their own ABI checks (i.e. nvidia) to perform the check before ScreenInit.
commit c42427f63f0e0495e56909ee99ad1e3c4321c39b
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date: Wed Jul 9 10:50:21 2008 -0300
Fix incorrect test regarding keyboard map.
In the map stored in each keyboard device, the first line refers to
minimum keycode, i.e., the 0th line refers to keycode 8. When not
using XKB the wrong test caused some keys to be interpreted as
locks ('m' for instance). The had to be pressed twice to generate
both KeyPress and KeyRelease events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e4054e5cb3d919dfc83021be3f2b9036d0e5a2be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 11:03:31 2008 +0930
Xi: pack the property stuff into a struct, make handlers a linked list.
We may need more than one handler to deal with a property (e.g. one in the
driver, one in the DIX), so get the handlers into a linked list and call them
one-by-one. This is of course slightly less entertaining than the hilarious
WRAP/UNWRAP game we play in other parts of the server.
XIRegisterPropertyHandler/XIUnregisterPropertyHandler are the interface
drivers/the DIX should use to attach themselves to the device.
XIDeleteAllDeviceProperties destroys everything, including the handlers.
commit 2039c6ea43244339659323d05d96c14e41996c20
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 7 22:10:17 2008 +0930
Xi: add support for input device properties.
Basically just copied from randr properties, with minor changes only.
Each device supports arbitrary properties that can be modified by clients.
Modifications to the properties are passed to the driver (if applicable) and
can then affect the configuration of the device.
Note that device properties are limited to a specific device. A property set
on a slave device does not migrate to the master.
commit 4ab01fe5db7fb330b1ec463aa49b77859527e597
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 16:27:36 2008 +0930
Revert "Xi: add support for input device properties."
Note to self: don't mix up branches with half-finished cherrypicks.
This reverts commit 666838fcc8b71fdeae160844160187f345cbf4a6.
commit 666838fcc8b71fdeae160844160187f345cbf4a6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 7 22:10:17 2008 +0930
Xi: add support for input device properties.
Basically just copied from randr properties, with minor changes only.
Each device supports arbitrary properties that can be modified by clients.
Modifications to the properties are passed to the driver (if applicable) and
can then affect the configuration of the device.
Note that device properties are limited to a specific device. A property set
on a slave device does not migrate to the master.
commit acce27093571497a0626cee1cdb61ddf751dbc40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 8 16:02:13 2008 +0930
Xext: store the GenericMasks in the resource system.
This fixes a severe issue - when the client died the event mask didn't get
unregistered and a future event would dereference dangling pointers. By
storing the event masks in the resource system we can free them when the
client dies.
commit db86b8839f286e0e2efb5638b8ab2fe608707655
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 8 15:12:45 2008 +0930
dix: free GenericMask allocations when destroying window.
commit 08e2c625f620688d35f3b443ffb878e8e991ff57
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jul 9 20:07:59 2008 -0700
Remove README.font, since it's just an old text copy of xorg-docs/sgml/fonts
commit 5e847c1d4fc30a0d263a861a76982660f11998cd
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jul 7 17:08:01 2008 -0700
Improved driver selection when autoconfiguring driver without xorg.conf
- Allow returning multiple drivers to try for a given PCI id (for instance,
try "geode" then "amd" for AMD Geode hardware)
- On Solaris, use VIS_GETIDENTIFIER ioctl as well as PCI id to choose drivers
- Use wsfb instead of fbdev as a fallback on non-Linux SPARC platforms
commit 235fea0e1a2101fb76a54e6505db321674530c60
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jul 7 15:21:59 2008 -0700
Update bsd & solaris descriptions in README.OS-lib
commit d8af9d9ab1cd98c07fdf42490dcc0cab3c655b89
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 7 13:14:49 2008 +0200
Export xkbfile.h in the SDK
It's needed by xkbsrv.h
commit d78bebb20a00e8519788c75c90b467a5750c78be
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 04:04:19 2008 -0300
Remove unused function and variables.
commit a8c4727f01949da0ae266369f0d12a96c2bf0da5
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 04:03:46 2008 -0300
Fix typo in the last commit.
commit 3164288b121990a5990747c0f92d4af13b1c929a
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 03:55:59 2008 -0300
Remove deprecated function miPointerPosition().
commit d1031a8972490ebf0ef6dc2762036a7a7172466b
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 03:46:21 2008 -0300
Update README.OS-lib to reflect reality.
commit f72500c4a09cce5dbbd16639b1951a4bf943e4ac
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 03:45:18 2008 -0300
Nuke libc wrapper remaining stuffs.
commit 3fd5fab5663fbdce2fc0b5377155aedf9a70b6c2
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 02:51:42 2008 -0300
Remove inexistent function headers.
commit 0b9ef835a0fe900c121b84e43989591e58ab1126
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jul 4 07:29:32 2008 +1000
modes: fix initial xorg.conf mode selection.
This was all kinds of broken, we ignored user preferred modes for multiple
monitors and also for side-by-side configurations.
commit e317943c125d7fdbe62c750324640eb30c88fa15
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 2 12:23:03 2008 +0930
xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway (written by Sasha Hlusiak).
Resurrect checkInput() and check for devices there if AEI is false (this also
creates the default devices if required).
Set AllowEmptyInput to enabled by default if hotplugging is enabled.
commit fe5cf7cb00fd926cefff933adbdbceea7353f4c2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 1 13:18:54 2008 +0930
xfree86: handle missing Screen lines in the ServerLayout #16301
If no Screen is specified in the ServerLayout section, either take the first
one from the config file or autogenerate a default screen.
X.Org Bug 16301 <http://bugs.freedesktop.org/show_bug.cgi?id=16301>
commit 6674b87a7dca7d6ffd9dd9af888c5256b13d7877
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 29 20:05:27 2008 +0930
xfree86: move declaration of configured_device to start of function.
Last I checked C doesn't allow declarations halfway down a block.
commit 1e96782011f0b4ba6ed1d3d3df118964a58d15fd
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Jul 3 20:00:22 2008 +1000
dri2: bump libdrm numbers as 2.3.1 is released without ttm interface
commit 1771edcb44b564f83f509748b4e4cd5b7586e2a8
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 3 18:57:09 2008 +1000
modes: check the crtc is valid before using its desired modes.
this fixes a crash I was getting on radeon rotate when gnome is running.
I'm sure g-s-d was doing something bad, but really not crashing ftw.
commit 689292e58cc5242cbfeaa29fcf65b6dcd9dfabb9
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 11:25:50 2008 -0400
Fix GLX in Xvfb and kdrive.
commit 9a73bca859be12721ef62304b1422c455d4aec49
Author: Chris Ball <cjb@laptop.org>
Date: Wed Jul 2 09:46:06 2008 -0400
Remove KdOffscreenMarkUsed() as all its callers are gone.
commit b84a27fd9fdcb579437cfa38f10cb12cf55dc7c3
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jul 2 06:25:03 2008 -0700
VBO: Regenerate files based on recent changes to gl_API.xml
Since GL_ARB_vertex_buffer_object protocol isn't supported yet, these
changes are innocuous.
commit 703a9645f3d547144ea62dd81c41f5356a5f87d8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 1 17:50:48 2008 -0400
Auf wiedersehen, KAA.
commit c8216aede6c4ac41976947521d884fa010913204
Author: Jeremy Uejio <jeremy.uejio@sun.com>
Date: Tue Jul 1 13:37:12 2008 -0700
Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>
This bug is caused by Xephyr not handling the RGB byte order correctly
of the server where Xephyr is displaying on. The previous code just
assumed that the order was RGB and did not take into account that
Xservers may use different order (such as BGR).
The fix is to add a function to calculate the byte order and bits
to shift based on the visual mask and the visual bits_per_rgb (which
is usually 8, but could be server dependent). Since the shifts won't
change once the display connection has been made, I can cache these
values so that Xephyr doesn't have to keep recalculating them everytime
it tries to translate the Xephyr colormap entries for Xephyr clients to
the actual server colormap entries (i.e. calling the function
hostx_set_cmap_entry() repeatedly for every colormap entry).
commit 2e8daee05343b2853b677acf4554def0ceeada00
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 30 17:29:35 2008 -0700
Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.
RandR 1.1 has a physical size for each mode. It used to be that the DIX would
remember these modes and pass them back up to the DDX when changing the screen
configuration. The DDX uses RR_GET_MODE_MM to query the driver for the physical
dimensions of the screen, allowing it to preserve the DPI.
With RandR 1.2, the physical dimensions are stored as part of the output, rather
than per mode. The DIX only uses the sizes passed in from the DDX to select the
mode pool for the "default" output, and forgets the physical sizes. Then, when
reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
from the output, screwing up the DPI.
This change works around this problem by ignoring the DIX and querying the real
size from the driver.
commit e2bbf2d248a2d2a2db4adfe9d1bda94cf184d8bd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 1 12:01:56 2008 -0400
Don't try to load DRI2 if built without it.
commit 66d7c9de82b5e733e4995f079a96efe612fca881
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 1 10:55:54 2008 -0400
Declare xf86InterpretEEDID() properly.
commit e4335e876d254e446a965259e845ad955da5b5c2
Author: root <root@samich.home.cworth.org>
Date: Mon Jun 30 15:29:04 2008 -0700
Revert "XInput ABI is 2.1, not 3.1."
This reverts commit 76576c87b0de106e006d1cfa59d42d3a483e966c.
which was an incorrect revert of previous ABI bumps. Those
responsible for the accidental ABI bumps in both directions
have all been sacked.
This allows xf86-input-mouse to build again, for example.
commit 6447f80c17077f924b2d58e07b38d32429edcb9b
Author: Carl Worth <cworth@samich.home.cworth.org>
Date: Mon Jun 30 13:16:49 2008 -0700
Use AC_CHECK_LIB before PKG_CHECK_MODULES for openssl
Previously, the code was using PKG_CHECK_EXISTS before PKG_CHECK_MODULES,
(to cater to OpenBSD systems that include openssl by default but without
a .pc file). But this meant that systems that didn't have openssl installed
at all would not get any error message at configure time.
Now, if the SHA1_Init function is found in -lcrypto without any additional
flags, then that's used. Otherwise, pkg-config is used to find the right
flags to link against libcrypto. And if that fails, a nice error message
is now generated.
commit 76576c87b0de106e006d1cfa59d42d3a483e966c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 16:10:37 2008 -0400
XInput ABI is 2.1, not 3.1.
commit bed12dd3df0129b7f28d0a42d470266bd3ae6b38
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jun 21 16:07:54 2008 -0400
Do EEDID in RANDR 1.2.
commit 4fc18b5fc31aa287e807ee520dc9117296e3d306
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jun 21 16:07:36 2008 -0400
Hexdump the whole EDID block if extensions present.
commit b4fbc31e109f1efe78613597f9a91d5363523493
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jun 21 16:00:05 2008 -0400
Actually fetch all blocks of EEDID if asked to.
commit 211e2bdcc677122145998829a7f26610c7c567e6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 10:29:17 2008 -0400
Bump ABI minor numbers for the devPrivate ABI functions.
commit d6b8d9eaffaf3f976db330bc35da3d30eb656bac
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri Jun 27 17:16:35 2008 -0700
DRI: Ensure we have the DRI headers from Mesa
Change the DRI configure check to look for the dri pkg-config file. This
prevents people who built an Xlib libGL from bombing later in the build.
commit 7ddfb2f1587da3ec1cd27ae270e42700adf4f560
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 26 21:23:31 2008 -0400
Fix a leak of window devPrivates in window.c/CrushTree().
commit 15e4b6c57484b6afb790c7dc1db9f529ba2219cf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 24 13:46:40 2008 +0930
input: for non-device events (e.g. DevicePresence) use MAX_DEVICES as id.
Using id = 0 only worked pre-MPX since XInput didn't allow XOpenDevice for the
core devices (0 and 1). Now we can now legally register for events so we may
overwrite our device-independent classes with the ones selected for the VCP.
So, increase the EMASKSIZE to MAX_DEVICES + 1 and use MAX_DEVICES as the ID
when we don't have a device.
commit f0c56ffd980db19bea271aeebf118bd931f6f40d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 24 12:58:49 2008 +0930
dix: don't dereference dev->key if it doesn't exist.
This may happen if we check for a passive grab on a floating pointer device.
commit 01f0b9c9784c55c94104bafa6dd545b373c64104
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 25 19:23:20 2008 -0700
xf86GetOptValFreq wants a pointer to double, but maxPixClock is an int
commit 7ce6dcef118139d0ccfc136b9a07f5bf0c078d70
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 25 15:06:49 2008 -0700
Don't log null device name in XkbDDXLoadKeymapByNames
commit cbc20d92de92aad5ca240310a9156ccf97c24a01
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 25 09:52:36 2008 -0400
XTrap delenda est.
commit a81b5ce452766bbc4b2ac0849711284ba8591b46
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 25 13:23:09 2008 +0930
dix: free memory associated with the EventList. #16507
Un-deprecates CloseDownEvents.
X.Org Bug 16507 <http://bugs.freedesktop.org/show_bug.cgi?id=16507>
commit 3a2beb2f867fd47dc5a7723dcac345ea0b0ecf3d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 25 13:12:41 2008 +0930
dix: InitEventList does not need to be _X_EXPORT.
commit 385943e0e97463ce4681a9b6a4a40d7e3c91e51e
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jun 24 23:13:32 2008 -0300
Set --enable-builtin-fonts as default.
Some reasons to embed fonts by default:
1. X server doesn't pick a good default font path so it's easiest just
to built in the core fonts and let new X hackers more happy. Developers
and distro guys are wise enough to just set --disable-builtin-fonts
when they want.
2. Seems that this is by far the most popular FAQ
(http://www.x.org/wiki/FAQErrorMessages).
3. No one gave a good argument to not do this:
http://lists.freedesktop.org/archives/xorg/2008-May/035479.html
commit f3b29efc4d7bb346cdd3fd79e780f1022c8f46e8
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jun 24 23:07:49 2008 -0300
Remove NOFONTSERVERACCESS macro
dix: this is semantically different but it goes through the same path in
the code.
commit 2ff7eb4995b663cf12a01124745de600f38d0bfc
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jun 24 22:09:34 2008 -0300
xfree86: kill INHERIT_LOCK_STATE macro.
I don't know how this survived so long. Google didn't show
anything usable related with this.
commit a3ec22627355fc08730ad7e90022e374763d333f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Jun 24 20:32:24 2008 -0400
Fix a leak in the code that parses the protocol names.
Also added some comments.
Reported by Ben Gamari (bug #16492).
commit a4cb25f8c816adc3bdf6a28d5beb558e8be40121
Author: Ben Gamari <bgamari@gmail.com>
Date: Tue Jun 24 12:08:35 2008 +0930
dix: free FocusPrivates when deleting a window. #16493
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
X.Org Bug 16493 <http://bugs.freedesktop.org/show_bug.cgi?id=16493>
commit 32a7bbbba6fec0535a8faa1d6d2ecebe786bcc81
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 24 09:28:05 2008 +0930
xfree86: fix up leftover allocation of xf86Events.
Thanks to Eamon Walsh for spotting this.
commit bcc88a1d46c7ba469c4e2861875f84f8c77d4b15
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 22 22:34:30 2008 +0930
xkb: remove unused variable is_core.
commit 9ed9d98dec58d1f7468d02c4b951811b8e1ca7c1
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 24 22:36:32 2008 +0200
x86emu: fix build, fallout from 9719354
commit e9b4f3cd856e2401675452c387b4155246239f91
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 23 16:18:20 2008 -0400
Fix "warning: suggest parentheses around && within ||".
commit 8910dde96ec4318c9c44fb9717b6b52fad56cd1d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 23 14:51:38 2008 -0400
Fix "warning: assignment discards qualifiers from pointer target type".
commit 95d4ede538fbb68049ba3efa0acb0e9712e5cb01
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 20 23:49:32 2008 -0400
Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type".
commit fa1545eeda2a7feebc006840a44d390177634231
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 20 23:47:22 2008 -0400
Fix "warning: passing argument 1 of `xf86addNewLoadDirective' from incompatible pointer type".
commit 2725ba1fca45e5ba241695e24333d8efab1f862b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 14:41:32 2008 -0400
Also remove xorgconfig from configure.ac.
commit 9719354ae04a41e9834ac9ba8fd9e895092ba4f1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 14:37:06 2008 -0400
Check for __amd64__, not __x86_64__.
Spiritual revert of 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe. Intel's C
compiler claims to be gcc-compatible; if they're not defining the same
macros as gcc then that's their bug, not ours. Even if we were to do
this aliasing we should do it once and for all in servermd.h.
commit 249c892784ca5e8c75863dd82097ca2bedec4723
Author: Roland Bär <roland@verifysoft.de>
Date: Tue Jun 24 14:13:02 2008 -0400
Bug #11857: Avoid running off the end of a MAXCLIENTS-sized array.
commit 9e5b3deafb97ec1f83e6bfe067bc68df7385bc6a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 14:08:04 2008 -0400
Bug #11842: Fix emulation of int1A PCI BIOS services.
Use only %di to name the PCI register to read/write, rather than %edi.
DOS is only expecting the base PCI config space anyway, and the BIOS
might be using the high bits of %edi.
commit d34430414ac0e77eec61ab0ac9ef427b236eb639
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 13:32:55 2008 -0400
Remove xorgconfig. Use X -configure instead.
commit 574c62e305e5380bb1b0f4bfec4f7cc3e3f03ada
Author: Owen Taylor <otaylor@fishsoup.net>
Date: Tue Jun 24 12:40:47 2008 -0400
Bug #15369: Don't reduce Over to Src for transform + RepeatNone.
Only do no-src-alpha optimizations for a RepeatNone source if we can
easily probe that we won't sample outside the edges of the source.
commit 100afae578e59e31b65a6264c281ba7deea5ac39
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 10:52:31 2008 -0400
Bug #15586: (Correctly) refuse to redirect the root window.
commit 4c4e06af7950df509fa02099788be66cf37a4d01
Author: Paul Bender <pebender@gmail.com>
Date: Tue Jun 24 10:44:47 2008 -0400
Bug #15665: Fix building without Composite.
commit 59510a76436c739fd9421f01cc4210607d9e7f57
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 10:40:36 2008 -0400
Remove some default modes that really shouldn't be in the default set.
commit b622f6dc5d8d70d17be0374a85a9b16b43a62a01
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 23 23:45:57 2008 +0200
kdrive: fix building with --disable-xv (bug#16488)
commit 3b587826924c60f6736dc5faf584b964fde1b4da
Author: Jesse Ruffin <jesse@eloquentpeasant.net>
Date: Mon Jun 23 14:35:20 2008 -0400
Bug #16302: Fix GLX drawable refcounting in DMX.
commit c8d066a15142678041c1d82ccf530dcdb2ea74ca
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 23 13:59:48 2008 -0400
Implement bswap in x86emu.
Yes, this is a 486+ instruction and thus not strictly legal in vm86
mode, but enough BIOSes use it (looking at you VIA) that we might as
well implement it.
commit b55fbca4f0705aeff1c69d3ef851c5ff5af6ed94
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 20 13:27:32 2008 -0400
Bug #12414: Create full-fledged pixmaps in fb24_32ReformatTile().
... instead of creating pixmaps that only fb knows about, which will
have no devPrivates for any other subsystem and thus cause havoc if
(when) they leak out.
commit 155fcecb320dbcfb899d6bcd78048ce0993bf28b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 08:09:33 2008 +0200
Various messages clean-ups.
commit 41a65e110409a290288180e8e1517f053f877586
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 06:12:04 2008 +0200
Fix ipc check on OpenBSD
commit ce4d4b3c1b0e25f64d6f781b09528b2f3ae33207
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 05:19:01 2008 +0200
build fix
commit 19c7e9da55646f1f6e05c28cd71865cd8d84e1ff
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 02:24:17 2008 +0200
preserve errno around the SIGIO handler
commit 0a81d476388c51f8aa723400dffc375e112ea97a
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 02:20:44 2008 +0200
Remove RCS Id.
commit c0d7ad9c88172d753b932069743ae65f75de3aa9
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu Jun 19 16:51:18 2008 +0200
Let code build with gcc 2.95
commit 219dd2d44a9da40427ad48b0f09b981fe0551f4b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun May 18 13:53:32 2008 +0200
sprintf() -> snprintf()
commit cfcb3da75e807dec225cc7ea469e04d2db10bf73
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 18 11:37:00 2008 -0700
Make button down state a bitmask. Master buttons track union of slave buttons
Mixing usage where some parts of the code treated this field as a bitmask
and other parts as an array of card8 was wrong, and as the wire protocol
wanted bitmasks, it was less invasive to switch the newer counting code use
booleans.
Master devices track slave buttons by waiting for all slave buttons to be
released before delivering the release event to the client.
This also removes the state merging code in DeepCopyDeviceClasses -- that
code was changing master device state without delivering any events,
violating protocol invariants. The result will be that existing slave
button state which does not match the master will not be visible through the
master device. Fixing this would require that we synthesize events in this
function, which seems like a bad idea. Note that keyboards have the same
issue.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 3cc5ae6a4f725483612c00fc8bcc2c61607f66a8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 18 16:14:42 2008 +0930
dix: don't attempt to send Enter/Leave events if we have a keyboard.
Dereferencing into dev->valuator could crash the server, although it looks
like I could only reproduce this by having a keyboard send an event after it
was created and the WM was still replaying. Or so.
commit 528b4e36ade482df99747081688ae52cfaeb28eb
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Jun 18 22:34:02 2008 +0100
Set driverPriv immediately on CreatePixmap.
If it's NULL anyway, we bail, if not, it lets
ModifyPixmapHeader know about the private.
commit 068fa63496c7c363706f0d356b5132bc591c04c6
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jun 18 09:23:09 2008 +0930
dix: fix a crash when the client has a different byteorder.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit d21155a3e9b51df946766926bc6155c8972c4439
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 15 20:00:41 2008 +0930
input: fix up usage of button->down, used to be a bitmask, is now an array.
device->button->down used to be a 32-byte bitmask with one bit for each
button. This has changed into a 256-byte array, with one byte assigned for
each button. Some of the callers were still using this array as a bitmask
however, this is fixed with this patch.
Thanks to Keith Packard for pointing this out. See also:
http://lists.freedesktop.org/archives/xorg/2008-June/036202.html
commit 2b9c829bdebd16910bdf48b9d64862e3d34f5b7f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 18 09:55:53 2008 +0930
Xi: don't drop the grab status in XExtendedGrabDevice().
commit 4f3ed54dc9ea7780ff03378b13de0fddfdec2e15
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 17 10:43:36 2008 +0930
mi: remove trailing whitespaces from misprite.c
commit 79dd600942bbac3c6b531f284b42c7b2c822da90
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Jun 17 19:09:44 2008 -0400
SELinux: Add an extension alias under the OS-agnostic "Flask" name.
commit 656d3d7623c6b83024e9cdc60d1257f4d87aa268
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Jun 17 17:55:11 2008 -0400
SELinux: Bring server-side name registry up to date.
commit f3490d3eba94c7d9e760d6d21991ab6677196c2b
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jun 17 10:35:24 2008 -0400
Bug #15169: Make the server build again on Alpha.
Still won't work until the kernel makes the resource files actually exist.
commit 8c9234a163eceda2abc0a2523e0f5587ea399935
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 15 10:01:28 2008 +0930
Xi: avoid double button mapping.
Button events were mapped once in GetPointerEvents and then again in
UpdateDeviceState. While it might make sense to just fix up UpdateDeviceState,
it turns out to be better to leave the raw button number in the event because
DGA reports raw device events without button translation, and so when it calls
UpdateDeviceState, the button down counts get scrambled and buttons get stuck
down.
See also:
http://lists.freedesktop.org/archives/xorg/2008-June/036201.html
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit d894e86aa5bea81147c4a7ad8630bcfb04156792
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 15 10:55:08 2008 +0930
randr: remove superfluous check against uninitialised variable.
Thanks to Eamon Walsh for pointing this out.
commit 5544c51447f551dfc6df64438873a7ce64743976
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:49:47 2008 -0400
Fix "warning: the address of ‘newTypes’ will always evaluate as ‘true’".
commit 2391c409a2840d61fed93832650c0d6c82ebebdf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:48:17 2008 -0400
Fix "warning: unused variable `s'".
commit 61dafe384a88fc397d7cd55cb23f4fdc3fb0645c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:47:10 2008 -0400
Fix "warning: unused variable `tsize'".
commit 37a64b02df02d42a19d4b777930dc5e457d97d63
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:41:58 2008 -0400
Fix "warning: ‘rc’ may be used uninitialized in this function".
commit e90fcd8294fe763c97610d39cab50f2836f87dca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:26:43 2008 -0400
Fix "warning: no previous prototype for ‘miRROutputGetProperty’".
commit 0b00bbca5df140edbfaffab627bd82165f1b1420
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:22:22 2008 -0400
Fix "Warning: no previous prototype for `SecureRPCInit'".
commit 1c2f038d69605b0ed1067e47dc75ca6f216991f5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:59:09 2008 -0400
Fix multiple warnings in os/xdmauth.c.
commit 384ebe02b354bf1ad0a2ac25e4b5290f2e795ea1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:49:01 2008 -0400
Fix "warning: label ‘done’ defined but not used".
commit 720e44f9730b9e275579483c2a34b16bba77e146
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:42:37 2008 -0400
Fix "warning: no previous prototype for ‘XevieExtensionInit’".
commit 9d871e19c9dee5d3ee7f123249e8890417d83093
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:35:29 2008 -0400
Fix "warning: unused variable ‘pDev’, `pPointer'".
commit 60f64af075e8ac3e63586452f2f3d338a05785f0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:23:31 2008 -0400
Fix "warning: passing argument 1 of 'pixman_fill' from incompatible pointer type".
commit c448460fdc23262f2b711a32599090c85c70447a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:05:26 2008 -0400
Fix "warning: pointer targets in assignment differ in signedness".
commit 17ed6242e73c5f733601b15732ab30c23acf14d2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:03:17 2008 -0400
Fix "warning: assignment from incompatible pointer type".
commit 02a8b118cd07d98f12aab8325d8443125703ba7d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:01:50 2008 -0400
Fix "warning: implicit declaration of function ‘miPointerGetScreen’".
commit 2d7ba09dc4b5eff5dba8d7867f285111574b1737
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 16:39:40 2008 -0400
Make devPrivates lookup functions ABI instead of static inlines.
This is required to preserve compatibility across changes to the
internal representation of the privates list.
commit 9e0e558f263a132babf8c91d31230831653f19c1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 13 11:17:49 2008 -0400
Fix unterminated endif.
commit 6bbfadb9094bb6437a6825b8293d13a32e041aff
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 13 11:00:50 2008 -0400
... and stay dead.
commit f31bd087e8a7f65cd588bd1d022bb18e72b2a60c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 13 10:35:07 2008 -0400
Death to mfb.
Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
commit af86c3b7ce705c1711c8cf8bf05a7a02b8afccf6
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat May 24 21:16:34 2008 +0300
clean .gitignore
commit 3108980f5e78c129b23ff32f72564cf9a746c693
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Jun 13 15:58:56 2008 +0300
glx: drop unused cleargc
commit 23b55a61f89f69454a3b0e3413b1f07d5fdf43aa
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jun 13 11:13:56 2008 +0200
AIGLX/DRI1: Switch to server context for calling pScreen->GetImage.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16292 .
commit d15b3790307053587df8daed1936ff6923881b63
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 12 16:00:50 2008 -0400
Remove xgl.
This code hasn't been updated with anything even resembling what anyone is
shipping in nearly thirty months. It hasn't built out of the box since
7.1. Most of its features over AIGLX are accomplished with DRI2 and
friends.
commit c37a93b4850866c713e3cbf39a08bbc9645e24d4
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 12 14:54:56 2008 +1000
modes: make aspect choosing work on single output case.
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.
This was causing my 2560x1600 to end up at 2048x1536.
commit 23e71ef71a178505494d4b410f9314acfff81524
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 12 09:04:24 2008 +1000
dbe: fix DoS reported by iDefense.
This isn't a security problem just a user could DoS themselves for fun or profit.
commit 390b155135a451fa728b73c8107aea91dfd56ed1
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 18:21:33 2008 -0300
Welcome to hotplug era.
`rm -rf xorg.conf` does not imply an error message. Maybe a warning.
checkInput() is defined but not used.
commit 6e018f6a30dab1259b8fdc1ae4c84056b2acf362
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 18:10:55 2008 -0300
No need for inputPending field in xf86Info.
commit 881e551de92e5664f92ef1961092e35cd7a77b15
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 18:03:33 2008 -0300
CopyGetMasterEvent() can be static.
commit 656949cbe24648a5b58f7df6ed49b25af0b47601
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 17:57:19 2008 -0300
Remove more unused things.
In function ‘miSpriteCloseScreen’:
warning: unused variable ‘pDev’
commit 84db8837d0faaac008be61df9f1261cd3028e923
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 17:47:00 2008 -0300
Remove unused xf86DeviceCursorUndisplay() function.
commit dba5455f06c439c7e7d399f30dc7067e98e6e50b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jun 11 11:41:34 2008 -0400
Un-K&R shm extension.
commit 9171206db349a0c6fda719746be0b15049d57aaa
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:23:03 2008 -0600
CVE-2008-2362 - RENDER Extension memory corruption
Integer overflows can occur in the code validating the parameters for
the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
and SProcRenderCreateConicalGradient functions, leading to memory
corruption by swapping bytes outside of the intended request
parameters.
commit 5257a0f83d5f3d80d0cd44dd76d047bac3869592
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:22:30 2008 -0600
CVE-2008-2361 - RENDER Extension crash
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the ProcRenderCreateCursor() function which
will cause less memory to be allocated than expected, leading later to
dereferencing un-mapped memory, causing a crash of the X server.
commit c5f69b297b1227cb802394fa90efdbe1de607f3c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:21:26 2008 -0600
CVE-2008-2360 - RENDER Extension heap buffer overflow
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the AllocateGlyph() function which will cause
less memory to be allocated than expected, leading to later heap
overflow.
commit 063f18ef6d7bf834225ddfd3527e58c078628f5f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:20:43 2008 -0600
CVE-2008-1379 - MIT-SHM arbitrary memory read
An integer overflow in the validation of the parameters of the
ShmPutImage() request makes it possible to trigger the copy of
arbitrary server memory to a pixmap that can subsequently be read by
the client, to read arbitrary parts of the X server memory space.
commit 95d162c4389857d960da9b0158345c1714e91f31
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:20:00 2008 -0600
CVE-2008-1377 - RECORD and Security extensions memory corruption
Lack of validation of the parameters of the
SProcSecurityGenerateAuthorization SProcRecordCreateContext
functions makes it possible for a specially crafted request to trigger
the swapping of bytes outside the parameter of these requests, causing
memory corruption.
commit 656d5d98855eb608ec6581f8c574f343a216ea32
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 11 17:32:59 2008 +0930
kdrive: fix wrong use of &, should be | instead.
Fallout from 26e7e69ab893d1f2b35213250ada40ec90944f62
commit 6528eb885dea0326aacdd026d44d82ab07f4a4fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 11 15:01:36 2008 +0930
Xext: init firstValuator to zero, otherwise core XTest events may get lost.
commit 6ab311c92d036dc63ee92ab4bb231f5f61ebe69f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 9 11:45:57 2008 +0930
dix: Call RealizeCursor during InitializeSprite.
RealizeCursor should be called when the cursor is allocated. However, when the
root cursor is allocated, no devices exist yet, and thus RealizeCursor is
never called. This may lead to segfaults lateron in DDXes like Xnest that
actually need to do something for each cursor, and lateron rely on that
DDX-specific data for each cursor has been initialized.
commit e083b5a07507d53de0d1d365ef1565346284c997
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 9 11:23:53 2008 +0930
xnest: wrap the xnest cursor sprite funcs around the mi funcs.
Modelled after the xfree86 code. Call miDCInitialize to init the SW rendering
engine, then take the pointers, store it in a xnest-local variable, and put
the xnest-specific sprite funcs in place. In the xnest sprite funcs, call
through to the mi sprite funcs after doing xnest-specific stuff.
commit ea6a02c048e8589e99ee3b459f3612eb3d041558
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 9 11:22:33 2008 +0930
mi: protect mipointrst.h against multiple includes.
commit a3a7c12fcf8e4ac1418f9ea53f76091f309a721b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:38:45 2008 +0930
xfree86: Fix up xf86ScaleAxis
Some driver still call it, so we might as well work correctly. Always
resetting X to the Sxhigh is sub-optimal.
commit f8431a62d57ab3118a0b409bce977db8261e2930
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 10 02:15:25 2008 -0700
XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
(cherry picked from commit 4505bae5d7341e1241be50c25cb3d1b941701de4)
commit c180a52332385b98635068d63a8fe0bba4835be7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 10 10:47:37 2008 -0700
XQuartz: Removed code path for old startup
(cherry picked from commit a9ee6b0d00fab01a78408a85e6542e88c19fda7c)
commit 49751fee3b82ebc4917bfb168ec78aad7874f1f1
Author: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Tue Jun 10 15:40:48 2008 +0200
glx: copy msaa visual capabilities
commit 5170c169db78cad3fe47dee4e438b48e67f0c7d1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 10 01:39:15 2008 -0700
XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.
(cherry picked from commit ee92aced10d0743c4658e53b58b5d9f5a094a415)
commit 01ace5f3fd56bc789ad7448059fcf907ef19a1c8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 18:28:20 2008 -0700
XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
(cherry picked from commit d8cf5623faab952a0f1196c8fe10baa09d1fc089)
commit 607b0d09ea003f87cfb3331e59e13495a483832a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 9 09:52:04 2008 -0700
CreateColormap returns Success on success, not TRUE.
Fixes a problem where enabling color index overlays disables the RENDER
extension.
commit 2854abd39d4deb79c9ee9bcc931fad969392cfc5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:20:11 2008 +0930
xnest: fix up sprite funcs to stop compiler warnings.
commit c68ca0c7b2c72df0501d26bf7f640029ff2d9568
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:14:20 2008 +0930
xnest: switch to using EventList rather than xEvents.
commit 34429d16d319ef2709c22a5c22f45d0e82c78b20
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:08:34 2008 +0930
xnest: call miDCInitialize rather than miPointerInitialize.
This unfortunately gives us a lots of artefacts, so cursor rendering cannot be
assumed complete. But it's better than crashing.
commit a7d4bec884c24c0e1792fd7d6677cdd0a69978e3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:03:20 2008 +0930
mi: remove leftover old license comment.
commit 585125685b5f09245021c8ee15f57950fe6cdd20
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 22:43:47 2008 +0930
ephyr: some whitespace changes.
commit 782394fe53220deafed06ad282b5f9ce42964c42
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 6 12:10:35 2008 +0200
mi: Fix typo in comments about deprecated functions
commit 6b96281100f2118fe9d99536c33d48298a5bce7b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jun 6 11:01:03 2008 +0200
EXA: Fix exaGetPixmapFirstPixel() crash if the driver has a CreatePixmap hook.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16243
commit d25ffcfbfcfe8e059f2889873c9dbe76a28ad00c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 5 15:29:35 2008 +0930
mi: protect against possible NULL-pointer dereference.
commit 874dcdb3bdb9320aae252d3c7927d412685059d5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 5 15:38:48 2008 +0930
dmx: remove a ifndef XINPUT, XINPUT is always defined now.
commit 52752911ea8470dd8805f5e6c3febb9e1e1cc4b3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 17:04:16 2008 +0930
dmx: don't free event list after use.
commit 5c5e58124581b845a6bfa7a2991a4e0ee7f7ebdb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 16:58:31 2008 +0930
dmx: add an XFlush.
Beats me why we need it, but without it we get segfaults lateron.
commit 246c10441bbf62646b77993b55233d5ceb93a81f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 16:37:25 2008 +0930
dmx: fix false memory allocation.
beNumVisuals and the number of GLX Visuals can be significantly different.
commit 17cd26225749a1daf7460b44e52f43082399b265
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 16:05:36 2008 +0930
dmx: don't dereference a nullpointer.
commit 75eb635e3543fcb731331d01f50e62b696967667
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 22:25:33 2008 +0930
dmx: add stubs for DeviceCursorInitialize, DeviceCursorCleanup
commit 3ff2f3a00ef3c484d1d53569b6cbc1f25dc6bd35
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 22:17:14 2008 +0930
dmx: for now, don't acknowledge SDs.
commit 5bcd9e8953dfb5f13e90baeebea1f6eac797644b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 22:01:43 2008 +0930
dmx: learn about the existence of IsXExtensionPointer and IsXExtensionKeyboard
commit 8da8a0fec4b1b9d9208635dedb2f449dc99e0004
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 21:59:33 2008 +0930
dmx: claim we support XI 2.
We don't really, yet, but at least we get the full device list this way.
commit 6f1d5147cb394b7c83c4c1447c78890fa2b40a45
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 21:36:03 2008 +0930
dmx: fix a segfault caused by GC devPrivates never being initalised.
commit d10ba4591a599a317093ffcbdd7cece11ab6de26
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 21:28:26 2008 +0930
dmx: some more build fixes.
commit 8d4d0b47a07a298a20ffae9fefe96c8c7ca9dccc
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jun 5 09:19:16 2008 +0930
gl: include assert.h if we're compiling with DEBUG.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 8644aa47177bf20f3aa85181032ce75c08270fc5
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jun 5 08:55:09 2008 +0930
mi: minor build fix when compiling with debug enabled.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit fbf4b5f16ac23359872361c8c95a617fe8c92292
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 11:10:46 2008 +0930
dix: set dst->mapWidth when allocating a new map.
commit ff3adf3e564d94fea18e48f966de40a7ded1279e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 11:10:11 2008 +0930
xkb: reset xkb_cached_map on CloseDownDevices.
Could lead to some invalid pointers in the second server generation.
commit 40855d8000b9b9f4e6c6b4317542378ecf516345
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 12:19:28 2008 -0700
XQuartz: Removed async debugging sleep
(cherry picked from commit 7812a8bdf9fab651ea5c07b852b2999547ec628d)
commit ee86b751192b690973ee2a1446a406bc721ce8eb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 12:01:19 2008 -0700
XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
(cherry picked from commit ff1c443cadf11d12a7d939e51194f6105153870e)
commit 38da26cd36957a45b2a47ef124282f7d863a9fd3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 11:35:24 2008 -0700
XQuartz: Don't forget to destroy the mutex and cond after we're done with them
(cherry picked from commit c3558bb8cd889e5b957190e9f5d23afad1e17b72)
commit ea40fcf4344c6e918d3be34354528940b05a70f3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 11:18:52 2008 -0700
XQuartz: Fork for trigger
(cherry picked from commit dd0f8a0f59593d7831fe09a2a086fcd57c84910e)
commit 2393dae6ffff7db8281a7977039450e8754cc19f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 3 00:06:26 2008 -0700
XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/
(cherry picked from commit 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5)
commit 45b661c67aca1a728f1793dd94d701488f1f196c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 13:39:39 2008 +0930
dix: Fix build with --disable-xinerama #16204
X.Org Bug 16204 <http://bugs.freedesktop.org/show_bug.cgi?id=16204>
commit 26e7e69ab893d1f2b35213250ada40ec90944f62
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 2 11:04:41 2008 +0930
kdrive: don't post motion event if there was no motion. #16179
Based on the patch by Tomas Janousek.
X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
commit ac1db454497ff1839aa7f7ee0649ede112824ed9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 2 10:40:10 2008 +0930
xfree86: suspend signals while removing a device (corrected version).
Block/Release is now symmetrical.
commit 95ecaa411aefbcd8e2e00814132cb07b4be4e5bf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 2 10:38:45 2008 +0930
Revert "xfree86: suspend signals while removing a device."
Left the signals blocked hanging after removing a master device.
This reverts commit 74372fd0049676787904f1f9f80f836b97f5f60e.
commit 5ba07cb54803b8c63e25e8ca1f1787860f684612
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Sun Jun 1 18:31:52 2008 -0300
kdrive: changes ephyr API according mpx merge.
This fix host-cursor in Xephyr server.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 5a3d06b8f42473cea3741dc722a775deaa2b73f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 1 15:20:42 2008 +0930
xkb: delete default rules when devices are closed.
We only have one set of default rules options in xkb. When the second keyboard
is brought up with Xkb options specified, these new options overwrite the old.
In future server generations, the rules used for the VCK are a mixture of the
default ones and ones previously specified for other keyboards. Simply
resetting the xkb default rules to NULL avoids this issue.
Reproducable by setting XkbLayout "de" and XkbVariant "nodeadkeys". In the
second server generation, the VCK has "us(nodeadkeys)". This again produces a
SIGABRT when the first key is hit.
I could not figure out why the SIGABRT happens. This patch is avoiding the
issue rather than fixing it.
commit 5ebe76f13fb6e96cebe5a386024a73eceeb828ff
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 22:13:03 2008 +0930
config: init dev to NULL to shut up a valgrind warning.
commit a7ae9cbd78193fdafcafd5d7af1f6fabbb434628
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 20:44:58 2008 +0930
dix: don't read valuators past numAxes.
commit f79ad5674ed41c3626e8055cd2bac0135de928c6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 18:46:35 2008 +0930
kdrive: fix up callers to KdQueueEvent, need to pass xEvent, not EventListPtr
commit 58d12c99abc4d06cb8b43386d4bcd126f0bedf83
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 18:45:11 2008 +0930
mi: Remove #ifdef XINPUT, kdrive otherwise won't get events.
commit 942086fc965fc9a24be2db4f537f0ff54db51083
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 18:17:49 2008 +0930
dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it
commit 6cecae0e8651b1fa58b3cd0e0a636db46f56f6a6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 13:12:53 2008 +0930
dix: Remove superfluous comment.
This code can handle devices with < 2 valuators now.
commit 105d28652d1fb80dd8ce8511e2605dccc8812e99
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 30 15:20:35 2008 +0930
Xext: use GPE/GKE from XTestFakeInput #16145
This commit fixes two problems:
1) XTFI used to assemble the event itself, then passed it to the device. It's
much easier to just pass the variables into GPE/GKE and let the DIX do the
rest.
2) XTFI would pass the VCP/VCK as default device to event processing. As a
result, updating LEDs would be updated on the VCK, not on the actual keyboard.
Instead, we now pass the events through the last-used SD, thus toggling the
LEDs on the last keyboard that sent through this MD.
Also some cleanup in XTFI to merge validity checks a bit closer together
rather than having several different sections.
This breaks XTestFakeMotion with Xinerama though.
X.Org Bug 16145 <http://bugs.freedesktop.org/show_bug.cgi?id=16145>
commit 341a61b608873c77b1a17fe7d145ed3ad716e5a3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 12:01:47 2008 +0930
mi: reduce noisyness. DebugF is enough if device ID can't be changed.
Also - printing out the event type is actually helpful.
commit 62c1a32976d571f3ced1812b8b96ed5a8e658b4a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 10:24:37 2008 +0930
dix: null out dummyDev, otherwise Xephyr dereferences random pointers.
SendEventToAllWindow eventually causes a IsInterferingGrab(), which attempts
to dereference dev->deviceGrab.grab.
commit 150c2f55a508ed24b230f68e30ec140c0901d9ae
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 23 03:09:04 2008 +0200
Add xkbstr.h and xkbsrv.h to sdk_HEADERS
commit f9bcecbe51e4cf0cb2d82ad953f8c6741ed5558b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 29 17:42:49 2008 +0930
Xext: only free events in case of core motion events.
commit 8cf7755a85f5c1e5da7805c12b7511581a368782
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 28 18:05:25 2008 +0930
Require x11proto 7.0.13, xextproto 7.0.4 and inputproto 1.9.99.1
commit 9b544fa40062b342ff3aa75f8f21d0bd4cec80ab
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 28 12:27:07 2008 +0930
mi: ansify.
commit 64677f6a167a5bee99e5dfb599a3c3a6fb5dffe7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 27 21:01:26 2008 +0930
xfree86: fix offset error in EDID parsing. #15964
X.Org Bug 15964 <http://bugs.freedesktop.org/show_bug.cgi?id=15964>
commit c8af7ce35a900ac9b898f51c1b95dabad3ba1d76
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri May 23 13:50:39 2008 -0300
Correct a NULL pointer deference
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 3a1278907ea8059546c7b9ab0c02714832c693e3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 18:01:07 2008 +0930
xfree86: Bump XINPUT ABI to 3.0.
commit 0050165a67bb462e0bf644a11644ad9d587c62bb
Author: Simon Thum <simon.thum@gmx.de>
Date: Mon May 26 17:56:08 2008 +0930
input: change dxremaind, dyremaind to floats for better acceleration #9156
X.Org Bug 9156 <http://bugs.freedesktop.org/show_bug.cgi?id=9156>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 26c1958c322be3ac4dfec9ba2c41c5202bd03709
Merge: 5fe5778 2958610
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 17:37:31 2008 +0930
Merge branch 'master' into mpx
commit 5fe57787faa2ea4f2f57b25455d200bf924206d6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 17:23:34 2008 +0930
dix: store the absolute values in the motion history.
The core protocol requires absolute values and it's a bit hard to get them if
we only have relative ones in the history. Switch the motion history to
absolute, and if we really need the relative values, we can probably generated
them from the abs. ones in the future.
commit 1883485edd7eb90c0b76bca41c71e26ae2c0b91a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 16:35:23 2008 +0930
If core motion history is required, scale back to screen coords and INT16.
commit 0b88510069bdf6d020d73b424f62c2923c0db4a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 13:53:45 2008 +0930
Ensure the motion history is merged for master devices.
Add each event to the master's MH as well as to the SDs. In the MD, store
min/max and the actual value. When retrieving the MH, rescale all coordinates
to the current coordinate range and only post those valuators that are
currently active on the device.
commit d22c25bda450f6f1dfa634f0f72b32c4bec429cd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 09:26:18 2008 +0930
dix: Allocate MD's motion history to be large enough for potential valuators
Since we can't predict how many valuators may be in a future SD attached to an
MD, we need to preallocate a history buffer that is large enough to keep
MAX_VALUATORS coordinates per event.
In addition, the history buffer needs to memorize the coordinate ranges at the
time, thus requiring MDs to store (min_val, max_val, current_val, time)
instead of (current_val, time) for each motion history entry.
This commit only fixes the allocation.
commit 0877de13ac6ddfb55108aa3456d47f970c6c442c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun May 25 22:49:54 2008 +0930
Remove GetMotionProc from ValuatorClassRec.
With the MD/SD device hierarchy we need control over the generation of the
motion history as well as the conversion later before posting it to the
client. So let's not let the drivers change it.
No x.org driver currently uses it anyway, linuxwacom doesn't either so dumping
it seems safe enough.
commit 00b4339168c10dd4ce026deb8e04bfb63dfd11dc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun May 25 22:34:11 2008 +0930
dmx: remove some #if 0'd code.
commit 096117cf023dc92dcadc91677931fc6ad1feb4a0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun May 25 10:38:33 2008 +0930
Xi: reset motion history when swapping device classes.
This isn't really the correct solution, but it'll have to do until I figured
out how to transfer the history over correctly.
commit 29586101dc11d498b212510f8dedbfeca7f8c859
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat May 24 20:01:41 2008 +0200
EXA: Only record damage generated by rendering operations.
Recording damage from other operations (e.g. creating a client damage record)
may confuse the migration code resulting in corruption.
Option "EXAOptimizeMigration" appears safe now, so enable it by default. Also
remove it from the manpage, as it should only be necessary on request in the
course of bug report diagnostics anymore.
commit f6d61d3d86971d6a202b46ff2fab8c8799a4d057
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat May 24 20:01:36 2008 +0200
EXA: Don't migrate twice in exaImageGlyphBlt.
exaPrepareAccess already handles migration.
commit d73304398255e0c3b03a497a8d4a2f8d900eef44
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat May 24 20:01:31 2008 +0200
EXA: Don't suggest exaCopyDirty be inlined.
Leave the decision to the compiler toolchain.
commit 3baf3b42e079b4e7b61c1e20df305db0724d21f8
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat May 24 20:01:21 2008 +0200
EXA: Specify region used for source pixmap migration in exaCopyNtoN.
Avoids excessive migration overhead in some pathological cases. See
http://bugs.freedesktop.org/show_bug.cgi?id=15845 .
commit ba557e0263eee0b75847c596f31c71492611b22c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 24 17:23:10 2008 +0930
Xi: remove deprecated comment.
Axis clipping wouldn't be necessary here, it's already performed in GPE.
commit e6cbb1e11e5da1a8b9001853c25f4e5a052e7110
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 23 23:00:40 2008 +0200
xfree86: fix build on GNU/kFreeBSD
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
commit 6c72961d8fa1ab1543f1b3e2cc7d34ff6d254bf8
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:39:35 2008 +0300
glx: fix memory corruption with r5g6b5
should cherry-pick to xserver-1.5
commit 21a8052fdca2115668dfc747b0b58db437b4eb6d
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:39:09 2008 +0300
glx: fix forgotten swrast -> SWRast
commit 877e6c35ff1f0f110627590ac0f12fddf47de506
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:38:36 2008 +0300
glx: missing swrast is fatal
commit 1345c93ad4be875951256dae87bc4fd9a1b5e08a
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:38:11 2008 +0300
glx: drop stray glcore.h include
commit ae0504d34d245f15b2f098a63ad1a9e1c4daef35
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:40:03 2008 +0300
kdrive: need not export symbols for glx anymore
commit 7082929ef7db20b507dce5a8cec043e787d0b55e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 23 02:27:58 2008 -0700
XQuartz: A 2 second delay for launchd socket connections should be sufficient.
(cherry picked from commit 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529)
commit 5a388b27a094c71b4214aa744b2ba0fdda7fd607
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 23 02:10:14 2008 -0700
XQuartz: Add the launchd fd to AllSockets as well
(cherry picked from commit 83f72529394be5871671d73b6ef4f8bc83708f8a)
commit 77b688a73025238ed9fe286a2bae8f78da65fce3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 23 02:32:28 2008 -0700
XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code.
(cherry picked from commit 1e1f4fb717d2f3a3227be2a034d28d6a4f29b5d1)
commit 225dddbaeded4d64fcc104da538449e5c4dedd2d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 23 01:39:02 2008 -0700
XQuartz: Move the launchd display grabbing into mach_startup
(cherry picked from commit c3866c98d23020d2151977ee1177b6054d05832e)
commit 3a22190061c7ebefee85564b0def5e1112c07ae8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 19 03:13:09 2008 -0700
XQuartz: Fixed a few issues with fd passing... still not working =(
(cherry picked from commit 7dd351271522b475d8017e4bd1618f12817ee2fa)
commit 3ae0f4fc832462444d03024c5fbb867f19d5e960
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 15:02:43 2008 +0930
dix: update valuators > 2 as well.
master->last.valuator[x] for x > 2 is undefined. For all other devices, it's
the respective device's last valuators.
If the lastSlave did not have a valuator that is to be updated now, it is
reset to 0.
commit 0d1b41ace38bc918e2cc2a0a6ad107c76346fd00
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 13:32:33 2008 +0930
Xi: update device valuators based on the event.
Event is always absolute, update the device's valuators (always absolute too),
and then change the deviceValuator event to reflect the device's reporting
mode.
commit 7eec1c23a34591064ea64499acb24f22ada08dfa
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 13:23:02 2008 +0930
dix: don't allow relative data in deviceValuators.
In GPE, we don't care about the device mode. Let's put the absolute values
into the deviceValuator event and worry about relative valuators on the other
side of the EQ.
commit 75551a2ef949c2cfb53fdc4b97f3964a5e2f45f5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 12:55:50 2008 +0930
Revert "dix: Correct values in the device axisVal are calculated in GPE"
We can't rely on GPE to update device->valuators->axisVal. If a SIGIO occurs
during event processing this may have incoherent results.
This reverts commit f6645ddbf754c80e9a8b1672519534a887622270.
commit fe59b1a62b2c7f467d20132db4913317bbf308eb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 12:51:52 2008 +0930
dix: more device scaling insanity.
Assuming master->last.valuators is in screen coords, SD's are always in device
coordinates.
1. If an event comes in, scale masters->last to the device, drop into device's
last->valuators.
2. Apply motion from the actual event
3. Scale back to screen coords, check if we may need to cross screens
4. Drop screen coords into master->last
5. Rescale to device coords, drop into deviceValuator event and SD->last
6. Drop screen coords into ev->root_x/y
Whoopee...
commit 6c9e9f8a40e20fb1761440acd2755f5fd31f4d44
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 11:51:53 2008 +0930
input: instead of lastx/y, use a last.valuators[] array on the device.
During GetPointerEvents (and others), we need to access the last coordinates
posted for this device from the driver (not as posted to the client!). Lastx/y
is ok if we only have two axes, but with more complex devices we also need to
transition between all other axes.
ABI break, recompile your input drivers.
commit fb146cbb0f28e4e480e5d16d61476ac46b5d00ce
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 12:00:13 2008 +0930
dix: coreEvents doesn't have meaning here, use master instead.
We mustn't clip x/y if we are attached, otherwise we can't change screens.
commit fc1cc0adcb91fdfa4c547bf379a85f9558c959ff
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Fri May 23 00:33:18 2008 +0200
dix: Cleanup of GetPointerEvents
Changed all the checks for x&y valuator so the more complex
calculation is only made once.
Added TODOs for valuator/axis 2 and above for future correct
handling of relative reporting of these.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit a0241d5380bb5d8b10865f8ea81a9a011de4aaf1
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Fri May 23 00:36:11 2008 +0200
dix: Correct clipAxis so it can handle devices with value ranges properly
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit f6645ddbf754c80e9a8b1672519534a887622270
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Thu May 22 23:33:45 2008 +0200
dix: Correct values in the device axisVal are calculated in GPE
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 7f85acdf70c67c567de688439e25081be5a7d5df
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 23:27:15 2008 +0930
dix: fill valuators with the correct values depending on the device mode (GPE)
valuators[] is passed from the DDX. Depending on the device mode, update it
with either absolute values or relative values. The deviceValuator event sent
to the client will then contain the respective values.
commit 1a3f351c50cba66f71a73239318174b09fd9b63b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 23:25:20 2008 +0930
dix: when floating a device, create a new cursor sprite.
This is essentially necessary to allow calls to miPointerGetSprite etc. to
work for floating slave devices.
commit e0fbe404a436aef24624a3a15e8405a9ca38aadb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 23:24:29 2008 +0930
mi: handle sprite even for floating slave devices.
We still don't render it, but we accept all the other calls to update it's
internal state.
commit 0f15875a271889ae3cc4997ad15f787ea28b3a08
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat May 17 19:24:00 2008 +0200
Make all conversion handling in GPE.
This isn't quite finished yet, but at least it gives us the ability to use a
tablet as a normal mouse - with all the scaling in place.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 74372fd0049676787904f1f9f80f836b97f5f60e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 18:02:10 2008 +0930
xfree86: suspend signals while removing a device.
Getting a keyboard event while halfway through freeing memory can be
unpleasant.
commit 30e9a33f7d1972dcf1c29c7455b2cea4e5857913
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 16:00:21 2008 +0930
xkb: fix crash caused by uninitialised variable.
commit e837244947fbb18192e9056c070ce439ef24d1a3
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed May 21 16:14:55 2008 -0700
Actually enable building GLX without Mesa source
commit ea4ec9e9983e25d94a3edf8a77ed2ad1db193284
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 20 13:59:09 2008 +1000
int10: add pci_device_enable support on Linux
commit 4230b92744d54528f48ddc3b096a265b488053c9
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 17:58:15 2008 -0400
Clean up remaining afb references.
commit 20ea99c655140e101f2d20cfab78fb22765fec62
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 17:03:25 2008 -0400
Death to afb.
Planar framebuffer people, please talk to wfb for all your 1988 hardware
needs.
commit c76fddeea28b4f88db97a2a3487d7a57cd9d578c
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed May 21 10:51:15 2008 -0700
Fix up paths for GL/glx -> glx renaming
commit c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 13:33:36 2008 -0400
Move GL/glx on level up now that it's the only thing left under GL.
commit a8a9b40e554dd0c184866978889a39519afc466a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 12:34:07 2008 -0400
Move the windows GL files to the xwin DDX.
commit e5aad4bc087036489e2af576628aa9b612054a6e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 11:44:12 2008 -0400
Get out of the mesa symlinking business.
This copies over the files generated from mesa/src/mesa/glapi. There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.
The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch]. Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.
The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
commit f558c7d4d1d87affe1ce4aec2e62ff64545f2bc8
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 10:18:16 2008 -0400
Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
commit 77ff8fd5072fa57158463bfd84656389eeb7b503
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 10:17:53 2008 -0400
Drop glcore GLX provider.
Obsoleted by the DRI swrast driver.
commit 61eaef22359ae2abcee7dcd73ee8610a83776fc7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue May 20 16:56:27 2008 -0400
Stop symlinking glcontextmodes.[ch] from mesa.
commit 88f43e5d06fb5543bc40ca060b2c5d8e2673afad
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed May 21 18:13:47 2008 +0300
glx: drop drm.h, sareaHandle from swrast loader
commit 255142b61eb73843b16c2afdb95aa4d1f27e4f0d
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Jan 3 17:53:56 2008 +0200
drop xprint remnants: InitGlobals
commit 641ce9c706ce3cbf726fb3fc9623161bb96ba127
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Jan 3 17:28:04 2008 +0200
drop xprint remnants: xpstubs
commit 5c5a1eaf68eb11053fd5b99d24eb8024b6d5b218
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 21 21:51:27 2008 +0930
Replace UniSA with full Uni name in Author affiliation.
Big boss says UniSA isn't unique enough. Who am I to argue?
commit 7509fb498c02fe1cebe4139612b8871ec877c130
Merge: 2ae3bed dfb7de6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 21 16:25:35 2008 +0930
Merge branch 'hwcursor' into mpx
commit 2ae3bed33731d800bb28a968e3a1c8066d179740
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 21 15:51:35 2008 +0930
mi: shut up compiler warning (return w/o a value)
commit 8b3d26f5b6caff1766669deb0e2100d2dee3f185
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue May 20 12:39:28 2008 -0700
Short-circuit PanoramiXTranslateVisualID after verifying that the visual actually exists first.
This allows using PanoramiXTranslateVisualID to test whether a given visual made
it through PanoramiXVisualConsolidate.
commit 6ff6465931c397f72db27a4fd0ca0dcac0609537
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Tue May 20 16:36:22 2008 -0400
Add loader for the swrast dri driver.
commit 4056595fc77c20052e226b402e38a2a914dca123
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 18:57:31 2008 +0930
xkb: remove superfluous checks in if statement.
commit 925e895b869e461a9e7f135891463c56ee633cd6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 19 18:43:29 2008 -0700
Restore return type on xf86SetScrnInfoModes
Seems to have been accidentally lost by commit 76943fec860315f3c93539e59a59080b8a7b3e75
commit 7a550cefd9417c22a4397ea4d103ddc347ab1a0f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 11:07:39 2008 +0930
dix: shut up two compiler warnings.
commit f9edecd1b53a2e234def9cbd954a47c4bda2bebc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 11:07:17 2008 +0930
mi: sync declaration and definition of mieqResizeEvents.
commit e73a03d589b47ac9131f3932da7f78d2fef7bfb5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 10:54:32 2008 +0930
fb: shut up two compiler warnings.
commit 99d28c3ef37aeffe7d8ec41e45a650ba248c6958
Merge: fc7e256 0178b6a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 10:20:14 2008 +0930
Merge branch 'master' into mpx
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
commit 0178b6a4abed0df3e90ba393709ed566105e7c2c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 19 11:22:19 2008 -0400
Fix reduced-blanking mode filtering in RANDR 1.2.
If the monitor isn't reduced-blanking (either through EDID logic, or
config file setting), then remove RB modes from the default pool. Any
RB modes from the driver and config file pools will stick around though;
you asked for them, you got them.
commit bb687465d0c5aef3cc1c865e6ea67c01a8b417fb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 19 02:45:47 2008 -0700
XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
(cherry picked from commit cccee9cfc29f85cca635df3b8dd54199b45c4df8)
commit 4b69d22bcb79210225379da2cefb0cd8d5ffa10e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun May 18 23:51:06 2008 -0700
XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config
(cherry picked from commit 2a72309c061f7060480d150791019ce232481462)
commit e997df8cd3c4222ea9fc3f0ebda728c4d1f15df5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun May 18 23:31:41 2008 -0700
XQuartz: Cleaned up ListenOnOpenFD...
(cherry picked from commit 6fb587d3d5fbbaee9e46cdce24d03e5d1c66d58a)
commit 738672858d9399ecbc170500c15f90bf657502d2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun May 18 23:02:12 2008 -0700
New XQuartz icon thanks to Simone Karin Lehmann
(cherry picked from commit c27e0c8f3c5108192362735db8a80bf3a9a1cc3a)
commit 4be2104c801340075e030d06d24ceb4d8a6d6549
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 15 12:26:32 2008 -0700
XQuartz: More work towards Mach-IPC startup... started working on FD passing
(cherry picked from commit 27fbfeacfa16d620801ac3492b25c1e50aec8588)
commit 82c4075d4ba3bea03341c80b754b0f9d2f62a826
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 19 03:15:11 2008 +0200
xfree86: fix initial output positions with Above or LeftOf and rotation
The fix in fa19e84714aa84a2f2e817e363d6440349d0b619 was incomplete,
as it was still using the wrong output's initial rotation to compute
the position.
commit 7dca84f3ee7265119fb81d598d7d2f7363e25f1f
Author: Dave Airlie <airlied@redhat.com>
Date: Mon May 19 11:16:08 2008 +1000
cursor: don't dereference NULL pointer is devPrivates not yet set.
This fixes a bug on server recycle with ati zaphod.
commit 5af5db5033582a84b616d5c50f4288adb0210459
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat May 17 14:51:09 2008 -0700
XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there...
(cherry picked from commit 301262b07024ad960f22d99a1267fe137f5c3fce)
commit 2408303d79297385063cae557195bd5fd3698478
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat May 17 14:56:53 2008 -0700
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
(cherry picked from commit 543c2cd68d1ffef65d4644b860faad7191c6b9da)
commit 01612fe612aa27262fc3c8167f52e0376941f1ef
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 15 07:08:21 2008 -0700
XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
Need to setup configs for the quartz keyboard
(cherry picked from commit c28fecc621b1803a4d4536afbc724d141de9e6ee)
commit 1d09deaa6e5a75420ea4f24f6b5533f0ebc3ba28
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 15 05:49:43 2008 -0700
XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
(cherry picked from commit 5626b0949b1a6bdd2fa3ec2ef53a688084349b87)
commit adc62f62b9f08aa6633718989ab61b61e3c1e8e2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed May 14 01:33:43 2008 -0700
Xquartz: Xquartz stub now can send Mach IPC to start the server.
(cherry picked from commit 55a3bca8ea42f8677897f94bf0a429bdc08c6696)
commit 93c082a060bfa8d2a204c0c57ec3507a8edea087
Author: Brad Smith <brad@comstyle.com>
Date: Sat May 17 13:14:31 2008 +0200
OpenBSD doesn't define __x86_64__, simplify tests.
Seeing as this code seems to be specific to OpenBSD I don't think
__x86_64__ should have been added there at all. It appears to have
been added wherever __amd64__ existed before which is wrong. I
think that part of the commit should be reverted but also all four of
the checks should be __OpenBSD__ && __amd64__ instead of two one
direction and two flipped.
commit 895d4e274d2b4638f0e6838dfee0e543311dba34
Author: Brad Smith <brad@comstyle.com>
Date: Sat May 17 13:05:58 2008 +0200
BSD's also have /dev/urandom.
commit aad1c37b0951eae216ac323c5d8bfc6fbcf096bd
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:52:41 2008 -0400
RANDR 1.1 compat: remove senseless comparison against the virtual size.
commit 14726b776d6cebb7d864b6ffa7554e1ce5637d5c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:51:32 2008 -0400
xf86SetDesiredModes(): Skip disabled CRTCs first thing.
commit 459f34b089aca4f4eee9752600c3a9e4f4e343ab
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:48:00 2008 -0400
Fix initial mode selection even harder.
The first guess used to be "is the preferred mode for one output the
preferred mode on all outputs". Instead, do "find the largest mode that's
preferred for at least one output and available on all outputs".
commit 96111c154713600dd534dd82104ac18b91466202
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:31:58 2008 -0400
Redo RANDR compatibility output selection.
Old logic was just the first one that happened to have an associated
CRTC. The new logic tries to find one that's definitely connected, has
probed modes, and has the largest candidate mode.
commit a4bbe1c8bca08f3df5ff7e50444af6aef7ec8b25
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:25:12 2008 -0400
Re-add sync range inference from legacy setup to RANDR 1.2.
commit f52f6c5c7efc281f9ac204fbaa4f71383df7463d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 5 14:37:07 2008 -0400
Fix hal shutdown crash.
Removing the device invalidates its ->next pointer. Copy it aside before
destroying the device.
commit 99e4531f7c3fafce065dfd21f65bad1cf190c3f1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 08:16:01 2008 -0400
The great kdrive purge.
Most of these drivers didn't work. ati was the only one that even came
close. The igs, ipaq, itsy, pcmcia, savage, sis530, trident, trio, ts300,
and vxworks directories have never built since modularisation, so clearly
no one can miss them.
commit fc7e2566cc076c0d979f74871bc436df43401058
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 16:59:34 2008 +0930
Xext: fix typo in condition.
Fall-out from dc3aba8a559d4304844ee1cc306c577a63b82762.
We must free the event if it is NOT an extension event.
commit 6fb76acc4524d6af4bfb6bc6d862c1ee2bbb8baa
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 19:22:32 2008 +0930
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
commit dfb7de6571345061d1cd88ab915064fc376529fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 20:56:04 2008 +0930
mi: don't call from miPointerMoved into the spriteFuncs for anything but VCP.
Calling ->MoveCursor for anything but the HW-rendered VCP causes the
SW-rendered cursor routines to be started, including mallocs, etc. Since
miPointerMoved is called during SIGIO, this is a bad idea.
commit f611719edce2ae51dca8e53947a3938b53c20b00
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 19:49:29 2008 +0930
xfree86: always render first cursor in HW, all others in SW.
commit 48ba58feacedf9781db81c82adbb37197d9a5cd1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 19:22:32 2008 +0930
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
commit 622d7c1d899a6146773a2ebd1d632a805f24025e
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed May 14 14:49:09 2008 -0300
Restructure and organize the code.
It was removed and simplified some conditionals. We don't need test for
pDev->isMaster inside xf86CursorSetCursor() because only MD enters there.
In the last chunk, ScreenPriv fields were being assigned without need, so
that code was wrapped inside the conditional to avoid it.
I also tried to make the identation more sane in some parts that I touched.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Minor modification, part of the original patch led to cursors not being
updated properly when controlled through XTest.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 5af90025fee6a92e7d94642978feed21f902d0cb
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed May 14 02:45:49 2008 -0300
Remove redundancy.
The only function that cat set SWCursor before xf86DeviceCursorInitialize()
is xf86InitCursor() when VCP and is created.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 9fc94edfe3df4c4a84ad70714c0a4ef8bbf57fc9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 16:59:34 2008 +0930
Xext: fix typo in condition.
Fall-out from dc3aba8a559d4304844ee1cc306c577a63b82762.
We must free the event if it is NOT an extension event.
commit 5127942f80983b2e053dddd5c5747d0c3d2f9d6d
Author: Brian Rogers <brian_rogers@comcast.net>
Date: Fri May 16 10:08:04 2008 +0930
DGA: pass nevents to UpdateDeviceState. #15936
Missing parameter caused event processing to go nuts when checking valuators.
X.Org Bug 15936 <http://bugs.freedesktop.org/show_bug.cgi?id=15936>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 28378d26b4bae377ef1212f6a51cda9b5529f1b5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 15 11:09:15 2008 +0930
Xi: assemble button/modifier state before updating the device. #15934
The state field of the event must specify the state of the devices before the
event occured. With the code as it was, the state would also include the
event (e.g. state from a button press event would show the button as pressed)
Gathering the state before updating the device should fix this.
X.Org Bug 15934 <http://bugs.freedesktop.org/show_bug.cgi?id=15934>
commit 7cabf81c8638739a15a1be6baa3fc569f38e7589
Author: Eric Anholt <eric@anholt.net>
Date: Thu May 15 13:24:27 2008 -0700
Add necessary include for COMPILEDDISPLAYCLASS.
Fixes build after 07f69023b0e75d98a4be8f0d1c3dd9391b8149a0.
commit 07f69023b0e75d98a4be8f0d1c3dd9391b8149a0
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 14 16:07:51 2008 -0400
Move defaultDisplayClass to xdmcp-only visibility.
commit 166177e36bfc7bd1df03663ad89500cff056d563
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 14 16:02:05 2008 -0400
Simplify default font path setup.
commit 2efe1abb6fc786a4f86464978ae0d23fc7347a98
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 14 15:53:11 2008 -0400
Remove global argc/argv variables.
Was only used in the logging code anymore, and uselessly so there.
commit 6c27b911222cdee9a057de0be7e8b2eff8b1ff2a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 14 15:44:04 2008 -0400
Restore compression of duplicate log file entries.
This undoes the workaround for bug #964, which was an Xprintism.
commit 937e5aae33d3b5112b5d10d605e25f57b48caa3f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 22:30:15 2008 +0930
dix: don't undisplay cursor if we don't own a sprite.
Sometimes we didn't have a cursor when coming back from suspend. Reason was
that the suspend caused the server to lose the device that was attached to the
VCP, and a RemoveDevice() would then set the cursor to NULL.
Solution: only set the cursor to NULL if we actually own the sprite.
commit cbb4e80eb7cc8dc2aff5e5268b49cdb7b3c3d5fa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed May 14 01:13:15 2008 -0700
XQuartz: More work on the Mach-IPC startup path
(cherry picked from commit 49cd0b185fd6c99b07357a74734b6a4023faca84)
commit 3b57c59bb08c9a3211f4ae57d9e2fb569d61bf2f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 13 10:40:20 2008 -0700
Xquartz: More work on the new Mach startup
(cherry picked from commit 6237acf75d3310d7d4f262556b677557c2907284)
commit e435acc84cb9477455ad005cee658630cbd363a2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 17:57:07 2008 -0700
Added missing to EXTRA_DIST
(cherry picked from commit e39613f4633ed992bc276b70833a703560e528f9)
commit f7d6d20ad64b235700185784d317417a94d1814b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 13:36:35 2008 -0700
XQuartz: Cleaned up the about box.
(cherry picked from commit 0279a5970694937e949ba533330ea48961c4edba)
commit b37e1f1f5ccc5a48df665449b0e31c4d25cc323c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 11:34:06 2008 -0700
Don't need the fink-friendly printf in the DDX anymore.
(cherry picked from commit fe2279440450c795d67ba5a2234b0797d0bfe39c)
commit 68b4f250eef441a3d75e3b9b2665a51d3a1538d6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 16:18:48 2008 +0930
dmx: fix build.
Just because it builds, doesn't mean it works.
commit 00db0f35acc00cb771ab1c23f35b0db1c25d81bb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 15:29:28 2008 +0930
dix: InitAndStartDevices doesn't need a window parameter.
Leftover from the old pointer-keyboard pairing code, obsolete and gone now.
commit da728f2127aaa5c1ed5d22bb9f3d0c8ff19e4933
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 15:17:05 2008 +0930
dix: don't use serverClient in AddInputDevice, use the one supplied instead.
We pass in the client that wants to create the device anyway, lets use the
parameter instead of hardcoding the serverClient.
Wow. I hope this is merge detritus, otherwise it'd be a sign that I didn't
have enough coffee that day.
commit a6659291c798f417a76d9aa7944694ff27c01fa7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 09:42:50 2008 +0930
mi: protect against NULL-pointer dereference.
Required by the recent patch to use a NullCursor instead of UndisplayCursor().
commit 7cdc19b29d93bf15cecfd6b69e269fab2501bca0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 13 16:39:30 2008 -0700
When XKB fails to open rules file, log the file name, not the NULL file pointer
commit dc3aba8a559d4304844ee1cc306c577a63b82762
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 13 14:37:26 2008 +0930
Xext: emulate XI events from core events when faking input.
We need XI events for event processing, so lets get rid of the pure core
events ASAP.
commit 8b3802d32041547fd6ed5393a56281c5c83d260e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 13 13:47:52 2008 +0930
Xext: core button events have rootX/Y unset too.
commit ed65e8b4f02a6da7f1c5d85984a9ccf6a94d0181
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 12 18:49:34 2008 -0700
Check for strcasestr and workaround it on systems without it
commit 8234af6c6a3ade13f7720743bde79957c7df3f6c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 13 11:17:39 2008 +0930
xfree86: remove Ubuntu-ism.
Additional #include was required due to broken libc headers or something like
that. Remove it, there's more to the world than ubuntu alone.
commit 59b8d29b3a91c65787dfadb5610342a62e85c48c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 12 21:22:54 2008 +0930
Xi: Fix up ProcIVector, got out of sync with the protocol.
When the opcode squash happened in the protocol, the processing vector got out
of sync for a few requests. As a result, client and server would interpret
requests differently, leading to a couple of BadLength problems.
commit 1fc1a2897e9185838c29d9ffff07c39d2fdf174f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 12 20:14:05 2008 +0930
Remove UndisplayCursor API.
We can achieve the same thing by simply displaying a NullCursor, there's no
need for a separate API.
commit 913989d643595030e67e7c0a758a16ae0da62ed9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 12 20:05:43 2008 +0930
mi: don't try to display a cursor for devices w/o cursors.
commit 248a1df63430717550adb0e79068d8f9fcfacb0b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 12 20:05:21 2008 +0930
render: don't dereference cursor if cursor is NULL.
commit c50b5d978981b13cdb22a9ad41c1b64f90cebe51
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun May 4 13:45:27 2008 -0700
Bug #14692: Allow drivers to have a say in Xinerama visual consolidation.
Create a new exported global variable, XineramaVisualsEqualPtr. Use this
pointer to decide whether two visuals are equal during visual consolidation.
This pointer can be wrapped, which allows drivers and extensions to control
which visuals are consolidated. A wrapper can reject the visuals without
calling down, but must call down and return that result if it deems the visuals
equal. This ensures that all layers agree that the visuals are equal.
Pass the screen of the other visual into the VisualsEqual callchain.
Don't free PanoramiXVisuals since we need it for PanoramiXTranslateVisualID.
Don't skip the first visual on the other screen in PanoramiXMaybeAddVisual.
Skip the loop in PanoramiXTranslateVisualID if screen is 0.
commit 86678e7cc2b021851ff508433fa160170f500c51
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 12 14:53:37 2008 -0400
Fix fbdevhw initialization for PCI drivers.
graphics/fb%d, not graphics:fb%d. Thanks sysfs. Thysfs.
commit 1c8bd318fbaf65890ef16fe26c76dd5e6f14dfde
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 12 14:15:11 2008 -0400
X n'est pas une print API.
commit f9fae16456c30479b0cb9317e57200af36795785
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 10:36:44 2008 -0700
XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app
(cherry picked from commit 78032815aeb10c22ff45b49702e9c9df82ab471c)
commit ac4e33a9cd0ca2f0ec76181d11d5b90b82690c05
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 09:27:27 2008 -0700
XQuartz: More startup work... listen if we're the actual server
(cherry picked from commit 3b0afb47c3d8ad922cb2315ed8034f4d77d4a249)
commit a7800d9355377ac02833613c2ffc2423beec9970
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 9 16:44:31 2008 -0700
XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
(cherry picked from commit 9b67fca9b7d3050d3d5582a5210270db7eb2ed05)
commit 04211c3532ca078420e3745a5eac3d9de120bc32
Author: James Cloos <cloos@jhcloos.com>
Date: Mon May 12 03:03:13 2008 -0400
Prevent the -wm command line option from causing a SEGV
The -wm (when mapped) option for the BackingStore support has been
causing the server to dereference a NULL pointer.
This has probably been the case since backing store has been
implemented on top of Composite.
It looks like (some of?) Composite didn’t expect its WIndowPtr
argument to be the root window.
In Composite’s compCheckRedirect() function we now avoid calling
compAllocPixmap() and compFreePixmap() when the pWin pointer’s
parent member is NULL, as is it the case with a server’s root window.
This addresses:
https://bugs.freedesktop.org/show_bug.cgi?id=15878
commit 7e768c08f7809b8dba4db1931e63314e2b6e1cfa
Author: James Cloos <cloos@jhcloos.com>
Date: Mon May 12 02:53:59 2008 -0400
Clean up whitespace
commit 3b6735528efc6d69ab7a7cd63dd09c87db7ef115
Author: Dave Airlie <airlied@redhat.com>
Date: Mon May 12 16:36:42 2008 +1000
pci: don't do this pci stuff when we don't have hw access
commit 9dfb525f6c91acab5d1a65765a046bf9ee2aa082
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 11 23:17:27 2008 +0200
kdrive: allow disabling Composite
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
commit 1a01e96c6d15ef17a8b5ab1afa361fb12476a25e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 9 15:38:44 2008 -0700
Return a valid X error when stuck in font alias loop
Part of fix for Sun bug 4258475
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
commit 7b3066d9b9099135d9c49e0682161d5568fc535b
Merge: 2a3d142 315f089
Author: Drew Parsons <drew@emerall.com>
Date: Sat May 10 00:01:15 2008 +1000
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental
commit 2a3d1421e0cc18822ae8f478fcc272e16a9e9340
Author: Drew Parsons <dparsons@debian.org>
Date: Fri May 9 23:20:11 2008 +1000
Disable D-BUS from Xprint.
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.
Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
commit 315f089056da67d4c463ed002eb2b74e38493b49
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 19:46:03 2008 -0700
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
(cherry picked from commit 2232c91d5c277673929eab2abb5e0495c00877cb)
commit 28ac79450c69219dc501e072c6e5028e7136380d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 19:47:40 2008 -0700
Updated .gitignore for new Xquartz layout
(cherry picked from commit cd4d2355e227549a3410485a130549dd91ccdcfe)
commit a07c5ad172b343ef26d2b41ff25f143950441c23
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 16:57:42 2008 -0700
XQuartz: Set bundle version to 2.3.0
(cherry picked from commit 8a0524b30e1e860f3ae35741c116fc8da28aef79)
commit 05f23ed3ea6ee0f052aee41b6573325fe0063fd8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 16:12:41 2008 -0700
XQuartz: Fixed some issue in our bundle creation
(cherry picked from commit 330ffad5477e32c5ab9ed338bc628bd5ae9f4c98)
commit 90b963c0da2b33bdc21483f1a089b95c7e717333
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 16:07:33 2008 -0700
Set CSRG_BASED on OSX
(cherry picked from commit ff085deba18682caa2f93d61a75b38db87d747b1)
commit ff013b0da4e6d33b2b69ce1212e9bd62050574e1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 16:58:31 2008 +0930
config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
specifies a X-specific {rmlv}, then this is overridden through the use of
input.x11_options.Xkb{RMLV}.
However, the way how the server parses options--by ignoring capitalisation,
underscores and spaces--the HAL and the x11_options would override each other.
So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
only actually add them to the device after parsing _all_ options.
* rmlv ... rules, model, layout, variant
See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
(cherry picked from commit fc35d1e3be201e3821413bb2eeb8d43e1e56ba17)
commit 901978ebe0f446532255701cd536e246e805a55b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 14:05:56 2008 +0930
config: remove trailing whitespaces.
It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
(cherry picked from commit 1f54c05cf8a6b82e5fc6362f7f8e8fdc2444b9e8)
commit 1c54c148895225e4ab3c781fe57d09e5f64353aa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri May 9 00:26:16 2008 +0300
Revert "GL: Make errors non-fatal"
Turns out this just caused segfaults further down the line. Oops.
This reverts commit 268d61e00cf4bc52c05f19eda7ab4f6accce12c8.
commit f17ba5d5849c92603f453195aca384844ca76d74
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 8 16:04:24 2008 -0400
Bug #13104: Remove broken XAA a1 glyph fast path.
commit ddaecfa13cefee7c66b39b606c8640c6544d4943
Merge: 9c2e087 cf20df3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 8 14:33:58 2008 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit fc35d1e3be201e3821413bb2eeb8d43e1e56ba17
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 16:58:31 2008 +0930
config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
specifies a X-specific {rmlv}, then this is overridden through the use of
input.x11_options.Xkb{RMLV}.
However, the way how the server parses options--by ignoring capitalisation,
underscores and spaces--the HAL and the x11_options would override each other.
So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
only actually add them to the device after parsing _all_ options.
* rmlv ... rules, model, layout, variant
See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
commit 1f54c05cf8a6b82e5fc6362f7f8e8fdc2444b9e8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 14:05:56 2008 +0930
config: remove trailing whitespaces.
It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
commit 1a314a1ef06222977e7ccb94331ce31c17534b2a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 13:16:48 2008 +0930
Revert "config: deprecate (and ignore) the use of input.xkb.whatever options."
daniels:
"Hrm, I'd prefer to have input.xkb.{m,l,v,o} be the primary keys, and
have input.x11_options be a backup for that, rather than the former
being deprecated, for the reasons I listed earlier ..."
see http://bugs.freedesktop.org/show_bug.cgi?id=13037#c51
This reverts commit 26188875de1ccc84ac60bfb251e3ec43de2b9e22.
commit cf20df39cc78203d17b99223908af388ecbf7d0e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 7 22:24:19 2008 +0300
XKB: Actually explain keymap failures
When something went wrong building a keymap, try to explain to the user
what it actually was, instead of the dreaded 'Failed to load XKB keymap'
catch-all.
commit 641a5f955b7b3ae04eeb6bc45fb30b0b531898e4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 7 22:29:04 2008 +0300
Build: Ensure xf86DefModeSet.c ends in an empty line
This shuts up a warning.
commit 268d61e00cf4bc52c05f19eda7ab4f6accce12c8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 7 22:28:45 2008 +0300
GL: Make errors non-fatal
GLX, there's more to the world than just you. If you fail to load the
software renderer, don't bring the entire server down.
The error path probably needs better testing on this one, but it seems
mostly okay to me.
commit 9c2e0871cfbe54e73eec1f790a7e383d08555055
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 7 13:21:26 2008 -0400
Bug #13104: XAA: Adapt to glyph storage changes.
Glyph bits are now stored in a proper pixmap, not just hanging off the
end of a GlyphRec.
commit 26188875de1ccc84ac60bfb251e3ec43de2b9e22
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 7 13:13:57 2008 +0930
config: deprecate (and ignore) the use of input.xkb.whatever options.
These options are still sent by some HAL implementations (e.g. HAL on FC8),
and may overwrite the options set in the x11-input.fdi file.
For a more detailed description of why see Bug #13037, comment 42.
X.Org Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037#c42>
commit b6a0c6d4864f73a18beb841b16e9be56f2fcd77e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 6 17:06:34 2008 -0700
Allow using libmd instead of libcrypto for SHA1 hashing in render/glyph.c
Builders can force one or the other by passing SHA1_LIB & SHA1_CFLAGS
to configure
commit 718652eaf9221e0eeec2c971dd7baa97f827451b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 6 17:52:37 2008 -0400
Bug #13104: Don't let XAA glyph pixmaps anywhere near video memory.
Since glyphs are stored in pixmaps now, they can make their way into VRAM,
which invalidates a bunch of fast-path assumptions in the XAA code. Thus
you end up doing color-expands or WriteBitmap from la-la land and your
aliased glyphs go all funny.
Since XAA isn't ever growing the ability to do sane glyph accel, just force
glyph pixmaps into host memory by catching them at CreatePixmap time.
commit a85d3ac87cc354093bb1e88697c44254e7721bb9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 02:59:13 2008 -0700
XQuartz: Fixed typo
(cherry picked from commit 56b7988d2662caa4d31094695b414080e4470ed4)
commit 077ced6384abad78253e857091e78f3685965b9d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 02:47:03 2008 -0700
XQuartz: Added uncommitted files
(cherry picked from commit e414ec462cfc63f8eb7f504f526f5a2c73f51e69)
commit 80e502c5d1f7e9221c6ae40716d6402fd28d8806
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 02:28:36 2008 -0700
Fixed up dist
(cherry picked from commit f225222ba2bf4f03425107f258d60b73c88efaec)
commit 7295e544332b0fa929f651304f9d4aca3db4a33e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 00:06:19 2008 -0700
XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
(cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50)
commit d41d677ab4118e73140ea2392e0d48eb361af1cf
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Mon May 5 20:55:08 2008 -0700
Xquartz: experimental embedding of Sparkle.framework
(cherry picked from commit b7a1a640cef8c69442859cbf89034ad362a19684)
commit 9e0d73fd8a43647b648ec5b2f0bcaae30c03259c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 6 17:52:15 2008 +0930
xfree86: call SetCursor for the VCP when switching between SW/HW rendering.
We need a manual call to SetCursor when we switch from SW to HW rendering and
the other way round. This way we display the new cursor after removing the old
one.
In addition, we only update the internal state for the VCP's sprite. This way,
when we switch back to HW rendering the state is up-to-date and wasn't
overwritten with the other sprite's state.
The second part is a hack. It would be better to keep a state for each sprite,
but then again we don't have hardware that can render multiple cursors so we
might as well do with the hack.
commit e4ebfed1785597b48b68e1bbdde3e5c4061b749f
Author: Dave Airlie <airlied@linux.ie>
Date: Tue May 6 16:46:37 2008 +1000
xf86edid: fix typo in debug output
commit b9c1a57e7a98dea63cd362f714411547e728a85a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 6 14:51:23 2008 +0930
xfree86: switch between to SW cursors if more than 1 sprite is available.
Switches back to HW cursors when sprites other than the VCP are removed.
The current state requires the cursor to change shape once before it updates
to SW / HW rendering (whatever is appropriate), e.g. by moving into a
different window. Until this is done, the cursor is invisible.
commit 3df88c17e315b5ae580096e4bc88920d1f452e83
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 6 11:50:20 2008 +0930
xfree86: re-enable hardware cursor (for a single cursor)
This commit enables HW rendering for cursors again, but only for a single
cursor. Other cursors can be created, however they will not be visible.
commit 6acc2acd0db2826add7c47e94e4061d169a41f88
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 5 15:32:26 2008 -0700
Rootless: mi doesn't let us resize root, so we need to do it ourselves...
(cherry picked from commit c1ec36e28cff857664090cc8792db1ae93b783fa)
commit efa65a0317e12c9ad34fa00fe90bf5eae9fa2670
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 4 21:52:58 2008 -0700
Rework composite overlay window code to fix several resource management bugs.
The composite overlay window code had several misunderstandings of the
workings of the X server, in particular error handling paths would often
double-free objects. Clean all of this up by using resource destruction as
the sole mechanism for freeing resource-based objects.
commit 6c1accce87c9bd640c1b4bbc49bae7d44b1cc97b
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 4 21:51:08 2008 -0700
Empty the borderClip of manual redirect windows. (bug 15823)
Thanks to Owen Taylor for root-causing this one.
If a TreatAsTransparent window has any area in the borderClip, that will be
added to the totalClip region for use by other windows. That's wrong.
Instead, simply empty the borderClip for TreatAsTransparent windows right up
front.
commit d500eeb9458336780d77baf8b7db96e1f7ff4f0d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun May 4 10:26:25 2008 -0700
Xephyr: Handle depth 30 and reject higher depths rather than crashing.
commit f4a68f3701889950d3b98842d021f357f3913fea
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 2 17:35:57 2008 -0700
XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values
(cherry picked from commit 8d9eab3a2ec5955cc2698fdcb1fa6ed12b2aadb7)
commit 96fa7da3b87e2f9187ec13dad259beefdc17cd94
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 2 16:53:45 2008 -0700
XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
(cherry picked from commit ff10c37bdd09656cf2f7ee9577f5552caa1ffdb8)
commit 6f63724b28c8b3fd85314fb95d1e4f363b610e19
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 2 14:56:58 2008 +0930
xfree86: don't try to repaint the cursor before cursors exist.
commit 334456952930cb3e55c02fcdada2d0c074cd0520
Merge: 8e56fd9 3b8d534
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 2 11:00:14 2008 +0930
Merge branch 'master' into mpx
Conflicts:
Xi/exevents.c
dix/devices.c
commit a338007be6fd4302af012109d959f43ac7eab2b1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 1 18:02:59 2008 -0700
XQuartz: Adjust the screen origin offset properly for multimonitor setups
(cherry picked from commit f2020b9836bacd0593ac0b4c8541e32714ab02a9)
commit 8e56fd9728d63a7a48ef44503425c6e25c7c9ffb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 2 10:22:06 2008 +0930
dix: continue to check for invalid valuator ranges.
In an ideal world, the drivers would init all axes with NO_AXIS_LIMIT. In the
real world, this is an ABI break, so let's just leave the old check in.
commit 3b8d53452cd6c74d32d7759964a7cd9ee775f161
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu May 1 15:10:52 2008 +0200
EXA: Fall back in CompositeRects if the driver can't accelerate Composite.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=15780 .
commit 01c61f3d972fc2f4e5bb536dd00d8b6bbeb0fb3d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu May 1 01:02:39 2008 -0300
xorgcfg: Fix a crash if xorg.conf doesn't have a Files section.
This patch only creates a Files section if required, so if no entries are
added, an empty Files section will not be created.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 6899ff81e8f668382e3e2f9afdd9cdf51d0e0f7d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Apr 30 16:38:42 2008 -0300
Fix an off by one read error in drmSIGIOHandler().
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit ec0419b50534006a272278b79ee51538193661cb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 30 17:30:57 2008 -0700
XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
(cherry picked from commit 1fcf74a436f2e19cceb3f285b89859025d94c040)
commit 28d1e21f1523d475cb757d3cfa33737ed62c534d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 30 17:30:32 2008 -0700
Dix: Cleaned up sanity checking in Get{Pointer,Keyboard}Events
XQuartz was crashing because the Appkit thread was trying to GetXXXEvents while the Xserver thread was exiting.
This adds some more sanity checks and avoids that crash
(cherry picked from commit 34ec4bd6acb834c0e3f9a5042a0cc3f52c6f3a68)
commit ce36ae526d88d20ff67cd6cb429fb06f48d231f6
Author: Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
Date: Wed Apr 30 11:58:32 2008 +0300
Add M32R architecture support (bug #10020)
Still needs autotools support, so this won't actually _build_: it's just
a starting point.
commit a0e6a7d4f507c5c0a0b11adb10394af58a0a6e07
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 30 17:57:48 2008 +0930
dix: resize EQ to minimum size to avoid reallocs during SIGIO.
When a new device is added, calculate the event size needed if a DCCE event is
sent and set the EQ's event size to this minimum. This avoids reallocs when a
event is sent (which may happen during a SIGIO).
commit b71b51c982706501b6229532ce342752207426bb
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Tue Apr 29 23:37:58 2008 -0700
xquartz: created darwinTablet, to represent tablet events
(cherry picked from commit 50641bce730ee03738fa0c4beb8125b34fda556f)
commit 519581b0bab5cc6dac397877da485745f18c2120
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Tue Apr 29 23:00:09 2008 -0700
xquartz: remove unused params from DarwinEQInit
(cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
commit d70487a4c09cfeb90d996ab40a23a74b2c15be6f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Apr 29 23:59:26 2008 -0700
XQuartz: Fix to tablet-event handling code; we now scale
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
(cherry picked from commit 588683cecca2cfc65a28de035cd6ee3d64ff59d2)
commit fea39c94bcc8b635d37530d8a27ee92acab484fe
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 30 13:17:14 2008 +0930
dix: fix typo from last commit.
commit ffaccc2dc91f4ca4ea10da010206a0a7d2b5540c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 30 11:45:19 2008 +0930
input: replace -1 as default axis limit with NO_AXIS_LIMIT define.
This allows easier refacturing of the coordinate limit handling. Grepping for
-1 is boring.
commit 00acb40f2bc5bb4a1977b9b08db75630677ff787
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 30 11:29:03 2008 +0930
dix: fix typo in clipAxis.
Check needs to be (min_axis < max_axis), not (min_axis < min_axis)
commit f65a1a62f9eac2f6620d5d469dbf6c79b2eadab7
Author: Hong Liu <hong.liu@intel.com>
Date: Tue Apr 29 09:00:11 2008 -0700
Keep rotation wrappers in place while transforms are in use
LeaveVT/EnterVT cycles will free/realloc shadow frame buffers. Because of
this, the presense/absence of that data is insufficient to know whether
the screen function wrappers are necessary. Instead, the 'transform_in_use'
flag should be used.
This patch also adds 'xf86RotateFreeShadow' for drivers to use at LeaveVT
time to free the rotation data; it will be reallocated on EnterVT.
commit 18b33dd4ff46f63bad70b493b1d0b0758c961ada
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 15:24:55 2008 +0930
Xi: stop excessive use of _X_EXPORT.
commit 2b179c32ac40f5258d95ae16da96a79fa8eea696
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 15:15:16 2008 +0930
include: add declaration for CopyGetMasterEvent to shut up compiler warning.
commit ff36753755360aaa16ab8604a0ab78123884b57d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 14:53:41 2008 +0930
mi: call the custom event handlers for both MD and SD.
commit ec2fca7e6f7ce8fdf33d959b7adeaae935ec4b37
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 14:40:44 2008 +0930
xfree86: DGA needs to call into Xi.
Two steps: first use UpdateDeviceState() instead of replicating the device
changing code. And emulate XI events instead of core events.
commit 8208b842b7dd3b30bafdd74147bdfa63bc00cc40
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 14:19:42 2008 +0930
Xi: add IEventBase global variable. Stores event base for X Input events.
commit 46340b740640b76b52b8e69bc67f9201c7e974c3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 14:17:48 2008 +0930
Xi: change UpdateDeviceState to be _X_EXPORT.
commit 3a922c5d07509703a3eeda2bbec6f332e6b0ffac
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 17:32:54 2008 +0930
Xi: apply ValuatorEvent data to the device's valuators.
After UpdateDeviceState, the device has the current position in absolute
coordinates, the event has the correct valuator data to be delivered to the
client.
commit f2a20294fe26f4c9d245d24d065331fefd8f830d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 16:56:22 2008 +0930
dix: store all valuators as they come from the device in the valuator events.
The event's sequenceNumber is mis-used to determine whether the values are
relative or absolute.
commit d5ab89f4f1acbe2614036e8934122185ac0f81ee
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 15:52:24 2008 -0700
XQuartz: Unset CFProcessPath... blech
(cherry picked from commit ce4fbfbc75c62a092214d140c7550279aebe69ef)
commit 0c2312b21b6700c1425baccaf9c26150b4f0fd6a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 15:28:21 2008 -0700
XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
(cherry picked from commit 22cf72437601c07b8a6c744b4f2f1f4cd6713e60)
commit c3dc4bdbb018c0606d561e2dfb9a36e9297fa312
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 15:42:02 2008 -0700
XQuartz: Disabled DPMS extension
(cherry picked from commit 1448fed9b6d484f471b9b2982c76ca921a9273b9)
commit 07382a70c7ac9807dfb31821a4763bea2309bde6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 12:36:54 2008 -0700
XQuartz: Added thread debugging to xprFrame.c
(cherry picked from commit 41542502b321c697271c1752525b600872b6df96)
commit 8349732a6720652bfbad7874a952be73a0e8e77b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Apr 28 21:09:35 2008 +0200
EXA: Try to accelerate non-antialiased text via the glyph cache as well.
Treat 1 bit glyphs and masks as PICT_a8 in the glyph cache. We're not able to
accelerate them otherwise.
commit a65d530040bb561ba88c5d8c71633a7c0bf11e89
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Apr 28 21:03:12 2008 +0200
EXA: Accumulate glyphs whenever possible, for full benefits of the glyph cache.
commit e7eaac59c424a205dd106fc7d70734ff4b390f28
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Apr 28 21:00:55 2008 +0200
EXA: Glyph cache upload tweaks.
Track damage after using UploadToScreen directly.
Don't waste any effort on empty glyphs.
commit cc08c06665ffe29ad44d023d75d0f86e5338875d
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:55 2008 +0200
EXA: Use UploadToScreen() for uploads to glyph cache
When possible, use UploadToScreen() rather than CompositePicture()
to upload glyphs onto the glyph cache pixmap. This avoids allocating
offscreen memory for each glyph making management of offscreen
areas much more efficient.
commit 13fd2256300b61d88b840952d838f834523f5dd7
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:55 2008 +0200
EXA: Clean up debug messages
commit fcb5949928f1c27f67f40c094c3c673786574422
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:54 2008 +0200
EXA: Fix overlapping glyphs in glyph cache
Allocate each cache at a different vertical position in the
per-format pixmap. Fix width/height confusion when choosing
the cache for a glyph.
commit 40eb14c9482457969e0bde97c49edad536285e02
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:54 2008 +0200
EXA: Add exaCompositeRects()
Add a function to composite multiple independent rectangles
from the same source to the same destination in a single
operation: this is useful for building a glyph mask.
commit 54184110f6f3e5d7276d5431e739a4fcf0c3523e
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:54 2008 +0200
EXA: Use a single large glyph cache pixmap
Add back exaGlyphs(); the new version copies the glyph images
onto a single large glyph pixmap and draws from their to the
destination surface. This reduces the management of small
offscreen areas and will allow us to avoid texture unit setup
between each glyph.
commit e9734306088e12f2cd68bf347ecf8415be4f0268
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 11:47:49 2008 -0700
XQuartz: More startup / threading house cleaning.
(cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
commit 4b46fc931e61bec0abd6a86062e46dd7a408e745
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 10:50:51 2008 -0700
XQuartz: Updated Localizable.strings
(cherry picked from commit d8d9c866b90fb24c93bd6e25fa90f8f2bf58ad34)
commit 4017ebe5bfa7a261cd1135801756c44e9fe93ca1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 27 00:01:14 2008 -0700
XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
(cherry picked from commit 03e707987f7f32e47dd0355c6d16bfb9169a379b)
commit 53dba5381fdd8f644e16aaa0ecb05df4dc615b23
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 11:37:52 2008 +0930
dix: if alloc of a master keyboard fails, remove the master pointer.
commit 1fab51edfc82e1ef60dfa29fd5d93478066a3998
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 11:37:21 2008 +0930
mi: guard against NULL-pointer dereference.
commit b5004722a208479a4bc762ff428bf4cbeb430d53
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 10:26:01 2008 +0930
Xi: Only return VCP, VCK and floating SDs to Xi 1.x clients.
This is better than the approach implemented with
8973a3f7983240407dd6da59b3643f40e6a3d83a which disabled XI altogether for 1.x.
Instead, return a device list that resembles a traditional XI setup on pre XI
2.0 servers. If the client tries to open a device other than a floating SD,
return a BadDevice error.
commit 0bd28315afc3b7223f8ff9f17597db09500a9388
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 26 23:00:42 2008 -0700
Xquartz: Added missing to EXTRA_DIST
(cherry picked from commit f4b963256feb03e9e6b5521bdefeb390e9a49688)
commit ef1c52053755fa14b4ca98b22c506f73f5f4a4b7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 26 19:21:05 2008 -0700
XQuartz: Cleaned up startup and thread creation a tad.
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
commit b114d4e861885cc5b49cd81b33ad825461811b3e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 26 17:04:49 2008 -0700
XQuartz: Don't subtract the titlebar off of the pointer_y
(cherry picked from commit 00a9567acce2b27a649cbebd4790e3043688a7d8)
commit 684b5d8382bf0bc6cd55774226ee362e81c0adbf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 19:55:59 2008 +0930
Xi: whoops, stray ! caused a bit of memory mess.
commit 87071b604c4b7c3c79ab784e2c09ff691e2bc5ad
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 19:37:57 2008 +0930
Revert "Xi: disable XI for clients < XI 2.0"
Turns out some programs don't like this change. gnome-settings-daemon crashes
hard if you tell it that XI doesn't exist. So, tell them we have XI, but leave
the other change (the one that pretends no devices are available).
This reverts commit 8973a3f7983240407dd6da59b3643f40e6a3d83a.
commit 7447a30fb27ed50a20a85b5a2de9afe7dea8cfa5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 19:03:13 2008 +0930
Xi: if a pre-XI2 client tries to list the devices, pretend we don't have any.
XI 1.x isn't supported anymore, so let's pretend we don't have any devices.
This stops clients from opening them and thus stops interference.
commit 8973a3f7983240407dd6da59b3643f40e6a3d83a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 17:48:52 2008 +0930
Xi: disable XI for clients < XI 2.0
Sorry. With the huge changes in the device handling I honestly don't know how
to support XI and XI2 alongside. So let's just pretend XI doesn't exist if a
client doesn't request it supporting XI2.
commit b304b0a65cc57127cdea103f2c5114e4ea79af41
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 17:38:55 2008 +0930
Xi: add versioning support.
Remember the version the client sent to us, so we can adjust our replies
accordingly. This requires the client to use the {major|minor}Version fields
in the GetExtensionVersion request. However, they were padding before, so we
must assume they are garbage if nbytes is non-zero. If nbytes is zero, the
client is probably a new client and we can handle it correctly.
commit b9ca7896356f79ee27be5d5aa62052f6984282b0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 25 17:54:36 2008 -0700
XQuartz: Added some pseudoramiX debug traces
(cherry picked from commit 5bee1585a399eab0a7b6fc80ad476d81b5d227d3)
commit e251c9e75afdc5e32f2bc9801712272358934266
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 16:49:35 2008 +0930
Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
commit 1d0438de176551aaeff549664f00b8bd83d465af
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 16:28:58 2008 +0930
Xi: remove RemoveOtherCoreGrabs()
PickPointer() returns grabbed devices, so we can't get a double grab anyway.
commit be5ff2b8d8a392eb8611e1fcd6da4752d68a7f9d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 16:25:13 2008 +0930
Xi: remove some superflous code
commit 0209e46249b61974a6e3ed54a51cc36dfaf0064f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 23:48:11 2008 -0700
XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
(cherry picked from commit 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
commit b65dbd350b8518bb90bed9cdc64dd900bc75d20c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 21:14:04 2008 -0700
XQuartz: Cleaned up multi-monitor support.
(cherry picked from commit c05abf0a19b0ef0fc4ace9400a095ce2521456bc)
(cherry picked from commit 9112f290434c246d3e797551aaaf3a89d2006b23)
commit b093bf3ec37367172be3b44a04f0f43890ba7d7d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 15:15:31 2008 +0930
dix: don't search for grabbed devices, PickPointer does it for us now.
Follow-up to 93ee33830778b9ec85ad81496572677a30022b09.
commit 6198bad07edc51ff4a264a9361c5e9b6c74647a6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 15:02:40 2008 +0930
dix: remove misleading (stale) comment
commit 93ee33830778b9ec85ad81496572677a30022b09
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 15:02:13 2008 +0930
dix: let PickPointer() return devices that are core-grabbed by the client.
If the client currently holds a core grab on any device, this device has
priority, even over the ClientPointer.
commit f5ac98747de921d48f36d4f3f66dbe73e26a6760
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 14:50:24 2008 +0930
Standardise copyright headers for all new files created as part of MPX.
commit 3fc67b4205851dcffcc431a07a885828549bd9cf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:37:32 2008 +0930
Xi: remove leftover chpkpair.h file.
Used to contain declarations for ChangePointerKeyboardPairing request
handling.
commit 89add4ee986e38b833bb58750b3e5a664efb6f4a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:19:12 2008 +0930
dix: remove obsolete InitWindowPrivates().
commit dcdc66fcfc7957aa7875fbf74fa3a55989a9a187
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:14:32 2008 +0930
dix: add mi.h include to stop compiler warning
commit 97552413d213337e4bff8c89b06d58a09d722b05
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:13:05 2008 +0930
dix: remove "unused variable" compiler warning.
commit d9c38e84cc492b931a2238757d438f562946e5bc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:04:02 2008 +0930
dix: remove pairingClient definition.
This variable was used originally to determine which client is allowed to
change the pointer-keyboard pairing. For now, we just let anyone change it and
see how that works out.
commit c14b858aeced81ff43723644f2de0f5c43f55755
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:02:12 2008 +0930
Xi: fix two compiler warnings
unused variable in exevents.c
implicit declaration in warpdevp.c
commit 6015b7a81252cd1729e6f4045f9b0c885c95b183
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 10:41:30 2008 +0930
Xi: handle requests through a dispatch handler.
Same principle as e.g. in the RandR extension, rather than having a load of
if (type == XI_whatever)
use an array of function pointers.
commit cb8cb87bc6decf75832c3724687000ecb658226e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 10:09:50 2008 +0930
Xi: remove unused #define DISPATCH
commit 5869e3f5551e7e2d18e06a2f220b77d8c4161db1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 19:39:27 2008 -0700
darwin gots /dev/urandom, too yo!
(cherry picked from commit bf0144f38034bc59f108bb2c5270ff37fbe70e10)
commit b1ae7c79db78cc3b789701f81328669f9f8ed80f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Apr 24 19:02:43 2008 -0700
Bug 14247: If pkg-config can't find openssl.pc, just link with -lcrypto
X.Org bugzilla #14247 <http://bugs.freedesktop.org/show_bug.cgi?id=14247>
commit 1daae4574c19a122baf73b6f9457b0d383b1bc66
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 18:22:05 2008 -0700
Added missing HAVE_LAUNCHD to dix-config.h.in
(cherry picked from commit 1b4b73cefbc2f3e3f6d0cb84ea202f84fb60abb5)
commit 63853e4ad211945ed25541223207a78f83766ced
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 18:21:42 2008 -0700
XQuartz: Compile in missing glx source that we still need
(cherry picked from commit c611335dee267e41dcd1733a6bb5206b102f804e)
commit ae982a27e4059fecd4048d245e6aa02f8dcc97d0
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 24 16:37:29 2008 +1000
glx: test for valid read and draw privates before using them
this should fix a bug where f-spot exiting blows up the X server
commit f377141912594f87144d6d7f7fdd279a101d8e6c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 13:30:28 2008 +0930
Xi: don't attempt to send to a NULL window.
Only applicable when the server comes down/restarts. In this case,
WindowTable[i] may be NULL. Let's not try to send an event then.
commit aec485f2dcc87b340759d67b60e7dee7931aaec5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 13:29:46 2008 +0930
dix: NULL out WindowTable after freeing all the windows.
CloseDownDevices() tries to send PresenceNotify events. If the windows are
already freed, then we are accessing dangling pointers.
commit 9ab4e2fd8eaa87dbd16835affb1aa54dcb1a619e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 23 11:38:08 2008 +0930
xfree86: don't free the config-file related information in DIDR. #15645
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.
This is an addon to 6d22a9615a0e6ab3d00b0bcb22ff001b6ece02ae, an attempt to
fix Bug 14418.
X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
commit 7dc40c8eca90ec1bfab84b6f54418b64c0e62d63
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 12:47:29 2008 +0930
xfree86: Don't free master devices.
The previous check works in the master-branch, but doesn't work with MPX. We
actually copy the SD's information into the MDs public.devicePrivate, so we
need to explicitly check whether a device is a MD before freeing the module.
commit cc13f87cd8ac54223fdb0b3d3c043dc9b9be5a42
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 11:43:47 2008 +0930
Xext: XGE: change function definition to have return value on separate line.
This seems to be the common style in most parts of the server.
commit d0890c40b9a9c7965c08608e6950c078a29aac16
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 11:32:36 2008 +0930
Xext: add a few lines of comments to XGE.
commit 745b90cde1007383ec8c887f02439a34ab427f31
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 11:27:22 2008 +0930
Xext: re-do the XGE versioning handling.
Basically the same approach RandR takes. Remember which one the client
requested, send back the one the server supports. Also divide XGE server
version (now defined in geext.c) and the client's version (still in the
protocol definition).
commit 5f3e5b3462bb02e828c70d0e1890b5a83d399d42
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 11:03:23 2008 +0930
Xext: remove trailing whitespaces in geext.{c|h}
commit d09c520b322ba5c5f4d6b630a7c0c62e56732f82
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 23 10:22:34 2008 -0700
Moved Apple GL bits into our DDX subtree
(cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
commit b05b416c622063b84747702a54ffd9a802d6fc11
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 23 09:59:48 2008 -0700
XQuartz: No need to include indirect.c a second time
(cherry picked from commit 41ed532525da85d1bd2c20af5ffa28ac6d1f4996)
commit 565492c70a280d7e749500c5c0073bdcaf175c86
Author: Ben Byer <bbyer@apple.com>
Date: Wed Apr 23 06:00:57 2008 -0700
xquartz: build fixes for GLX/DRI2 fallout (note: not guaranteed)
(cherry picked from commit 85a5796b667461bf1fafc68c07b3a704cd8efd5b)
commit 6f6505db51763d902142a8161e71cad44f52560c
Author: Ben Byer <bbyer@apple.com>
Date: Wed Apr 23 03:43:51 2008 -0700
glx / xquartz: we still need glxcontentmodes.[ch] kthx
(cherry picked from commit 27545fd37f8c703b72f7cfc329778abc1ceabfa0)
commit 4e3a8af5751ff88c0cadd612821b0ef349d250c5
Author: Ben Byer <bbyer@apple.com>
Date: Wed Apr 23 03:39:41 2008 -0700
xquartz: clean up linker line for main binary
(cherry picked from commit 821d7400f2ff917497b2ee58ceef2b69c2d47ec7)
commit 3685b171da51f853bfdb312d36622dfa03ee75be
Author: Ben Byer <bbyer@apple.com>
Date: Tue Apr 22 23:53:23 2008 -0700
xquartz: remove vestigial aglGlx.c
(cherry picked from commit 40bd041e4255f26fcbdf0831e68619ae0f46ab39)
commit f6e22d69af6bc8f63c3a46535a09e217696a679f
Author: Hans de Goede <j.w.r.degoede@hhs.nl>
Date: Wed Apr 23 12:28:30 2008 -0400
Prefer glxvisuals with stencil buffer for default visuals
The first fbconfig which has a depthbuffer > 0 and doublebuf is choosen
when associating fbconfigs with the visuals, indepenent of stencil bits.
This happens to work ok on intel as there all fbconfigs with a
depthbuffer > 0 also have stencil bits.
This patch fixes this by first trying to get a fbconfig for default X visuals
with both stencilbuf, depthbuf and doublebuffering, and if that fails fallback
to trying to get one with only a depthbuf and doublebuffering.
commit 00effad583713e882c3f2518bcd3da51bf4db716
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:46:30 2008 +0300
xephyr: XEPHYR_DRI is identical to XF86DRI
commit 6a9f7f28ec455d2879ca1a315ce77c48af49e7f4
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:46:15 2008 +0300
xephyr: sync with mesa
commit 7ffc68c5cc7108c9e56af25f9f9b4398f5b027df
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:45:54 2008 +0300
xephyr: libGL is client lib
commit a27c244d72603e27766ff3900ab28fe094f7397e
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:45:37 2008 +0300
xephyr: Makefile cleanup 2
commit d4d19b2f22002b1579438cb9cf08dd580c7ec005
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:45:19 2008 +0300
xephyr: Makefile cleanup 1
commit cdc4571b580a8f4fd279404215bff0fb9a5b4816
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sun Apr 20 17:06:26 2008 +0300
drop TOGCUP remnants
commit 6cd9287aed3c128d9c10b9b042ba7b864143d522
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sun Apr 20 16:58:51 2008 +0300
drop EVI remnants
commit a88c6b66465c039bf92a54a496516fee4d900784
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 18 17:47:16 2008 +0300
glcore: drop GLcore (files)
commit dd7a53f8f21e41e1ab43f7e684ba586abc97ef7e
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 18 17:47:01 2008 +0300
glcore: drop GLcore (build system)
commit 567d389d47dee233a973b101e04ce41c47a68f34
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 18 17:46:18 2008 +0300
glcore: build from mesa, dlopen from xorg
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
GLX_PROVIDER_INSTALL_DIR
commit efb723e166e5fa89e90c7b400fb4c7979b1f50c0
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 18 17:45:53 2008 +0300
glcore: prepare for dynamic loading
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
DLOPEN_LIBS - to dlopen the glcore dso
LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use
the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
commit fbad87f2ae9f97fcb43546b0fa35f1100415dfec
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 22 23:50:11 2008 +0200
autoconfig: don't call closedir() when opendir() failed
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
commit 76381092e8f650ec7d1f058fa4c8a7348893f775
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 23 02:22:14 2008 -0700
XQuartz: Make sure QuartzAudioInit() gets run.
(cherry picked from commit bb3d034675b70e22e78df5554cab0ec2a3d913d0)
(cherry picked from commit 824b31c7f8144a67a320442abd3d854e99d2bfe2)
commit 275cdc1c74b7e43ecd931d312469fecc8d998ed1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 23 16:16:15 2008 +0930
xfree86: pass correct value to mieqEnqueue (merge detritus I guess)
commit c3659cb414ef05da8fa09009b2b82a3deeeb4f3a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 22 21:54:02 2008 +0930
dix: always send FocusIn events if mode is NotifyUngrab.
In the case of a NotifyUngrab, the flag for the device may already be set but
we still need to send the FocusIn event.
commit 00815b3e5223e822f306db45cd4884a22ac9f7ed
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 21 14:34:39 2008 +0200
Don't set DRI2=yes if we can't find dri2proto or libdrm
commit e77f65768efbf05cdf363a2f41f036f74eaa45de
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 18:07:46 2008 +0100
Reuse the existing framebuffer mode in kdrive/fbdev
When starting up kdrive/fbdev, if the current framebuffer mode is sensible use
that unless told otherwise.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit c4fd1121531b0cba1a3e90fa747871d784365c7e
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 18:05:53 2008 +0100
Add mediumraw support to the linux kdrive driver
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 455383db95618a05ebdbeae78423e08065f0e14e
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 18:04:31 2008 +0100
Enable the epson kdrive driver
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 82b37d35af13a9f402755e167493ab256b664b9c
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 16:38:14 2008 +0100
Add support for AVR32
commit 20a90bef8b4993f06cf76ad05e3d4c974e1614f6
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 16:37:02 2008 +0100
Add a default touchscreen path
When enabling the touchscreen, open /dev/input/touchscreen0 if no path was
specified.
commit b44e89f4683ffcfd75eaf39f1f37d7461db44689
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 16:28:39 2008 +0100
Update to tslib 1.0
Update the pkgconfig checks to tslib 1.0, and fix the LIBS definitions.
commit 3848422d2354b7a5302fda92b05b0d728190e050
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 16:25:23 2008 +0100
Fix build when XKB is disabled.
commit 744d0cfda74f8283801cc2d6c5eda48402455bc3
Author: Ben Byer <bbyer@apple.com>
Date: Mon Apr 21 22:06:38 2008 -0700
add missing DARWIN_GLX_LIBS in configure.ac
(cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44)
commit 8190ef87547b704848231bde10b1cdffc6442790
Merge: 179a082 2ddbfd3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 22 18:04:05 2008 +0930
Merge branch 'master' into mpx
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
commit 179a082c26f9e562492ee2e59e7f44f949f39f9c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 21:13:10 2008 +0930
Xext: route event through master if required (XTestFakeInput)
commit fb784d99c521823339bf00b70b9824f735d88875
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 20:57:42 2008 +0930
mi: fix typo in comment.
commit 8209fdbc7c7f2dd068b30ff184b5fbf00db78686
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 20:53:57 2008 +0930
Xext: Update sprite on fake input only for MDs and floating SDs.
commit 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 22 16:31:44 2008 +0930
xnest: re-enable XKB support. #10015
XKB was disabled in 08928afb0500d46b0caa0a1d1244dee2ed80e6a0, with the comment
"Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
and changing XKB settings seems to work in Xnest now.
X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015>
commit a8b8700c7345b89953c8b63cb5c347a95e6ab988
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 21 23:44:37 2008 -0700
XQuartz: Fixed cmd-tab to bring all windows forward.
(cherry picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
commit a368ab757edf36ed7bbda023673d28883ce11231
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Apr 22 15:13:57 2008 +1000
GLcore: make googleearth not crash the server on sw-rendering.
I don't think this is the 100% correct answer as I get log spam saying
(EE) DoSwapInterval: cx = 0x98b8998, GLX screen = 0x96dd780
(EE) AIGLX: cx->pGlxScreen->swapInterval == NULL
but thats better than X exiting in my book.
commit 449723510a1f9d024e23d9eb33795cac27f9443e
Author: Egbert Eich <eich@pdx.freedesktop.org>
Date: Tue Apr 22 13:30:03 2008 +0930
xkb: use the correct device instead of an uninitialised "dev". #15614
X.Org Bug 15614 <http://bugs.freedesktop.org/show_bug.cgi?id=15614>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit ba87c25321c3378fd1ad0c55dcb0af0a6e82a540
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 21 20:03:08 2008 -0700
Make rootless use dixLookupClient rather than deprecated LookupClient.
(cherry picked from commit 582b5b01f9697b66489ea906a2ecb8bfc5915571)
commit 8822110d7d6b684f373fc883aeb7cab9734e9ddb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 21 20:08:05 2008 -0700
Fixed dixLookupClient to work with client=NullClient as it did in the 1.3 branch
(cherry picked from commit e41ccc64702f856e5e09dfa652fe73c14b8a0225)
(cherry picked from commit ce5a5f93990647de85e535734ee6bb430ad591cb)
commit 5ffb6a2fe8db5871eaf26b8535af1588c43f33d3
Author: Ben Byer <bbyer@apple.com>
Date: Mon Apr 21 19:55:54 2008 -0700
Nuke a call to deprecated LookupClient, and hopefully prevent a
null-pointer dereference, too!
(cherry picked from commit 3d28e9f953709914e18807bc74c241333671cb30)
commit 590688131d89595bdc78ca562ee88df86c9012a6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 20 22:18:45 2008 -0700
XQuartz: Fixed quit dialog to be more conforming with HIG.
(cherry picked from commit 14c6b837bb03bd0956f90882f550847f13d0ca09)
commit d20b3ac22d960fa44632cc4a14be079daa2d5a33
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 20 22:18:19 2008 -0700
.gitignore: Added Xquartz stuff
(cherry picked from commit 0a9a3bec2de8d1f442493e13cf9f039902a4928f)
commit 570b0dca261920c9b01b4eb11fe9b9987b1c636a
Author: Ben Byer <bbyer@apple.com>
Date: Mon Apr 21 17:52:10 2008 -0700
Fix for pointer-offset issue when using a multi-display environment on X11.app.
(cherry picked from commit 9a7e14286ced55c5e2a4512e2629e03836443009)
commit 3f081b4de55e1378728a24d069bf06575ffca2d8
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Apr 21 11:22:07 2008 +0200
EXA: Set pixmap->accel_blocked on the screen pixmap, too.
commit 26c1801a27b81fdd988d5bd210ba0e76ecc274ae
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Apr 21 11:03:27 2008 +0200
EXA: Update sys_pitch/fb_pitch in exaModifyPixmapHeader.
exaModifyPixmapHeader now also only evaluates arguments that have a
meaningful value.
commit 4fa89fbe18c929e0d36305ab47e7e17841309ffd
Author: Jordan Crouse <jordan.crouse@amd.com>
Date: Mon Apr 21 12:09:00 2008 -0600
xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'
commit 6c95fae1e9d6b0eb64bc78eced05a6e9f5faf02e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Apr 21 10:45:11 2008 +0200
EXA: Offscreen memory eviction improvements.
* Make sure available areas are considered to have no eviction cost. This seems
to help for https://bugs.freedesktop.org/show_bug.cgi?id=15513 but I'm afraid
that may just be coincidence.
* Only calculate eviction cost of each area once for each eviction pass.
Safeguard against potential (though unlikely) division by zero.
* Cosmetic enhancements: Name eviction cost related variables 'cost' instead of
'score' to emphasize that smaller values are better, update Doxygen file
comment to the way eviction works now.
commit 40c6be1408a1f0b236fdb28af27ae18aea0d578f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 20 20:36:44 2008 +0200
Minor xorg.conf manpage fixups
Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
replaced, and rewrap some text to get __xservername__ replaced in the
description of Option "Accel" (cpp doesn't like the preceding quote).
commit 4bcfed2f9cf5dbf682d3bc98873ba97c4efdff44
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 20 08:35:42 2008 -0700
Revert "Removed XWin DDX"
This reverts commit 6550078b0925f754e3eec3bbce94dbfe5de8c419.
Doctor, I'm starting to get a pulse...
commit 14396fdebac1868df17559220ed7aaa34c34251e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 19 23:31:05 2008 -0700
XQuartz: Cleanup turning off COMPOSITE
(cherry picked from commit 8f920fca6f9149185649d52569d33bf81b6c6857)
commit d13828797fe22856b07e08a55d2b9375902194bf
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:38:31 2008 -0700
XQuartz: Cleaned up some casting to get rid of compiler warnings
(cherry picked from commit 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
commit 6550078b0925f754e3eec3bbce94dbfe5de8c419
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 19 09:29:46 2008 -0700
Removed XWin DDX
commit 587c010a1cd733fded4d49dc339df0634bda8be6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 19 09:27:21 2008 -0700
Rootless: Kill off rlAccel
commit d3d00d92586c3e1cbc88087c930b65c8b3832fcc
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Apr 19 12:54:40 2008 +0200
Removed fbpseudocolor.h from sdk_HEADERS.
commit 5bdc4198795ffd011bb07cffe3817e4cded87f60
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Apr 19 04:06:19 2008 -0400
Remove fbpseudocolor
"An experimental pseudocolor emulation layer. Not fully completed,
currently only works for 16bpp." That was almost four years ago.
It still doesn't work, only one driver even attempts to use it, it
contains an ad-hoc implementation of damage, and should really be
done up in Composite now anyway.
commit 60ff56050b64183cb6e58f54223c8a3ddc2e704b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 18 22:17:53 2008 -0700
Revert "Optimize dixLookupPrivate for repeated lookups of the same private."
The patch was wildly unsafe for SIGIO, and made everything full of
crashy crashy fail.
This reverts commit 9b30cc524867a0ad3d0d2227e167f4284830ab4e.
commit ed9dabb47c467dbf49836b631d5d6bda4b0d98b0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:30:43 2008 -0700
Last of the spam... I promise...
(cherry picked from commit 45ebee4f729b148a75e925a4863b4eb850c88f8e)
commit 49f2bb4681fdee9e45f952ef0ac9c34a090117de
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:25:38 2008 -0700
XQuartz: More sanitization of the namespace
(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
commit c2f0d020b5d7950267aa3df391a7a72b9ae5883b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:10:57 2008 -0700
XQuartz: Removed unneccessary include
(cherry picked from commit 45ff59e69eddfcceafced31cf6e73e381d0f6914)
commit 5183fea6d38de4bcf657e9c2a983dfd81a2a223f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:06:17 2008 -0700
XQuartz: Handled sanitization of namespace better
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
commit edd3fb784bad893550ee270e0a09f22f99783cf5
Author: Ben Byer <bbyer@bbyer.local>
Date: Fri Apr 18 17:17:01 2008 -0700
random flailing
(cherry picked from commit 7fb9b2dc615a3bd1a3c087438af7a8b88265cfaa)
commit a7503615a6893749d512f75d37646273f31b9dbf
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 19:56:41 2008 -0400
Death to TOG-CUP.
If you still care about 8bpp visuals that much, fix Composite to provide
synthetic visuals.
commit 4da9ec16e9725ebb9817b49e33ea1035b6aff09a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 19:54:09 2008 -0400
Remove appgroup mentions from configure.ac
commit 25827fde68d3bb02a2b7e05fae53a1d97edf1f76
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 18 15:32:04 2008 -0700
Nuke the MIT-SUNDRY-NONSTANDARD extension.
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
commit 13adef8a17d8815f4db2aaac30ae04438e125343
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 19:01:06 2008 -0400
Finish deleting EVI
commit eafaf40fb3368ca7e4cf48336fdb7a6c9f536bfa
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 18:50:05 2008 -0400
Death to APPGROUP.
commit f6617b4127125516583f321c961d70f762f728be
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 18:28:01 2008 -0400
Death to Extended Visual Information.
commit 3b93631e59ca4d312d318eac4015e0a79ad6351f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 11:31:54 2008 +0930
dix: remove coreOnly check. Core pointer must generate XI events now.
This flag was only used when an event is generated by Warp[Device]Pointer.
Since the VCP now happily generates core events, this flag is obsolete.
commit e0eaf8e5e3fa7a11c087851dff93f50f6907c4a5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 10:57:47 2008 +0930
Xext: Let XTestFakeInput update the sprite for XI events.
Since XI devices can have their own sprite now, we need to update the sprite
coordinates too when processing an XI event.
Note: This doesn't deal with the device hierarchy correctly yet.
commit cb0168b4ac5c59cdce6f0a6d89ddd9f30d93b5f3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 09:48:06 2008 +0930
Xext: xtest.c: death to tabs+spaces indendation, remove #define XINPUT
commit eebdf69e9a52e071e0467a1f99de135df4d1eabc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 09:22:37 2008 +0930
xkb: mixing up src and dst in a memcpy is suboptimal.
commit aa6687322de85a2d1025a3ae851fb290a089b2d3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 15 23:03:06 2008 +0930
Xi: when copying button classes, copy xkb_acts as well.
This should be the last piece in the quest for the class copy.
commit c14f5dc237a31b13d98ae2d0d6143bd91083cf13
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 20:21:45 2008 -0700
XQuartz: Forgot to commit xprEvent.[hc] ...
(cherry picked from commit 70e543baf2508d636f01b2b7e8cb05172195b68c)
commit 22bb7608a025a4ec0f442637810b20e2cb0b0820
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 17:04:08 2008 -0700
Added XKB support for Xquartz
(cherry picked from commit 56dc1215202746590dbe8758411f47e8876e1317)
commit 652479dba38470273313dc46f17e3bcb1bc5e383
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 15:49:13 2008 -0700
XQuartz: Moved some rootless-specific cruft into xpr
(cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
commit 2a1ba20af98c0e9a6a7f1a50d32058dcc9759c21
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 15:23:00 2008 -0700
XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time.
(cherry picked from commit 7b087c965bce9f440ab5233d6383aa4a7de969b8)
commit 55f80d754525398378de1ef28aa562bd29ee750f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 14:21:31 2008 -0700
XQuartz: A little more debugging output from threadSafety
(cherry picked from commit f6fbdbf838ab77c3a4635f0b2356b1bbb060ff5b)
commit 0d61f6fca1efeb4f68488e323d1c0508b9b7a711
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 13:17:58 2008 -0700
XQuartz: Fixed some missing prototypes
(cherry picked from commit 95056afc562cfe58b116f5c36e4624018e79ff4a)
commit dbd4c031565d269fef90af23386ff045ec78688c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 13:12:56 2008 -0700
XQuartz: Added framework for asserting which thread we're in.
(cherry picked from commit 00beb982510e7a82d77e1f1d43e77c84d7bf74c2)
commit fa0645b452cbebd1800a63f1c95cb77fef4ab211
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 12:27:12 2008 -0700
removed Xquartz debugging code that leaked into master. Our Bad.
commit a3d40f0549f6c6f49fffc286bcdaad758fa92367
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 11:56:48 2008 -0700
XQuartz: Include version info for CrashReporter
(cherry picked from commit b4992755c3e29086c5939683c38fa8fd7d2e6754)
commit 6d11712c2a35b243c19eea3b26622d18c2446dbe
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 11:06:54 2008 -0700
XQuartz: Use strerror(errno)... cause I like text more than grepping header files
(cherry picked from commit 1b4c37d8f9b517fbec5b94ed4e4a5e86a31472a5)
commit dcf4f917cc9488de72711255bbb030d9aa8f8bfb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 11:03:31 2008 -0700
merged darwinKeyboard.[ch] into quartzKeyboard
(cherry picked from commit 57bb07320908b74facea0a97822bb19ed6f960a9)
commit 582397cd024c68df65ab9dececd6d2c40a5a261b
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 02:31:53 2008 -0700
oops, missed a spot
(cherry picked from commit 19872a6aeb8ee9cb0e33e4b4ffd794c9dbefe0cf)
commit 0bd1c369cce05d5a4da5e3fd7033aea8c68460ec
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 02:30:36 2008 -0700
formatting cleanup
(cherry picked from commit 769acd29348abf9e5b0bebfca6ae695d345f3077)
commit 700e14c22616b209867e4ea4d1811e53ca996164
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 02:21:33 2008 -0700
delete debugging spew
(cherry picked from commit f04f3af86a91d0cafbc86a0d71aeb0599d685f07)
commit a440eebf2541ae0bb06bf65281b5facff2f04e00
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 02:21:11 2008 -0700
add support for horizontal scrolling (buttons 6 and 7)
(cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
commit 612e901ef6aa3edc54b39e55e8040cda0e5ab7b6
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 01:32:56 2008 -0700
enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
(cherry picked from commit ab662c736e0654e2b4347091f0d9e87f26034216)
commit 5bdfbfbedcbd9ff61cbb0b678cbf7ce7889a5826
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 01:29:46 2008 -0700
darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
(cherry picked from commit a8a090b853e811b9843a5732572cbbe542224f32)
commit 58e42683c9e998f6b8a55d5653b9caec7b6acf96
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 00:19:56 2008 -0700
hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
(cherry picked from commit cab54466a61281cfafc12825017c23d720cd75f4)
commit cd3470a0cffbd6b8cec7c44227b33307c9e227ae
Author: Ben Byer <bbyer@apple.com>
Date: Wed Apr 16 22:48:54 2008 -0700
kludge: miEqEnqueue wants a device, even if we're passing custom messages,
so give it one
(cherry picked from commit a494ff04b2a14470eaf5a23c7cf6dbdea182c6d1)
commit 966ae1781f3ca563e15a9a1b8cab6fab94e07fe9
Author: Drew Parsons <dparsons@debian.org>
Date: Mon Mar 10 22:54:49 2008 +1100
Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)
required because of commit 7c0709a736c0f3aa011de67dd2c2962585ab146e,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.
Follows 571206832d454771e3c638c7515767958365c19c (providing -DXPRINT
to xprint subdirs).
Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
commit 571206832d454771e3c638c7515767958365c19c
Author: Drew Parsons <dparsons@debian.org>
Date: Mon Mar 10 13:48:05 2008 +1100
Define XPRINT in XPRINT_CFLAGS (configure.ac)
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736c0f3aa011de67dd2c2962585ab146e it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
commit 9b30cc524867a0ad3d0d2227e167f4284830ab4e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Apr 17 16:10:10 2008 +0200
Optimize dixLookupPrivate for repeated lookups of the same private.
This gives me a 20% speedup for EXA text rendering, though I still seem to burn
quite a lot of cycles in here...
commit 886af8f3849a0fcfc6b63a9695107ce26d7a6955
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Apr 16 16:20:19 2008 +0200
EXA: Avoid some fallbacks in exaCopyNtoN.
In some cases we can still do the copying in hardware even if the
dimensions of the pixmaps are out of range. This is true when the boxes
that we're to copy are all in the card's range.
commit dc10f0a0e243b7ba38d02a4e2c43027563aead7c
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 17 11:13:47 2008 +0200
Fix composite on !darwin
2ffdb0eb641ab6949783b4eb574f77e7486ac929 changes the default value of
COMPOSITE to 'auto', but doesn't set it back to 'yes' as appropriate.
commit 8716d081fdf61ddf956c30aff7697c70507911fd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 3 16:29:43 2008 -0700
XQuartz: Don't enable rootless accelerated functionality... crashy...
(cherry picked from commit cdb4c291d8c10c3a9ea59d8e79275a30d2ea82b4)
commit 2ffdb0eb641ab6949783b4eb574f77e7486ac929
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 16 21:54:00 2008 -0700
XQuartz: Don't use composite.
(cherry picked from commit 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0)
commit 757a1bf3a3d72e17eeb362f825124c4ba40cc080
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 16 21:48:52 2008 -0700
Xquartz: Don't need to link against rlAccel since we don't use it
(cherry picked from commit 180ec128adef11a9a90cea1189dc31ac5de8359f)
commit ab8c6a3c5acb2a3bf288f1d6339b09a125bbb930
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Apr 14 19:12:00 2008 -0700
Update ac_define_dir macro in acinclude.m4 to 2008-04-12 version
commit b907258ebe62642af088f6e2970a45a68cf4be19
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 16 12:07:51 2008 -0700
Update dolt from upstream, fixing fallback to libtool.
commit e1e189f8538f2b77ae0cf0d846d3899061e4c4b7
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 15 14:49:51 2008 -0700
Include pciaccess in the xorg-server.pc Requires line.
This pulls in the include path for pciaccess.h, which is needed by, among other
things, xf86.h.
commit 9e7ced94a5e3a14762fe934aa69d91f0831cf5ca
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Apr 15 12:06:07 2008 -0700
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
(cherry picked from commit cb27d5ca8230707b276763c0ec20e586203144c9)
commit 51c8fd69ec9292f5e18cdc7f60e1716fbd6ae61a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 15 15:09:40 2008 +0930
dix: free the unused device classes when closing a device.
This also requires to NULL-ify all pointers while we're actually using them,
otherwise we'd try to free them twice.
commit 48d33ab9b672b3b3ca308000cdbd573d1e368ff9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 15 14:29:53 2008 +0930
dix: float attached devices _before_ disabling the master.
It also helps if we're actually providing the correct argument to
AttachDevice...
commit 4cf9c5909d926ec322ed1c7df47f95bd872bb607
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 15 13:56:11 2008 +0930
Xi: fix up button count.
Some leftover code from the previously used alloc/free device classes left us
with a incorrect button count. So a button release didn't come through if
a different pointer was moved after the button press.
commit 35982bc109d424c464551ab22ec90af69908c884
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Apr 11 11:09:13 2008 -0400
Make DRI2 a serverlayout/serverflags option.
Add xf86DRI2Enabled() to export the value of the setting.
commit f133d85778462134f366389bde7673bff7845fa8
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Apr 14 11:43:51 2008 +0200
EXA: Update pixmaps' accel_blocked field in ModifyPixmapHeader.
commit bb8868540f017b121d698da45e552ffb55a57cea
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Apr 14 09:58:49 2008 +0200
EXA: Teach exaCompositeFallbackPictDesc() about x8r8g8b8.
commit 1a9d7205cd5640eb65f019336097d86301942ea7
Merge: 90f491c 6866e84
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 14 16:25:58 2008 +0930
Merge whot@wombat:~/potoroo/xserver into mpx
commit 3e12c5bb67f3049156475d5cbf4e899aaded76bb
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Apr 14 11:45:12 2008 +1000
glx: silly nitpick...
even though i and j are the same, we use i to derefence visuals everywhere else
commit 97565c0f394f16d042c614695c8b7b4ac354f2a3
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Apr 14 11:40:38 2008 +1000
glcore: make visualRating GLX_NONE - note GLX_NONE is not == 0
Finally glxinfo returns the set of 3 visuals and glxgears works again for me on
sw rendering
commit c61087c82784633e522bd9392172b43656bdf45e
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Apr 14 10:47:28 2008 +1000
glcore: zero fbconfigs before filling them in.
I'm not sure this the complete proper solution, perhaps it should explicitly fill
in ever field.
This at least makes glxinfo on glcore return sensible information, it doesn't make
gears work yet though.
commit 6866e84e3c607d00d88eab2249c2619d6707c1a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 19:57:51 2008 +0930
Xi: store feedback classes in devProviates system as well.
This is a follow-up to cb48d880856fd196ab8e8de5eb1f14944a1b4fff.
commit cb48d880856fd196ab8e8de5eb1f14944a1b4fff
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 19:48:28 2008 +0930
Xi: store unused classes in devPrivates.
Rather than freeing/allocing classes each time the device capabilities need to
swap, store them in the devPrivates system.
When a class is unused, it is pushed into the devPrivates, and later recovered
when needed again. This saves us a lot of memory allocations/frees, admittedly
on the cost of some memory.
commit fde3c836628b6cdec3e5d107d6b1b99bc8b86912
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 17:08:51 2008 +0930
Xi: copy the KeySyms.map over from the source.
commit 3c4c9938f31755c5a59995fdcfa138c99db76bbf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 16:52:14 2008 +0930
Xi: Fix pointer handling in KeyClassRec copy.
We don't free the class anymore, so just store the previous pointers, do the
memcpy from the SD and then restore the pointers.
Plugs a memleak too, before xkbInfo was never freed.
commit 755f9e5d7898056cf3bead69ce25a10e23995582
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 16:49:25 2008 +0930
dix: Ignore focus for passive grabs if the event is a pointer event.
commit 6faf5b97b92953c331d6540ceb18fd0a77197fea
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 15:42:33 2008 +0930
Xi: fix up modifierKeyMap copying.
Setting it to NULL isn't correct either. The correct behaviour is to realloc
it to the size necessary (or newly alloc it/free it). Otherwise we have a
memleak.
commit 3106ba1116e3b9d893f66a93e4a91cc61e23226a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 11:48:06 2008 +0930
xkb: two fixes to avoid server crashes.
- map can be NULL in some cases, so don't try to dereference it.
- don't default to inputInfo.keyboard
This is firefighting, I presume something in the class copy may have gone
wrong to get a NULL map in the first instance?
commit 415c6df0da1197d487456b4c48e2e28e7ded8b8e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 11:46:44 2008 +0930
Xi: copy feedback classes first, in some cases xkb relies on kbdfeed.
XkbInitIndicatorMap (in XkbInitDevice) calls XkbFindSrvLedInfo. This accesses
the devices kbdfeed struct, which is all nice and dandy if it is NULL. When
copying the device classes however, kbdfeed may not be NULL and thus
XkbFindSrvLedInfo goes on its merry way to do whatever it does.
By copying kbdfeed first, we avoid XkbFSLI to reference the "old" kbdfeed
struct of the previous SD.
commit 961f6660902163e99727c2dcc1a039f32b083859
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 09:31:16 2008 +0930
Xi: modifierKeyMap needs to be set to NULL when copying classes.
Otherwise we have a double reference to the same memory area.
commit bf6679cba40a936d46008c886d204ed521a4971a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 08:28:07 2008 +0930
Xi: copy the XkbSrvLedInfo too when copying device classes.
commit 4219e94c2f7d431be433eceddfe79760a1ee31a1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 08:27:31 2008 +0930
xkb: Add XkbCopySrvLedInfo, deep-copies a XkbSrvLedInfoRec.
commit 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe
Author: Matt Turner <mattst88@gmail.com>
Date: Sat Apr 12 20:39:18 2008 +0200
Check for __x86_64__ when we check for __amd64__
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
commit b1f3f42840ec01db417345a0740b59ad5e4471cb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 11 17:49:51 2008 -0700
Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
(cherry picked from commit 55d9973b053f25bb95b26e00351dc5531caf5b04)
commit eabcfce0a68d504d11be9479f09e66f574dd2f21
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 11 09:51:26 2008 -0400
Stop building mfb/afb/xf1bpp by default.
commit 0dab6fa3582b70ccd0f01459902415c28dbc81ff
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 11 09:47:51 2008 -0400
So long, and thanks for all the cfb.
commit 059b4876e6350aa1110648788cdfbb3f45b4d66d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 11 09:46:48 2008 -0400
Add doltcompile to .gitignore
commit 6d22a9615a0e6ab3d00b0bcb22ff001b6ece02ae
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Feb 22 11:01:51 2008 +1030
dix: Call DeleteInputDeviceRequest from CloseDownDevices (#14418)
The DDX (xfree86 anyway) maintains its own device list in addition to the one
in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
server then restarts (last client disconnects), the DDX devices are still
there, will be re-initialised, then the hal devices come in and are added too.
This repeats until we run out of device ids.
This also requires us to strdup() the default pointer/keyboard in
checkCoreInputDevices.
X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
commit 90f491cf8eb869f27c4278b26c1bb84432b12d63
Merge: cbe01b3 b4380d8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 11 08:29:52 2008 +0930
Merge whot@wombat:~/potoroo/xserver into mpx
commit 3c337e18b933881e22b0d03312511f1d23a8640b
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu Apr 10 21:36:19 2008 +0200
Fixed configure.ac for autoconf 2.62.
commit 13dcde6bf994fae09c67c3edce9de42df61ef043
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 10 11:08:49 2008 -0700
Fix dolt to error out on compile error, and not print errors on race to mkdir.
Both of these changes have been submitted upstream.
commit a7e3ad1c6b455bda7c4abb352a20845d1d4574a0
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 10 10:33:11 2008 -0700
Remove NDEBUG (assert() disable) define from the X Server.
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead. There should be no ABI consequences
to this change.
The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h. As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
commit b4380d8030927c940ddaea83c4cf24e0b9eb7b96
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 19:25:43 2008 +0930
dix: don't free MDs classes on init.
The device classes aren't deleted anymore on a class change, so there's no
need to store the MD's original classes. We should however restore the MD to
sane defaults when disconnecting the last device, consider this as TODO item.
commit 04dff74ffdf727015e3721aae4ea13acc498cd1c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 19:22:59 2008 +0930
dix: Rework Enter/Leave semaphore system.
Instead of a simple counter, use bits to keep track of which device is where
etc. When device enters a window (or sets focus), the bit matching the device
is set, when it leaves again, it is unset. If there are 0 bits set, then
Leave/Enter/Focus events may be sent to the client.
Same theory as before, but this should get around the insanity with
Grab/Ungrab special cases. Those cases are basically untested though.
commit a88386ee277d136caaaeec305f8753f23f9b6274
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 14:36:57 2008 +0930
Xi: only DeliverFocusedEvents if the event is not a pointer event.
A pointer device may have a focus class, but even if so, pointer events must
be delivered to the sprite window, not the focus window.
commit 48249425275cc90242497aee9968e5f1ffc86698
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 14:36:10 2008 +0930
Xi: dont copy FocusClassRec if the master already has one.
Blindly copying will override the focus setting of the master. If there's XI
applications running, they may set the SD focus, while leaving the
MD's focus as it was. In this case, after a class swap we still want to get
the MD's events to the same window as before.
commit bce6091c6b04ff2db704ae4f161179d21dcbec59
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 09:59:45 2008 +0930
dix: Extend IsKeyboardDevice() to not include pointer devices.
If a pointer devices has key classes as well, don't register it as a keyboard
device. Let's see how much that change will break.
commit cc7dab2d04da4ca164eeec1a3296df1706585466
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 09:58:50 2008 +0930
dix: Dont deliver grabbed pointer events to a focus window.
If an pointer event is being processed during a device grab, don't deliver it
to the focus window, even if the device has a focus class. Reason being that
some pointers may have a focus class, thus killing drag-and-drop.
commit df2545b98d888924209cb889a68737c15f1aa209
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 08:50:43 2008 +0930
xfree86: Sanity check before retrieving the paired device.
Some pointer devices send key events [1], blindly getting the paired device
crashes the server. So let's check if the device is a pointer before we try to
get the paired device.
[1] The MS Wireless Optical Desktop 2000's multimedia keys are sent through
the pointer device, not through the keyboard device.
commit 5a4c6621aaf4e886f2c3b633e837ba359fedf921
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 08:29:05 2008 +0930
Xi: some extra checks for validity of kbd and mouse.
Floating SDs are paired with themselves, so the paired device may not be a
proper keyboard or mouse. Put some extra checks in to avoid dereferencing a
nullpointer later.
commit 8e0a6529303a52acc10905dd47c72a0d60979676
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 08:25:36 2008 +0930
dix: When floating, set sprite to NULL before calling InitializeSprite.
InitializeSprite won't create a new one if it already exists, with the result
of overwriting the master's sprite. This master sprite is then assigned to the
floating slave, and freed when the slave is reattached later.
Setting the sprite to NULL forces InitializeSprite to alloc a new one, and
this one can be freed without further repercussions.
commit e7211eb0b3d10323dab681bcb18580405ea18ab2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 08:08:54 2008 +0930
Xi: When attaching, check for ptr -> ptr and keybd -> keybd.
Some pointer devices have key classes (e.g. MS Optical Desktop 2000). The
previous test was performed as Error if ptr -> keybd or keybd -> ptr. This
doesnt work with such devices. New test is Succeed if ptr->ptr or
keybd->keybd.
commit 7909ebe7f163716520f843fae11ac7bdeffcb57c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 9 10:43:25 2008 -0700
dolt: add FreeBSD support (this and ppc have been submitted upstream).
commit b4842d8dc3b1619033c5c123c8adc6e164098dc3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Apr 9 16:17:35 2008 +0200
dolt works on powerpc Linux.
commit 0d1746995d91b55e40f233f0c38b56bafe896d38
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Apr 9 13:37:59 2008 +0200
Fix off-by-one error in ProcXResQueryClients().
Fixes memory corruption reported at
http://bugs.freedesktop.org/show_bug.cgi?id=14004 .
commit 6d031cbdefd8072b61645955f01b470a3e6858c1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 9 14:36:26 2008 +0300
configure.ac: Do the dolt
Use dolt instead of libtool whereever practical. See:
http://lists.debian.org/debian-devel/2008/04/msg00286.html
commit b19027fbaea4c3a146926e862983e0e3411fff3d
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Apr 9 14:27:58 2008 +1000
quirk: add quirk for ACR 640x350 default mode is wrong
RH #440186
commit 1f8188656a075dc7b1bb27a0795b5bd43610bbc8
Author: Ben Byer <bbyer@apple.com>
Date: Tue Apr 8 20:37:25 2008 -0700
add missing dix-config include
(cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)
commit cbe01b3083eb65c9d4259b1071683febebf11600
Merge: 5ffbcfe 389dae7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 9 10:46:46 2008 +0930
Merge whot@wombat:~/potoroo/xserver into mpx
commit 3f51f493b6daf2464e6c2ba5a924219b88a9e57e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Apr 8 17:02:56 2008 -0700
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
(cherry picked from commit df21312c8b0e9ef0c809bfc57cdf64f27db0d8a7)
(cherry picked from commit 2d4194a8d124e7a9c7cd1b83635ba6957aa4ae1c)
commit 389dae73cc0f3693f49807fd2de146c454ba9783
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 9 08:26:00 2008 +0930
Xi: If device "to" has a class but "from" doesn't, free the class in "to".
commit 60c38d248c1a89392c2c6695c3802f4b54e4c00b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 9 07:46:53 2008 +0930
Xi: plug memory leak, free previous motion history before allocating new.
commit ea05cf0813b2b7c8cd2151cb935820753ae7997a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 8 22:09:11 2008 +0930
Xi: check if source has a key class before copying.
commit 08073862f8c4e1219b6459708ffd28e2bc35885f
Author: Hasso Tepper <hasso@estpak.ee>
Date: Tue Apr 8 13:00:38 2008 +0300
configure.ac: Fix monotonic test harder
This was only introduced in a later version of POSIX, so define that
version to get it from more conformant systems.
commit 5ffbcfec3d37d3b627a78acfa00dbafc5948df82
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Tue Apr 8 14:42:00 2008 +0930
dix: Ensure Proximity events don't kill the server.
Add Prox events to the if-clauses with the other events
that are usually sent from the input devices.
Ensure that the event deliverers won't try to deliver
events of type '0' (some extended events doesn't have
an equivalent core-type)
Small modification by Peter Hutterer.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 32e4a88ae613c7200d84d5621344b418b656346b
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Tue Apr 8 08:42:58 2008 +0930
xkb: don't overwrite CtrlProc in the second run of XkbFinishDeviceInit.
XkbFinishDeviceInit is called once when the device is initialised, but also
when a class copy causes the key class of a device to change. In this case,
overwriting the CtrlProc of the KeybdFeedbackClass with XkbDDXKeybdCtrlProc
sets up a nice recursive loop of XkbDDXKeybdCtrlProc calling itself until the
cows come home.
commit 6271df6953bea462be7e9e01744e5dd46841e867
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Tue Apr 8 08:42:58 2008 +0930
xkb: don't overwrite CtrlProc in the second run of XkbFinishDeviceInit.
XkbFinishDeviceInit is called once when the device is initialised, but also
when a class copy causes the key class of a device to change. In this case, overwriting the CtrlProc of the KeybdFeedbackClass with XkbDDXKeybdCtrlProc sets up a nice recursive loop of XkbDDXKeybdCtrlProc calling itself until the cows come home.
commit 726dcd9e4ebfb09c0685450dca6e9fae7e773814
Author: Adam Tkac <atkac@redhat.com>
Date: Mon Apr 7 10:20:02 2008 -0400
Fix Xvfb input when building against current X sources.
commit 0f87b41a432a6472a15ec0c9dee997e3bddbd0f2
Author: Hasso Tepper <hasso@estpak.ee>
Date: Mon Apr 7 14:09:04 2008 +0300
configure.ac: DragonFly BSD support
Add support for DragonFly BSD, which is just the same as FreeBSD for all
of these cases.
commit 6b1a27023e48b661c4bb3b61181ac57608d8e448
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date: Thu Apr 3 14:50:05 2008 -0400
EXA: Fix TS origin computation when implementing RenderComposite with tiling.
commit fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab
Merge: b46a009 6c0cfe3
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Mon Apr 7 07:56:41 2008 +0930
Merge branch 'master' into dcdc_rework
Conflicts:
Xext/xevie.c
dix/dispatch.c
commit 539bf3c2836727e7560c64144071b086f8ea32fe
Merge: 3ab33e7 6c0cfe3
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Mon Apr 7 00:10:16 2008 +0200
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3ab33e7cd46c25dfc461b2a1b13e138225a94524
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Apr 6 23:23:47 2008 +0200
Remove stale code
The jstk code for Joysticks is not used by any module, was never actually compiled and uses an API
that is deprecated these days.
No reason to keep it.
commit b46a00918691cbd5ca80b6d3acae7614f93e073b
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Sun Apr 6 09:02:57 2008 +0930
dix: sprite may be NULL, don't dereference it then.
In some rare cases (e.g. when the init fails) a device's sprite is NULL,
dereferencing it to xfree the spriteTrace is a bad idea then.
commit 638a50552e3e2190eac9721deb72e7365bdd52e4
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Sun Apr 6 08:36:21 2008 +0930
dix: remove debug error message about XI->core type conversion.
commit 8f38feb3e464986dc523dabd3447ba13263a3a4a
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Sat Apr 5 20:37:09 2008 +1030
Xi: add comments for DeepCopyDeviceClasses, ChangeMasterDeviceClasses.
commit 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 4 19:01:40 2008 +0200
Fix the clock_gettime check for glibc-based non-Linux systems
We need to define _POSIX_C_SOURCE on glibc, not just Linux, so add a new
test for the __GLIBC__ macro.
commit cc7c045bae01d90d8f1b750080ba48a96e983c68
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 4 12:58:12 2008 -0400
Fix PCI config space cycles from int10 emulator.
The top bit of 0xCF8 is an enable bit, not part of the domain. Sending
cycles to domain 128 instead of domain 0 is rarely the right thing to do.
commit d1de3dda8efe501d4192c8a99c34ab4265316c32
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 17 14:22:39 2008 -0700
Fix clock_gettime presence detect on FreeBSD.
For non-Linux, _POSIX_C_SOURCE and friends restrict symbols defined rather
than enabling defines of symbols. Additionally, CLOCK_MONOTONIC was
apparently added to the standard around 2000 anyway, not 1993.
commit ec17900f52bbd25d07566834756e5c7e832e0463
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Apr 4 10:46:45 2008 -0400
Convert __DRIconfigs after we've made sure createNewScreen succeeded.
commit 16a8ce75585ea360c39e0ffce4f7bb26a359b754
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Apr 3 16:44:32 2008 -0400
Only autoload RECORD if it was enabled.
commit d0395a753079f291a78d9ab86810b5f84f237491
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 15:05:26 2008 +1030
Xi: realloc to->valuator instead of allocing it blindly.
commit 502689847b86be5619da7134646d55a1ac322a2c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 15:01:53 2008 +1030
Xi: ALLOC_COPY_CLASS_IF should only alloc if to->field doesn't exist.
commit 035b1b6995e670ce5593e8aceb08f9ec812c70ea
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 15:00:06 2008 +1030
Xi: remove duplicate copying of kbdfeed and ptrfeed.
commit 52fc7aed18930fc9e6bcfdd5dbc28ae559978288
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 14:47:23 2008 +1030
Xi: only alloc memory for feedback classes if it doesn't already exist.
commit 4eb87c8693b57d9354832c76417797394656333e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 14:20:18 2008 +1030
Xi: don't free device classes before copying them.
First commit in a series to come.
commit f0915fb3c4a9712200882440a64d11dc595a02bb
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Apr 4 09:29:51 2008 +1000
quirk: add quirk for ACER EDID
commit 2e42b67b82db0f9128dd00e339b9dfdd9fe6d667
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 2 18:05:34 2008 -0700
XQuartz: Change reporting of space change to debug log rather than stderr
(cherry picked from commit ed15556a9fc4ebdb88f42961052fc8456082165f)
commit c737d04c758e03e32f692a31ed2a665ccbafa931
Author: Ben Byer <bbyer@apple.com>
Date: Tue Apr 1 00:40:46 2008 -0700
The AppKit thread should not be calling directly into the X server
functions to change state when the keyboard is reloaded; instead,
pass it as an event.
(cherry picked from commit 7e653f806ff5508aace059312156f319a9ed4479)
commit 15b0084f1ab23042190d8beeb3f088b92dee5a10
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 23:31:25 2008 -0700
formatting cleanup for X11Application.m (no code changes)
(cherry picked from commit eb083d3f68f459d90417558da1ed00729b749950)
commit e9e2d88436597875f102085d216dc0a8fce1450a
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 22:55:24 2008 -0700
moved and renamed QuartzMessageServerThread to
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377efc930e25017636e5112093a3a6549c7)
commit c1be4e3379d8780dff20390939b657ca0973995a
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 21:04:37 2008 -0700
shovelling code around ...
(cherry picked from commit 2143182ba49195bbb2e9163ea6872fd68e7a4a85)
commit 985c631b2e1f113039e6e620f030505435fd9815
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 20:18:58 2008 -0700
just a bit of juggling headers around -- we're preparing
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa727e22316e8ca456f7218bea9ee0313)
commit 89f1d880e83e32b72d35c4dbd6795defa6efa847
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 19:47:28 2008 -0700
nuke DarwinEventQueue
(cherry picked from commit 1e0ec02202eeaffae480048b91bf02140ee29f8a)
commit 8944b77ec0c18476a25ba3179bcc45b338be22b8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 2 17:47:42 2008 -0700
continue with gutting darwinEvents.c
(cherry picked from commit c34fce7051b996633291dddc061b696ff737f3fb)
commit aa6d12e93e8661da841192ef7c3aa7c6a7731c7f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 2 17:46:59 2008 -0700
turns out we weren't actually using these files. oops
(cherry picked from commit bfec44d7b4baf0ad0aae55c8209bc60ac93c5b58)
commit 6c5962e44730395f81cdb333322c9ad5242c32d4
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 18:15:18 2008 -0700
remove vestigal DarwinEQPointerPost etc
(cherry picked from commit a25704c423598d596fd7f2ed4290d4b860bd5d5f)
commit c6f0d5d1e51326e5110d27918d834eb0096df7db
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 17:48:09 2008 -0700
gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
(cherry picked from commit a9e081a60ca227c0d96d4613075d97d6b762366a)
commit 5b6c273eaa53d7b554d69c2b4865988068e73a26
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 17:08:45 2008 -0700
add prototype for DarwinEventHandler
(cherry picked from commit 9a03ae33c4f9de830f15eabf3b994882ead7c000)
commit 3713be8b470b1ac0fcb4f1e4c6b79c526b2196db
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 16:30:16 2008 -0700
add logging of current thread ID to DEBUG_LOG macro
(cherry picked from commit 5848510cc5a8091b30230ab920d904ca6b159480)
commit 1400a51ae70d8e498d9ae3975f58ba7c1768ca6f
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 16:24:01 2008 -0700
Begin to move all of our Xquartz DDX-specific event handlers
to miEQ, in preparation to remove the DDX-specific code entirely.
(cherry picked from commit 3f4447b95f73a82b3aa0f7b0d1640aba5fb0d1bc)
commit 8746daa6732d9837f66d925f2fd74818ecbf8ba2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 2 15:01:33 2008 -0700
XQuartz: Fixed missing close-paren in preference pane text.
(cherry picked from commit ea37e151dc6032d2a1a33cef809f2a7d507aae35)
commit b5a0a865c3045cc08c33388320d4ec3ab7065efb
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 2 19:21:41 2008 -0400
Pick up dri2proto from the standard proto header include path.
commit 8cde0af3c57f0375ba8ba77af9fdf74b79d9496d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 2 19:06:40 2008 -0400
Send the GLX_EXT_texture_from_pixmap attributes to the client.
commit 7c20f65fea3dd3170cde89d7113d85f377671bfb
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 2 18:00:06 2008 -0400
Add @XORG_CFLAGS@ to satisfy xf86* includes.
Pointed out by Hasso Tepper.
commit b13ab156894074fb38cc812738bc7aeeebd9614d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 2 12:38:36 2008 -0400
dri2: Unbreak glcore visual setup.
commit b31de6a59044f91f8230aa581c9ca8540289c168
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed Apr 2 16:29:30 2008 +1000
dri2: fix crasher if DRI2Connect fails
commit ebc56aca8bdfec1918cac3c8380895dfddea48ce
Author: Hong Liu <hong.liu@intel.com>
Date: Wed Apr 2 10:43:19 2008 +0800
Bug #15160: quirk Proview AY765C
prefer first detailed timing
commit 9500033b9ecdfaf5a56a4355ffc94d74cb17ca17
Author: Goneri Le Bouder <goneri@rulezlan.org>
Date: Tue Apr 1 20:19:40 2008 +0200
xfree86: don't crash in AutoConfig if the primary device is not pci
Only call matchDriverFromFiles() if we found a pci device.
Debian bug#472823 (http://bugs.debian.org/472823).
commit 37b1258f0a288a79ce6a3eef3559e17a67c4dd96
Author: Thomas Jaeger <thjaeger@gmail.com>
Date: Tue Apr 1 15:27:06 2008 +0300
XKB: Fix processInputProc wrapping
If input processing is frozen, only wrap realInputProc: don't smash
processInputProc as well. When input processing is thawed, pIP will be
rewrapped correctly.
This supersedes the previous workaround in 50e80c9.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit a4d034941100c6ca3b7cc4e59952c2745b9306cc
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Fri Mar 28 20:47:44 2008 -0700
Add code to track 5 valuators for pointing device, in preparation
for supporting tablet input in Xquartz.
(cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
commit 6648867d8bd1e86458d2ade77a3ee4567c3d6a97
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Fri Mar 28 18:27:02 2008 -0700
add debug statements so we can see if/when our Xinput stubs are getting called.
(cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
commit 19ff23ab0e72a27d05ed4470f75a0934d6f6c1d1
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Fri Mar 28 18:25:03 2008 -0700
Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
(cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
commit 9f56fc580646a519875b5a1452738d8c6e1fa860
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 31 17:34:07 2008 -0400
XSELinux: Add a request to get a client's context from a resource ID.
commit c40e0b51f0d9ef5e1f30f233d7db1e6db9d6681b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Mar 26 19:28:09 2008 -0400
Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext. Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.
Add protocol code to DRI2 module and load DRI2 extension by default.
commit 8074676d2df8d577b443e3fa5e22d7c71c944bd1
Author: Fredrik Höglund <fredrik@kde.org>
Date: Mon Mar 31 21:24:59 2008 +0200
EXA: Optimize the eviction scanning loop in exaOffscreenAlloc.
Reduce the cost of the inner loop, by keeping a set of pointers to the
first and the last areas in the series, subtracting the cost of the first
area from the score, and adding the cost of the last area while walking
the list. This commit also moves the scanning loop from exaOffscreenAlloc
into a separate function.
Idea by Michel Dänzer.
commit 93d876891dbba41b920a9a29a5de77f647f43928
Author: Fredrik Höglund <fredrik@kde.org>
Date: Mon Mar 31 21:15:50 2008 +0200
EXA: Improve the algorithm used for tracking offscreen pixmap use.
Replace the current score keeping algorithm with a rolling counter that's
incremented in ExaOffscreenMarkUsed, with the previous value being stored
in the area. exaOffscreenAlloc uses the difference between the counter
value and the value in the area when deciding which area to evict.
It now also takes the size of the areas into account, and favors evicting
smaller areas.
The credit for these ideas goes to Michel Dänzer.
commit 7034484f0887ea0f8ab956515f2d9301ea5842ce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 28 10:23:36 2008 +0200
gitignore: Add two more bits
Get slightly better at ignoring vim swap files, and let people keep
local changes if they want to.
commit b8ea9f2a25aad88aee77a68f8e20ac07276f0dab
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Mar 28 17:00:08 2008 -0700
XQuartz: Fixed names of enums to be more consistent
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
commit bd28839eb866a9e6dc3ff80f13a67611da7eaf64
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Mar 28 17:02:02 2008 -0700
=?utf-8?q?XQuartz:=20Another=20Expos=C3=A9=20fix:=20F9=20doesn't=20raise=20all=20windows
=20(cherry=20picked=20from=20commit=20b9cffa20debae73737c674bf75ab65db1bd74556)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
commit 933ffcdf7d2eaaf7caabfe6f861f04bcb149918f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 28 17:53:55 2008 -0400
Compile fix.
commit 9e8451d869a4032ddb7de6a62920a3a7b0b1acc1
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 17:38:53 2007 -0500
Add E-EDID segment selection.
commit 0b4aef4d6df7a5525d381de035fbbf78c5fffeef
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 16:00:00 2007 -0500
Refactor DDC2 code to allow for proper segmented addressing.
commit 88ece11d6c45c6f4b94f7fb2da64a46e879d7c27
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 15:47:39 2007 -0500
Start E-EDID support in the DDC module.
Since there's no way to safely know how many blocks xf86DoEDID_DDC2 would
return, add a new xf86DoEEDID entrypoint to do that, and implement the
one in terms of the other.
commit b5f98fcea2024c67e598947782913982072cf4fb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Mar 28 14:01:34 2008 -0400
XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
Patch by Joe Nall.
The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
commit 415e49b940bba2d08870db410ebb47d2add5d836
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Mar 25 23:01:02 2008 -0700
XQuartz: Sanity-check the removal of the 256-color option
Fixes the 'one-time-preferences' bug in 2.2.0_rc1
(cherry picked from commit 38cbd13490fc21724e8eef0ec7e1a20a9cc2e39d)
commit c1d37efe9aae5f2895b3437418f7e4bb2eb3400f
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Tue Mar 25 19:25:00 2008 -0700
xquartz: copy in new stubs from Xi/stubs.c to replace our old
Xinput stubs. Hey, it's a start.
(cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
commit c4a616a741e15865ce0ff98781c6f1dca4d62887
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Mon Mar 24 22:43:10 2008 -0700
prevent "fake mouse clicks" from generating spurious extra events
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
commit c747030a49dd289e873e2b686cd129d840e55468
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Mar 27 15:18:39 2008 +1000
quirk: fix LPL monitors properly.
no point having a h cm fix when we really want to copy the sizes from the
other place.
RH BZ 435216
commit 9df915b84d45d39aed7557c98883b20a66da2e96
Merge: 47eb658 333e712
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Tue Mar 25 17:50:50 2008 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 333e7123dc484888d79c0f5aa3977bd72f1eb341
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 25 12:48:22 2008 -0400
Fix that last commit.
I can apply patches, really.
commit 47eb658e802775021e3efec109f95431cca188ca
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Tue Mar 25 17:37:25 2008 +0100
Support to pass arbitrary options via HAL hotplugging
Parse "input.x11_options" and pass every key/name pair to the driver.
Remove check for input.capabilities, because that's part of the fdi files.
Thanks to Dustin Spicuzza <dustin@virtualroadside.com> for the patch.
commit e7a364425547103a98acabfc67d16e1ae0c2967f
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Tue Mar 25 12:32:33 2008 -0400
Fix getValuatorEvents to compute number of valuators correctly.
commit f028e245a7932362656701c08fcfbfa8e8949077
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Feb 28 19:45:21 2008 -0500
Bug #10016: Implement WM_CLASS hints in Xephyr.
commit 862ff9ac92037e13629329eb6ba50ff6bd2c5f71
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 13:37:42 2008 -0400
Bug #11510: Fix build without RECORD.
commit 87bfd3bd96c714a1c252d42408b5a1a4ff9dab06
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 13:33:38 2008 -0400
Bug #11508: Fix build without XV.
commit 536f2ff5382aaaace3b55481e15366bb15d87801
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 12:22:19 2008 -0400
Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
commit 4217ba0cf0c9bbea3774760e836ab372acf3237c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 22 17:31:08 2008 +0100
xaa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't return the option's value, just whether it's present
in the configuration.
commit 6b9d2bb1f7f87acbf275027af9c2982e91e5faed
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 22 17:28:48 2008 +0100
exa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't give you the option's value, it just tells you if
it's present in the configuration. So using Option "EXANoComposite" "false"
disabled composite acceleration.
commit 63859473965f911515bc6e8d87b32a65ec41eb73
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Fri Mar 21 19:31:31 2008 -0700
XQuartz: Disable 256 color option and fullscreen option
(cherry picked from commit 7c1964338a33558d3f25e369dfca99e3ef9d10f9)
commit 93daa3a3bf1a981757024847882ce92b6bdaae83
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Fri Mar 21 19:11:59 2008 -0700
Xquartz: Added separate preference tab for quartz-wm settings
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7cb0b0db3db948d26b4d5ec7747deb8)
commit c49e11268322712c211f29d51d664d3f8a59b00b
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Fri Mar 21 18:07:38 2008 -0700
XQuartz: Initial framework for dealing with spaces on OS-X
(cherry picked from commit 9831324998f9d1f05ff944c58c5bf60dcae17355)
commit 4c76607b699431183ee7e88fa7818cb7644a5a02
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Mon Mar 17 23:57:41 2008 -0700
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
(cherry picked from commit f03202ad15457c98be7ca78cc59bac88cf5f1966)
commit 87c64cfd6901083da5a9375d0bde65691d374b5b
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Fri Mar 14 17:31:54 2008 -0700
=?utf-8?q?Apple:=20Xserver=20half=20of=20the=20Expos=C3=A9=20bug-fix=20(requires=20updated=20libXplugin=20from=20Apple...=20coming=20with=202.2)
=20(cherry=20picked=20from=20commit=2037be23e8c1d8e5c7a1157e9d66ef3f30a4c472c5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
commit 3bbd77ff98478153afe3251de9ba11d757218213
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 20 20:03:02 2008 -0400
XSELinux: Do a check for whether background "None" is allowed.
commit e323bb426ce8a072d119cb2720b773241259c137
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 20 19:42:09 2008 -0400
XSELinux: Correctly handle some permission bits that are used more than once.
commit da973e962d09854b571320dee7dd9569060bc39e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Mar 20 09:18:29 2008 -0400
Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.
Correct patch this time :)
commit f8c1eb29e28818895d744c4e1d6897353d51790b
Author: Alex Deucher <alex@cube.(none)>
Date: Thu Mar 20 09:14:41 2008 -0400
Revert "Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB"
This reverts commit 267352579612155adfd4743432d6569b2cdeebde.
Pushed the wrong patch.
commit 267352579612155adfd4743432d6569b2cdeebde
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Mar 19 19:12:37 2008 -0400
Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
See bug 11796
commit 060a99444ee25a684b0ab9b4819bf8e855aea2d8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Mar 19 16:04:16 2008 -0700
Make Xevie private symbol names less generic
Makes it easier to figure out what you're seeing in the stack trace
instead of wondering where in the server "ProcSend" is.
commit f37046984d7839faefa4d716624e4a85ddde9634
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Mar 19 14:06:53 2008 -0700
Xevie cleanups, byteswapping fixes & request length check fixes
commit edad0a9dfebcce5c54b2f9c32bd9d45549e20c51
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 18 17:51:21 2008 -0400
Apply __glXDisp_GetVisualConfigs message patch
From http://bugs.freedesktop.org/show_bug.cgi?id=13863
Problem was that the glxcmds.c __glXDisp_GetVisualConfigs
function left garbage in the tail end of the message used for extensions.
commit cdadd2ff9bade318caac5c1d9bcdc8a001347da9
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Mar 18 14:00:15 2008 +0100
[Xephyr/DRI] correctly route motion events targeted at GL drawable
commit afd7428690d87097117ab20335658f6d59d60103
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Mon Mar 17 14:55:44 2008 -0700
Cleanup logic in xf86PrepareOutputs
Should have done this in the first place. Since we're checking for the absence
of the get_crtc callback in the first place, we'll short circuit the later call
and disable the output, so the ugly "continue" block is unnecesary.
commit ba85caacb565b9aa0aeace52a362350304b0566d
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Mon Mar 17 14:13:09 2008 -0700
Make xf86SetDesiredModes aware of current output configuration
By adding a new output callback, ->get_crtc, xf86SetDesiredModes is able to
avoid turning off outputs & CRTCs if the current output<->CRTC mappings are the
same as the desired configuration. This helps avoid flickering displays at
startup time, which speeds things up a little and looks better.
commit bee2ddf35f75086cee951142098637f2c756b96b
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Mon Mar 17 08:33:01 2008 -0700
Fail CRTC configuration if !vtSema
Unless we check for vtSema before calling into the CRTC and output callbacks,
we may end up trying to access video memory that no longer exists, leading to a
crash. So if we don't have vtSema, return FALSE to the caller, indicating that
we didn't do anything.
Fixes #14444.
commit db248ffb840a0c113b6eb508a0fa1e74e752474d
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 16 18:46:11 2008 +0100
test for the presence of pci_system_init_dev_mem() before calling it.
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
commit aa231f28d56402d7daea6cbd3002fbf760f79497
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date: Fri Mar 14 18:41:25 2008 -0700
Xephyr: Build fix: Port across XF86dri.c changes from Mesa.
commit a955c3b587b22b8bf20cb6bedbbec4ad5fcb32ac
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date: Fri Mar 14 18:41:07 2008 -0700
Xephyr: Distribute ephyrdriext.h in tarballs.
commit 090b26db767d296e7a3452da83b136d1caa0ed01
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 14 21:58:27 2008 +0200
XkbCopyKeymap: Fix broken indentation
An astute observer will note that the entirety of XkbCopyKeymap is indented
with spaces, and no tabs whatsoever, and not commit changes which break the
otherwise consistent indentation.
A non-astute observer will note the breakage when the commit mail comes
through with clearly broken indentation.
A polite, non-astute, observer will then fix it.
C'est la vie.
commit 88bec0915e3867f8dbf859a3dfbb771d0d07092d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 14 21:54:13 2008 +0200
mi: More meaningful assert crashes
When we fail an assert in miregion.c (which happens every now and then,
though I haven't yet checked up why), at least generate a segfault, so
we'll get a backtrace.
commit 57d48d94b8947c571925e6fd4c9bf041fbd1b2ac
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 14 14:37:42 2008 -0400
Fix a stray use of ALLOCATE_LOCAL.
commit 824853772241acf64bc37ac8b85254194741ae13
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 14 14:24:21 2008 -0400
RANDR 1.2: Fix initial mode aspect ratio match in a corner case.
Actually more like in the mainline case, where the ideal mode happens to
be the very first aspect match on the first monitor. But let's not
split hairs.
commit 1b9878ffcfc0c0dbc4a6e674827fe508ba77db4b
Author: Bart Trojanowski <bart@jukie.net>
Date: Thu Mar 13 17:42:16 2008 -0400
Bug #14332: Fix PCI access cycles from x86emu.
The address written to 0xcf8 contains the PCI slot address to send the
config cycle to. However, we would ignore that and always send the
cycle to the device whose BIOS we were running. This breaks some
integrated graphics platforms that have explicit knowledge about the
system's host bridge, for example.
commit f7abe05b3306ed9a6f2cf5e3e45ed524d725d029
Author: Doug Chapman <doug.chapman@hp.com>
Date: Thu Mar 13 17:40:34 2008 -0400
Bug #14091: Fix build (and runtime) on ia64.
commit 5d7437c29e686a081b20823450d78c4c2f4e0aec
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 13 17:37:12 2008 -0400
RANDR 1.2: Fix the RANDR 1.1 screen size estimation to approach reality.
While the ScreenRec's notion of size in millimeters would get updates,
the RANDR 1.1 notion wouldn't, so your screen would appear to be square
and probably at some ludicrous DPI.
commit 61c3f63a75d8b0cc47ffed4a0e30147fab2ae8f4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 13 17:34:54 2008 -0400
RANDR 1.2: Don't report a square resolution to RANDR 1.1 clients.
It can't possibly do anything useful, and older versions of Gnome (and
proably others) get very confused by it. So do the drivers, for that
matter.
commit 06c0372c3a1b45005eb6d50406f77f4e93f1de1e
Author: Mark Kettenis <mark.kettenis@xs4all.nl>
Date: Wed Mar 12 21:45:37 2008 +0100
OpenBSD support for libpciaccess.
xserver and libpciaccess both need to open /dev/xf86, which can only
be opened once. I implemented pci_system_init_dev_mem() like Ian
suggested. This requires some minor changes to the BSD-specific
os-support code. Since pci_system_init_dev_mem() is a no-op on
FreeBSD this should be no problem.
commit 2036851125226065891f13583ade3ce559e7bd37
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Mar 10 19:29:07 2008 +0100
Return randr interface version in xf86CrtcScreenInit()
Necessary to allow drivers to be run-time backwards compatible when using the
modes/ functions w/o providing their own copy.
commit c7536f4b87e089a7e7c43026b189922fec70c565
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 11 13:11:04 2008 -0400
Silence REGION_INIT() warning.
Evaluating the address of a BoxRec as a boolean gives this warning:
i830_driver.c:2317: warning: the address of 'ScreenBox' will always
evaluate as 'true'
which is pretty annoying. This patch compares the address to NULL to
avoid the pointer->bool conversion and gets rid of the warning. Seems
like a lame hack, but the warning is worse.
commit cc05255191413b3f376edbc600122ff085f45f7b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 11 00:51:43 2008 -0400
Make WriteToClient take a const void * like any decent IO write function.
Enough with the casting. Doesn't break API or even ABI, but does make
a lot of silly casts superfluos.
commit bc504ffbba3dec2e3467bab8ba1ac25db6dd317e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 11 00:35:31 2008 -0400
DRI2: Add DRI2AuthConnection().
DRI2 uses the same authentication scheme as XF86DRI, so implement this
entry point so DRI2 protocol code can access it.
commit b2657ec5981122e7cc0bda0d8802aec63cde9014
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 6 16:51:57 2008 -0800
XkbCopyKeymap was mangling doodads and overlays
commit ab9b0b36ac8ac72fc48c0abd91a83de49a18313c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 10 13:40:00 2008 -0400
Add the "amd" driver to magic driver selection.
commit 0f6aaf636b7ac4c98467284ff7baf1b83e0b72e7
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 10 09:14:20 2008 -0400
Bug #14927: Fix the math for xf86NumDefaultModes.
commit 01c2e01f2aee580438b74bfb9da8f584f3878e6b
Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Sun Mar 9 21:40:27 2008 -0400
GLX: Track changes to DRI_TEX_BUFFER extension.
We now just pass in the __DRIdrawable.
commit acedc03367e9e69f03b4838f0f0e8d8a8e872b9b
Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Sun Mar 9 21:39:19 2008 -0400
DRI2: Return event buffer head index in DRI2CreateDrawable.
And pass it to the DRI driver in AIGLX.
commit 911f0c147699d3b8d97491be2ef6d2e4a6682a0b
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 7 23:24:06 2008 +0100
Programs in hw/dmx/examples/ want client-side xkb headers.
commit 9abaad115cb6245b12b2adb3552ace99b634ab4a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 7 14:12:28 2008 -0500
Fix DRI2 texture target for GLX_EXT_texture_from_pixmap.
Thanks to Dennis Kasprzyk for pointing it out and for reminding me to
commit it.
commit 3bf7ff70323d533a3a05c0f3e22393e63beada99
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 7 09:25:06 2008 -0500
Size xf86DefaultModes explicitly.
i.e., don't check for the end of the list by ->name == NULL, since that
won't work now. Fix the consumers of xf86DefaultModes to use the new
explicit size as well.
commit 3fcb6445dc08f42488287162e3b7009d405e9c5b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 7 08:29:49 2008 -0500
Fix segfault when a monitor exists but has no modes.
Thanks to Zhenyu Wang for finding this.
commit a8d760f567b19268329c4682495caa591f08a854
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Mar 2 20:13:11 2008 -0800
Get modes code building with old X servers again.
This change uses XORG_VERSION_CURRENT < 7.0 to mean "server newer than 1.2"
since XORG_VERSION current went backwards at some point.
commit ca616b902b2c5d0f046c7a042c11f045479e373a
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Thu Mar 6 13:47:44 2008 -0800
Allow RandR get output property to call into drivers
In order to report accurate values to users of the RandR property interface,
it's sometimes necessary to ask the driver to update the value (for example
when backlight brightness changes without the server's knowledge, due to hotkey
events or direct sysfs banging).
This patch wires up the core server code with a new xf86CrtcFuncs callback,
get_property, to allow for this.
The new code is available under the RANDR_13_INTERFACE define, which in turn
depends on the RANDR_12_INTERFACE code.
commit 34b69e3bc0e6462eb60029fbcb4f5479494007a2
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 5 23:56:49 2008 -0500
Fix distcheck.
(cherry picked from commit 2a47accff8dccded4dfe031f9366c028ba927824)
commit 8e562fe26ff77c03be0855afb08e43f3ed0bd4b9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Mar 5 15:11:41 2008 +1030
Xi: remove false memset from DeepCopyDeviceClasses.
It's wrong, needs to be different, but I haven't had enough coffee to figure
out what it needs to do yet.
commit d4101140f4e569f18554cf0cbf43138d08bd1277
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 4 22:39:41 2008 -0500
xselinux: Implement polyinstantiation support and related protocol.
commit cf984dcc156958d4f8d98110e7add150628ce97e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Mar 4 16:03:04 2008 -0800
Make sure SIOGLIFCONF buffer is properly aligned for socket structures
commit 27e7dacbf7ef17712be31ff90f98ee3a5c5cf909
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 4 11:38:34 2008 -0500
Make xf86InitialConfiguration slightly smarter.
Old heuristic was to find the first monitor that expressed a preference,
then attempt to get all other monitors to agree. This doesn't work
particularly well when the two sets of modes don't precisely intersect,
you get overlapping-but-not-identical output geometry and things go wrong.
New heuristic is:
- Exact user preference, if given
- Exact output preference, if the same for all outputs
- Best (largest) mode of modes common to all outputs:
- with the same aspect ratio as all outputs (may be NULL)
- with 4:3 aspect ratio
- Then the old heuristic to try to get something lit
Note that it is simply not doable to have a reliable initial output guess if
you insist on trying to clone all outputs together. It's far too easy to
end up with displays that simply don't have modes in common. We need to
switch to right-of placement someday, once we're not limited to CRTC size
limits and we have working multi-GPU in RANDR.
commit 95df04b744c6a3498a9a9e2ea9bb03ee780e60f8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 4 10:59:24 2008 -0500
Remove all mention of the vga driver from the config logic.
commit 7b4f3616f75a541b819d99c28bb6cb73761b6066
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Mar 4 18:29:15 2008 +1030
Xi: add deviceid to QueryDevicePointer request.
Why not, we had the padding anyway.
Suggested by Jim Gettys on the X.Org mailing list.
commit 056a2ce02ce85013e89055ee44a7aa3eabedac09
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 4 02:44:48 2008 -0500
XACE: Check the return value of the selection create hook call.
commit 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd
Merge: 23ae68a 453661a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Mar 4 18:11:10 2008 +1030
Merge branch 'master' into mpx
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
commit 72f2197545e734cd0aa785d05a57b2fc0351a763
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 4 02:02:54 2008 -0500
dix: Convert selection list to a linked list.
Fixes a bug where pointers were being invalidated after a realloc.
commit 0bd0f90d7c7928052197da7119177e5a1c9eee2c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Mar 4 03:47:36 2008 +0200
XKB: Fix initial map setting on startup
Due to an unwitting sense inversion when eliminating XkbFileInfo, we were
setting the complete wrong keymap on startup (non-XKB map if we had an XKB
map available, or the XKB map if we didn't have any available). Invert the
sense properly, and add two small bits that also went missing in that commit.
commit 613852ce6a821ce6f6382fc14629f517776a3701
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Mar 3 16:10:04 2008 -0500
Fix some documentation typos
commit 3f23139137e024e09d207be05a61968100cf53e8
Author: Jesse Barnes <jesse.barnes@intel.com>
Date: Mon Mar 3 13:05:12 2008 -0800
Add cscope files to .gitignore
commit 708f07753ff22ade54e9ee8885e4198fff363b87
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 3 15:49:48 2008 -0500
RANDR 1.2: Inherit PreferredMode from the global configuration, if any.
If you don't do this, then Modes "800x600" in the Display subsection will
be dutifully ignored and the driver will start at whatever resolution it
feels like.
commit 605e6764dfd3e9cb917b9cfcd92fe89857c1a1c9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 3 15:45:17 2008 -0500
Fix Motif menu drawing in Xnest.
See also Red Hat bug #229350, OpenSolaris bug #6366490.
commit 3b73d62791d925c465ec855f96981d151dd3c179
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 3 15:43:22 2008 -0500
xf86DDCMonitorSet: Honor the DisplaySize from the config file.
We honor sync ranges and pixel clock settings from the config here, no
reason to ignore DisplaySize.
commit 7c16b68ab879f5b4b1aedfc6b2aadbe56193dd19
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 3 15:09:11 2008 -0500
1.5 has branched, start 1.5.99.x.
commit f7ab2d3821e6bccc943f088e308fd58395a186d2
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Mar 2 18:36:25 2008 -0500
Add missing file from previous commit.
commit b5ce0e1d0b861dc5521fcd9db6287ed6da817726
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Mar 2 17:12:02 2008 -0500
Bug #13860: Ensure that the DRI mode is in octal format.
commit c934366424b0d20e013c84e6b94b226b20e7baa2
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 2 19:27:53 2008 +0100
use UTILS_SYS_LIBS to pass SYS_LIBS to utils/ioports correctly
commit 2bb9c1f36f685044b837f42076dec2ea7d22d034
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Mar 1 18:44:58 2008 -0500
bug #10008: Make Xvfb.1 document the correct default depth
commit b0b9c811cda3e35a8f6d0813483f750602c55ff6
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Mar 1 20:24:50 2008 +0200
fix typo
commit 3d642905477f4b1ec3223f1fbe0d0d37e959ec81
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Mar 1 16:18:18 2008 +0200
clean some "unused" warnings
commit e7a6f79754816976d92857d55840262cccff80a6
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Mar 1 16:16:29 2008 +0200
glcore: split mesa and X in build system
commit cdd46aa3cd2e720558186cdbe48d871ab385fcdd
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Mar 1 15:57:57 2008 +0200
configure: minor cleanup
- dmx
- darwin: remove from xorg options
- xephyr: libxv is client lib
commit 8af2c39bcc4ddc4693d5a2597c9622fa17b6c272
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Mar 1 16:54:01 2008 +0100
Fix big mistake in commit fd41f46ac62033a724bd1f4612f19448a21c1224.
- When a mode is deleted, the name pointer is also free()'ed.
- This leaves other modes with an invalid pointer.
commit ef60632e200853680282016e32a7a9fb01882852
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 29 18:00:27 2008 -0500
dix: Modify callers of property and selection API to use new interfaces.
commit cc76ea6e3ac6a405f0c198c4e62be40aa8d2b546
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 29 17:55:31 2008 -0500
XACE: Add generic support for property and selection polyinstantiation.
commit 34bf308a9e66f1a2f48630a15b1802afad50ec24
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 29 18:00:23 2008 -0500
dix: Refactoring of selection code to allow for polyinstantiation.
Introduces dixLookupSelection() API.
Removes NumCurrentSelections from API.
commit d5715f7beaad6816db27b01b67d7a3c69164d106
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 29 16:16:12 2008 -0500
dix: Refactoring of property code to allow for polyinstantiation.
Introduces dixLookupProperty() API.
commit c0e1959f285d7a7df66f42d55912a5a595decd0f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 29 16:45:11 2008 -0500
On second thought, revert that, it'll make large pixmaps painfully slow.
Need to just fix the callers.
commit 4a44fe7c8678360d0549cf0e0d63870f3623b1db
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 29 16:43:14 2008 -0500
Bug #10465: Use calloc() for allocating PixmapRec's.
commit 5d5fcc7198ca54fa9dc24fe974763eff9fddabee
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 29 16:42:04 2008 -0500
Bug #10464: Set pixel value to 0 before FindColor()
commit 8f0a4282f0ac33625eda9466e3db0bcef64e403a
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 29 16:39:29 2008 -0500
Bug #10463: Always initialize reference pixel before AllocColor()
commit b7eb92774a58639aff3f26bb28a3dcff910c3fb6
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 01:22:05 2008 -0500
EDID 1.4: Print additional CVT support data in the log.
commit 31014d88aff8dc8a502cf0f26e4cde141e1a92f5
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 01:03:44 2008 -0500
EDID 1.4: Decode additional CVT support information.
Table 3.28: Display Range Limits & CVT Support Definition
commit d1c48955f80692a32ab6adcee1384e3d298f471a
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 00:30:58 2008 -0500
Fix CVT abuse in DDCModesFromStandardTiming.
CVT is enough different from GTF that it should not be used on monitors
that aren't expecting it. This brings us closer to what the spec says
the correct behaviour is.
commit 26c2e95fa5bf30726356cf4bdd0fea32a771a179
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 00:09:34 2008 -0500
Nuke a duplicate SYMFUNC(xf86CVTMode)
commit ca5625b911e65fdfd410247b3eff57fedcfc1f79
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 00:08:00 2008 -0500
Add xf86GTFMode().
This should probably be shared like xf86CVTMode().
commit 4cb4817c1072e1d31333db47d95f71d08bf0d1dc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 23:38:48 2008 -0500
Remove the duplicate copy of xf86cvt.c
commit e65e51a99b17a0510782775f010e9820ca567fcb
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 23:19:20 2008 -0500
Constify the built-in mode tables.
commit 6828d8fc2b464e0755f46e3fbdeb07be0c38b620
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 22:57:42 2008 -0500
Clean up DisplayModeRec handling in many places.
Use xf86DuplicateMode() instead of rolling our own, and change
malloc+memset to calloc.
commit 85617b56e5e00e7b8c7d8ce5b49af289056921a7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 22:55:37 2008 -0500
Remove some #if 0 guarding code duplicated in xf86Modes.c
commit fd41f46ac62033a724bd1f4612f19448a21c1224
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 22:38:21 2008 -0500
Allow xf86DuplicateMode() to work correctly on read-only modes.
Before this it was meaningless to try to mark DisplayModeRec tables
const, since the mode name would be emitted as a pointer to an
anonymous string constant, and therefore would have to be fixed up by
ld.so and so couldn't live in .rodata. With this change the standard
mode lists can live in .rodata, and modes duplicated from them will
have their names filled in on the fly.
commit 8ac19d16a030ec416e30d3650cf43e024ada167f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 21:58:21 2008 -0500
Add several comments documenting our EDID failures.
commit 13bfa5937d43392f686b76a99ea6331e3dce5987
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Feb 29 15:10:36 2008 -0500
GLX: Adjust to changes in DRI driver interface.
commit d04ea267a4a51c16088d9ef429681a1edde536b1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 21:53:16 2008 -0500
xselinux: Don't require device "read" permission for XQueryPointer.
These keyboard and pointer state polling calls are a real problem.
commit 3fb17a3e647e926688c91a49a9b5b97f37dbc367
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 21:52:57 2008 -0500
xselinux: Log messages to both libaudit and Xorg.0.log.
commit 4d91b1d5e422c5c460b1b7050baa9487a59b8aa8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 21:52:32 2008 -0500
XACE: Adjust the location of the COMPOSITE creation hook.
Avoids incrementing the refcnt if the hook fails.
commit 5675ae1f72145e9b719c613023da525731b42461
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 18:12:52 2008 -0500
XACE: Call the creation hook to properly label COMPOSITE window pixmaps.
commit 27bcf40cda1d7c52b189cc76528f1f51cbe1d5eb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 16:43:43 2008 -0500
XACE: Fix instances of DixUnknownAccess at hook callsites.
commit 453661a9e193a511cf5e54e6d330454163817316
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 27 20:43:50 2008 +1030
Xi: swap the control attached to a ChangeDeviceControl request. Bug #14170
Just swapping the request's data isn't enough, we need to swap the actual
control as well.
X.Org Bug 14170 <http://bugs.freedesktop.org/show_bug.cgi?id=14170>
commit aebd9dc252449747416b23c740a550d914275399
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Feb 28 01:22:31 2008 -0300
Oops, there's one more parenthesis.
commit f616735f17a681e3add866bf199540327c322490
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 27 22:46:14 2008 -0500
xselinux: Prefix a few remaining error messages with "SELinux".
commit e40cc5305bec656108077ab13fcc8e6e82b3707a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 27 22:29:15 2008 -0500
xselinux: Don't throw BadAccess if DixUnknownAccess is passed in to a hook.
The avc will still appear, however, so that the callsite can be fixed.
commit 3b1df47bd400be9dca34b5e5d1ac2b117f8cc4ed
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 27 22:28:54 2008 -0500
XACE: Require "manage" permission for XKBSetNames.
commit 08afc70513e5496cc5cd8b76c8658c4292119e4b
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 28 10:45:41 2008 +1000
quirks: another LPL panel with the cm/mm wrong
commit f6d51797a523ecc2d4a8f18b2681160fcd5d1d55
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Feb 27 23:44:39 2008 +0100
EXA: Let the driver decide what repeat/extend types are supported.
commit 41aea6194bd29ab34cc166b3fd90eee64299ddf8
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Feb 27 17:06:27 2008 +0000
More checking for failed contexts/drawables
commit 43e46a654fa7cf69f0c8bcb7f583008d96a98686
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Feb 27 16:58:21 2008 +0000
Fix context sharing between direct/indirect contexts
commit d74b0327e8355546e6b41e8ce684f461d65fa9dc
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Feb 27 09:48:10 2008 +0100
[Xephyr/GL] unbreak the build
Don't touch Xephyr DRI stuff when not compiling in a DRI environment.
commit 2257e20900460d85254734b595238e7ad5ee55c8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 27 17:15:28 2008 +1030
dix: set dev->key to NULL after freeing it in CloseDevice. (Bug #12830)
Otherwise XkbRemoveResourceClient may try to dereference it lateron.
X.Org Bug 12830 <http://bugs.freedesktop.org/show_bug.cgi?id=12830>
commit 3f0681fb0b2d0744c2ef892883ae5359b43a4a9a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 26 23:14:29 2008 -0500
xselinux: Stub out selection protocol requests.
commit 4632ea22580c31d44b0786321668d9e78f02900e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 26 22:00:52 2008 -0500
xselinux: Rip out the selection code in advance of polyinstantiation support.
This resolves an issue where BadWindow errors were being thrown.
commit c8e979b3b800e4c58be454daa0213285d4ee6510
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 26 21:34:22 2008 -0500
security: Register resource names in the server-side name registry.
commit d12b7b6632fb4cf41d2e28c7792eaa503f25404a
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Feb 27 07:08:00 2008 +1000
xf86Crtc: add higher level modesetting entry point.
For kernel modesetting work we need a bigger stick to beat the modesetting path
commit dcc077c753137f37aa58231f1df3c4adb92b2c4b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Feb 26 12:13:06 2008 +0100
AIGLX: Switch to server context for calling DamageDamageRegion().
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=14518 .
commit 23ae68a4c74a2ec90b4130c37b0d0aec3f4082ce
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 26 15:12:36 2008 +1030
dix: before copying the classes the first time, set the VCK's classes to NULL.
XkbFinishDeviceInit does the following:
xkbi->kbdProc= pXDev->kbdfeed->CtrlProc;
pXDev->kbdfeed->CtrlProc= XkbDDXKeybdCtrlProc;
If we directly copy the device classes for the VCK, pXDev->kbdfeed->CtrlProc
at the time of copying is still XbkDDXKeybdCtrlProc. So at some point
XkbDDXKeybdCtrlProc is called, and calls itself, and calls itself, and...
Setting the device's classes to NULL seems to fix things. The memory isn't
lost, it gets stored into the devPrivates and freed at device closing time.
commit ce9fb2f8c4610016e49321018fc9b24729380afc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 26 13:19:54 2008 +1030
Xi: MDs return the paired device's ID in attached field of ListInputDevices.
commit c46f7b62d2bf9f35937cfef98325ed904895396a
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 18:14:08 2008 -0300
Fine, we don't need pciInit() anymore. Nuke, nuke, nuke...
commit a9050d54249ed9f54c6fe59143b846c9c7548f59
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 18:10:18 2008 -0300
Jesus, pciInit() was called 32 times in my machine without need!
xf86scanpci() will always call pciInit() before any other function, so
there's no need to guarantee it after.
commit 81272f7ec9a3465e1d102c2ce627a45f92268857
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 17:39:33 2008 -0300
Some doc clean up:
clean up legacy things in os-support/bus/Pci.c.
Put InitOutput() comment to its right place.
commit 7c582dd6de27d2f4fedf73319d2dea2bfb240efa
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 17:31:37 2008 -0300
remove lnxPciInit() unused function.
commit 9727db88d57089be6483104de435626cdbad883a
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 17:08:07 2008 -0300
No more "-scanpci" given that we already have it in libpciaccess.
(Yeah, lets nuke dead code!)
commit f19f7b8e53ed6609fc1fdd272de5521417946209
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 17:07:07 2008 -0300
Clean some garbage caused when pciaccess was merged:
FindPCIVideoInfo() function isn't need anymore.
xf86scanpci() is being called only once so we don't need permanent
(static) variables there.
restorePciState() is not used for now (until we find why multiple
cards aren't working).
commit d61f481a4455dd2a94674d2b7b26429cf9dcece3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 25 17:52:45 2008 +1030
Xi: remove GetPairedPointer handling.
obsolete, ListInputDevices provides this information now.
commit 27b21278939a06ab6a22c9902f202eae6c5fae72
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 25 17:00:42 2008 +1030
Xi: remove ungrab handling of ExtendedUngrabDevice request.
This can be done by UngrabDevice, no need for separate codepaths.
commit 4b50e71bf127c8e0f289e3b76c786f0398effe65
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Feb 24 20:25:13 2008 -0500
Bug #13736: Fix %bx in VBEGetPixelClock to match spec.
Reported by Yannick Henault.
commit 6dc369028d3ca741de57ad78febf2f5f82e0696e
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sat Feb 23 00:01:02 2008 -0800
XQuartz: Quit now properly warns the user
(cherry picked from commit ed3d7b3959c2a0cb63e37210455bcc6cf195b807)
commit e6a4cde16dc99ea02ac93da1d1b9517b1073d159
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 22 18:36:29 2008 -0500
Use the client-side XKB headers for the config utilities
commit 347db49ebe4596db16455ea8a1a608cfa826c5c7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 22 16:05:33 2008 -0500
s/via/openchrome/ in the autoconfig logic.
Xorg's via driver is effectively dead anyway.
commit 69f782676797744815ff76b8a11b11178066f501
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 22 16:04:35 2008 -0500
Match Xephyr DRI definitions to the ones in xf86dri.h
commit 060a66b6e2feddba43ed207b6fcf2cf1f7fe39fd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 24 15:55:58 2007 -0500
Normalize swapped dispatch for Fixes{ChangeSaveSet,SelectSelectionInput}
commit 24bebdded44a9e184455b4fee7800257fee81efb
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 24 15:07:49 2007 -0500
fbFillRegionTiled() is now dead code.
Only ever called from the old PaintWindow* screen hooks, but those are
gone now. As a pleasant side effect, fb loses its #ifdef PANORAMIX.
commit ee21aba6be0078949204e315ddfffd99de60c2f1
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 24 13:13:19 2007 -0500
Fix Xinerama's consolidated visual handling.
Formerly the code claimed it could only handle up to 256 visuals, which
was true. Also true, but not explicitly stated, was that it could only
handle visuals with VID < 256. If you have enough screens, and subsystems
that add lots of visuals, you can easily run off the end. (Made worse
because we allocate visual IDs from the same pool as XIDs.) If your app
then chooses a visual > 256, then the Xinerama code would throw BadMatch
on CreateColormap and your app wouldn't start.
With this change, PanoramiXVisualTable is gone. Other subsystems that
were using it as a translation table between each screen's visuals now
use a PanoramiXTranslateVisual() helper.
commit a4202b898f07dd733590ae5adb21e48775369781
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Feb 22 18:22:58 2008 +0100
XKB: Actually use the keymap we compile at startup
During XkbInitKeyboardDevice, we compiled a keymap and promptly threw it away;
brief inspection revealed the embarassingly simple problem. Sorry.
commit c14fd2a5cb3f45d5c4502e09f55f5e3732c5e698
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Feb 21 15:33:02 2008 +0100
[Xephyr/GL] properly route expose event on GL drawables
When an expose event happens on an host GL window paired with an
internal drawable, route that expose event to the clients listening
to the expose event on the internal drawable.
commit 437c78ef9ff1177e04b3d6781b5805d89b2ab81a
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Feb 21 15:29:27 2008 +0100
[Xephyr/GL] don't crash when the host returns a NULL server string
commit f343265a289724c81017f089c024a7618267c4e3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 15 19:53:45 2008 -0500
XACE: Make the default window background state configurable per-window.
To recap: the original XC-SECURITY extension disallowed background "None" if
the window was untrusted. XACE 1.0 preserved this check as a hook function.
XACE pre-2.0 removed the hook and first abolished background "None entirely,
then restored it as a global on/off switch in response to Bug #13683.
Now it's back to being per-window, via a flag instead of a hook function.
commit 7c2f0a8befb310707ea923dbcdfde84521e52c88
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 15 19:17:40 2008 -0500
Remove COMPOSITE ifdefs around WindowRec bitfield as it has no ABI effect.
commit 5cb9e15562a32c1f102d94d5e15d5fd298baff3f
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 20 10:36:06 2008 -0800
EXA: Fix Render acceleration in copy and tiling cases.
Code shuffling in a634c9b03494ba80aeec28be19662ac96657cc23 broke this by
leaving pSrcPixmap = NULL.
commit f14a62f823e257f92745bbcde11838f2ddd32ac8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 19 21:44:10 2008 +1030
dix: set evlen to the size of the reallocated memory.
What a good idea this is... I'm very proud of myself.
commit 67a78e84a81571cedaf7fd214a21ce1bbdc4fb3b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 19 21:31:50 2008 +1030
Revert "xfree86: plug a memory leak in xf86LoadModules."
This reverts commit 3abce3ea2b1f43bd111664d4a57e5ccd282acab0 and
6cbaf15e6109ba77819c4070f5b46c78237ec460.
The memory returned to xf86LoadModule was allocated in doLoadModule, which
calls the respective module's PreInit. As it turns out, input and output
drivers store a pointer to the module elswhere, so freeing it in
xf86LoadModule is a bad idea.
For further reference: hw/xfree86/common/xf86Helper.c
Input drivers: xf86InputDriverList[blah]->module = module;
Output drivers: xf86DriverList[blah]->module = module;
Unloading the module would not look pretty then.
commit 5f5ec5db35e82ddd9659763875e5d6c63cf1b691
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Tue Feb 19 00:00:11 2008 -0800
XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it.
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471ec6e6ad672dc00118fc7edbd6ddc7c)
commit 750d70267679ddee10590c80ec621d890bd3d4a7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 10:25:15 2008 +1030
dix: Ensure enough memory for ClassesChangedEvent for a new device.
Before we enable the device through the driver, we size it up and make sure
that the events in the event list contain enough bytes for a possible
ClassesChangedEvent lateron.
commit 74628d639719815c1beff4cac84662fa41c55925
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 10:15:40 2008 +1030
dix: change GetEventList to return length of list and set parameter in place.
Changing DDXs to use new prototype too.
commit 77dba004a9aaf35f183f61ff6875a491a52aa030
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 10:10:46 2008 +1030
dix: add InputEventListLen and SetMinimumEventSize
The latter is used to increase the amount of allocated memory for the event
list. This will be needed for ClassesChangedEvents that can be of more or less
arbitrary size (larger than 32 anyway).
commit 6cbaf15e6109ba77819c4070f5b46c78237ec460
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 19 12:02:22 2008 +1030
xfree86: guard against NULL-pointer dereferences in xf86LoadModules.
Should have been part of 3abce3ea2b1f43bd111664d4a57e5ccd282acab0, but I
forgot to git-update-index before I committed.
Thanks to Bill Crawford for pointing it out.
commit 3fe64d8d271aea0863bf01b0376f3eceec0c90b5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 09:56:19 2008 +1030
Move input event list initialisation and storage from DDX to DIX.
Rather than letting the DDX allocate the events, allocate them once in the DIX
and just pass it around when needed.
DDX should call GetEventList() to obtain this list and then pass it into
Get{Pointer|Keyboard}Events.
commit 09a8fc5c7a79ca22fc23224bb544f2e709681f3f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 07:47:18 2008 +1030
Xi: make SizeDeviceInfo public and re-use from CreateClassesChangedEvent.
commit 3abce3ea2b1f43bd111664d4a57e5ccd282acab0
Author: Arjan van de Ven <arjan@infradead.org>
Date: Mon Feb 18 18:13:10 2008 +1030
xfree86: plug a memory leak in xf86LoadModules.
LoadModule() returns the only reference to a fresh piece of memory (a
ModuleDescPtr). Sadly, xf86LoadModules dropped the return value on the floor
leaking memory for each module it loaded.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 6dc71f6b2c7ff49adb504426b4cd206e4745e1e3
Author: Arjan van de Ven <arjan@infradead.org>
Date: Mon Feb 18 17:52:37 2008 +1030
xfree86: plug memory leak in InitPathList.
All the failure paths were very diligent in freeing the "fullpath" temporary
string, but the success case was not. All the content only got strdup()d, so
it's not live memory anymore.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 1bec6ad8977cefa49cc297a310f5eb0b7cd0b8bc
Author: Arjan van de Ven <arjan@infradead.org>
Date: Mon Feb 18 17:46:04 2008 +1030
xfree86: plug memory leak in xf86LogInit()
xf86LogInit allocates a piece of memory, stores it in lf. LogInit() will then
effectively strdup it, but lf is never freed again.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 6d9d18bf7708eb9e640ef732b5dc4c99aa6d5feb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 18 17:25:15 2008 +1030
dix: add support for WindowAccessAllowAll in device access checking.
AllowAll is the last check before the parent window is checked. This allows
to override a DenyAll in the parent window in a simpler way than before (the
previous method required all devices to be in the permit list).
commit 088067c891a78670d9509f48f56bf3ff9c16a30d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 18 16:46:07 2008 +1030
Xi: even if ChangeDeviceHierarchy fails, we may need to send an event.
Changes are committed instantly, so if at least one change was successful, we
must send an event to the client, even if subsequent ones fail.
commit 660739c6bc84cb74f43a277052ce163fae654417
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Feb 15 13:36:34 2008 +1030
dix: Handle the case where a device cursor was removed correctly
In the case that the device cursor was the first in the list of cursors
the window knew about, unsetting the cursor could lead to a segfault
due to pPrev being NULL. Instead catch the condition and correctly remove
the node from the list. Since there is no cursor now set on the device,
we simply return success as the parent windows cursor will propogate
down later.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 24db28230120ecc2b65b25164b6e7b407970f9e2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 18 16:16:19 2008 +1030
dix: set num_events to 1 by default. (no RawDeviceEvents anymore)
This should have been part of acb412d5399f865b5048fdd683147cea0f19f0c1.
commit 45d00433e7bfbab476dd02ec92a9fbee40af5dad
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Jan 15 19:43:16 2008 -0800
glx: Use glapi sources from the mesa tree
With recent mesa HEAD, the glapi sources used only in the xserver glx
module are carried in the mesa tree. Previously, these were generated
separately and committed to the xserver tree.
The build is changed to symlink these files like the other mesa sources.
This reduces the chance for mismatches between mesa's glX API and the
xserver's glX API.
commit fbd776894658e7afb2c55dc8582b2a3efab78a3c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 16 20:01:18 2008 +0200
XKB: Ditch XkbFileInfo
Sorry about the megacommit, but this touches on a lot of stuff.
Get rid of XkbFileInfo, which was pretty seriously redundant, and move the
only useful thing it had (defined) into XkbDescRec. defined will be removed
pretty soon anyway. Is the compat map pointer non-NULL? Then you have a
compat map, congratulations! Anyhow, I digress.
All functions that took an XkbFileInfoPtr now take an XkbDescPtr, _except_
XkmReadFile, which returns an XkbDescPtr *, because people want to deal in
XkbDescPtrs, not XkbDescRecs.
commit e5f002eddef1abe324033a3155f01d048536a48d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 16 20:00:47 2008 +0200
XkbProcessOtherEvent: Don't depend on now-removed header
We don't do XKBsrv.h anymore.
commit 2d256f098ae05033ad76672d5ebdb9dfa7e6b995
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 16 19:57:37 2008 +0200
XKB: Always set size correctly in XkbCopyKeymap's geometry routines
We were forgetting to set the sizes for sections and rows and a couple of
other misc bits in XkbCopyKeymap's geometry. Sort that out, and add a
couple of clarifying comments along the way.
commit ab79110a84b2d299ecae0605fa535edbebd99565
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:48:57 2008 +1100
XKB: Remove support for pre-built keymaps
Don't load prebuilt keymaps anymore.
commit 1332343910a1880854bae21a790cff198855cd24
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:43:18 2008 +1100
XKB: Remove usage of client-side types
Since we're no longer sharing with Xlib, don't pass Displays and XPointers
everywhere.
commit 534fc5140b039a8c98ab715d0a6740d513b41209
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:30:22 2008 +1100
XKB: Remove a bunch of mad ifdefs
We have SEEK_SET and size_t, seriously. Also use DebugF instead of
ifdef DEBUG, and ditch a couple of random bits that were never used.
commit 0f12a448dcbbbf1f40aa98d09c9d25ee511c5bbf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:15:39 2008 +1100
XKB: Deprecate XKBSRV_NEED_FILE_FUNCS
There's no point in having the function definitions be conditional, so
whatever.
commit 68bd7ac1930b5cffb6657b8d5f5bf8ae58eae8d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:12:15 2008 +1100
XKB: Move headers into the server tree
We need to start breaking the XKB API to enforce sanity, so drag whichever
headers we need to do so into the server tree, as the client API is set in
stone, being part of Xlib.
commit 37867626e314e74031378a8a4ff06f69b899a3b2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Feb 1 14:41:04 2008 +1100
main(): Remove uncredible failure
NO, NO, NO.
NO.
The only way this could possibly be worse is if you were viewing it in
Comic Sans.
commit e4eb7e5842f0f56f07e9cf3b16249c172d0a975d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jan 30 23:24:14 2008 +1100
XKB: Delete xkberrs.c
Get rid of the XKB errors code to save a bunch of space.
commit a48cc88ea2674c28b69b8d738b168cbafcf4001f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 17 18:47:28 2008 +0100
Fix rotation for multi-monitor situation.
- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find.
- Fix bug #13787.
commit 70c0592a97c7dc9db0576d32b3bdbe4766520509
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 17 11:21:01 2008 +0100
Resize composite overlay window when the root window changes.
- This allows some compositing managers to work, even after randr12 has changed the root window size.
- Thanks to ajax for figuring out the best place to put this.
- Example:
- xf86RandR12SetMode() calls EnableDisableFBAccess().
- That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize().
- The final step is the call to PositionWindow().
commit b95059c20746a71e60ef152bb627e1d5c2210d75
Author: Jeremy Huddleston <jeremy@tifa-2.local>
Date: Sat Feb 16 01:33:13 2008 -0800
Added Xquartz.plist to EXTRA_DIST
(cherry picked from commit 70f9495e0c1f1459507064b673fe57b1c90d3c2c)
commit d103820bb8635c63b34b85b45cad95ed9c152d90
Author: Jeremy Huddleston <jeremy@tifa-2.local>
Date: Sat Feb 16 00:35:50 2008 -0800
Fixed unescaped newline in EXTRA_DIST
(cherry picked from commit 567c172c4d400fdfe69e7b096a3877fce5c2de9f)
commit a7d936c4ac8e3d7227ecbfe0ddc6cc257b450458
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Mon Feb 11 16:09:03 2008 -0800
XQuartz: Fixed EXTRA_DIST to include localization
(cherry picked from commit 1b338c2a9330c85490a7c24d52adf24b124b70e6)
commit 0ffb6a3ad010e80fe8f973fc228d549f9dd3effd
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Feb 14 22:20:56 2008 -0500
GLX: Implement support for TTM BO based TFP when available.
commit 879515b1399f87a47010532af70f34b9b09e2a9b
Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Mon Feb 4 13:13:35 2008 -0500
Add GLX provider for DRI2.
commit b71dc54352bc56a889823040ec19c1d8e118a1f3
Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Mon Feb 4 11:58:24 2008 -0500
Add DRI2 module.
commit 005e31d3de04e7003f84a94d30f2b75a9636266e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Feb 15 00:01:32 2008 +0000
AIGLX: Refactor code common between __glXDRI{drawableDestroy,releaseTexImage}.
commit cd78f0d0fc08e4e2339ed09dad1a12802de7729c
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Thu Feb 7 21:28:28 2008 +0100
AIGLX: Fix crash after client using GLX_EXT_texture_from_pixmap died.
commit 3e0353c78571890f849a1db47b0540aacc6793bc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 15 06:42:48 2008 +1100
Bah, macros are hard.
commit c38feeb1492d9a47379b2e4d77dbadd8c421d17f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Feb 14 18:52:47 2008 +0100
Fix typo in commit b8b7cdf6df3d338c50db670ce4cfd245f9fa8844.
commit b8b7cdf6df3d338c50db670ce4cfd245f9fa8844
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 15 01:31:46 2008 +1100
Silence useless debug spew from XFree86-Misc extension.
commit 4573cb2ce4b859744118d9a33de3599f033cdd2b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 13 20:16:56 2008 -0500
security: Revise set of permissions granted to untrusted clients.
Bug #14480: untrusted access broken on 7.3.
commit e99aadbc2635e87543fc9980d8156c3ede83544f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 13 19:46:29 2008 -0500
xselinux: Add use to permission map for devices.
commit ae43d835bdaef96c3c73d7cee5b105f07340833d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 13 19:39:49 2008 -0500
XACE: Change access modes for some device-related requests.
Opening a device is not really "reading" it.
Requests that globally configure a device should require "manage" access.
commit 921c298c4cdd2c879403ebdacbef48129058cad4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:48:19 2008 +1030
Xi: QueryDevicePointer doesn't have a shared field anymore.
commit b885588756450e2fa25fdd191e300e1c5dd37ec3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:47:31 2008 +1030
Xi: remove FakeDeviceData calls. And one leftover from GrabAccessControl.
FakeDeviceData needs more thoughtful integration.
commit c99a9a97290c51bf2843f42d5683888cea8a3ff6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:43:49 2008 +1030
Xi: remove raw device events.
Need to be better refined.
commit b35a9efa16d9e14378a95c11fa39171b78710996
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:41:49 2008 +1030
Xi: Remove files for GrabAccessControl.
commit b81c330f70c4a4c8f37216aa4856c7f8db93a375
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:32:54 2008 +1030
mi: remove RawDeviceEvent's ID changing.
commit acb412d5399f865b5048fdd683147cea0f19f0c1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:27:51 2008 +1030
dix: Don't generate RawDeviceEvents anymore.
These events have been removed from the protocol pending some more refinement
and more thoughtful integration.
commit ba69904148acf755bec8fbda2eb869144f0ef7d4
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Feb 3 22:49:23 2008 +1100
Simplify dlloader a bit more.
commit f750ce53ac450824d0c792d11eafdf311cf8abc0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 17:33:48 2008 +1100
Remove some braindamage from ModuleDesc.
Yay dead code elimination.
commit e91ff09568c5579818b6641e88e95c6fe122cbe7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 17:21:34 2008 +1100
Friends don't let friends call xf86AddModuleInfo.
That code only existed to leak memory. It can go now, thanks.
commit 0bdd20a0454c94f902fd4874855125bf7510fcf5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 16:15:58 2008 +1100
Eradicate the VTInit code.
"This option should rarely be used." Never sounds like a better idea.
commit 24089b06243101b1bff4f2fd79fcbfd6a93992d5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 16:11:13 2008 +1100
Don't bother warning people about the keyboard driver rename, just do it.
commit 2aaf6ac134fa9f61984b1c03929c7b596c971cc8
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 16:10:23 2008 +1100
Don't even attempt to parse -bpp in xfree86 DDX option parsing.
This hasn't been valid since 1999. Get with the times, man.
commit ef77e4c4419703b5a802f3eee92476a43f788a86
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 16:03:01 2008 +1100
Remove useless commentary from environment and argument processing.
commit f3b3b37ec6197f8884417fbc26630d3a28f2e319
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:36:11 2008 +1100
Use strerror instead of errno values in user strings.
commit b740b865e4c156a40adc6b63fcf215156fc9151a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:16:01 2008 +1100
Silence an error message in ConfigureWindow that never happens.
commit 89d3249c3e7611b22414bc84b10ca60aab4b9a77
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:11:27 2008 +1100
Silence FreeResource()
commit 238b816469355159eea98600ca900e3baa8fa313
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:08:03 2008 +1100
X.Org Group -> X.Org Foundation
commit 9113fa3de36e84bbae2727cace82b1cf0d709a86
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:03:57 2008 +1100
Silence the harmless FreeFontPath error message.
commit 7c0709a736c0f3aa011de67dd2c2962585ab146e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 14:59:58 2008 +1100
requestingClient is an xprintism, hide it for other servers.
commit 62cfe8863823c0994f20555cb35ee3bacb9e5225
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 14:57:25 2008 +1100
Redact all mention of PanoramiX from user strings.
commit eb8dc11d19dd0b5354de408578ab0cfb865df672
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 31 21:45:14 2008 +1100
Remove some MAX* #defines that never get used.
commit 2ce35f6d45c3e1761d33b786520ff5ba56a3c518
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 31 21:39:48 2008 +1100
Simplify critical output flushing.
commit 3eaecdd66e791e0f3d86b23ce10be057ca44c044
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 31 21:36:14 2008 +1100
Disable Record by default.
commit aa5216e89797b600f382c04e3eaa657e808a5c3e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 31 12:05:08 2008 +1100
Rip out useless indirection in the callback list management.
commit 0d492b2166c4026b9078ffd86d89a31ebe590be4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 12 19:59:10 2008 -0500
XACE: Move the selection access hook to its own function.
commit 4be69e41c07b784f75918141eead70415c0ec4a4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Feb 11 16:03:25 2008 -0500
Revert "Bug #8937: Extension setup functions not called on server resets"
This reverts commit 5e946dd853a4ebc2722ae023429ce5797de3d7a6.
The devPrivates rework makes this workaround unnecessary.
commit 8a244c2bc04a4184535e42d1f2f8c9e3e55678b4
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Feb 11 12:09:41 2008 -0800
XQuartz: Fixed layout of Applications->Customize menu
Now resizing it won't produce weir overlaps of the widgets. Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d13c82633fdbe8120396bfbe1e7489a)
commit 3570ca1cb76f084272f7d8bd22c4cfdf03201a77
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Feb 10 18:27:52 2008 -0800
XQuartz: Added option for setting quartz-wm click-through preference
(cherry picked from commit bf54c267cba97b2b3b9a621da0575776a388b2cb)
commit 8004e160fa8cc75a3f1b7385fee64e5864b3b50a
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Feb 10 16:34:40 2008 -0800
XQuartz: Converted interface to nib 3.x format
(cherry picked from commit 656aaab95773bd70fc3504b68bf7e1d292891d93)
commit 0b0a09797302ac2171db5df20fc5110aafc8efbb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 7 15:48:04 2008 +1030
xkb: when copying the keymap, make sure the structs default to 0/NULL.
It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
(cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
commit 7018f280406eb0ef899a4046de274cfdd582881b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 7 15:48:04 2008 +1030
xkb: when copying the keymap, make sure the structs default to 0/NULL.
It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
commit 66f8001b61d12eaf4905ac71ccbb3f304914d00d
Author: Bart Trojanowski <bart@symbio-technologies.com>
Date: Thu Feb 7 21:26:54 2008 -0500
X86EMU: handle CPUID instruction
After trying to switch from X to VT (or just quit) the video-amd driver
attempts to issue INT 10/0 to go to mode 3 (VGA). The emulator, running
the BIOS code, would then spit out:
c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE!
The opcode was 0F A2, or CPUID; it was not implemented in the emulator.
This simple patch, against 1.3.0.0, handles the CPUID instruction in one of
two ways:
1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction
directly.
2) if ran elsewhere it returns a canned 486dx4 set of values for
function 1.
This fix allows the video-amd driver to switch back to console mode,
with the GSW BIOS.
Thanks to Symbio Technologies for funding my work, and ThinCan for
providing hardware :)
Signed-off-by: Bart Trojanowski <bart@jukie.net>
Acked-by: Eric Anholt <eric@anholt.net>
commit de16a8c53046764dbdf26a87acc5c984ef00d818
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 7 20:14:16 2008 -0500
XACE: Correct some protocol error values in the colormap routines.
commit 31934132a490b1b8ae73010c44e0b23217d8dab2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 7 16:32:06 2008 -0500
xselinux: Use the device name in debugging output.
commit 6dcb7d732bfeadc214228d68c5a13eef30248eb1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 7 16:00:52 2008 -0500
xselinux: Split devPrivate state into subject and object records.
commit 2259b144f0fd4855085a656111a0c64246733e78
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 7 14:35:02 2008 -0500
xselinux: Add getattr and setattr to the permission map for properties.
commit 9d5edebe9664f4ac35b82830e000a72d5ca9cbe4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 7 21:22:50 2008 +1030
Xi: finish XKB initialisation before copying the keymap.
commit 96eafa3d4f05997dac8be6a8d66a92410511824c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 5 16:01:56 2008 +1030
xkb: when copying sections, make sure num_rows is set too.
(cherry picked from commit 41991fb991313202e8e6b513fe928ba14f8fcb87)
commit 5c30327275509576b7848a5f842e7a1bffabe980
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 5 21:06:05 2008 -0500
XACE: Push the dix "structure" includes down to the security modules.
commit bb1a577a6822f781f1e38d2434a13914e74f89aa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 5 20:07:08 2008 -0500
XACE: Move the property access hook to its own function.
commit 019ad5acd20e34dc2aa3b89cc426138db5164c48
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 5 15:44:41 2008 -0500
XFixes: squash a pointer/integer size mismatch warning.
commit d3c36fe721edc55636438bc3e0e7a6c03f62784e
Author: liuhong <liuhong@devlinux-hong.sh.intel.com>
Date: Tue Feb 5 10:54:58 2008 +0800
validate mode clock for probed modes
Some modes claimed in monitor EDID data may not be supported by
the monitor. So also validating the max clock for probed modes.
commit 4b5b6e7baab58072a983d2ec136965f404c3a74a
Author: liuhong <liuhong@devlinux-hong.sh.intel.com>
Date: Tue Feb 5 10:54:10 2008 +0800
fix max clock unit
max clock from EDID data is in MHz, while we need KHz to validate modes.
commit a56ef7aaa4b6ac13c8181f68fc7dad3ca89e6973
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 23:04:46 2008 +0100
dix: Move motion history update until after screen crossing and clipping
Cross screen and clip the coordinates before updating the motion history
so that it will have the same contents as the events that are reported.
commit a0284d577aabea8406b72dd63773e341430ebe56
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 23:03:51 2008 +0100
dix: Skip call to clipAxis for relative core-events
Relative events that generates both core and extention
events will have its axis cliped and screen changed by
miPointerSetPosition when the events are processed. For
absolute and non core-generating relative events the
axis must be clipped if we shouldn't end up completely
outside the defined ranges (if any).
commit d9e23c4ff1607a62164b34717ef9afd352ce2b94
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 22:57:32 2008 +0100
Bug # 10324: dix: Add scaling of X and Y on the reported pointer-events
Restore the rescaling code for x and y axis when generating
motion events.
commit f04c0838699f1a733735838e74cfbb1677b15dc4
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 22:45:31 2008 +0100
Bug # 10324: dix: Allow arbitrary value ranges in GetPointerEvents
Don't use a possitive value as a marker for if a max-value
is defined on the valuators. Use the existence of a valid
value range instead. This will also make it possible to
define arbitrary start and end-values for min and max as
long as min < max.
commit 12e532403210c15a25200ef448bfe9701735ab20
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 22:44:31 2008 +0100
dix: Always add valuator information if present
Send valuator information for all event types, not only for
MotionEvents and absolute button events.
commit 41991fb991313202e8e6b513fe928ba14f8fcb87
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 5 16:01:56 2008 +1030
xkb: when copying sections, make sure num_rows is set too.
commit 521a7f26e088029707fb9a2bb80c9ddc734a3f8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 5 18:34:31 2008 +1030
mi: Only UpdateSpriteForScreen if we actually changed the screen. (Bug #12650)
X.Org Bug 12650 <http://bugs.freedesktop.org/show_bug.cgi?id=12650>
commit 10617dc0fb7166ccd5b2e92fa708390c2d7d0d27
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Feb 1 14:24:04 2008 +1030
xfree86: stick two more checks in for num_valuators < MAX_VALUATORS
commit c68f063be639f39c2facbb496e8455e8e3771b41
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Feb 1 14:13:29 2008 +1030
xfree86: don't call xalloc from signal handlers when posting events.
Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit e5e531ce96264518f278f572a4d0bfcd345aa618
Merge: 6c38682 1692dcf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 31 16:36:17 2008 +1030
Merge branch 'master' into mpx
Conflicts:
dix/events.c
commit 6c38682084e24b18bac0ea75729b1183aeb01600
Author: Benjamin Tissoires <tissoire@cena.fr>
Date: Thu Jan 31 15:51:32 2008 +1030
kdrive: AddInputClient takes a ClientPtr.
commit 1692dcf197470d074f69d5af1608cb2ff1d08872
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 30 13:04:58 2008 +1030
dix: print out event type if a bogus pointer event occurs.
commit d954f9c80348de294602d931d387e5cd1ef4b9a5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 30 10:39:54 2008 +1030
xkb: don't update LEDs if they don't exist. (Bug #13961)
In some weird cases we call this function when there is no SrvLedInfo on the
device. And it turns out null-pointer dereferences are bad.
X.Org Bug 13961 <http://bugs.freedesktop.org/show_bug.cgi?id=13961>
commit df325be394e1f75c396b2768f81373f2989aef7c
Author: Coleman Kane <cokane@cokane.org>
Date: Tue Jan 29 09:47:00 2008 -0800
Bug 13101: xorg-server has a typo in hw/xfree86/os-support/bsd/i386_video.c
X.Org Bug #13101 <https://bugs.freedesktop.org/show_bug.cgi?id=13101>
Patch #12360 <https://bugs.freedesktop.org/attachment.cgi?id=12360>
commit 94f412cb7e954fe872fed979057cbdfbef953c6f
Author: Julien Goodwin <julien@studio442.com.au>
Date: Sun Jan 27 12:30:16 2008 +1100
Loader: Fix verbosity confusion
'Loading foo' is verbosity 3, whereas 'already built-in' is verbosity 0.
This means that gdm's log would just be full of bare 'module already
built-in' messages.
commit 442838fcb3bf07ac57553ae5600d9e6c59a559bb
Author: Julien Goodwin <julien@studio442.com.au>
Date: Sun Jan 27 12:27:26 2008 +1100
xorg.conf.man: Fix monitor/output confusion in monitor positioning
On the Intel driver at least, LeftOf/RightOf/Above/Below in xorg.conf refers
to output names, not monitor names. Fix nomenclature in xorg.conf.man.
commit 5b8641a5fdc112c19e78ca2954878712e328d403
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 29 10:01:37 2008 +1030
xfree86: fix AlwaysCore handling. (Bug #14256)
Assume AlwaysCore being set by default, just like the other options.
X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256>
commit 975ab11799c819a81da1dfe83505194410dbcb95
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jan 26 09:39:54 2008 +1030
config: don't reset connection info on disconnect.
If dbus is restarted, we try to connect again and this is difficult if the
busname and/or busobject is not set.
(cherry picked from commit 210eeef495770c1883c842ff003c28ce25f279d4)
commit 7dde5a694a06efed0a9186f05d33f5be6f5dba71
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 13:54:47 2008 +1030
config: check connection != NULL before getting dbus' dispatch status.
(cherry picked from commit d23266522390a4ef7203ae7c062b2b920e45f9d7)
commit f0ba7707161b8866e6fde32d6f25be6afcdecb48
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 13:45:22 2008 +1030
config: only shutdown libhal if the connection is valid.
Thanks to libdbus' extensive use of assert we won't just get an error, it'll
bring the whole server down for us.
(cherry picked from commit fb07fab2c07e7b0834724541dc47bfba02ba8574)
commit 2cb0ebec2b85d96289c23c17cfdcdf97ef6877d2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 11:48:13 2008 +1030
config: add a debug message, fix a whitespace error.
(cherry picked from commit 7732898aaa70e076000f6e6aa9420482896ed996)
commit 4fc2d3cef8d7868b025aa14af7ed4b730e8f2c49
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Mon Jan 28 12:18:43 2008 -0800
Rootless: RootlessEnsureFrame: Added check for !IsRoot
This was causing an issue with Apple-DRI and was reported here:
http://trac.macosforge.org/projects/xquartz/ticket/51
(cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff)
commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f
Merge: 1a88aed e915a26
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Jan 26 16:13:25 2008 -0500
Merge commit 'upstream/master'
commit 0ac175597712edfeae676f536746a4d26d625e30
Merge: 210eeef e915a26
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jan 26 13:55:07 2008 +1030
Merge branch 'master' into mpx
Conflicts:
Xext/sampleEVI.c
commit e915a2639752bc0ea9e6e192e020cc2031c08063
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 25 19:22:19 2008 -0500
xselinux: Move the extension to extmod instead of being built-in.
commit 210eeef495770c1883c842ff003c28ce25f279d4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jan 26 09:39:54 2008 +1030
config: don't reset connection info on disconnect.
If dbus is restarted, we try to connect again and this is difficult if the
busname and/or busobject is not set.
commit f6a78ee143e3a3ad69538adf2b9675d724468ffa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 25 18:04:10 2008 -0500
XACE: Remove the extension code entirely, XACE is completely static now.
commit 7724c30a751c653ca3e2e8a6752af27bc37de3f0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 25 17:28:17 2008 -0500
XACE: Stop using fake requestVectors in favor of a simple hook call.
commit f82329b0811469ddae5c44dcfffa38185c11a67c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 25 16:20:46 2008 -0500
XACE: Don't need to actually register a protocol extension.
commit d23266522390a4ef7203ae7c062b2b920e45f9d7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 13:54:47 2008 +1030
config: check connection != NULL before getting dbus' dispatch status.
commit fb07fab2c07e7b0834724541dc47bfba02ba8574
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 13:45:22 2008 +1030
config: only shutdown libhal if the connection is valid.
Thanks to libdbus' extensive use of assert we won't just get an error, it'll
bring the whole server down for us.
commit 7732898aaa70e076000f6e6aa9420482896ed996
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 11:48:13 2008 +1030
config: add a debug message, fix a whitespace error.
commit 46794d0c9665f07913980830d038c88d00407612
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 24 19:49:13 2008 -0500
xselinux: Rename SelectionManager to more generic SecurityManager.
commit 466f6552190d1b83d66ebfd71e07921ed6210ee2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 23 16:11:31 2008 +1030
Xi: if deviceid is > 127 assume GE mask is for all devices (XiSelectEvent).
commit 379f057646588fa3211d7ba0ec8d77d2fc0ad246
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 23 16:08:37 2008 +1030
Xext: add GEDeviceMaskIsSet (GE mask checking per device)
If a mask was set for the NULL device, then we pretend the mask is set for all
devices.
commit 91dc8c43d2343e494c59023484883f4683bdc639
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 23 15:45:02 2008 +1030
Xi: Change window access right check to RecieveAccess in XiSelectEvent.
commit 94a6a65ae7414c8247aa1741ec5c7561e6f4bbe0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 23 15:43:48 2008 +1030
Xext: allow per-device GE masks.
Instead of a single mask per client we allow the storage of a mask per client
per device.
commit 6ffeecabb7f3f3173864e0f0af21a99bdc5b5044
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 24 18:11:49 2008 -0500
xselinux: Use a privileged bit in the state instead of passing an index
to the permission checking function.
commit 7ba8e97cbabfef4d614a6a38314830ec0f925471
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 24 19:09:58 2008 -0500
xselinux: Implement "get context" protocol requests.
commit f0bf9a5231d4f612ac916355118484d055715f32
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 24 19:02:35 2008 -0500
xselinux: Whitespace fixups.
commit 734e115871ce98badb8800383c423493802ae3d3
Author: Hong Liu <hong.liu@intel.com>
Date: Wed Jan 23 21:04:32 2008 +0800
Bug #12439: add a quirk to use +hsync +vsync for the probed detailed mode.
Samsung 205BW quirk is somehow reworked.
commit cc22b05ea06e08568d0f0abdaccf67bd32662e94
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 22 18:57:11 2008 -0500
There is no such thing as /dev/cpu/mtrr.
commit 1a88aed5c82c7c131e3d473ef7b8766a418fdf1b
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jan 21 21:16:13 2008 -0500
Add tags/TAGS to .gitignore for ctags usage
commit be6c17fcf9efebc0bbcc3d9a25f8c5a2450c2161
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Jan 21 16:13:21 2008 +0100
CVE-2007-6429: Always test for size+offset wrapping.
commit ba315ae5ddd00763147a4b0cdcacba7691793dfc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 21 23:43:53 2008 +1030
Xi: add XACE hooks for device creation (ChangeDeviceHierarchy)
AddInputDevice checks for permissions already, so all we do is modify a few
callers to let AID sort it out.
commit 94a21d757ce58254accbd5dd3a86810aadeec9f0
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jan 19 13:17:45 2008 +0100
AIGLX: Fix GLX_EXT_texture_from_pixmap fallback with EXA.
Use pScreen->GetImage to obtain the pixmap contents instead of dereferencing
pPixmap->devPrivate.ptr directly.
commit e9fa7c1c88a8130a48f772c92b186b8b777986b5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 18 14:41:20 2008 -0500
CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps.
Move size validation after depth validation, and only validate size if
the bpp of the pixmap format is > 8. If bpp < 8 then we're already
protected from overflow by the width and height checks.
commit 6492d513c0022d70f838d1b2561442c7a41e401f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 21:44:22 2008 +1030
dix: if a client has a core grab, return the grab device on QueryPointer.
The correct thing would be to return the ClientPointer. However, if the client
for some reason has a core grab on another device (e.g. as result of a passive
grab), return the coordinates of the grabbed device instead.
This makes the use of nautilus a bit saner.
commit cd2ad4c2ed58b49cee085174e77c242048159321
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 20:11:55 2008 +1030
dix: remove some superfluous lines in ProcChangeActivePointerGrab.
commit 8a925d201efac52ef663ea3ff46acc5046178666
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 20:06:29 2008 +1030
dix: free the genericMasks when ungrabbing.
This finally plugs a memory hole created by grabs registering for generic
events.
commit 8949d81a3c79eef351d7c018c76692dcca74b63e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 19:45:54 2008 +1030
include: mark CoreProcessPointerEvent, CoreProcessKeyboardEvent as deprecated.
ProcessOtherEvent does all the work now.
commit d323fd64206ddb4221daa7cf7504daf62c5e7d90
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 19:17:42 2008 +1030
dix: remove inputInfo.pointer refernce in EventSelectForWindow
If the window being changed is set as the motion hint window for any device,
the device's motion hint window is set to NULL. Which is kinda what the old
code did, except that it did it with only the VCP.
commit 883811c2bed9c6fcb706effbf83ddc97518b6f0c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 18:48:46 2008 +1030
dix: remove inputInfo.pointer reference in TryClientEvents.
Unfortunately, this requires a change in the TCE API, and thus a change in all
callers. Tough luck.
commit 6e17184486c4309ec8b47c7cfd11fef60bb360ac
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 17:52:38 2008 +1030
Xi: Check for DestroyAccess when trying to delete a master device.
commit 23f3f0e27dc90b7b3a375f2a5dd094e6f53552b5
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Jan 13 14:00:25 2008 -0800
XQuartz: Moved SetFrontProcess haco to set_front_process
So it is done by the other thread...
(cherry picked from commit 7429379eb1001ee3dc769daa8fe6b3aef1b9cc8a)
commit 8e133d96740d010a4fd969a8188e6e71fb2cafe2
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:29:06 2008 +0100
Fix for CVE-2008-0006 - PCF Font parser buffer overflow.
commit 6de61f82728df22ea01f9659df6581b87f33f11d
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:28:42 2008 +0100
Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
commit 7dc1717ff0f96b99271a912b8948dfce5164d5ad
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:28:03 2008 +0100
Fix for CVE-2007-6428 - TOG-cup extension memory corruption.
commit dd5e0f5cd5f3a87fee86d99c073ffa7cf89b0a27
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:27:34 2008 +0100
Fix for CVE-2007-6427 - Xinput extension memory corruption.
commit bbde5b62a137ba726a747b838d81e92d72c1b42b
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:26:41 2008 +0100
Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index
commit e85130c85f727466fc27be1cfa46c88b257499fb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 5 10:47:39 2008 +0200
Xephyr: One-time keyboard leak fix
Don't leak the originally-allocated keysym map.
commit 0137b0394a248f694448a7d97c9a1a3efcf24e81
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 5 10:43:53 2008 +0200
XKB: XkbCopyKeymap: Don't leak all the sections
Previously, we'd just keep num_sections at 0, which would break the
geometry and lead us to leak sections. Don't do that.
commit b99a43dfe97c1813e1c61f298b1c83c5d5ca88a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 5 10:38:16 2008 +0200
OS: IO: Zero out client buffers
For alignment reasons, we can write out uninitialised bytes, so allocate
the whole thing with xcalloc.
commit a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jan 16 20:24:11 2008 -0500
Don't break grab and focus state for a window when redirecting it.
Composite uses an unmap/map cycle to trigger backing pixmap allocation
and cliprect recomputation when a window is redirected or unredirected.
To avoid protocol visible side effects, map and unmap events are
disabled temporarily. However, when a window is unmapped it is also
removed from grabs and loses focus, but these state changes are not
disabled.
This change supresses the unmap side effects during the composite
unmap/map cycle and fixes this bug:
http://bugzilla.gnome.org/show_bug.cgi?id=488264
where compiz would cause gnome-screensaver to lose its grab when
compiz unredirects the fullscreen lock window.
commit e46f6ddeccd082b2d507a1e8b57ea30e6b0a2c83
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jan 16 14:24:22 2008 +0100
Yet another Xv extension byte swapping fix.
commit b0bf4308acb706abc87c51658c2251fa86231c35
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 19:15:09 2008 +1030
dix: print out an error when core type can't be converted.
Helps a bit in tracking down bugs.
commit 2a988ed75b7634d7cb6e83bb7aa89bc8768d3a58
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 19:14:46 2008 +1030
xkb: don't do core key repeats, XI only is the path to light.
commit 4fd0885978be286a68b689824f1d910f929a52b0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 18:58:42 2008 +1030
Xi: remove some leftovers from ProcessOtherEvents.
Core handling not needed anymore here.
commit 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 15:22:39 2008 +1030
dix: Process an input event as a single event, instead of two separate ones.
This is a significant shift in how input events are perceived. The common
approach was to treat a core event as a different entity than the XI event.
This could result in the XI event being delivered to a different client than
the core event. This doesn't work nicely if they come from the same device.
Instead, we treat an input event as a single event, that is delivered through
two separate APIs. So when delivering an event, we first try the XI event,
then the core event. If the window want's neither, we go to the parent and
repeat. Once either core or XI has been delivered, the processing stops.
Important: Different to the previous method, if a client registers for core
button events, the parent window will not get XI events. This should only
cause problems when you're mixing core and XI events, so don't do that!
Generic events don't fit into this yet, they cause me headaches.
commit 7a0d16ef0a103bcb25fa8a20322685f017aaf5a3
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jan 15 03:27:16 2008 -0200
Removed some warnings.
commit 315d6a2b1d2a3de308e98d548afe780c59a784fc
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jan 15 02:59:56 2008 -0200
Fix Xephyr compilation without GLX.
commit 0969a9f7497e10794a6534321c10a0e1ac680ad7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 11:31:12 2008 +1030
dix: Emulate core events within CheckDeviceGrabs and ComputeFreezes.
This should restore the correct passive grab processing. When checking for
passive grabs, the core event is emulated and we check first for XI grabs on
the window, then for core grabs. Regardless of which event activates the grab,
the XI event is stored in the device's EQ.
When replaying the event, we take the XI event and replay it on the next
window, again including the emulation of the core event.
commit 1f83f40525acd3aff8f50b3c519bc1f307ff1e19
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Jan 15 10:20:50 2008 +1000
xf86Cursors: fix memset for non-square cursors
commit e6ea3147bfb686798dac381eb8900f9f18beb88e
Author: Bernardo Innocenti <bernie@codewiz.org>
Date: Sun Jan 13 19:50:37 2008 -0500
exa: make the prototype for exaGetPixmapFirstPixel() public
This fixes a warning in amd_drv which is using it.
Signed-off-by: Bernardo Innocenti <bernie@codewiz.org>
commit a83a0c5a144da67dab96a857b849a5692b73245d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jan 13 16:14:29 2008 +1030
dix: remove obsolete comment.
Pairings don't exist anymore and the documented issue is a non-issue now.
commit 180a5aba4de3104fed8bc4e7d42a1e3a51575318
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Jan 12 21:24:34 2008 -0800
XQuartz: Fixed copy-paste error with login_shell commit
(cherry picked from commit 6deec3acc6f8010b5b53a1e55a0a2c4080ba69d2)
commit 6fd4a5e2e4d0be0ba0773df831687e11e1262c72
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Jan 12 11:56:00 2008 -0800
XQuartz: Corrected copyright X.org Project -> X.org Foundation
(cherry picked from commit f21631444816fc12b8a534c2cf79e6ac6c2af7c9)
commit f72255639c065d795f7767683e851b1b5b2d9480
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Jan 12 11:35:48 2008 -0800
XQuartz: added 'login_shell' option to defaults
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18cebd3435d70f62855239484974c455a1)
commit ec24a6b5aa732ec6999a27889d9a33cf80123886
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Jan 6 18:29:54 2008 -0800
XQuartz: Fixed switching into XQuartz via expose.
(cherry picked from commit 627ed60ce5d7499761028edf379ebd95250d3e04)
commit 6844bd2e63490870bab3c469eec6030354ef2865
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 9 19:52:00 2008 -0800
More Xv extension byte swapping fixes
commit 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca
Merge: 4e85c7c 0883e83
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 10 13:38:46 2008 +1030
Merge branch 'master' into mpx
commit 0883e838e25227f0af84d2a90979175724166d16
Author: Peter Harris <peter.harris@hummingbird.com>
Date: Wed Jan 9 14:52:33 2008 -0500
xf86misc.c: Avoid use of swapped values
commit 59a63d72a1407a8aaf9878eeff7ee7a66f65a42b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 9 18:42:58 2008 -0800
Fix reference to old versions of XFree86 to not say "Xorg 4.2 or earlier"
commit 4e85c7c322faf14c14e4229fa294b8e3d3a4d304
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 9 17:36:39 2008 +1030
Xi: keep a counter of buttons down to avoid duplicate press/release events.
If two devices are attached to the same master device, pressing button 1 on
each of them leads to two button presses from the same device. Some apps
really don't like that.
So we just put a counter in place and only send the first press and the last
release.
commit e070c2cbef0d6fbbafce8d417e8b29231c2fdc50
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:18:49 2007 +1030
mi: change infamous "Tossed event ..." error for something more explanatory.
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
(cherry picked from commit 117458d2db49efd3f04432ff45871b44c7d4ad57)
commit c31aead0fe9fe424120ce221cd9f76cb6d29a5b5
Author: Richard Purdie <rpurdie@openedhand.com>
Date: Tue Jan 8 12:12:06 2008 +0100
[Kdrive] make XCalibrate 'orientation aware'
commit 30375cd6d1439a3390b41714fe116aecc94743ca
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jan 7 20:57:30 2008 -0500
Don't log DPMS enabling as being from xorg.conf if it's not
commit 981bb9f1e33e4564d1b59c00c808cc43a2e9497b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 18 13:57:07 2007 +1030
dix: set the correct number of valuators in valuator events.
(first_valuator + num_valuators) must never be larger than the number of axes,
otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
wrong too.
(cherry picked from commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e)
commit 20ace6321ac464d821c67a82c7023f74ae038176
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 7 20:08:56 2008 +1030
dix: don't try to confine cursor on screen restructure if there is no cursor.
Stops segfaulting when using xrandr. Yay.
commit 57a491e6d3ebec464c0c861b02c9ddcb1cc62c3c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 7 20:06:32 2008 +1030
dix: init GrabPrivateKey to correct value.
Merge detritus from last pull.
commit 260505e3c5a18044e97d31ea3bcc0955e46335c8
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 16:37:13 2008 -0500
Log enabling of DPMS even when it's not set in xorg.conf
commit 7e7622165940934e56ae96ae785a8f88eec1a5cf
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 6 18:23:09 2008 +0100
Fix the name of the XFree86-Misc extension in the xorg.conf manpage.
commit 59df687835c68eda147de47edfe9bc415c0efb4f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 6 16:57:45 2008 +0100
Document the AllowEmptyInput, AutoAddDevices and AutoEnableDevices flags
Add documentation for the new AllowEmptyInput, AutoAddDevices and
AutoEnableDevices server flags in the xorg.conf manpage.
commit 7d226d6a251cb90765be2b50a1973986c5b7605b
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Jan 5 03:14:07 2008 -0800
XQuartz: Cleanup for strict-prototyping
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
(cherry picked from commit 4c5c30a4beb7a427b00b18097f548876ad3c11d7)
commit 11967dce11cd953d123d53bb3389aa257c5158e8
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Jan 4 22:54:26 2008 -0800
XQuartz: Fixed copyright in About box for 2008. Happy New Year!
commit aca75f389e2b08096c3cacec03b12a58075cf12c
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Jan 4 12:23:09 2008 -0800
XQuartz: Flush the debug log for easier debugging
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d4239c7f3918332ef07752f1e211afb23)
commit 57468a696e1259c1e1c185fc60230e1d195defb7
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Fri Jan 4 12:37:55 2008 +0000
Fix Line drawing with CapNotLast set in PolySegment.
commit 39cb782f28be4efb2621fd8c614f2367eb834412
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 23:16:06 2008 -0500
XACE: DeleteCallbackList zeroes out its argument so don't do it twice.
commit 7f376f23db463a65176de632ca6094acb55db951
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 23:08:49 2008 -0500
devPrivates rework: Free callback lists after use.
commit de18703d2a25999e391d11b4c82ee018fb87372d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 23:07:24 2008 -0500
dix: Fix bug+leak in callback manager DeleteCallbackList function.
commit 20eb26f9d149993ae360a2cbd1b536b68c9f4069
Author: Alex Deucher <alex@samba.(none)>
Date: Thu Jan 3 22:53:36 2008 -0500
Fix potential crasher in xf86CrtcRotate()
xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom.
commit 249b9b30c11e03bb113b37cf4712bf88debf6f05
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 4 13:49:48 2008 +1030
Xi: remove file for the obsolete ChangePointerKeyboardPairing request handling.
commit e4a214e40d35aa957c83b86b4e4abc86c22fbde0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 4 13:32:53 2008 +1030
dix: don't free device's devPrivates manually, dixFreePrivates does it.
Merge detritus from last pull.
commit cd0603c2dc5ee000ebce66056bc1a72f99bfb617
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 21:41:02 2008 -0500
Bug #13765: Heap corruption in XC-SECURITY extension code.
commit e46d559739e020dc7f6fcbdc6d1fb39c57aab4b1
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 22 15:09:12 2007 -0800
XQuartz: Cleaned up color map configuration.
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27c053d22882f54337cfd09203aa5383)
commit 17a9714a6789a389d52dbb40fd1eed1e24c04d64
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 14:46:54 2008 -0500
Bug #13794: Update MBE extension devPrivates to new interface.
commit b2da44c76d68a76f20e90bccb268ebf65e132b49
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:51:44 2008 +1030
dix: DoChangeKeyboardControl shouldn't be using inputInfo.keyboard.
commit 9cc41b88dfebb3f1e0a7cb5c224146e651a2cda4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:47:28 2008 +1030
Xi: ProcXSetClientPointer should directly check for the client from the id.
The window ID includes the client ID anyway, so we might as well just look up
the client directly instead of trying to get the window first and the client
from the window.
This also fixes a possible issue with XACE. If the client had permission to
write on the client but not on the window, the previous approach would have
failed.
commit 521fdc28d86d091495da3558d26ab4a938250ffe
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:43:18 2008 +1030
xfixes: switch a few inputInfo.pointer to PickPointer
commit 37194b13554f0d36343cf73324b128b15bb6a338
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:36:33 2008 +1030
Xi: switch to using "rc" (instead of "err") as returncode.
All the rest of XI uses rc and returns rc in case of error, so make
mpx-related stuff comply. This stops the rest of XI sending the error
manually.
This is just a cosmetic change to be in line with the rest.
commit c7e9b67c547c97b2c943eab555b4fe2844e8a91f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:09:56 2008 +1030
dix: free ClassesRec when a BadAlloc occurs during CoreKeyboardProc.
commit 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d
Merge: eace889 ae869fc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 17:04:54 2008 +1030
Merge branch 'master' into mpx
Conflicts:
XTrap/xtrapddmi.c
Xext/security.c
Xext/xprint.c
Xext/xtest.c
Xext/xvdisp.c
Xi/exevents.c
Xi/grabdevb.c
Xi/grabdevk.c
Xi/opendev.c
Xi/ungrdev.c
Xi/ungrdevb.c
Xi/ungrdevk.c
dix/cursor.c
dix/devices.c
dix/dixutils.c
dix/events.c
dix/getevents.c
dix/main.c
dix/window.c
hw/xfree86/ramdac/xf86Cursor.c
include/dix.h
include/input.h
include/inputstr.h
mi/midispcur.c
mi/miinitext.c
mi/misprite.c
render/animcur.c
xfixes/cursor.c
xkb/xkbAccessX.c
commit ccf6636d2ca8acdaaeb8da34db507a10a082b0de
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 19:28:33 2008 -0800
Kill xf86getpagesize even harder (dummylib & ioport)
commit dfd682b582636a36345144bcf835e3ee46718d90
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 19:27:22 2008 -0800
X.Org bug 4947/Sun bug 6646626: Xv extension not byte-swapping properly
X.Org Bugzilla #4947 <https://bugs.freedesktop.org/show_bug.cgi?id=4947>
Sun bug 6646626 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6646626>
Don't use swapped data after swapping it. When done swapping data,
send the swapped data, not the address of the pointer to it, to the client.
commit f6666dcc3b1ac60f850ea53c357a9ef61672a52a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 19:19:55 2008 -0800
Add dixAllocatePrivate stub to dummylib for utils
Normally not necessary, except when building non-optimized/debug causes
the inline functions from private.h to appear in os-support/libxorgos.la
commit 73f422996016107d5f53492e4197bb05ed9c4bb9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 19:17:54 2008 -0800
Fix names/types of new vuidMouse{Get,Set}ScreenPrivates macros
commit 895073f6b41d9313cfe748232c492c5e9f76b443
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 18:09:26 2008 -0800
Restore include & typedef needed by dtrace
996b621bec1bbc4fb21970c75eaec62053bc6ccb deleted a couple lines too many
commit 306fde4082044dfecbedd9af41e660bafb3ce438
Author: Brian <brian@i915.localnet.net>
Date: Tue Jan 1 09:27:44 2008 -0700
regenerated to add framebuffer object tokens (bug 13800)
commit 5c362c2eb2cfdf1f6d667a3e64a0a7bc4942c950
Author: Brian <brian@i915.localnet.net>
Date: Tue Jan 1 09:07:48 2008 -0700
regenerated, adds GL_MAX_3D_TEXTURE_SIZE (see bug 13811)
commit 85365ddf16e2b954d8249b380df53337420ed684
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 17:35:54 2007 -0500
EDID 1.4: If given a native pixel format, use it when inferring virtual.
commit 312b30cb03e439644ea10e08fa93268116333f0d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 17:18:30 2007 -0500
EDID 1.4: First detailed mode is always preferred.
... so act like it in the modelist generator, not just the parser.
commit 9dbb73033ae60e7ab85f1469a696e2a52f0cb0fe
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sat Dec 29 00:02:16 2007 +0200
Rootless: Fix lvalue error from devPrivates change
Instead of trying to use an invalid expression as an lvalue, use the function
call instead.
commit 36ff05771b0699aa80ad718e24097bc25cb4fb00
Author: Jurij Smakov <jurij@wooyd.org>
Date: Fri Dec 28 23:59:53 2007 +0200
GL: Add GLX compile flags lost in modular X server changes
RISC chips that trap on unaligned loads and stores need to
define __GLX_ALIGN64. This used to get added to the cflags
in the old *.cf files but it no longer does in the modular
X server.
Also, Alpha needs to pass -mieee to the compiler as well.
This is a simple backport of a patch that debian, and probably other
distributions, have been applying forever. To the best of my
knowledge the patch was written by Jurij Smakov. See Debian bug
number #388125.
I just checked and this has been rotting for more than a year in
freedesktop bugzilla as #8392.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit bae459cfc4f17a5ec5f2810e9f913e3ad2d8b8d4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:50:18 2007 -0500
Don't carp on EDID 1.4 blocks anymore.
Also whine more loudly when we get something other than 1.x.
commit 70b2d6cfeb3bcb7b862a2ae29f6ef7cb84d69486
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:39:00 2007 -0500
Check the gamma value, not its address.
commit 592d814ee09e86e283116a7a1052762c8398e8e5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:37:23 2007 -0500
EDID 1.4: Additional semantics for display feature bits.
First mode is _always_ preferred in 1.4; the bit that used to mean this
now means that the preferred mode is also the native pixel format. The
old "is GTF" bit now means "is continuous-frequency" instead.
Section 3.6.4, Table 3.14: Feature Support, Notes 4 and 5.
commit 322d0103aee317500057c80d542d7270d69a5731
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:28:44 2007 -0500
EDID 1.4: Alternate color encodings for digital inputs.
Section 3.6.4, Table 3.14: Feature support.
commit f1f43caf7e26a84dbacd4e5d7d47c8b4e4982836
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:12:11 2007 -0500
EDID 1.4: Allow for gamma definition in extension blocks.
Section 3.6.3, Table 3.13: Display Transfer Characteristics (Gamma)
commit 861ee38817523a647e6be10d7e8fe26f66054217
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:06:45 2007 -0500
EDID 1.4: Additional aspect ratio semantics for screen size fields.
Section 3.6.2, Table 3.12: Horizontal and Vertical Screen Size or
Aspect Ratio.
commit 14b5c8a447db0395fb14b2d404eafb1d8e4fb817
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 15:52:42 2007 -0500
EDID 1.4: Extended support for digital interfaces.
Section 3.6.1, Table 3.11: Video Input Definition.
commit a948216dccb5ee577a50a42035dc9bc49d0a00c6
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 15:00:41 2007 -0500
EDID 1.4: Decode CVT 3-byte codes and add them to the mode pool.
Section 3.10.3.8: CVT 3 Byte Code Descriptor Definition.
commit f6df66cc89bcd0a0be2e7bca05839fdd428c1d4c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 13:55:39 2007 -0500
EDID 1.4: Trivial support for new detailed sections.
Nothing actually decoded yet, but at least we print what they are.
New in EDID 1.4:
- Color Management Data (0xF9), Section 3.10.3.7
- CVT 3 Byte Code Descriptor (0xF8), Section 3.10.3.8
- Established Timings III Descriptor (0xF7), section 3.10.3.9
- Manufacturer-specified data tag (0x00 - 0x0F), section 3.10.3.12
commit bac3ecde39cc914ab515991234b7dc2138005b84
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 13:33:39 2007 -0500
EDID 1.4: Allow for sync range offsets.
Table 3.26: Display Range Limits & Timing Descriptor Block Definition
commit 3b23dd9fd43a28033d0af7b02088b0c6ca433158
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 28 13:29:45 2007 -0500
xselinux: Fix whitespace warnings.
commit 643c52be32c187a0fdb9a031b1e31d97cd551339
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 28 13:26:26 2007 -0500
xselinux: Remove "X" prefix on remaining functions and strings.
Should be evident from the context.
commit f4bc333fc1e8d9fa9911771d2072df4df741c553
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 28 11:56:54 2007 -0500
xselinux: don't FatalError on an invalid class mapping, just disable support.
commit f3780ece528ed3ead809ba6a388fa0f8aab2a775
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 20 20:32:07 2007 -0500
xselinux: Implement swapped protocol request logic.
commit 1bbf64ab115e2a1121d6f9c0830b1b977f025178
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 20 20:31:34 2007 -0500
xselinux: Remove unnecessary structure definition.
commit 938da5ee389975f910721f1c2cebc2dcec793117
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 12:23:44 2007 -0500
Add HDMI and DisplayPort connector types.
commit 24105cf6582201a94bc39aeac5a795297018aeb5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:49:50 2007 +0200
Input: Don't reinit devices
If a device is already initialised (i.e. the virtual core devices) during
IASD, don't init them again. This fixes a leak.
commit 941058f8da0d725f909dc97f68c32ce244a9dc0a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:48:57 2007 +0200
KDrive: Xephyr: Don't leak screen damage structure
commit b2f6cd290c43b88f0d08fb29f8657618a067d2a0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:48:25 2007 +0200
OS: Don't leak connection translation table on regeneration
commit 190a0506243b39cd8dfc0e12068e3a3f416330f1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:47:57 2007 +0200
Config: HAL: Don't leak options on failure to add device
This showed up in Xephyr in particular, which denies new device requests.
commit f44fd3f9e41bf467360ace93ef5b532d8f61fb2c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:47:21 2007 +0200
Config: D-Bus: Don't leak timers
TimerCancel doesn't free the timer: you need TimerFree for that.
commit ae869fc7669764729e13fdd70149ed636753f2a3
Author: David S. Miller <davem@davemloft.net>
Date: Tue Dec 25 22:42:50 2007 -0800
[SBUS]: Fix build, use getpagesize() instead of xf86getpagesize().
xf86getpagesize() was removed, but this one call site was
not fixed up.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 009f1e4e55200425de2fe0dbc1f0ac0f431fb4cf
Author: Fatih Aşıcı <fatih@pardus.org.tr>
Date: Tue Dec 25 23:09:49 2007 +0200
Config: Don't forget to add xkb_rules option
commit 389e8917f66a489455f1d5c70f44c262717538ad
Author: Fatih Aşıcı <fatih@pardus.org.tr>
Date: Tue Dec 25 22:59:24 2007 +0200
Config: Fix a memory leak
commit 743008a4812d6b046211ebcf4eab202687b458d5
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Dec 23 14:27:14 2007 -0500
Report serverClient resources in the X-Resource extension.
commit beb29c605b8c66e1a18b89668aa421c1519645f6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 21 02:09:01 2007 -0800
XQuartz: *REALLY* use CFStringCreateWithCString
I need sleep! Why am I making these stupid mistakes... sorry for pointless commit spam. ugg.
(cherry picked from commit b16351fc6457aabead328472d16dc25789032940)
commit 5dd895efa305954e2695aa22a9e49acfb65b4d5e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 21 02:06:47 2007 -0800
XQuartz: Use CFStringCreateWithCString
(cherry picked from commit 79782b0e14761dcf5d6635b8eec161b74f06763a)
commit 2c24231fc2027cf5034bb1b6636332687f586726
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 21 01:57:43 2007 -0800
XQuartz: Reduce code duplication in X11.app
(cherry picked from commit b81809cd91a9f90b7f2de77b1dcf514cee87c32d)
commit f3042a63be0748bb60567144276d2c61b75ba0b7
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 21 01:24:06 2007 -0800
XQuartz: Handle Pseudorami init in miinitext
(cherry picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)
commit fa9680a7305d7f906da1bdeb40a0863ef66316e6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 19:38:20 2007 -0800
XQuartz: Added localization.
(cherry picked from commit 7a5cc7bfbb296a2c41a580b063324c448f7131db)
commit 603a8b73d46d59e5f9f0be39be8317f3fadfe7e6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 18:29:57 2007 -0800
XQuartz: Cleaned up command line arguments.
commit 4cf3002b6020024f2fc2ed0cc40a872a066e482d
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 18:08:40 2007 -0800
XQuartz: Kill off server-main.c and launcher-main.c
Now using xinit
(cherry picked from commit 5d6ae3d299f72df714117948b3d31dcbddf6c0bc)
commit 1f74bef1ad1399323fc0d2e309b808bf32c622e4
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 17:33:38 2007 -0800
XQuartz: Don't fork to exec app_to_run.
Plus other housecleaning...
(cherry picked from commit ae302db472f127be082d05b418ede332fae8ccc5)
commit 2d15d439f844d4016f169664a338595c11b91b77
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 15:46:40 2007 -0800
Xquartz: Use X11ControllerMain()
(cherry picked from commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)
commit 1393a97ea97b5f7d7b90e3e8c58b5996b600e0c6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 20 16:23:35 2007 -0500
xselinux: Send AVC messages to audit system instead of log file/stderr.
commit 42802a8e6b3d3795acc4f8b7597ea5a48619b5cd
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 13:17:30 2007 -0800
Xquartz: General Cleanup
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4316c93843aa3fe959cf8df3c7d5892)
commit 7ef7727b800fa4715b80a82850d65b88fde5fe6c
Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
Date: Thu Dec 20 10:11:26 2007 +1000
entity sharing: make !shareable entity non-fatal.
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
commit 50e80c39870adfdc84fdbc00dddf1362117ad443
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 19 16:20:36 2007 +1030
include: never overwrite realInputProc with enqueueInputProc. Bug #13511
In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
can overwrite the device's realInputProc with the enqueueInputProc. When the
grab is released and the events are replayed, we end up in an infinite loop.
Each event is replayed and in replaying pushed to the end of the queue again.
This fix is a hack only. It ensures that the realInputProc is never
overwritten with the enqueueInputProc.
This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
(cherry picked from commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335)
commit d0308b64655360517d83e07e866d103c3f2b389d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 19 18:18:10 2007 +1030
Xi: specify correct struct when calculating size of GetDeviceControl reply.
This doesn't change much, as the struct previously given has the same size as
the ones now anyway. Still, we should be pendantic.
Thanks to Simon Thum for reporting.
commit 66b00029e587cec628d0041179a301e888277f8e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 19 18:10:50 2007 +1030
Xext: remove redefinition of Bool.
Thanks to Simon Thum.
commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 19 16:20:36 2007 +1030
include: never overwrite realInputProc with enqueueInputProc. Bug #13511
In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
can overwrite the device's realInputProc with the enqueueInputProc. When the
grab is released and the events are replayed, we end up in an infinite loop.
Each event is replayed and in replaying pushed to the end of the queue again.
This fix is a hack only. It ensures that the realInputProc is never
overwritten with the enqueueInputProc.
This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
commit bcad2a5a24f30cfdf9eca31915ed5a55ed094285
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 18 20:19:26 2007 -0500
XACE: Too many arguments to selection access hook.
commit 7721d3e9217b41aab3a0ee5eaa52f5b53cbb07db
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 18 19:14:26 2007 -0500
Reference cvt and gtf in the xorg.conf man page.
commit 51fab1eb30691c503f1b4dc98b465f2bc2e1394e
Author: Sam Lau <sam.lau@sun.com>
Date: Tue Dec 18 11:38:47 2007 -0800
Sun bug 6278039: Xevie checking wrong size in swapped XevieSelectInput requests
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6278039>
commit 97c82ce0510808ea9d8a37a0a121e750f6dd8158
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Dec 17 23:11:29 2007 -0500
XACE: Restore the old background None behavior in response to bug #13683.
From the X11 protocol spec:
"If background None is specified, the window has no defined background."
This means that toolkits and apps cannot rely on the "transparent" nature
of the current implementation! At some point before the next release,
XACE will switch back to a solid background as the default.
commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 18 13:57:07 2007 +1030
dix: set the correct number of valuators in valuator events.
(first_valuator + num_valuators) must never be larger than the number of axes,
otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
wrong too.
commit 6a5c3e04fa43b98ccffd69ad86dd781602f88d0b
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 17 14:59:12 2007 +1000
mi: set the private key to a unique non-zero value
commit a18d28a5efbe6021d6c800506cece28a73545aad
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 17 13:49:16 2007 +1000
damn then my cut-n-paste ate my end of lines...
commit d096bbd01bf7c7e15b5a2c582718f3333e063ddc
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 17 13:45:15 2007 +1000
Xquartz ate my DMX - thanks
commit bf20c4374aeb5160a0dc372df9b49f1bbc05f078
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Dec 16 01:14:32 2007 -0800
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
(cherry picked from commit 767b4c9d9daa5d0ea59ac1f0d70146798da631cb)
commit 58c2898b62fbf0d8e0f175de7cc208dc29d93788
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Dec 16 01:21:45 2007 +0100
xfree86: permit access to io port 0xffff on the hurd
commit b4ef8885e1697b83a0dcc9f7fe79155f19241798
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 15 14:00:19 2007 -0800
Xquartz: Fixed launchd detection
commit ff5abc72fcc459d7eac663e5f8e4d40b28749841
Author: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri Dec 14 17:59:29 2007 -0200
registry: XREGISTRY_UNKNOWN needs to be defined even if XREGISTRY isn't enabled
In case XREGISTRY isn't enabled, XREGISTRY_UNKNOWN is used but it's
not being available. It's now always available.
commit a3f7f7b60e391e6106f5db40b3fe5fbc67ccd836
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 20:45:14 2007 -0800
clarified debug message to indicate that we're sleeping
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf893f8f81bacd434b31408dfb38cb06)
commit e0e59b3bbc4d8e7ac3934a6f6a9e4a15b328c475
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 20:44:33 2007 -0800
we need to link against CoreServices, not ApplicationServices
(cherry picked from commit ba4d2096e7953ef5b971682f0e28535da968acb1)
commit 062d9234e233fc4c1c617f59093da973c9d3e2ce
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 20:40:27 2007 -0800
fixed bug in x11-exec that prevent icon from showing up
(cherry picked from commit e1f4a0c20d3a52d98954c4b28d0ec4d44564bc32)
commit 95c02adea80a14e18bb51876bc1418eccdade31d
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 14 15:21:40 2007 -0800
Xquartz: Fixed cpprules include
commit 86730337001ba4db6d77fe42406695e32784b157
Author: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri Dec 14 08:46:35 2007 -0200
kdrive/ati: use operating system input devices
commit e110255501e2f699709e6978f5e52d3be96333c8
Author: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri Dec 14 08:45:09 2007 -0200
kdrive/vesa: use operating system input devices
commit 863ba390e9fdf0d37cdf03bf5eebe7fdfe6288f5
Author: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri Dec 14 00:03:13 2007 -0200
kdrive/fbdev: use operating system input devices
commit ca59d3f7bdb5f3724ff45ea57912c0b1098a73d6
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
Date: Thu Dec 13 00:09:08 2007 +0200
Xprint: Clean up generated files
Remember to clean generated wrapper files.
commit 5b02a6ca5b31db69d08f2f452494c0f93a6260d9
Author: Bartosz Fabianowski <freebsd@chillt.de>
Date: Fri Dec 7 02:38:14 2007 +0000
Input: Fix proximity events with valuators
Initialise num_events to 1, so we always send a proximity event, and then
optionally valuator events. Also make sure mieq can deal with valuator
events sent after proximity events.
commit a14a143832be844b4b890b0160ccb9fc8293c28c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 14 00:57:16 2007 -0500
Bump server version for devPrivates rework / XACE.
commit a2df51f8e95a814c54b806814020155ac8bd177d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 14 00:53:54 2007 -0500
Bump video driver ABI and extension ABI for devPrivates rework.
commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629
Merge: 1c1a4bc cb0d7e2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 14 00:32:24 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
configure.ac
This is the last pull before merging to master.
commit 1c1a4bc970be061484bb8dcccf945eb08144c656
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 13 19:51:40 2007 -0500
devPrivates rework: more cleanup from previous merge operation.
commit cb0d7e2c2692a332e2bd5495478ebf9a6cd601d0
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 13 16:23:46 2007 -0800
Xquartz: Don't hardcode libexec dir
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
commit c39212fd7353fc1a07a30bade90f78356c748e2d
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 13 15:56:31 2007 -0800
Xquartz: Don't hardcode LaunchAgents dir
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
commit 82e1aff9fbc1d15e3451707e3ccbf4b13eedda94
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 15:57:39 2007 -0800
Modified X11 plist to use x11-exec
(cherry picked from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)
commit 1a5910588a60af0c136595e2457d897d9e54ac88
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 15:55:28 2007 -0800
created x11-exec wrapper, which uses LaunchServices to find
(and then exec) X11.app
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
commit c8feb73f5841e7812d8dfdb91f1064e2033d028c
Merge: 9a7ce57 a125ce4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 13 18:38:25 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
commit efcdc0d7010f4e6ec833842cb010a07068edf7ab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 13 15:38:41 2007 -0500
Correct the documentation comments in xf86Modes.c
Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore.
commit 1768af38c737f4c14d32f587b51a8ec3d3d6ed5f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 13 15:06:18 2007 -0500
Add infrastructure for validating modes by memory bandwidth.
commit 4359193aaa522599c502d012b9c163e993c01d79
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 13 10:59:48 2007 -0500
Explain a confusing #ifdef.
commit 8cedbb0a53d47b12f03edb726db9d5879c8a63a4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 13 10:57:35 2007 -0500
Clean up some #if 0.
commit 9a7ce573636e349ee2967991c7cc1407e80ae524
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Dec 12 20:44:59 2007 -0500
xselinux: Add new protocol for setting device create context.
commit a125ce4a84f5fb5934fefebd7cfb22a83180874d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Dec 12 12:20:54 2007 -0800
Fix dist by including modeline2c.awk.
This was broken by commit cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
commit 671592343701d8174a70f1ffb9c818784ea3af7a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Dec 12 10:59:15 2007 -0800
Get rid of xf86DefModes.c.
It's out of date and not included in the build. Instead, xf86DefModeSet.c is
built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
built.
commit d86e7f2ecc0a0129a722ffaca93dfc7c0c60e842
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:40:21 2007 +1030
dix: when getting a bogus event, at least print out the type.
commit eab0c4e49015fe96f6d985316f9c5fa28a7eb1fe
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 20:57:24 2007 -0800
Xquartz: Pre-process Xquartz man page
(cherry picked from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)
commit 1ff945a8e43e622b39b360ee49efd6ae3b77be67
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 20:47:48 2007 -0800
Xquartz: Make Alt work with Xmodmap again
(cherry picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)
commit 7d61893b49569a72bccb63f1ae8c9ce4ef4e354f
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 20:33:30 2007 -0800
Xquartz: Removed Xplugin.h from EXTRA_DIST
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
commit 8f2eff643bf421bc4233fbaa2409b75d9f80d147
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Dec 8 23:34:40 2007 -0800
remove Xplugin.h, because we should use the one in /usr/include
(cherry picked from commit 3e881032f35f774ff9638678d7e3f77c81f62976)
commit 7b573ed43672b1fac7b4e6df85a657942ab4cba6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Dec 9 12:02:04 2007 -0800
Xquartz: Added missing link to libconfig.a
(cherry picked from commit 14ec1cf1cb7ebc183c05e13f9c2b4b4eed679ff3)
commit cd13c4ba5b7a1bdfb419cb492a96a72dccf2681e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 13:18:17 2007 -0800
.gitignore: added hw/xquartz/bundle/org.x.X11.plist
commit 020b0e92b039d6ddaea0bbdb890b6a01037bf9b6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 11:49:37 2007 -0800
Xquartz Added quartzKeyboard.h to EXTRA_DIST
(cherry picked from commit 37c9781fdb672229ceab101b080762e15512943f)
commit 5e016fa9b2bf28971ed1794f4706c6538b1d411c
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Dec 8 06:12:46 2007 -0800
Added darwinEvents.h to EXTRA_DIST
(cherry picked from commit 45e5247564c423a2bf02cfec1993155858c91a14)
commit 6bb5dacc1710cdbededb9b28ba89a184ecd0931c
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 01:41:37 2007 -0800
Xquartz: Actually add quartzForeground.[hc]
Sorry for the commit spam... I'm tired and was overly quick to commit... forgot to include a neccessary file.
(cherry picked from commit e564b7aeaab63e4c943445275af680b3b5898a94)
commit 02df03667052fa6a4e0405b91a005dc48e9b39c4
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 01:28:26 2007 -0800
Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
(cherry picked from commit c5ccb98d5d461c8a22fc0f3942a607ac90e1e37e)
commit 740cc54f081393d4ffe1a3e91c9e504dfaee3fe9
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 01:24:58 2007 -0800
Xquartz: Use org.x.X11 instead of com.apple.X11 for preferences
Fixed inconsistency so preferences get read from the correct source.
(cherry picked from commit a74c38bd9f28735acd602d359d7ca6357aed1e93)
commit 41a0aeaae9b7b2f8cc2468fd1f3ee11287d34828
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 00:13:47 2007 -0800
XQuartz: Fixed "Multiple Dock Icons"
BAM!
(cherry picked from commit d0dca8a88506f50b51f41f99a2f1feb6954c8a31)
(cherry picked from commit 0502955a2af487b51bf22916ac02e497c2d96aba)
commit a1b0346853720e98963910b82603c5cda72bb7f9
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 7 23:26:11 2007 -0800
XQuartz: Cleaned up configure, X11.app path in launchd script
Don't hardcode X11.app's path in the launchd plist.
Only install the launchd plist if we --enable-launchd.
(cherry picked from commit 6b74c535dc331d1d621b2541492a3336f69d70a2)
commit 1157cfcc5a4e2a7299a4c48df04a1cc8d5093906
Author: Ben Byer <bbyer@bbyer.local>
Date: Fri Dec 7 21:55:42 2007 -0800
Just a couple of small uninitialized pointer fixes
(cherry picked from commit d12b650362da100ceaecb7e859cd4ef1908d4407)
commit 0ad1c359c5b0be63748f5c630c97be88a8cc92ce
Author: Jeremy Huddleston <jeremy@dhcp-38-248.EECS.Berkeley.EDU>
Date: Fri Dec 7 18:54:58 2007 -0800
Darwin: Use __APPLE__ instead of __DARWIN__
(cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)
commit 85ed0bb44011312dfaa9f2dc31642a0f89ec0bd3
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Dec 8 02:53:27 2007 +0100
Add a missing linebreak after LoadModule: "foo"
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
commit 4fc288a13f825db942c9dcd64f4abd0265652faf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 7 17:28:37 2007 -0800
Check for <sys/sdt.h> as well when determining to enable dtrace probes
Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
named dtrace installed, but not the dynamic tracing facility named dtrace
commit 67907904f094c803d5faf6fa2ce23c01f9a5a521
Author: Ben Byer <bbyer@bbyer.local>
Date: Fri Dec 7 01:51:53 2007 -0800
fixed pathname in GL/apple/Makefile.am
(cherry picked from commit b6357cec6d837226009c0d2b69026027da36656e)
commit 56f5066d477836a975122f4e5748c0f4fb790175
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 6 20:51:32 2007 -0800
ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differences
from Linux, so let's define NO_ALLOCA.
(cherry picked from commit 7caf51d1a5a86ae884e0087795636222c082962c)
commit c238ef06a270c0c1d48cdb9175b6d5815c7c2a49
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Dec 5 21:36:34 2007 -0800
Darwin: Dead coded removal
Kill off assert macro
(cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)
commit 3a058456e0ce531b21ae2b37be8868b8e0d56e56
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:23:36 2007 +1030
mi: unify ErrorFs, prepend [mi]
commit c5acf401dad6fbca47f2bb870185c1d08ac947a5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:19:43 2007 +1030
mi: unify last two ErrorF's in mieq.c
commit 117458d2db49efd3f04432ff45871b44c7d4ad57
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:18:49 2007 +1030
mi: change infamous "Tossed event ..." error for something more explanatory.
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
commit 8a8239f2e21795602fcff5281833b350e6b2a286
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Dec 5 21:23:36 2007 -0800
Darwin: Renamed DarwinModeBlah to QuartzBlah
(cherry picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)
commit 540439a966cce3fc68a7e4bffdb5bcab1b20725f
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Dec 5 20:55:06 2007 -0800
.gitignore: Added Xcode user files
commit bc65a243930e4b02f06a861495420b0a120eae8c
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Dec 5 19:43:49 2007 -0800
Darwin: Flattened quartz into darwin, renamed darwin xquartz
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
commit e00f7061b22001989edf5bd38c2d0cc1566fdd19
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Dec 4 23:18:37 2007 -0800
Darwin: Cleaned up keyboard interface headers
(cherry picked from commit 141f69dc3d8d6e7d8ff65607f43700ac11243041)
commit cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013
Author: Andrew Oakley <andrew@ado.is-a-geek.net>
Date: Wed Dec 5 20:23:05 2007 -0500
Fix commit aa0dfb3f42f19bb351ca7f1a9507ff5ec4590e96
From bugzilla bug 13467¹:
Currently the xserver fails to build without this (now deleted) file, as the
Makefile tries to distribute it. The patch simply removes the reference to
modeline2c.pl.
1] http://bugs.freedesktop.org/show_bug.cgi?id=13467
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit 320abd7d1d906807448fa01ad3377daf707f46cc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 5 19:37:48 2007 +0000
XKB: Actions: Don't run certain actions on the core keyboard
Don't run VT switches, terminations, or anything, on the core keyboard: only
run actions which affect the keyboard state. If we get an action such as VT
switch, just swallow the event.
commit 85dd8efac1bc0715f03c99d261b1c5d0980623e1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 5 19:36:59 2007 +0000
WaitForSomething: Ignore EAGAIN
If select ever returns EAGAIN, don't bother complaining.
commit b7f3618f3933a810778093fd47564a1e3bf3fde6
Author: Rich Coe <Richard.Coe@med.ge.com>
Date: Wed Dec 5 19:36:37 2007 +0000
OS: Connection: Keep trying select while it gets interrupted (bug #9240)
If we got interrupted (EINTR or EAGAIN) during select, just try again, rather
than shutting clients down on either of these errors.
commit d8b2cad3771a09860e7be1726f67e684cf7caeec
Author: Rich Coe <Richard.Coe@med.ge.com>
Date: Wed Dec 5 19:31:07 2007 +0000
OS: Connection: Don't shut down disappeared clients (bug #7876)
If a client disappears in the middle of CheckConnections (presumably
because its appgroup leader disappears), then don't attempt to shut it down
a second time, when it's already vanished.
commit a8e27a108abeba73b2888da4e0604008f4b02045
Author: Kanru Chen <koster@debian.org.tw>
Date: Mon Dec 3 12:46:45 2007 +0000
Config: HAL: Fix XKB option parsing
Actually combine the XKB options into a string, rather than just repeatedly
writing a comma.
commit 2d723bbd0d36f6d7763b4df3298d40720f97fdd0
Author: Peter Harris <peter.harris@hummingbird.com>
Date: Mon Oct 29 18:05:19 2007 -0400
Add missing swaps in panoramiXSwap.c
commit 0fccb24aa978b838cf0fb008e9695837e612c529
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Nov 30 20:35:26 2007 +0200
ProcessOtherEvent: Don't do double translation of button events
We already deal with the button mapping in GetPointerEvents, so don't
do the remapping again in ProcessOtherEvent.
commit c6cfcd408df3e44d0094946c0a7d2fa944b4d2d1
Author: Hong Liu <hong.liu@intel.com>
Date: Wed Dec 5 17:48:28 2007 +0100
Bug 13308: Verify and reject obviously broken modes.
commit 8d0efe4c2a48047680af40e5f6d639f426902e07
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Dec 4 17:59:13 2007 -0800
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
(cherry picked from commit e8399fd4d66a2b77b770c277e2fa424229a721b2)
commit cc98a8e2415f12c7a90fd846d1ec858068e8c796
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 3 23:59:19 2007 -0800
Darwin: RIP dumpkeymap, cr, and fullscreen
Taking out the trash.
We don't need dumpkeymap since we'll be getting keymaps straight from the OS. .Xmodmap should be sufficient for any user-needed changes. If this is not
the case, please let us know, so we can address any problems you have.
fullscreen never worked AFAIK
cr isn't being used and xpr is much better.
(cherry picked from commit e41af2967e885466c4d194fa4c3b358e6be37c30)
commit 13af2d1efcc83d1412a4c727afddd97577b00f32
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 4 17:36:21 2007 -0500
Restore xf86getsecs() as not having an ANSI equivalent.
commit 447cd5d411875b62eb1a501bf00e604225b74d26
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 4 19:09:37 2007 +1030
dix: update comments about inputInfo.pointer.
commit f44d7dcb5fefca3ddfd45e75d0bd0b47ec785e48
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 4 19:07:46 2007 +1030
dix: change the filters to be per-device.
If we have one global filter, one pointer may change the filter value and
affect another pointer.
Reproduceable effect:
blackbox and xterm, start dragging xterm then click anywhere with the other
pointer (attached to different masterd device!). The button release resets
the filter[Motion_Filter(button)] value, thus stopping dragging and no event
is sent to the client anymore.
Having the filters set per device gets around this.
commit 0931f40bf1bd6e00b8d95968d761a495b2c9a46c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 4 17:08:56 2007 +1030
dix: comments, whitespaces, copyright fixes.
Removing my copyright message for now, should eventually be in line with the
rest of the messages.
commit 09c0c1a3cc4807813774a3c0e28a7ba9a87bb5c7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 4 16:51:52 2007 +1030
dix: remove #ifdef XINPUT.
No escaping XINPUT anymore.
commit f8d7729df388c142624def36ba6d8c3b15922018
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 3 20:20:05 2007 -0800
Darwin: Combine launcher and server X11.app
This should hopefully eliminate confusion some people have over which X11.app is which.
Now BOTH are in /A/U/X11.app and we intelligently determine whether to execute our app_to_run
or launch the server. If arguments are given, we launch the server. Otherwise if we can
connect to an X DISPLAY, we execute app_to_run. Otherwise, we launch the server.
(cherry picked from commit e7026216ccaa8e4fb073800ba947c9909d4faada)
commit 678f786715d76e972f8a77807c9caf3e90c24418
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Dec 4 12:24:47 2007 +1100
xf86crtc: oh mon could be NULL, so check before quirks
commit a9df4bb555fd91707a68794c2dce24fb06e6cf64
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Dec 4 12:17:29 2007 +1100
xf86Crtc: pass correct parameter.
quite how this has worked I've no idea.
commit fe25f897c62bb324660217e15dbd3091c808dbba
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 18:34:40 2007 -0500
xf86getpagesize -> getpagesize elsewhere in os-support/
commit b84f2833a681585162b8dabfb02ff62e7e0ef4d6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 3 14:52:17 2007 -0800
xf86getpagesize() -> getpagesize() in os-support/solaris/sun_bios.c
commit aa0dfb3f42f19bb351ca7f1a9507ff5ec4590e96
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Dec 3 16:57:58 2007 -0500
Remove Perl dependency from the build
From bugzilla bug 13467¹:
The modeline2c script is the only part of the Xorg server that requires Perl.
[This] is a simpler replacement that works with any normal AWK.
1] http://bugs.freedesktop.org/show_bug.cgi?id=13467
Bug was posted by Joerg Sonnenberger <joerg@NetBSD.org>.
commit 60086d90168265795e07a60939e9e2fe95c6e15c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 3 11:30:58 2007 -0800
Use pkg-config to get -I, -L & -R flags needed for OpenSSL
Still just uses -lcrypto instead of the full library list from --libs
commit b77ca7cc9c23184c4ab367baf1b3ed0acf27c269
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 3 11:29:54 2007 -0800
Use _X_EXPORT instead of __attribute__((visibility("default")))
commit 1faba797cbfe1a4804b7ea6b47e1ca9d4e4324e4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 14:12:58 2007 -0500
Death to libcwrapper.
This has been deprecated since 1.1. Since we're breaking ABI again anyway,
remove it entirely.
commit 28b93d74a11a1064d68a214fcaa7b0aede864a38
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 3 14:32:53 2007 +1030
ephyr: miPointerWarpCursor needs the device parameter.
Thanks to Mitchell Quille for spotting it.
commit 004876355b43fb4d3c2bc5653a7dc1bfd3f985ee
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 30 13:56:04 2007 +1030
dix: Remove RegisterPairingClient and UnregisterPairingClient.
commit f4dc521b38560c8f93b614316a3a5511941a93a9
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Dec 2 18:21:40 2007 -0800
Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH
(cherry picked from commit b0069b04dddaa2df6d4cdf86f96fd8a2a257e47e)
commit 0fff01f5660fb3bb9284f97c45dc76154435d02b
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sun Dec 2 14:15:36 2007 -0500
Fix swapped Xv dispatch under Xinerama.
Same-endian dispatch was properly calling through the Xinerama wrapping,
but other-endian dispatch wasn't.
commit fa47910045c3700d8d668b5e214e5ffc1e8dc3e7
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Dec 2 12:39:05 2007 -0500
Clean up many #if 0.
commit 83ba1e167c1473ac7d85239a6ee5ed629353cb16
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Dec 1 18:28:19 2007 -0800
added missing call to xcb_connect()
(cherry picked from commit dc2fb323ee11f081d447605be151024f9e2487f9)
commit 9ad4560b3cbd42e647d6227746d4d037616d57cf
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sat Dec 1 16:23:23 2007 -0800
Darwin: Alt is Mode_switch Switching to Mode_switch to maintain compatibility with Tiger X11.
(cherry picked from commit 8a76c99c0ebbaf7375f3a9c75c4f7921a79024da)
commit f83d758dcc4878849a851c8466f6fa16b2b7cd8e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Nov 30 16:11:15 2007 -0800
Darwin: properly implemented xcb check for stale sockets
(cherry picked from commit f543cb8fbb3d9213cb03396f4252ab9821319993)
commit f54b28eeba119c42d0fcccfbe295306dd670221a
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Nov 30 16:09:23 2007 -0800
Darwin: Undo focus-hack which didn't work right.
commit f30abe30c5fea10e680aa12f3fe37ee8ce1a0201
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Nov 30 13:52:06 2007 +1000
edid quirk for MAX 0x77e monitor
From RH bugzilla 306441
commit 6216abe0c1a94efa4b2f0d14e88278f128304cd2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 30 11:34:24 2007 +1030
dix: avoid activating the VCP/VCK twice.
This may set dev->key-xkbinfo to NULL, causing a segfault in xkb code lateron.
Spotted by David Huggins-Daines.
commit 9eb8ea9e615ebd8b568711eeca36aa84aa781ad3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 30 11:32:59 2007 +1030
dix: only freeze the paired MD on a grab, not all other devices.
commit 8a079be0dd0f2ce37868988cde4ac8895522b088
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Nov 29 02:19:22 2007 -0800
Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround.
(cherry picked from commit d2b768890f0878ae4e3fec8f7219e82b79256133)
commit 38397560612424b5b348f34c1a0bea8c47a574be
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Nov 28 23:07:41 2007 -0800
Darwin: Removed support for darwinSwapAltMeta
(cherry picked from commit 3d153c8fa40986d194b7701f5eafa0080e32399a)
commit 89c3dfe41e3a17a4f27b20e23623dc5777670feb
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Nov 29 19:57:24 2007 +1100
modes: use xf86RandR12Index to stop illegal access
xf86RandR12Index set to -1, and if initialised it gets 0 or higher.
This allows the server to start with xinerama turned on with only one head
commit 725710fd0bc990b2c35e4c76128ef1c668013299
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Nov 29 19:40:53 2007 +1100
randr: make randr code not segfault when xinerama set
commit e4fe0a3cb789b8757f1c80f606dfe32bccada582
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 29 09:55:24 2007 +1030
xkb: swap a LookupKeyboardDevice over in favour of GetPairedDevice
The former always returns the VCK, which is obviously wrong if we have
multiple devices.
commit 23b8ca8a373d919225de9739af7b064f650eceec
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 27 13:20:40 2007 -0500
RANDR 1.2: Only enable unknown outputs if there are no connected outputs.
Otherwise you end up with a confusing initial geometry, and xscreensaver
and friends get very angry.
commit edebe76cfdb31072d18a6fcd3ee8f1d95006855f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 27 10:22:44 2007 +1030
Xi: set DeviceXXXState's length fields to the correct size of the struct.
Setting it to the size of a pointer is an interesting but equally wrong
approach. Luckily Xlib never used this field anyway so nobody got hurt so far.
Spotted by Simon Thum.
(cherry picked from commit 0f2398d06ce591724e388b3270800c5e22b3de2d)
commit 0f2398d06ce591724e388b3270800c5e22b3de2d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 27 10:22:44 2007 +1030
Xi: set DeviceXXXState's length fields to the correct size of the struct.
Setting it to the size of a pointer is an interesting but equally wrong
approach. Luckily Xlib never used this field anyway so nobody got hurt so far.
Spotted by Simon Thum.
commit 601307615e4955be23fd86a057285074242ad83e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Nov 26 13:04:57 2007 -0800
Darwin,Rootless: Makefile cleanup
(cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3)
commit 8503072e1c2b89dca786d4afb72aa60a170d2fbd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 16:52:41 2007 -0500
registry: add missing include statement.
commit 996b621bec1bbc4fb21970c75eaec62053bc6ccb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:59:44 2007 -0500
registry: swap out the DTRACE XErrorDB stuff for the new registry call.
commit 54cb729ecc2d366c1af836cb3d2ffc8e864e9b79
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:59:01 2007 -0500
registry: Add a call for DTRACE compatibility.
commit decd5a7c605e42c99b6a4523c8e1833b859d9b24
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:26:49 2007 -0500
registry: Rebase registry to use the server config file of protocol names.
commit 9b0e72c8d960d056276f5fa93f3cc2872825711e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:26:04 2007 -0500
registry: Add a great big list of protocol names, like the XErrorDB that
ships with Xlib. This is considered temporary, until server-side XCB can
solve the problem programmatically.
commit c0f9e204baf0218466973868c5ea6ed0f78e6b8b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:24:15 2007 -0500
registry: rename the SERVERCONFIGdir and relocate it to /usr/lib/xorg
by default.
commit a344920ae86c1970e4cc34ee91e2f2008d490c49
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 26 11:53:08 2007 -0500
Allow Virtual to be specified globally in the Screen section.
The Display subsections are optional, and it's confusing to need to create
them just to set a Virtual size.
commit c6c284e64b1f537a3243856cf78cf3f2324e4c2b
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Nov 26 15:38:20 2007 +0100
Initialize Mode with 0 in xf86RandRModeConvert.
Asking for trouble if non-initialized values contain random data.
commit a4edfbef022f9635c2c9b9eb229cb622834dc68c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 24 16:16:48 2007 +1030
mi: only call UpdateSpriteForScreen if the screen actually changed.
If we call it unconditionally, we flip the dev->spriteInfo->sprite permanently
when using XTestFakeInput (once in CheckMotion as called from the
processInputProc, another time in UpdateSpriteForScreen when we actually warp
the cursor). USFS also updates to the screen's root window unconditionally,
which is not really what we want if we haven't changed screen at all.
commit bf3198c8c56289244c58d36c6869442479fd3481
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 24 15:00:57 2007 +1030
dix: fix typo
commit 5dabe448bda68a483bf444a4adfed2b25b30f600
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 24 15:00:43 2007 +1030
dix: Add special treatment of NotifyUngrab for enter/leave events.
In some cases (e.g. using x2x) the previous model broke, with a window ending
not counting down to 0 anymore. Special treatment for NotifyUngrab seems to
help here.
Current solution: If a NotifyGrab is to be sent ignore it. If a NotifyUngrab
enter is sent, only adjust the semaphore if it is on 0. Likewise, do the same
for a NotifyUngrab leave if the semaphore is on 1. This seems to work alright
so far.
commit 33b94da6327d3423b4ebc1a58d5894c9904e67c9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 23 16:01:11 2007 -0800
Re-add call to XFixesExtensionInit for static servers.
This reverts a portion of bcbaf2a0ce34b6c5e41d2831b8b87dbd0617a89b which
removed the call to XFixesExtensionInit and some cpp lines.
commit f6401f944d327cc5d9a7ee0bbdf4f7fc8eaa31e8
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 23 16:12:49 2007 +0100
Don't segfault if referring to a relative output where no modes survived.
commit fa19e84714aa84a2f2e817e363d6440349d0b619
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Nov 20 16:54:50 2007 +0100
Fix initial placement of LeftOf and Above.
commit 184e571957f697f2a125dc9c9da0c7dfb92c2cd9
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Nov 20 13:05:26 2007 +0100
Adjust offsets of modes that do not fit virtual screen size.
Fixes memory corruption if a too small "Virtual" was specified in xorg.conf
for the selected multi-monitor configuration.
commit a80e64f1503a4d8b11c4a6608d296422c69e3e8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 17 22:50:07 2007 +0100
XKB: Generate correct key repeat events (bug #13114)
Make sure we send the correct event for the type of device when we're
sending key repeat events, which stops repeats being sent to incorrect
windows.
commit 63351df0eec320aa3ce27d4d2ee6bcdb58aa2d92
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 18:02:07 2007 -0800
Darwin: Fix compilation/linking problems
commit bf4ef4da759c01e6794ed28ba4988a2c8ee049bf
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 17:45:15 2007 -0800
Darwin: Remove the PaintWindow optimization which snuck back in.
commit 2082e7aa878fe1221fd50895a9de1f408b3157a8
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 17:18:48 2007 -0800
Rootless: Remove the PaintWindow optimization which snuck back in.
commit a751bc12bee1d4d2ed35e3a0c64d9c8c9bf30a82
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 13:53:00 2007 -0800
Rootless: Imported changes made in xorg-server-1.2-apple branch
commit 59c7ca6586e7c20e28ad407ca9a0883c4d621d64
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 13:29:15 2007 -0800
Darwin: Added missing Makefile.am
commit 23596291c30a85e38c00aef2c01b46d561e2916e
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 13:17:44 2007 -0800
Darwin: More syncing witn xorg-server-1.2-apple
commit 4e18c626350c7c2e0fb540aa64a98957699f3abe
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 12:21:59 2007 -0800
Rootless: Pulled in changes from fb{Blt,Fill} into rl{Blt,Fill}
(cherry picked from commit 3f857e129df7ce492191e0c51b8e53eaf6179366)
(cherry picked from commit 70374a58937d7a6f01c210bd6ac66cafb63e895a)
commit ed9524d36e42a310bb128284f2b507f76b8c40d9
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 01:07:02 2007 -0800
Darwin: Copied over missing file (Localizable.strings) from xorg-server-1.2-apple
commit 4d9cef197b12548e0716dab3557e48311519e325
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 00:35:09 2007 -0800
Darwin: Misc cleanups to line up with xorg-server-1.2-apple
commit 5e950123daa167c9ffe289b3bd89e3bd288da0e3
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 23:32:00 2007 -0800
Darwin: Removed cvs tags from Xquartz man page
commit 3a2f714eea475a13cde65921e24c7ee3f70ffc3c
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 23:30:37 2007 -0800
Darwin: Removed .svn dir
commit 691da031319dc59b9496101358c267f317abfd1e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 22 17:44:39 2007 +1030
Xi: allocate motion history for master device.
We're still missing out on the actual content of the history but at least this
way we don't segfault.
commit 602de4f70b6f4aab93b514f3a01917bd5d4ad640
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 16:53:10 2007 -0800
Darwin: Use UTF8String since lossyCString is deprecated
(cherry picked from commit 1786f9464af51ff606a612aec6fe420fa9688a28)
commit 13666e287c347aab2a5e9d8ee5f6bb29b9b85171
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 18 17:44:12 2007 -0800
Darwin: Added some DEBUG_LOG sauce to the XP_EVENT handling code
(cherry picked from commit ec84a4cef66a2b46ed71f9758c434ea629d2f270)
commit 829b6641bd64c352e1e8a7c619f84dedbdb07a09
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 18 17:43:40 2007 -0800
Darwin: Disabled ALT_IS_MODE_SWITCH
(cherry picked from commit fd181254f85543558190140787dc7b41f6cf90db)
commit 8486f8af91b477c7bcb8438a0e9a72d0c11d1d63
Author: Ben Byer <bbyer@bbyer.local>
Date: Thu Nov 15 02:25:50 2007 -0800
Darwin: Added a lightweight debugging facility to support troubleshooting
(for example) the stuck modifier key issue
(cherry picked from commit 0e0b452d10c0af55497c3299b5f3db45d5b381cb)
commit 74214a9f42b931f99d83ddb4efb3720881a2de16
Author: Ben Byer <bbyer@bbyer.local>
Date: Thu Nov 15 00:56:54 2007 -0800
Darwin: Patch to avert (some) damage / rootless crashes, courtesy of Ken Thomases
(cherry picked from commit 148a87ff20aa5e7a6d839610aa14fa1a31505c4a)
commit f5f833b80609f1f98c93113183bd2b1bab3bfec9
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 11 04:30:34 2007 -0800
Darwin: These changes are necessary, yet not sufficient, to get 8-bit indexed
color mode working in Xquartz.
(cherry picked from commit a415f62f5289fae99ea9b0038d21fad7695b1336)
commit 8358334180a4f8c1e73fc5647a62bcd3539dee45
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 11 04:30:00 2007 -0800
Darwin: Fixed the call to xp_init so that we now receive Motion notifications even
if X is not the active application.
fixes <rdar://problem/5167664> xeyes dead until window activation
(cherry picked from commit c7573379a85a1480cc51650075078e41dafe56af)
commit 512dee90878e552ad1b2bb5b27366707f6464f28
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 22:17:38 2007 -0800
Darwin: fix for spurious "Are you sure you want to quit?" message
(cherry picked from commit 30cbfc786e4fedda3fe070bacceabe1d9212d00b)
commit 28e73e99a9a59223963312c5dd43ce5566d1db9d
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 22:12:41 2007 -0800
Darwin: Adding "fake RandR" support from old X11.app
(cherry picked from commit 633490c4e8dab30af7ecbe1bef076c22ad5f5da9)
commit 01b70afaac0990b41d1fb6fadbfd64df1486b669
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Nov 3 05:34:19 2007 -0700
Darwin: Initial support for Spaces -- if you use Expose to drag an X11
window to another Space, it will work correctly (as opposed
to just leaving a ghost window). We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
(cherry picked from commit 2d50ea8013e7c1639d570e227b53b037fb567565)
commit b39edc01a6588697b65f831e8ab1dbb24cbe7b24
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Oct 31 23:46:50 2007 -0700
Darwin: Swap modifier keys for buttons 2 and 3 -- now Option-click is the middle click
(cherry picked from commit 0aa61293b62aeb69a93b2035d0aef8644343eed3)
commit 606a8dc73d91a198d72d249934dc027a23f4c338
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Oct 31 03:39:47 2007 -0700
Darwin: Trap Deactivate messages and release modifiers to avoid "stuck shift lock" (etc) bugs
(cherry picked from commit 2b189a99330eb465fa0d17020fb1db1e38829151)
commit 4c18ef4331aaee268431a3ba50991f0312b82870
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Oct 31 03:22:18 2007 -0700
Darwin: Workaround for a bug where the holding down Command to make a "fake"
button 2 click would actually result in a Command-2 chord.
(I.e. it wasn't releasing Command before clicking the fake button.)
(cherry picked from commit 0d5dd5dffa4c5ce3f54dfe53720a39d524dc8e37)
commit f9269bebae27bbc9d0e03e02943166b83946623d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 22 17:30:14 2007 +1030
DeviceIntRec: move lastx/lasty from valuator into DeviceIntRec.
We free the ValuatorClassRec quite regularly. If a SIGIO is handled while
we're swapping device classes, we can bring the server down when we try to
access lastx/lasty of the master device.
commit 7f2972d47a5d74fe92268c6d609b1eb6ad845824
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 21:59:59 2007 -0800
Darwin: Really add launcher this time
commit bcbaf2a0ce34b6c5e41d2831b8b87dbd0617a89b
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 19:51:14 2007 -0800
Darwin: Dead code removal, Code cleanup, Added launcher
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
commit 9ed43eff48201520797f89a12bb3b2f5819bd99f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 21 17:16:27 2007 +1030
Xi: allow clients to specify pure client id in SetClientPointer.
If no window was found with the given ID, try if there's a client with the ID.
Allows us to set the CP for apps that don't open windows (e.g. x2x).
commit 33f15689922ad9f1193f803bc1636c82c23ab99e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 21 16:06:44 2007 +1030
xtest: switch an inputInfo.pointer over to PickPointer.
Couple of whitespace fixes too.
commit e5dd7a95791748c57cab75c0d8ba9d37f72edccf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 21 15:59:31 2007 +1030
Xext: Scruffy the janitor don't like no "register" keywords.
commit a55ec1a9f4b62139dc5e5462d79d47b330c27c79
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 20 18:31:03 2007 -0800
Restore checks for __i386 where needed for Sun compilers on Solaris
commit 2f387d913aa76f1b6d21d8e2698be165301c6bc1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 20 18:27:12 2007 -0800
Enable use of /dev/urandom on Solaris as well
commit 4363d70c6b420648b501126d1fbdebfafc7ae09f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:58:55 2007 -0500
registry: Fix some mistakes in the reversion of prior commits.
commit 140a4660aca1c283613d5b62f51668b44b45baf6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:49:30 2007 -0500
Revert "registry: Register XTrap extension protocol names."
This reverts commit b38a91993364aa80cfd99721e319e1458d9fb760.
Moving all the names into dix/registry.c
commit ed8a39c48ab9dac085fcf58b9641364b5608f3f4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:47:52 2007 -0500
Revert "registry: Register XKB extension protocol names."
This reverts commit a5cf3f21f712e46dbf9bca289e67be75f2b531d3.
Moving all the names into dix/registry.c
commit 17b0c729b553e2f0f8f82497698b282a47db3326
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:46:43 2007 -0500
registry: Remove registry code from XInput extension.
Moving all the names into dix/registry.c
commit e86852aff62a861823b8e419434e0401b8cdc8e0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:44:56 2007 -0500
Revert "registry: Register XFixes extension protocol names."
This reverts commit 106758893b68033f14f69c4ee6591fb6a149ba37.
Moving all the names into dix/registry.c
commit 5269da2bde3cf4feb12fa2bd87bff6ee6d8730a1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:43:38 2007 -0500
Revert "registry: Register XvMC extension protocol names."
This reverts commit 853ea337bdad17f8f6ec7d940de14ce2cbbbf93e.
Moving all the names into dix/registry.c
commit 03a86c8d5e20a6e47f3c294f0087f205cf2a72dd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:42:19 2007 -0500
Revert "registry: Register Xv extension protocol names."
This reverts commit 12766c5b5ffdab95255a63b2c8421ee773fd43b5.
Moving all the names into dix/registry.c
commit edcf490cdb965e2a5bfc0169c01732d2924da3ae
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:41:10 2007 -0500
registry: Remove registry code from XTest extension.
Moving all the names into dix/registry.c
commit 5fea1ed50f37691a5273bf2897479781de808ff5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:39:48 2007 -0500
registry: Remove registry code from SELinux extension.
Moving all the names into dix/registry.c
commit 9a8af33718d085656a672e4c27df200485c84154
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:38:24 2007 -0500
Revert "registry: Register Resource extension protocol names."
This reverts commit 5c8b1a91726817816d20faefad21c7a68ab634cc.
Moving all the names into dix/registry.c
commit e6023e0208fae8f19c566f9df1a8aa20494f40ab
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:36:49 2007 -0500
Revert "registry: Register XPrint extension protocol names."
This reverts commit f077578e42eee424b0e534774574c84af9d6f85b.
Moving all the names into dix/registry.c
commit 277345fb7065d74c3b0d076382affb78cbe67569
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:35:57 2007 -0500
registry: Remove registry code from XF86Bigfont extension.
Moving all the names into dix/registry.c
commit bf27edd365ffd275e5453f44d130eeacbfe0ecd9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:34:14 2007 -0500
Revert "registry: Register EVIE extension protocol names."
This reverts commit 48891d5696f56711f23743cb03be39cf6b26c522.
Moving all the names into dix/registry.c
commit 687427179420b18a55a1a02b8a9f2a32ea8eac8d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:32:54 2007 -0500
registry: Remove registry code from XC-MISC extension.
Moving all the names into dix/registry.c
commit 4b0274e8f712e51b18618a2a0bdbe03b17b9736b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:25:15 2007 -0500
Revert "registry: Register SYNC extension protocol names."
This reverts commit 9f597f6c87e0b14cc382d8e5929e42f822db4329.
Moving all the names into dix/registry.c
commit 4c7cf5aa4c802dcde895c723879a80a87620c0f7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:23:57 2007 -0500
Revert "registry: Register SHM extension protocol names."
This reverts commit 2c9646ad4e65bb061d910c9e2b1a8a978f21fa17.
Moving all the names to dix/registry.c
commit 67e82e306f67a215c6c89868cc1d3649747bd93d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:22:59 2007 -0500
Revert "registry: Register SHAPE extension protocol names."
This reverts commit 4e274e90e16b1d954391e1af3e2074fb10f70ee7.
Moving all the names to dix/registry.c
commit 8583bf78ad056ffe2d83b54e5c9a0a217e425a7b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:21:09 2007 -0500
registry: Remove registry code from XC-SECURITY extension.
Moving all the names to dix/registry.c
commit 55744d8e5d7bf1ff27cd25de54e14e799dd1a70a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:19:44 2007 -0500
Revert "registry: Register MIT-SCREEN-SAVER extension protocol names."
This reverts commit 58c3240fcbec23aad122e1c340f6bb6d3b18f779.
Moving all the names into dix/registry.c
commit 36ef45928c783292cef18acfdd83ae057826c989
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:18:01 2007 -0500
registry: Remove registry code from MIT-MISC extension.
Moving all the names to dix/registry.c
commit 816e6e612e4bc3cea1e67e7ea79d5b640458011f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:15:37 2007 -0500
Revert "registry: Register Multibuffer extension protocol names."
This reverts commit 3877faf7d9fe00ed634077e38a198ae4b91a2bb4.
Moving all the names into dix/registry.c
commit 40a0da044e911ea51de003f3621331ffbe2842bc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:13:43 2007 -0500
registry: Remove registry code from Fontcache extension.
Moving all the names into dix/registry.c
commit 46412baf60ed639ddc1d5fb601f73a75e39737f7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:11:06 2007 -0500
registry: Remove registry code from EVI extension.
Moving all the names into dix/registry.c
commit 460c43032f05aad3f0f552901a52d199f61c7f4f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:08:18 2007 -0500
registry: Remove registry code from DPMS extension.
Moving all the names into dix/registry.c
commit 76e89d45b497d4afa4e60e1d0ec50b62f54f6b88
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:06:40 2007 -0500
registry: Remove registry code from TOG-CUP extension.
Moving all the names into dix/registry.c
commit ce93c5772da52ab88faef7e5b661b681d5b60b1e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:03:57 2007 -0500
registry: Remove registry code from BigRequests extension.
Moving all the names into dix/registry.c
commit 0756d1271209e6ae14cc641dddca095271b43150
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:59:40 2007 -0500
Revert "registry: Register APPGROUP extension protocol names."
This reverts commit b504678ba5407a6fd8d47d051305f7c3d5606dfe.
Moving all the names into dix/registry.c
commit 5aff37d1d69be493727856a29628bd782d50b90f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:57:06 2007 -0500
Revert "registry: Register RENDER extension protocol names."
This reverts commit 8964c6d8e14ae47798762191e359b2bf138ca32e.
Moving all the names into dix/registry.c
commit e585a2ddb495b50a53e15cccc368ca0858fc9d23
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:55:47 2007 -0500
Revert "registry: Register Record extension protocol names."
This reverts commit ea09c9acc8f0d5577f54c864ff88b7f03d93b2f4.
Moving all the names into dix/registry.c
commit d4577e485367468227e031eb434b739eff7b5e9a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:51:27 2007 -0500
Revert "registry: Register RANDR extension protocol names."
This reverts commit c827db57e4d9ca14c82b099dcfc9b7a0c0b5ba0a.
Moving all the names into dix/registry.c
commit a541e826c9310d3051e53834833c6c3a08654148
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:50:26 2007 -0500
Revert "registry: Register WINDOWSWM extension protocol names."
This reverts commit 4c3285c883cc50a91bc5262bbc9d073d816f860a.
Moving all the names into dix/registry.c
commit 993595430bd0580ab4d936be6b70fb91b8bb1d16
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:48:46 2007 -0500
Revert "registry: Register XF86DRI extension protocol names."
This reverts commit b7786724080fd3928ef7b8c294346661d7ffd90b.
Moving all the names into dix/registry.c
commit 6b73c215c9d612534af290230b2e914d42d819cd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:47:30 2007 -0500
Revert "registry: Register XF86VidMode extension protocol names."
This reverts commit 960677e876c068400fb45e1764bb5470cd8c389f.
Moving all the names into dix/registry.c
commit 8e2cd7a804664bbd2d03789dcd5c93223122e929
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:45:30 2007 -0500
Revert "registry: Register XF86Misc extension protocol names."
This reverts commit 2cd1b32b77e0ceeaccb3f01c4ac13a97c557668c.
Moving all the names into dix/registry.c
commit 0356153a58cef87d655bccacd8e2cf03d577bd19
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:43:18 2007 -0500
Revert "registry: Register XF86DGA extension protocol names."
This reverts commit 3815284e899b61731b6a63c4ba14c5d773e24eb6.
Moving all the names into dix/registry.c
commit de93c1e9df14577e158b6dc3ccec7ee48f592386
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:40:57 2007 -0500
Revert "registry: Register DMX extension protocol names."
This reverts commit 32f3f5a1e7654f8bb43ea16b9227b3994e616739.
Moving all the names into dix/registry.c
commit 2d3e0cdf4bd7ab069bad7244ede7c2d489e92b17
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:39:56 2007 -0500
Revert "registry: Register APPLEDRI extension protocol names."
This reverts commit 3464b419230c6d17e940d967b567c5d2cb22d232.
Moving all the names into dix/registry.c
commit 546d46224e355d4f00232da5538548e3c8853e40
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:37:48 2007 -0500
Revert "registry: Register XINERAMA extension protocol names."
This reverts commit b9f5ab98c8dea36dcce1ad15fd2e059a77e77c39.
Moving all the names into dix/registry.c
commit fd2d83d5bf5b35c8a2b05f725486be166783921e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:34:48 2007 -0500
Revert "registry: Register APPLEWM extension protocol names."
This reverts commit eee46b4681ec55297604b0425705f2b18381f7ca.
Moving all the names into dix/registry.c
commit c934e1af27189571c1e7dd838872e380c3580eeb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:32:35 2007 -0500
Revert "registry: Register DBE extension protocol names."
This reverts commit 2e1e5be1d9067816525aa13a1d818e8ca6899599.
Moving all the names into dix/registry.c
commit b9ab6f300a46aa8879b11eac51857357cc379c2f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:31:00 2007 -0500
Revert "registry: Register DAMAGE extension protocol names."
This reverts commit 20db50b4c44a14f7eeac2b1de17ada68482521da.
Moving all the names into dix/registry.c
commit 26586a7ad5e999b34996d147fb43998deea89178
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:27:37 2007 -0500
Revert "registry: Register composite extension protocol names."
This reverts commit 166ef972febc00c665e1d5aeb68e75d7bbcf9879.
Moving all the names into dix/registry.c
commit fae39db7957c0ebdc7af36f8d8f484473beb6d38
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 15:21:31 2007 -0500
devPrivates rework: put back some changes that were mistakenly removed
during merge conflict resolution.
commit 709c1a70c8c6a9e132bf0d92f78a12be72beee51
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 15:18:02 2007 -0500
Remove some duplicate include statements.
commit be0cbe5a330f62cef47fffbc49e83b5e1637b7d0
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Nov 20 15:39:49 2007 +0100
kaa: update kaaCreatePixmap to support the new usage_int
commit 5b0dfb73ca4699cc4b33720f10416de7440081b7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 21:01:22 2007 -0500
devPrivates rework: put back a comment that was mistakenly removed
during merge conflict resolution.
commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94
Merge: 60be452 ea9c63e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 18:10:46 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
commit 60be452c2e88342f92a76ba5ec7d90b5b0211aaf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 16:55:09 2007 -0500
xace: restore the old SaveScreens function and introduce new API, since the
old version is called from drivers...
commit a95bb52b4366d85fc049130c60af5c9e727c565b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 16:34:38 2007 -0500
devPrivates rework: add missing include of dix/privates.h
commit ea9c63e93b9bb731796e8a8de2d127e6cc720076
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Nov 19 15:53:49 2007 +0100
DEFAULT_DPI was undefined here.
commit db9ae863536fff80b5463d99e71dc47ae587980d
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sun Nov 18 11:57:01 2007 -0500
Bump DEFAULT_DPI to 96.
75 is just nonsense.
commit ee2d4626dca6e0d4fc6f524e5de4bdefa2ed43df
Author: Tormod Volden <bugzi06.fdo.tormod@xoxy.net>
Date: Sun Nov 18 11:56:31 2007 -0500
Bug #12932: Use DEFAULT_DPI in randr1.2 instead of hardcoded 96.
commit a46c30c3be33ffb304a885503c8aaa78396ed3d9
Author: Jernej Azarija <azi.stdout@gmail.com>
Date: Sun Nov 18 11:44:36 2007 -0500
Bug #12531: RRModesForScreen can fail to allocate.
commit fac7e7e4e1809e865b9b3cf5b7eb69ba9d3a3759
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sun Nov 18 11:39:26 2007 -0500
Document the requirement for interleaved code and declarations.
commit bad96e5a864e40fbd47265d7fb6eaa67c55fac11
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Nov 18 15:02:24 2007 +1030
dix: getevents.c remove trailing whitespaces.
commit 75e5e9f88c5f974d996dd81e672cd3709d361a44
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 17 13:46:01 2007 +1030
Xi: add missing XI_DeviceClassesChangedMask to XI filters array.
commit d15339a92c4d689d2ab8a86e4f10107f3e45eff8
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sat Nov 17 22:12:10 2007 -0500
Bug #9725: Don't look in root's $HOME for config files, that's just confusing.
commit 748cfbc820f8cdeb544c54a6db495fecf2e2457b
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sat Nov 17 21:23:05 2007 -0500
Disinfect mi/ of mfb.
commit a969db091cab16a448f82782e85b3dd19c81627a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 17 22:34:47 2007 +0100
XKB: Don't ring the bell when we don't have a BellProc (bug #13246)
commit c89b543198d5ec56ff025bdd6bb7229523478e58
Author: Ben Skeggs <skeggsb@gmail.com>
Date: Sat Nov 17 18:20:49 2007 +1000
exa: set driverPriv to NULL before it might get used later with garbage
commit 514ba4ca727f0b1076bc67500617722203d34daa
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Fri Nov 16 19:53:11 2007 -0500
Bug #1612: Use a stronger PRNG.
Currently just reads from /dev/urandom, and only on Linux.
commit 12dd6e9911de187e0ebee86434e8c24a67c990f9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 17:23:09 2007 +1030
dix: reset MD's devPrivate classes to NULL before device initialisation.
XkbInitKeyboardDefviceStruct may call FatalError if it fails. FatalError then
cleans up all the devices, resulting in a segfault if the pointer is
uninitialised.
commit be3321c2e9fad228a9ee5fef47680a47bc9e39a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 12:12:41 2007 +1030
dix: Free both current classes and original classes when closing an MD.
commit 3c39dd19ec2a53b8854279e3b03131098031473a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 12:12:14 2007 +1030
Xi: Deep-copy full list of FeedbackClasses.
All feedback classes are linked lists and the whole list has to be duplicated,
not just the first entry.
Xkb stuff still missing.
commit 497862df2fcd67531fbe0f876c20a09884ee74df
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 11:20:22 2007 +1030
dix: explicitly float all attached SDs before closing down devices.
Some drivers flush on shutdown, if our SD is still attached we'd be trying to
route an event through a non-existing device.
commit 9de1ebe2a80164507cbe2ef688f284225e0ec808
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 10:45:28 2007 +1030
dix: Fix up class restoring when last SD disconnects.
Old code was fundamentally broken, fixes now are:
- free the MDs current device classes
- copy the device classes instead of flipping the pointers
- check for the old MD, not the new one.
commit 20fd4783247b1b93d9675dc36768dd1ed59ba2d3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 17:01:33 2007 -0500
Small static cleanups on dix/
commit 70e50fa51f05663f289eeeea4521e737e8e24bca
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 17:00:37 2007 -0500
Allocate RRCrtcRecs with calloc.
commit 8d0cd1cd2c57ee5a2fc4d577d8182d66369f0617
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Nov 15 12:16:36 2007 -0800
Fix a really dumb typo.
commit f797c96845a3fab37cda6839ebecf9ac5401fd6e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Nov 15 12:12:02 2007 -0800
Save pixmap allocation hints into the PixmapRec.
commit 6bc50de02108f822977fc7545da81fce95ea7ff4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 15:03:58 2007 -0500
Simplify system resource range setup.
osRes only existed to get copied into Acc. Waste of effort.
commit e1ff14a9246e12d42ce8ca5afbe3b957333a5620
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 14:45:49 2007 -0500
Delete some dead code in X -configure.
commit 01cfba75229f4b9bf1e4fe80814931acdacde14c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 14:27:03 2007 -0500
Nuke the debugging allocator.
This has never been hooked up in the modular build, and can not possibly
have built since before 6.7. Clearly no one's using it.
commit c67b9c5fc33002b13a2360929a37f24169710f64
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 14:24:36 2007 -0500
Clean up some garbage in driver enumeration.
commit 0706e5e790060fbf046cfaff295b78806b7841c6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 14:15:09 2007 -0500
Eliminate some redundancy in autoconfiguration.
We already synthesize Monitor and Module sections for you, no need to
specify them explicitly in the fake config buffer.
commit 2c01a49bf0a407bd5510bb9ceb4ef86a2cc36be9
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 13:32:59 2007 -0500
Don't sleep(1) at exit on any platform.
commit 83926cb8bef6288b89e801c5e60b3f40e923e16e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 17:41:07 2007 +1030
Xi: Only alloc modifierKeyMap if <slave device>->maxKeysPerModifier > 0
Sometimes (e.g. on my debian ppc box) maxKeysPerModifier of the SD is 0. So we
try to malloc(0), bringing the whole server down with a FatalError because it
looks as if the malloc failed. This is bad, so only alloc if we actually have
something to alloc.
commit 070195dbf88eb121e65f802e023aa37ed1f2c2ac
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 16:27:18 2007 +1030
Xi: fix up sloppy class copying causing segfaults.
commit 53539688cab990a7df1851d64f3ee4e11920a86b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 16:23:48 2007 +1030
dix: SetKeySymMap should alloc the map if dst doesn't have one already.
commit b40646dc104fb03ea7cc0b27fae573aecaab486e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 15:43:44 2007 +1030
dix: Add FreeDeviceClass and FreeFeedbackClass for centralised xfree.
Ensures that we only have one way of freeing a device class to avoid leaks in
ChangeMasterDeviceClasses and other places.
commit 4c9cc82fc4461d180ae2c2fbe50e7f98b0777f91
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Nov 15 01:46:11 2007 -0200
For some reason "-nozap" appeared twice. Weird.
commit 18833d648fd7e1a5e962b93636bbbb38aca9c454
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 12:13:59 2007 +1030
Xi: reset xkb-stuff to NULL after copying (DeepCopyDeviceClasses)
Having two devices point to the same xkb stuff causes SIGABRTs.
Also, don't init a MD's xkbInfo unless the SD has an xkbInfo.
commit 1635832c1635374033686d3a943b77adbd60bb98
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 11:35:07 2007 +1030
Revert "xkb: disable xkb key repeats (temporarily)"
This reverts commit 2b1d946392ce28b96941341778b2b526aa0fb126.
commit b05246696d14bd35aa53b49302707b51206c72a6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 11:31:43 2007 +1030
Xi: free XkbSrvLedInfos as well when freeing an MD's device classes.
commit c758e5a664a52045ad419340044beebb6774a336
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 10:47:20 2007 +1030
dix: Make sure core MDs copy their initial classes before they are used.
Anything in dev->key, dev->valuator etc. of a MD must always be a copy of the
original class. The intial classes of an MD (the ones set up before an SD is
attached) as well, as we may have to restore them if no SD is attached
anymore.
commit a08665d4d3b0a7d567a90bb9bbfe4abafd6f3887
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 10:42:29 2007 +1030
mi: don't call SwitchCoreKeyboard, we switch during event processing now.
commit 64711a094893e83764bbeda538c6e877ebe2af79
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 10:41:34 2007 +1030
Xi: When switching MD classes, make a deep copy instead of pointer flip.
Turns out it's really really hard synchronising device state across multiple
duplicated events if they all share the same struct. So instead of doing so,
when the SD changes deep-copy all it's classes into the MD. The MD then has
the same capabilities, but the state can be set separately. This should fix
xkb, key state, repeat etc. problems.
Updating the device state allows us to remove the SwitchCoreKeyboard from the
event gathering, it's all done during event processing now.
commit 3dde66f96b9b8431381871cf85266da3ec57a0d4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 14 15:10:59 2007 -0500
Start 1.4.99
commit c3897ca7099fc007b4134a8fabd4c707f99f2ac7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 13:55:32 2007 -0500
Add -pogo option for init/teardown performance testing.
commit cecac794451b793871f297b91a11d3b52eeb6d1b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 8 17:25:36 2007 -0500
Don't sleep(1) at server exit.
commit 1603130236c55ddabc3854d4ba62d544debcf1f5
Merge: f207e69 f7dd0c7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 14 13:35:50 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/xace.c
Xext/xace.h
commit f207e69d62bc04c7f254347b03e6d8fa8b569d66
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 14 12:23:29 2007 -0500
xselinux: adjust receive hook to use new synthetic_event class.
commit cc4586df600af571815d5cdda2028c0d074c8469
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 14 14:27:52 2007 +1030
Xi: toggle the public.devPrivate as well when switching device classes.
The master needs to have the same devPrivate as the slave, in case a client
issues a request that goes down to the driver.
Example: if a driver wants to ring the keyboard bell, it'll pick a keyboard.
The KeyClassPtr will direct it to the matching method in the driver, but
because the MD doesn't have the devPrivate set the driver segfaults.
Even if all drivers were updated to not dereference the nullpointer, nothing
would actually ever happen.
To avoid this, we flip the master's public.devPrivate to the last SDs
devPrivate.
commit b44c1118f3bab6d5f28fa42e0c322fbaec005012
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 14 14:08:21 2007 +1030
dix: Return Success from ProcBell if no BellProc is set.
We must not return BadDevice, this causes applications to crash. If no
BellProc is set, just quietly do nothing and report a Success.
commit 240b10fa9c32510a380a73a8acdd8267c81e538b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 14 12:18:08 2007 +1030
Xi: Move updating the device state from POE into separate function.
POE now only deals with processing the event and calling the appropriate
delivery methods. Actually modifying the device state is done in
UpdateDeviceState. This separation should make it easier to avoid setting the
state twice when master events are processed.
commit 0bdfeb55fc559ffe0334df69ba6e9e711b26dc18
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 17:31:20 2007 +1030
Xi: remove RegisterPairingClient handling. Deprecated with device hierarchy.
commit e96d926d64f7fb63f6bf2aa0ea0a8440a188947b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 17:14:35 2007 +1030
Xi: remove trailing whitespaces.
commit 5031238aad2b6b7511aab0f9d15edfbdd2b4cce7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 16:58:23 2007 +1030
dix: remove trailing/wrong whitespaces from devices.c and events.c
commit c703849e79391bb1bb01a994bb8d5cf2eb64e48b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 16:50:18 2007 +1030
dix: Attach spriteInfoRec to same memory block as the DeviceIntRec.
No need to alloc a separate one, we never do anything special with it anyway.
commit 51239f87ce42ad564ceee1761980391947294511
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 11:26:16 2007 +1030
dix: Send MappingNotify when keyboard maps change.
If a slave device is attached to a master device, then we need to send a
mapping notify to the client.
Mapping notify needs to be sent if
- different slave device but on same master
- different master
This gives you funny behaviour with the ClientPointer. When a
MappingNotify is sent to the client, the client usually responds with a
GetKeyboardMapping. This will retrieve the ClientPointer's keyboard mapping,
regardless of which keyboard sent the last mapping notify request. So
depending on the CP setting, your keyboard may change layout in each app...
commit 2b1d946392ce28b96941341778b2b526aa0fb126
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 09:51:33 2007 +1030
xkb: disable xkb key repeats (temporarily)
Haven't quite figured out yet how to make these repeats work. Because we share
the class between devices, the key state is already set when we process the
master device's event, causing a repeat on each event.
commit f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Nov 12 15:11:03 2007 +0100
Only clear crtc of output if it is the one we're actually working on.
Upon recreation of the RandR internal data structures in RRCrtcNotify() the
crtc of an output could be NULLed if the crtc was shared (cloned) between two
outputs and one of them got another crtc assigned.
commit 70b4087c4dd1904d9d655f4afb9dfcea4f137f7a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 12 13:10:39 2007 +1030
dix: don't unconditionally update valuators during key events.
Master may not have valuators, device may not have valuators.
commit 23365d28651f7942fdafb889bcbbd019470a4274
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 12 13:08:38 2007 +1030
dix: allow grab modifier device to be NULL.
This can happen if we check for a passive core grab and our device is a
floating slave device. Doesn't really change anything as SDs can't send core
events but it stops the server from segfaulting.
commit 5a7a65a3c978a65e8ff39d0cc9878527ec42adc9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 12 12:37:39 2007 +1030
mi: avoid SIGABRT by setting master_event to NULL.
commit a05f43bf3e9629df98e93c366d4327f20ed81e6c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 12 11:35:18 2007 +1030
dix: When the last slave is removed, set master to the original classes.
DeviceClassesChangedEvent is sent to the client, where device == new slave.
commit 45f884d79c0eebaa1eb24d7db76c1177f6b710c9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Nov 9 14:45:27 2007 -0500
xselinux: add new synthetic_event security class, and fix registry code.
commit b092856baba5bd43b23950f23236b5cc3ce78c1e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Nov 9 14:45:02 2007 -0500
registry: Register XC-SECURITY extension protocol names.
commit 7a81bafc9bc7048560b17483e6addf58469a05d0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 9 23:10:24 2007 +1030
Xi, dix: Add ability to change MD classes + send event when doing so.
Each time a different slave device sends through a master, an
DeviceClassesChangedEvent is enqueued. When this event is processed, all
classes of the matching master device are changed, and the event is sent to
the clients.
Next time the master is queried, it thus shows the evclasses of the last slave
device. The original classes are stored in the devPrivates.
TODO: if all slave devices are removed, the master's original classes need to
be restored.
commit c0a05805783ee3d38fbcc0fb45f4aa3c511785f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 9 23:07:10 2007 +1030
Xext: add simple macro to easily check a generic event's type.
commit f48087b6c33c1f84bf2cfc0744b1c38697321c07
Author: Kristian Høgsberg <krh@temari.boston.redhat.com>
Date: Fri Nov 9 05:49:26 2007 -0500
Regenerate GLX dispatch code for recent gl_API.xml changes (#12935).
commit f2a3728868376a3646832d4af3a29549ce0b8f5d
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 18:49:05 2007 -0800
Patch to rootless code that should fix many crashes. Credit to Ken Thomases
at CodeWeavers for the patch. From his description:
Fix a display bug with the X server. The Generic Rootless extension
installs overrides for certain GC (graphics context) operations. Within
these overrides, they temporarily uninstall themselves, perform their work,
and then reinstall themselves. Except sometimes they would return early
and wouldn't reinstall themselves when they should. Now they do in all cases.
Fix a bug in RootlessCopyWindow where early returns could leave the screen's
dispatch table entry for CopyWindow unwrapped. We think that this is
another case (hopefully the last) of the rootless drawing bug.
commit 338c1aedbdf3964e542947140f7c50d58542cf12
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 03:56:44 2007 -0800
formatting fixes
commit bd269d0d783d418ef99363478fdf849fd89eed76
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 03:55:08 2007 -0800
Fix for off-by-one error in menu bar height calculation -- props to Nicholas Riley!
commit b4d14484056e6f4a7374fc1acf3f223be4bd116f
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 03:10:52 2007 -0800
Undo some last-minute breakage in xpr.h
commit 05d5b9baa05a4ba14a4383d8a981bc327d99290c
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 02:28:49 2007 -0800
removed debugging output
commit 9a8abcfa6d6d0cdc17be02a3443a7e116eb07d07
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 02:22:39 2007 -0800
Fixed focus problem (clicking on an X11 window that sits behind
an Aqua window would not always bring it to the top of the stack.
commit b34d2ffc38002f7c4980c138f57e9a828cd79c37
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 01:56:37 2007 -0800
formatting changes.
commit 50dac9b2cb3b40810fb79253adc0265a838a497b
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 01:35:48 2007 -0800
Fixed Spaces issue, correctly -- dragging an X window from one
Space to another in Expose mode now works.
commit ce7cfbe261b7fd4fcd09d1a4a61344d1555a71f2
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 20:10:51 2007 -0800
Fixed check to refer to DarwinApp, not all Darwin targets
commit d68bd5510437c1fd3850e020f7cd90901fae8e1b
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 20:08:49 2007 -0800
fixing GLX in Xquartz
commit a6ac9002956767fefa37aac95513e21ac5246d15
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Mon Nov 5 20:25:10 2007 -0800
formatting cleanup
commit 67e96be13cdb45be31db121ce216295cd9496d20
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Mon Nov 5 20:01:34 2007 -0800
Fixed logic error that prevent JIS (Japanese) keyboard layouts from
being detected.
commit 154fb6417e5d0bae5191984beac5ce045ce754bb
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Nov 3 05:34:19 2007 -0700
Initial support for Spaces -- if you use Expose to drag an X11
window to another Space, it will work correctly (as opposed
to just leaving a ghost window). We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
commit 5bbc468b702f62d7c91d41aabcc27eeb553f6959
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 9 11:33:27 2007 +1030
dix: grabbing an attached SD sets it floating for the duration of the grab.
commit 676b26ca3e9b142cf007af3f439aa1993f2247c4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 17:54:17 2007 +1030
Xi: notify the clients when the device hierarchy has been changed.
commit cb75f09146a3c17b1a67b636bbf7229c65c83b35
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 9 11:29:18 2007 +1030
dix: calloc root window's Generic Event mask, stops segfaults.
commit 169f83e366f678ac5441ad21beb84c9b8c65d28e
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 19:14:10 2007 -0800
Disable deferred updates in xp_init to fix performance problems
-- thanks to Eric Gouriou for pointing out the issue
commit 1c6cb353f77747c101ce47716ff1fa055fbf85a4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Nov 8 16:46:49 2007 -0500
Restore the XC-SECURITY option in configure.ac, but disabled by default.
commit 9d03cad1446c27b397c198cf6247e71e46bc9e6d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Nov 8 16:41:47 2007 -0500
Remove SecurityPolicy file and associated references in the manpages.
commit 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Nov 8 16:32:42 2007 -0500
Rework of the XC-SECURITY extension. The gen-auth protocol has not changed,
but the XC-QUERY-SECURITY-1 authorization method and the SecurityPolicy
configuration file have been removed. The semantics of the trusted vs.
untrusted split have been changed. This will be documented in a future
commit.
commit 476a9d85f819f454a6901ccb7eb028d1c563c341
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Nov 8 09:11:05 2007 +0100
Xephyr: do not AM_CONDITIONAL inside a shell if branch
commit 59b304d8a24fecd094296feb217823f0c73d6f82
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 15:44:18 2007 +1030
dix, mi: stop segfaults when a floating device emits events.
For pointers: don't try to set master->valuator fields if there is no master.
For keyboards: check if device is valid before trying to access the fields in
miPointerGetScreen (btw. this disables DGA events for floating keyboards).
Also stop the hideous number of ErrorFs if we request the paired device for a
floating dev.
commit 3063f0c6679bdbea13f360cff8d09a88b9871da9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 11:51:03 2007 +1030
mi: change the device id to the master devices' when duplicating the event.
Move the event duplication into a CopyGetMasterEvent(), makes the code a bit
better to read.
commit 0e9ef65fa583bf2393dd0fda82df6f092387b425
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Nov 7 16:33:10 2007 -0800
Don't frob timers unless SmartSchedule is running
commit 180220f284823c486e7001ef00f1279dc548c9c7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 10:00:35 2007 +1030
Xi: return BadDevice for slave devices on ProcXSetClientPointer
Also clean up to return error codes instead of sending the error manually.
commit 184a7b8917a15bb2c719153b9b016c03aab42101
Merge: a8808ac 0b72905
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 09:34:35 2007 +1030
Merge branch 'mpx' into mdsd
Conflicts:
Xi/opendev.c
commit e94ab0b502160376d1956345196f7e1c7e2e886f
Merge: 26e1fc7 9bee1c6
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Nov 7 19:04:24 2007 +0100
sync with 'master'
commit 9bee1c6912817f65bbb8cf4078f0ad016d9d51cb
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Nov 7 18:56:45 2007 +0100
EXA: Disable problematic optimization of dest pixmap migration by default.
Also add some code comments about these optimizations.
commit 26e1fc7b42de850d69fba89703ffddd36480b997
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Nov 7 18:48:23 2007 +0100
Xephyr: don't use Xv or GL when those are disabled.
commit 950f9995d11aff2c51139b34fb27eba594f2bd20
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Nov 7 18:43:16 2007 +0100
Xnest: fix lib dependancy to make libtool happy
This fixes an undefined symbol error happening when compiling
the server with the --disable-xv configure switch.
Basically, xnest was linking against
@XSERVER_LIBS@ and @XNEST_LIBS@ and the order of the libraries
given to the linker at the end of the process was bogus.
* configure.ac: make XNEST_LIBS contain the $XSERVER_LIBS re-ordered
in such a way that the linker finds the symbols of all the libs contained
in $XNEST_LIBS.
* hw/xnest/Makefile.am: don't link against @XSERVER_LIBS@ anymore because
XNEST_LIBS contains the right thing.
commit 0b729051c04da7068f1e6dd319190bd0a362b2c0
Merge: b7ee005 d7c5e8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 7 15:37:23 2007 +1030
Merge branch 'master' into mpx
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
commit e717409bae355df9a617a226f12fbb8c54ae77e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 21:36:13 2007 +0000
DIX/getevents: Document GetMaximumEventsNum() a little better
Note that the number returned by GMEN can _never_ change, and be a little more
explicit about the figure for repeats.
commit 66fe554a59bb7de37354b618945cd5f30d78250d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 18:57:09 2007 +0000
COPYING: Collapse 'canonical license' into one statement
For a few of us, the license statement is identical, and the only variant is
the copyright. For these, aggregate the copyrights, and only list the license
once. Put this at the top, and note that this is more or less our agreed
canonical license.
commit fda832772b3e630037bf1b822534996154a50861
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 15:05:06 2007 +0000
.gitignore: Ignore build directories
Ignore directories people might use for building.
commit 512bac25ec0e980968b93a2ebe88bd89bf99b697
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 14:52:03 2007 +0000
DIX: XKB: Set xkbInfo to NULL as well as freeing it (bug #10639)
XkbRemoveResourceClient wants to access xkbInfo if it exists, so make
sure we NULL it after freeing it. It doesn't make much sense to move
the RemoveResourceClient call first, as there's not much point in
notifying clients while we're shutting the server down anyway.
commit a8808ac3d093f33b39de109107d396fe0a02c4fc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 7 11:42:58 2007 +1030
Xi: don't call CheckMotion for slave devices.
This essentially disables enter/leave for slave devices, but re-enables them
for master devices. Which is a good thing after all.
commit 15944b8f02752eedd61be34a6a29dd6b82a0ac97
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 7 11:33:24 2007 +1030
mi: duplicate event before processing it, so master has original values
Event values may get changed in the event processing stage, so we need to
duplicate it to pump different events through for slave and master device.
commit d7c5e8bfc1aecbd23a4cbb2eab08656587aac2e8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 6 16:26:09 2007 -0500
Modified performance patches from Arjan van de Ven <arjan@infradead.org>
Subject: [PATCH] fix some performance gaps in Xace
The XaceHook function is used in several hotpaths.
The problem with it (performance wise) is twofold:
* The XaceHook function has a big switch() statement for the hook number in it
* The XaceHook function uses varargs to reassemble the final dispatch arguments again
Both are expensive operations... for something that is known at compile time
This patch turns the hotpath XaceHook call into a direct call to avoid
the switch and varargs; this gives me over 10% performance gain
on the x11perf benchmark.
commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500
Merge: 868e303 ddce48e
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Nov 6 16:25:40 2007 +0100
resync with 'master'
commit 868e303630d8b84070c2f1fd8d6da2cef045b029
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Nov 6 16:24:46 2007 +0100
Xephyr: fix a crash when using xrandr twice
* hw/kdrive/ephyr/ephyr.c:
(ephyrScreenFini): don't forget to
free shadowfb data (if necessary) upon server is reset.
commit ddce48ede036f3996f8e584b0012c396c5df42fb
Author: Elvis Pranskevichus <el@prans.net>
Date: Tue Nov 6 09:40:14 2007 +0000
Config: D-Bus: Fix dbus_bus_request_name failure check
The code in connect_hook incorrectly checks for dbus_bus_request_name failure.
The dbus_bus_request_name error indicator is -1, not 0. This leads
to subsequent assertion failure in libdbus.
commit a52c9b2a59f27266557ff9d5d2c08492e04135a6
Merge: c7e18be 5833289
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 5 19:08:36 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
commit 58332894c061ae96d6a457f65266660f5f65e88b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 5 17:17:25 2007 -0500
Export the server ABI versions from xorg-server.pc
commit c7e18beb3c87eb1ada9b21c4ffacd11c1939c087
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 5 15:01:13 2007 -0500
xselinux: Register SELinux extension protocol names.
commit 632c33c5c18b3e091c4fce98280af4d583e99640
Merge: 4113f04 dda10c9
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Nov 5 17:52:33 2007 +0100
pull 'master'
commit 4113f040c587fc536adc693d7ee5a4c0a60b75d4
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Nov 5 17:33:01 2007 +0100
GL: fix crash at mesa destruction time
* GL/glx/glxglcore.c:
(_glXMesaScreenDestroy): delete the same amount of visuals
that those which were created in createMesaVisuals().
commit dda10c9066a660b647384179f82e1da8e063264f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 16:28:35 2007 +0000
Remove all traces of external RGB database (and Speedo)
Remove all references to an external RGB database (which hasn't been enabled
for a very long time). Also get rid of some references to Speedo fonts.
commit 6ff79ea5f7d3ff0c3b14e39849514784ccd40190
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Nov 5 16:46:49 2007 +0100
Xephyr: fix some DRI build breakage
commit 5e363500c86042c394595e1a6633581eb8fcd1bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:38:28 2007 +0000
OS: Remove ALLOCATE_LOCAL from os.h
Remove ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK from os.h, and
remove the include of Xalloca.h as well.
commit 83e5d9e75d0fa1135e2c9d8b59caee98c3291681
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:36:54 2007 +0000
DIX: Remove last alloca call
Replace with heap allocations.
commit 1179ddea94efae6606162e9a1b0f2bf752ae4dd0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:36:36 2007 +0000
EXA: Remove usage of alloca
Replace with heap allocations.
commit 1eb6a1d0d2817cd0ce96fb27db3ceb2d0ff024af
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:18:35 2007 +0000
XTrap: Remove usage of alloca
Replace with xalloc/xfree.
commit 934281126f6c602fa4bd0c2e29d8c9f44fe532b8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:18:22 2007 +0000
Xext: Remove usage of alloca
Replace with heap allocations.
commit fb32bb9839b615f7297fbfac2050bc216682f01c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:17:54 2007 +0000
Xi: Remove usage of alloca
Replace with xalloc/xfree.
commit 683ee1776d172035c465aa8fc84ccd53bb8ba7fd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:14:25 2007 +0000
afb: Remove usage of alloca
Replace with heap allocations.
commit ca75261beedc3e00767b3812a81b7dac4437f4a1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:14:04 2007 +0000
cfb: Remove usage of alloca
Replace with xalloc/xfree.
commit 914922fd6100a409a3dfd1c64511ed6bdc344bef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:12:59 2007 +0000
DIX: Remove usage of alloca
Replace with heap allocations.
commit 3b77689266e729411229ec83d2a90578ebc1d82f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:12:34 2007 +0000
EXA: Remove usage of alloca
Replace with heap allocations.
commit 34cdf06e4ccb243664005cc33009d8759a7f6e4d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:12:22 2007 +0000
fb: Remove usage of alloca
Replace with heap storage.
commit 733d42065f2c24505b3874ce51c18f6063c2b67e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:11:59 2007 +0000
XFree86: Remove usage of alloca
Replace with heap allocations.
commit caf545063457591f88e1f7bcd25dbd0342f44343
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:10:55 2007 +0000
KDrive: Remove usage of alloca
Replace with heap allocations.
commit d57060f16714f5667722001bd1a4500059dd59e1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:10:21 2007 +0000
DMX: Remove usage of alloca
Replace with heap allocations.
commit def6f74f2d7342f85f3df2053e0b9c1ac483b51d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:10:03 2007 +0000
Xvfb: Remove usage of alloca
Replace with heap allocations
commit 259f4c36d581896ce605741b9e557a589013a9b8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:09:49 2007 +0000
Xprint: Remove usage of alloca
Replace with heap-based allocations.
commit 1c84337af0ac40498a53aa36289e2f6f5ff8b1c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:09:32 2007 +0000
Xwin: Remove usage of alloca
Replace with heap allocations.
commit f7d5c292e44113ea8eb32e67e91cd02e520df5e3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:09:14 2007 +0000
mfb: Remove usage of alloca
Replace with heap-based allocations.
commit be9ee17f960cc3d8a8f999cab1579e83d9aea520
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:08:51 2007 +0000
mi: Remove usage of alloca
Replace with heap allocations.
commit 3633ae6efb57c5405c26e8ae132b9371e5f920de
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:04:27 2007 +0000
Damage: Remove usage of alloca
Replace with heap allocations.
commit 2761c103311a1160bc483fd0367d654733df8598
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:03:26 2007 +0000
OS: Remove usage of alloca
Replace with heap allocations.
commit 2d738efb959912d8a89864e41190e0064fa77906
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:01:11 2007 +0000
RandR: Remove usage of alloca
Replace with heap allocations.
commit 3c1d2fdeff0ed61d86fa7d35cb0a61535d9b2816
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:00:40 2007 +0000
Record: Remove usage of alloca
Replace with xalloc/xfree.
commit e0491f470e130147191388168e878e3a7348afaf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 13:59:51 2007 +0000
Render: Remove usage of alloca
Replace it with heap-based allocations.
commit 59774af86b851c7fb8989cef6c013522549000b8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 13:59:15 2007 +0000
XKB: Remove usage of alloca
alloca has no way to return failure, and instead can possibly arbitrarily
overflow the stack. Let's avoid that one.
commit 6e4f5cf83f35ffebb51633ab30b1826e63e37223
Author: Ben Byer <bbyer@bbyer.local>
Date: Mon Nov 5 05:53:34 2007 -0800
changing ALLOCATE_LOCAL to xalloc to prevent stack overflow
commit b1764ddf133cfdf979db62ee2491124a4798b55b
Author: Ben Byer <bbyer@bbyer.local>
Date: Mon Nov 5 05:44:54 2007 -0800
pulling more patches over from xorg-xserver-1.2-apple branch
commit 10fde62fc88302f7d3b2546239b1679be249567c
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 18:59:41 2007 -0800
more CVS tags
commit 27ecb89250398f45564fe454e20bfdd66f62c8e4
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 18:53:41 2007 -0800
Removed CVS tags.
commit f2e310132fbe1520c1b5f3da4faa2d2d47835e72
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Oct 31 14:15:35 2007 -0700
Add CreatePixmap allocation hints.
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
commit 3f1b6765aadf665ede8253464da19a5878f16e56
Author: Markku Vire <markku.vire@movial.fi>
Date: Thu Nov 1 22:43:04 2007 +0200
Config: HAL: Touchpads are pointers too
Treat touchpads -- not just mice -- as pointer devices.
commit 41c3069f7cf28155f8e6cfe0c10a12a1f5f76c7d
Author: Mark Vytlacil <mrv@wi.rr.com>
Date: Thu Nov 1 21:05:43 2007 +0200
XFree86: Input: Save/restore errno around SIGIO (bug #10683)
Make sure errno is saved and restored from the SIGIO handler, so errors
from system calls in input handlers don't break the interrupted code.
commit ff9929ed48f2dec8b536d348e25e66a0bc4ac1a6
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 05:13:19 2007 -0800
pulling in changes from xorg-server-1.2-apple branch
commit 181468db92d44a58080fc9a76e46dfc7011bf9f1
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 04:50:26 2007 -0800
add missing null-pointer checks
commit 4d0f35c81df307609b29c0f12aa1b4c6ee6fd8d2
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 2 19:27:32 2007 +0100
Always duplicate mode name when duplicating a mode.
If the originating mode didn't have a name, we would end up with the name of
the original mode being setup correctly, but with the name of the copy still
being NULL.
commit dfb1cce28ac07d412598f7b9ab2ee908978b38e7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 2 12:51:56 2007 -0400
Restore build of xf8_16bpp.
It doesn't link against cfb, so don't conditionalize its build against cfb.
commit 7a0555e9bb59d02816803a1100f807d2d29f31d4
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Fix crash in xf86InitOrigins()
In a multihead setup, if only the first screen can be
initialized, but the second screen is mentioned first in the
ServerLayout section, the xf86InitOrigins() function will crash
because the screen referred to in the e.g. "RightOf" part is
non-existent.
commit 5b41d4e60be35cfb96bedec0931fd5922823b4b9
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Don't filter modes away during VBE mode list construction.
Pass all VBE modes back up to the driver, on the assumption that it
knows how to filter modes intelligently.
commit c095da04fe7c73b6503ef5b93549b13796c51b22
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Fix magic number in fbdevhw
The transformation between fbdev and xfree86 mode timings needs to be
invertible, otherwise Xen and other framebuffers that don't have real
pixel clocks won't initialize.
commit f4fe66f6767d1941317dc0280ac359421a152587
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Disable explicit commenting in Monitor section.
commit 22f0e3a8b04e574047a51c8f928a007787303294
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Avoid PS/2 protocol probing for /dev/input/mice
The kernel will always upconvert to ExplorerPS/2 for all readers of
/dev/input/mice, so don't waste time on startup trying to figure
that out.
commit b97518666dc32710fe69eee33ee56881dcff1bbc
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Fix accidental ABI usage in RANDR 1.2 drivers.
Due to RANDR 1.2, xf86findOptionValue and xf86nameCompare are now ABI.
Make sure they're exported from the server.
commit f01e149d1af14ef9ee0e8a6743ab6a08f3bb677c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 1 15:41:11 2007 -0400
Move SIGUSR1 notification as late as possible.
If we inherited a signal mask from the parent process that ignores SIGUSR1,
then we will send SIGUSR1 to the parent to indicate when we're ready to
accept connections. Unfortunately, we send this notification way too
early, right after creating the sockets rather than just before entering
the main loop.
Move it to just before Dispatch() so we're not lying quite so much.
commit a2ee5fe0c4e863c7ff4f644e5ac86f2793903103
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 1 13:46:20 2007 -0400
Enable MIT-SHM in Xdmx.
The extension is entirely DIX-level, no new DDX changes needed.
commit 2338d5c9914e2a43c3a4f7ee0f4355ad0a1ad9e7
Author: Arjan van de Ven <arjan@linux.intel.com>
Date: Sun Oct 28 09:37:52 2007 +0100
reduce wakeups from smart scheduler
The smart scheduler itimer currently always fires after each request
(which in turn causes the CPU to wake out of idle, burning precious
power). Rather than doing this, just stop the timer before going into
the select() portion of the WaitFor loop. It's a cheap system call, and
it will only get called if there's no more commands batched up from the
active fd.
This change also allows some of the functions to be simplified;
setitimer() will only fail if it's passed invalid data, and we don't do
that... so make it void and remove all the conditional code that deals
with failure.
The change also allows us to remove a few variables that were used for
housekeeping between the signal handler and the main loop.
Signed-off-by: Keith Packard <keithp@koto.keithp.com>
commit 692654b4300e61a9481e6fa588bcb44a3c3ca150
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Oct 29 18:13:58 2007 -0400
Set up visuals for the existing X visuals.
This makes the root visual a GLX capable visual again and adds a GLX visual
for the COMPOSITE ARGB visual cleanly (as opposed to the hack we had before).
commit a5546a99ac4da61aee0d49c55bcb38bbce9a96aa
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Oct 29 18:06:41 2007 -0400
Change the GLX module to initialize after COMPOSITE.
This changes the module initalization order so that the GLX module initializes
after COMPOSITE. The reason for this change is to be able to initialize a
GLX visual config for the COMPOSITE ARGB visual.
commit 8ead41388e36e21eea6fa0408c847f174911eab0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:57:00 2007 +0930
xfree86: wrap keyboard devices for XKB.
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.
Note that the VCK is still not wrapped, so core events will bypass XKB.
(cherry picked from commit d627061b48ae06d27b37be209d67a3f4f2388dd3)
commit e717cf08e99746761d74289c426bbd84176f4435
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:32:47 2007 +0300
XKB: Cope with all events in XkbProcessKeyboardEvent
Cope with Xi and pointer events in the (now increasingly misnamed)
XkbProcessKeyboardEvent. If it's the wrong type, call through the wrapping
chain to get out; else, process it.
commit 9db8846fa53d91193bbfe541b244e2326440011d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:31:39 2007 +0300
XKB: Don't update indicators on all devices, add missing include file
Don't get XkbUpdateIndicators to update the indicators on all our devices: we
already deal with that ourselves.
Add exevents.h include to get more (proto)types.
commit ee3aa948eb8ed181d037294ed87df6ceec81684e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 18:04:59 2007 +0930
xkb: Unwrap properly in ProcessPointerEvent.
Instead of hardcoding CoreProcessPointerEvent, actually try to unwrap properly
and then call the unwrapped processInputProc. Seems to be a better idea,
especially since it makes stuff actually work...
(cherry picked from commit 8f9bf927e1beecf9b9ec8877131ec12c765e4d84)
commit d3588a0aee33fbd233082f881c0d37152c6d4d8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 11:44:03 2007 +0930
xkb: xkbHandleActions: let wrapping take care of event delivery.
This is hopefully better than hardcodey calling CoreProcessPointerEvent.
(cherry picked from commit 32d0440c7f6e604807cb14dd32349df6f22c903b)
commit 352c5a311200bf491153fe9ef16126c5877a57bb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 17:40:11 2007 +0930
dix: don't compress motion events from different devices (EventEnqueue)
(cherry picked from commit 8840829ab93c4eb62eb58753c015da5307133fe5)
commit 8d3d027062c105b50863dce43b8070ec560bc12e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:52:02 2007 +0930
dix: add XI event support to FixKeyState.
FixKeyState needs to be able to handle XI events, otherwise we get "impossible
keyboard events" on server zaps and other special key combos.
(cherry picked from commit 5ee409794ee604fcf84886f70429fc2d6b1ff4f1)
commit 99e826e867c1c5520153c539ba07a884aec88d0c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:49:57 2007 +0930
xkb: enable XI event processing for xkb.
XI events can now take the same processing paths as core events, and should do
the correct state changes etc.
There's some cases where XKB will use KeyPress as type for an event to be
delivered to the client. Stuck warnings in, not sure what the correct solution
is yet.
(cherry picked from commit 6334d4e7be18de5f237c12a6dc20f75aa23477d0 with some
additional compile fixes and non-MPX adaptations)
commit 91077bfc50d54be37c217e377c55b6bf886a2fab
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 18:24:30 2007 +0930
Save processInputProc before wrapping it and restore it later, instead of
using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to
process DeviceKeyEvents after the first key press.
This should be the correct fix now.
(cherry picked from commit 4d5df14f2c4a3108a8c8adfcf4766c0d1a9daad2)
commit 8b9481a113b56078191e2298bf590905978f6289
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Sep 4 17:44:51 2007 +0930
xkb: Store the action filters per device in the XkbSrvInfoRec.
Using a global array for action filters is bad. If two keyboard hit a modifier
at the same time, releaseing the first one will deactivate the filter and
thus the second keyboard can never release the modifier again.
(cherry picked from commit bfe6b4d2d9952a80f8dbc63eec974ef894e5c226)
commit 493b83bd097372ae0023da9919da83af39e3fc1c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:33:52 2007 +0300
XFree86: Remove ridiculous SIGIO debugging
YOU PRESSED A KEY
AND AGAIN
YOU RELEASED A KEY
AND AGAIN
YOU PRESSED A KEY
AND AGAIN
... not so much.
commit a3d48de5f2b7eacf3193c60f0fb461912201210b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:35:31 2007 +0300
XKB: Add more bits to xkbsrv.h
Add the device private index, given we use that in a macro here, and also the
prototype for xkbUnwrapProc, since that's also useful.
commit e29e69960d67aa4b7a4d1551af509dbac193f438
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:34:22 2007 +0300
Xi: Include XI protocol header in exevents.h
Make sure we have all the types we need to use this header.
commit df57ae1639ba4f1719883c5bf868394e4748a022
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 28 15:46:26 2007 +0200
configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate
Don't build XF86Misc or XF86Vidmode in hw/xfree86/dixmod when it's been
explicitly disabled in configure, or we don't have the proto modules
installed.
commit 3b7af72fe315c7c26c89838c0c5dacbe58765d0f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 26 20:32:10 2007 -0400
xselinux: Add a SetDeviceContext request and stubs for more requests.
commit 2251572062b2c25643671b8d5070de1c3f7ae976
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Oct 26 15:13:50 2007 -0700
Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs.
commit 497aba894904b08b15bb19916e2a163f96212a7d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 26 11:25:57 2007 -0400
Weed out some unused fluff from __GLXcontext.
commit 0e749ceab421d72b48e18292c5ca0e337baf5ce8
Author: Bernardo Innocenti <bernie@codewiz.org>
Date: Sat Oct 20 20:31:57 2007 -0400
Include stddef.h for size_t.
This is required by a buggy version of the openssl/sha.h header
which is distributed with Fedora 7.
commit 80d8a3e1767609a92b0b85a7e92cea5f0748038a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 26 10:19:57 2007 -0400
Quiet glx visual debug info.
commit 27b13eeb56a5cbac00b381309604505002e77228
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Oct 26 13:15:07 2007 +0200
Nuke superfluous ",", added missing include for xf86i2c.h.
commit 6d59bb5709a99ab60b482bbf3393ebffda7f9407
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 26 09:12:15 2007 +0300
XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs
When we're building with --enable-debug, don't emit an ErrorF every time a
function gets called.
commit 5f9095f0d29bac0190d82c87a09cf32d6a34c17c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 19:02:03 2007 -0400
registry: Remove synthetic bit from event types in lookup function.
commit 8c6923018c7d71cd15d9cf4ef9e8528ef5ec7c2e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 19:01:29 2007 -0400
xace: Add a "manage" access check when setting the Redirect event bits.
commit 7d14ca59c5b942c09feaa2429c394cde9d8d3fd1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 19:00:50 2007 -0400
xselinux: Don't include the client in the receive hook audit messages.
commit f62277d421023b3150d3a1accb00a8206ab2bde3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 25 18:48:39 2007 -0400
Clean up unused pVisual part of __GLXcontext.
commit 30bcaa966d6b00f1630609a78db18dee683cc43d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 25 18:48:06 2007 -0400
Make glx destroy path handle cases where the X window goes away first.
commit 40de9fcf18930811dd5ae355c83275af887a9f83
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 12:35:01 2007 -0400
xselinux: Label the default device directly with the process context.
commit b633d54b94d746d26e13014634d9f63bbb7e8f7d
Merge: 4b05f19 48ca596
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 12:19:30 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
commit 242f56f722243938e908d1957781ee53c2999783
Author: Naoki Hamada <nao@tom-yam.or.jp>
Date: Thu Oct 25 18:45:50 2007 +0300
Input: Fix key down test (bug #12858)
Fix the botched previous key_is_down test, which would give false positives.
Also move key_autorepeats to a separate inline function.
commit 4b05f19cb9e42d8c8eff5ca4e463f5bc2a05433d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 24 19:59:58 2007 -0400
xselinux: Introduce a type transition when labeling events.
commit 0d2ef187e77b12713d2a9661932fa01dba58a945
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 24 18:23:31 2007 -0400
xselinux: Add audit message fields for selection and event names.
commit 48ca5961caee62f2980017a6bdc96a1b4c747727
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Oct 24 20:31:51 2007 +0200
Prefer configured DisplaySize to probed DDC data, if available.
Based on patch by Hong Liu <hong.liu@intel.com>.
commit 0388a59a6ef212c497cc3f64d677b1ca5b410982
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 20:59:21 2007 -0400
Revert "registry: special case minor number when looking up core requests."
This reverts commit 31110d6837ee52fd654729d9e5c4b0c5395abab0.
This is handled properly by StandardMinorOpcode().
commit 46521f529841e032e198e5df87974088548a68de
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 20:58:48 2007 -0400
xselinux: Add basic support for selection access control and redirection.
Probably not fully baked yet. It's difficult to test since so few apps
actually follow the ICCCM with respect to cut & paste.
commit b7ee005d327372c1e414ee6c526f9f7aee14bc86
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 24 10:26:12 2007 +0930
dix: Don't interfere grabs the interfering device is of different type.
A pointer device should be able to send events while the client has a core
grab on a keyboard device, and likewise.
commit 02508614b9f882ba1559fb4581dcf812118fdf89
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 24 10:09:18 2007 +0930
dix: check for core passive grabs on inferiors when replaying events.
commit 825f09dffd94cfcd0562a01c5181998503851461
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 17:12:57 2007 -0400
xace: Still more changes to selection code. Removed the SelectionPtr from
the hook - the hook only needs the Atom to control access to the selection
object. Upgraded the SelectionCallback to take a client argument and
additional type codes so that it can be used for redirection.
commit 660557593ea961948722298ea8ffba83891c9914
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 14:46:37 2007 -0400
xselinux: Remove synthetic bit when looking up event type.
commit d7db549db41a27aef28cff9bfb7973bc741f88b2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 14:08:54 2007 -0400
xselinux: Unregister callbacks on server reset.
commit 9e0a468af19d8e46330bcff37c9adc5e11d3aee7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 13:35:30 2007 -0400
xace: try to pretend events were sent when a denial occurs.
Probably need to redo the error return paths in these functions
at some point.
commit d502521c3669f3f22b94c39a64ab63bfd92c6a97
Author: Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
Date: Tue Oct 23 16:45:13 2007 +0200
EXA: Fix off-by-one in polyline drawing.
commit a8a148919b84a293e3e7a49409ab833590357edb
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 23 16:23:28 2007 +0200
Superfluous ','.
commit 75f05086d04a90c3dcdcdd31bf79d7033708e3e0
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 23 15:39:23 2007 +0200
Get rid of unnecessary GNU extended variadic macro.
commit 7ef863720dc79107fc2cd17ce684366c87e001a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 23 17:28:03 2007 +0930
dix: Create new sprite for floating devices.
Floating devices get sprites, but still aren't spriteOwners. This prevents
them from getting rendered, and also stops segfaulting.
(not really solving the problems with keyboards though)
commit d808d653d1fc16f1d5af76ab00fa862fb80fa3ba
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Oct 22 21:30:04 2007 -0400
Define PCI_TXT_IDS_DIR more cleanly
commit 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f
Author: Keith Packard <keithp@koto.keithp.com>
Date: Mon Oct 22 13:38:16 2007 -0700
Leave hardware-specified preferred modes alone when user preference exists.
Instead of removing the preference bit marking the hardware declared mode
preference, leave it in place and just move the user preferred mode to the
front of the list while marking it with the USERPREF bit which will cause it
to be selected by the initial mode selection code.
commit fbe19c66c36acfb484809111cf02579a3baf2f0f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Oct 22 18:28:03 2007 +0200
GLX: Fix leak of X pixmaps associated with GLX pixmaps.
commit c6d36b1cee44a9cbb690dff62a4683d7f6fbf30c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Oct 22 18:28:03 2007 +0200
GLX: Don't crash on unused client array members when switching to/from console.
commit be9b0e558d6172ef01ed880d47da897d2ceb25fa
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Oct 21 23:49:14 2007 -0400
Add a note as to why the text file based PCI ID scheme is present at all
commit b79b965bd9a96f79781e85c0428068caa1ba381b
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Oct 21 23:46:54 2007 -0400
Fix compilation issue on FreeBSD (bug #12841)
Hide getline call by checking for glibc. If not, use fgetln instead. Even
though this section is now #ifdef'ed for linux only, this should help make
it more portable if non-linux folks end up wanting it.
commit 7f5e71fa7347fb4ec2657ccc453831c04a0f288d
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Oct 21 23:41:49 2007 -0400
Make PCI text file directory configurable
commit ce7f6fe1268fef4f89aa21c7b44d73ecd98efe24
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 19 19:40:04 2007 -0400
xselinux: properly update sizes when dynamic arrays are resized...
commit 4b14c9a9cd2033d3839c4ba364d41ab4c4b198ab
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 19 16:34:54 2007 -0700
Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.
Not all of the DDX/miext Glyphs hook implementations have been removed, but
they should be.
commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a
Merge: a358b87 7e1cada
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 19 15:44:17 2007 -0700
Merge branch 'master' into glyph-pixmaps
Conflicts:
configure.ac
commit 12e889d202ac9849f534c51167cbfed91c32027a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 19 18:43:38 2007 -0400
xace: Bug fixes, name changes to selection access hooks and fields.
commit 7e1cada6c6b9fa41ef3ead00bf7725d626dda193
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 19 15:16:19 2007 -0700
Disable debian pci-id-list autoconfig code on non-linux.
It contains static paths, fails to build on non-glibc, and apparently just
exists to support distributions managing binary drivers and open-source drivers
together. Also restores previous code for fallback to vesa if nothing is
detected.
commit 89c6108531e603bdc81faf2ea860f318a2e94a39
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 19 16:21:54 2007 -0400
Fix software GL to provide a list of supported fbconfigs like the DRI case.
commit 74e84b8d891632141a60e2d29463ab46f622df3f
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Oct 19 17:28:15 2007 +0200
Only issue XF86_APM_CAPABILITY_CHANGED for video change ACPI events (not e.g. brightness etc.).
commit 6fdf3ddfef2707755cec0fc9cbce354fd472bb52
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Oct 19 17:20:21 2007 +0200
Fix ids of ACPI events according to ACPI spec.
commit d9caa469b9bb4eb6125b890820853062fc2c4441
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 19 15:26:09 2007 +0930
Xi: allow VCP/VCK to be OpenDevice'd as well.
All devices deserve to be equal. Except master devices, they are a bit more
equal than the others.
commit 155e2c559ed0dbf31b6d39d48648a3ee22b37635
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 19 14:37:07 2007 +0930
Xi: advertise as XInput v2 capable
commit 5ba738935f0d786e4670adf3b05ad42fc5e710fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 19 14:36:37 2007 +0930
Xi: remove ChangePointerKeyboardPairing in favour of ChangeDeviceHierarchy.
commit 6dcde0e9c1d068d9fc4a772d29d1d4c6cc57aeb9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Oct 18 12:21:07 2007 +0930
Xi: set master device's id in ListDevices Reply.
commit cfcc6e14b9a15f7979ba0df9c105cf563bef98fa
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 19 11:28:44 2007 +0930
Xi: return all master devices as type IsXPointer/Keyboard when listing devs.
Slave devices are reported as IsXExtensionPointer/Keyboard.
commit 8e3c1dfc48930c455529313a42efa35e3b9071b2
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 18 21:01:51 2007 -0400
Introduce a new "GlxVisuals" option that controls which visuals are added.
Right now we default to "all" which gives us a situation much like before,
but when the "typical" option is implemented, we can change the default and
reduce the number of visuals the GLX module bloats the X server with.
commit 9e3cfd950d279353f1795352ad2c4132aabc1bab
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 18 19:12:24 2007 -0400
Add code to set up GLX visuals and add one for the first double buffered FBConfig.
commit 8fc635e6a8072c7cd2777d804dd6f8eda2eecc15
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 18 15:51:11 2007 -0400
Separate handling of GLX visuals and GLX FBConfigs.
XIDs for GLX visuals and FBConfigs used to be interchangable and the list of
GLX visuals was identical to the list for FBConfigs. This patch splits handling
of these two data types and allows the X server to pick and choose the FBConfigs
that are exposed as visuals.
commit 0af8180683247955ce4cfd48e6a5b4d00bbe618a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Oct 17 17:18:47 2007 -0400
Drop VisualConfigPriv support from the DRI module.
No DDX driver uses this, and this patch stops the DRI module from
poking around GLX module data structures.
commit 7d74690536b64f7b8e8036507ab7790807349c50
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Oct 14 15:39:21 2007 -0400
Simplify and clean up GLX visual initialization.
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
commit ab4bce02a9457dd9c86b774fc74caf3dd6b287ca
Author: Eric Anholt <eric@anholt.net>
Date: Thu Oct 18 15:22:42 2007 -0700
Add a quirk for Philips 107P5 which lacks the preferred bit on detailed timing.
Also fix the prefer-large-75 quirk if the prefer-first-detailed bit was set,
though it's not the case for the existing prefer-large-75 consumer.
commit 55a96aa6b0995fda6660b7e78c85b955a62b9735
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 14:11:11 2007 -0400
xselinux: add basic event labeling.
commit e974bc1233608ec09fbd40b12217925e4d2205aa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 12:33:39 2007 -0400
xselinux: add hooks for send and receive access.
commit 06eb830169afd0631a31e8846c7d2533c49ea378
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 12:31:14 2007 -0400
xace: Fix bug in AddPassiveGrabToList(), was using wrong GrabPtr.
commit 6107a245035366fe762756b6aa05ac0e3a5482bb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 12:24:55 2007 -0400
dix: Add client parameter to AddPassiveGrabsToList().
commit ce50bfd3369686cfecee5a138bd84ef1107a249d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 18 17:44:48 2007 +0200
EXA: Skip empty glyphs.
commit 5d74416740de883b7ef0994afea4bbd4d3901be0
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 18 17:44:14 2007 +0200
EXA: Don't attempt to move in pixmaps that can't be accelerated.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12815 .
commit 31110d6837ee52fd654729d9e5c4b0c5395abab0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 10:30:44 2007 -0400
registry: special case minor number when looking up core requests.
commit e3fd90ae9c3ddfc5d78e62614e311b73505d7ead
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 10:29:10 2007 -0400
registry: Add "X11:" prefix to core protocol names.
commit aa340b2c7cbe9ddab53cff08c8ba165558209187
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 19:27:16 2007 -0400
xselinux: add hook for device acceses.
commit 503f918f55d0cb29585d83b022bbb8dc29f446c5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 19:14:15 2007 -0400
xselinux: Move functions around; add some more comments.
commit 50b27e1ad2a98d36728dc8157492ef5c59c132cd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 16:09:40 2007 -0400
devPrivates rework: update new GL/glxext code.
Need to merge so this type of thing stops happening.
commit c3f7b862550fa8f46633162f83db8c27e46fc672
Merge: af4dde0 feac075
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 15:00:54 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
os/access.c
commit af4dde0ac19ecec1d0ad988eb25b15401e7c6b36
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 14:13:02 2007 -0400
xselinux: Remove config file, this has been moved to the policy.
commit baabae623b3658196b67a710dc72663c2105bf31
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 13:54:56 2007 -0400
xselinux: Started reworking extension using new XACE hooks.
commit db66e66dbf26b91c655f1659859c022cc31f0db6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 13:51:11 2007 -0400
xace: Add an access_mode field to the extension structure.
This allows the same callback to be used for both extension hooks.
commit e3a8cbe523bae8b771ad3c8ad497f4444f6d05d5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 13:48:44 2007 -0400
xace: add creation/labeling hook to CreateRootWindow().
commit feac0759522cbdc3e61ccfa373df735903c5cb27
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Oct 17 11:42:28 2007 +0800
Make config file preferred mode override monitor preferred mode.
Add a new even-more-preferred bit to each mode which is used to make config
file preferences selected instead of the monitor preferred mode.
commit f2da10f7bc2ddb6ad2f18b793afc10d04b97c51c
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Oct 17 10:50:22 2007 +0800
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
commit 9aadde377991bfbd88524d02106bec3dedd6e7c9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 17 12:05:50 2007 +0930
mi: don't call UndisplayCursor for non-sprite-owners.
Segfaults are bad.
commit 8b7c4249d82d07e852d8d8c15c7ab9977dd1f31c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 17 10:41:58 2007 +0930
mi: call processInputProc for master devices after slave event processing.
More work is needed to sort out grabs though.
commit ae9fc10adec8f9bf0492d14d435f8f11e0163b27
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 17 10:41:04 2007 +0930
Xi: don't send core events for slave devices.
commit de70cfdbe60eb6e7bf3e74dfd1ac34de554deff1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 17 09:52:30 2007 +0930
mi: fix some macros to allow multiple cursors for master devices.
Macros defaulted to inputInfo.pointe rfor devices that weren't spriteOwners.
Changed to take the device's master device now.
This includes sticking in a number of checks and warnings that cursor
rendering won't be called for floating devices.
commit 773f6491c1cc8819038e753d08c32ba213f80f8f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 16 19:11:36 2007 -0400
xace: update the DeleteProperty prototype to include the client argument.
This should have been part of 8f23d40068151ad85cde239d07031284f0b2c4dc.
commit 9dde53ed179336c7b483c9a94a97182ad1777dfb
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue Oct 16 19:55:56 2007 +0100
Fix walking of GLX providers.
commit 70a5d33c9e41c077a8cd92abd43376e2956d3aed
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Oct 16 12:46:07 2007 +0200
Always check the return value of __glXGetDrawable first.
Fixes spurious GLX protocol errors because __glXGetDrawable doesn't set the
error code in case of success. Maybe it should, though.
commit 1d9ebbac8c589cae7e4952083692b6d148def9bc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 18:46:12 2007 +0930
dix: Make InitCoreDevices use AllocMasterDevice.
Also change naming a bit, append "pointer" and "keyboard" to master devices
instead of -ptr and -keybd.
commit 299573f4617c3b5599bb65069e96d050277b9471
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 18:40:15 2007 +0930
dix: add AllocMasterDevice for creation of new master devices.
Devices are initiated pretty much the same as the core devices.
commit 5fe9bfd23f17b84c3afaa82f75a7c517c9f8e0d3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 18:23:48 2007 +0930
xfree86: NIDR: don't call PairDevices explicitly.
set isMaster to FALSE explicitly.
Pairing isn't necessary, attachment should be done in EnableDevices.
commit 5eb033835e92ea951cc385fd709af9656b3772d8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 18:03:52 2007 +0930
mi: don't exclude inputInfo.pointer from rendering.
commit b697c4ed145968d3c3281bb85e628f1b068b09fc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 17:47:06 2007 +0930
dix: CheckPassiveGrabOnWindow: only get paired device for non-keyboards.
commit caa69d8f7b92b80669df02e1001409d7c653e7e4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 17:38:13 2007 +0930
dix: fix detritus from adding lastSlave field.
commit 90d077e537ac4cb7d79d67afcf3984a3e8d65fe8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 17:37:33 2007 +0930
dix: GetPointerEvents: get state from master device before applying valuators.
We need to get lastx/y from the master device before we start applying
acceleration etc. Otherwise we get jumping cursors, which is reasonably bad.
commit b6ccf721b0a582150858d68f91967fb4e319c340
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 17:35:06 2007 +0930
include: add "lastSlave" field to DeviceIntRec.
Set to the last slave device that routed events through the master.
commit e6bd8ae0608bd8379c5ac962f69cd0bcc54f9734
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 15:59:30 2007 +0930
dix: set the device's sprite when using AttachDevice
Sprite is set to the master device's sprite.
commit 271d4c3d6255318aabb9ad1ea444f534ed456f0b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 15:50:07 2007 +0930
xfree86: remove XI86_SHARED_POINTER flag.
Not needed anymore. By default, all devices are slaves of first master device.
commit c7b878b90406781c97db751a9b454e2b6baee0e1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 15:07:31 2007 +0930
dix: don't treat VCK/VCP separately in DevHasCursor, IsPointer/KeyboardDevice.
commit e9f149fb56747f7eaa0f714dce97b067b007c47e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 14:24:20 2007 +0930
Fix up detritus from removing GetPairedPointer/Keyboard.
commit 840bde3d32f3627dfc3d7d8b6564a61a8014933b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 13:09:35 2007 +0930
dix: GetPairedDevice: return dev paired with master for slave devices.
commit 6c259a08d917f94fd7381453b625b07826d3ef9c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 13:09:19 2007 +0930
include: remove unused GetPairedPointer/Keyboard declarations.
commit fe97f7c54a1b42acd542696b6cdc9e83e89548f3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:46:08 2007 -0400
registry: Add some missing #include's.
commit 9ecbbf198f4cec398897736e173e7e8c56bf6f94
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 08:00:06 2007 +0930
dix: adjust PickPointer and PickKeyboard to get the first master device.
Simplifies it a lot, since we always have at least one master device
available at all times, so less mucking around.
commit 0c5f65ecd3ad11fbdb1cab3cb1d0eb4f33bb4e35
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 07:57:24 2007 +0930
dix: don't allow slave devices as ClientPointer
commit 9ccc9ab6f29f68298b68cdb5c9b4bd57a095f05a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 07:53:00 2007 +0930
dix: don't call CloseDevice on VCP/VCK separately.
commit e4fd981b48723b77a6c1a528638a771b9cc35472
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 07:52:11 2007 +0930
dix: check for isMaster before calling DeviceCursorCleanup.
commit 7503d1340726e0a529f04304d177ed2ceb8fbc91
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 07:50:13 2007 +0930
dix: don't check VCK and VCP separately when looking for device ids.
Both are part of the device list again, so we cover them there.
commit 032e906711202d376af95b37bb0cdf14a3648256
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 11:57:42 2007 +0930
dix: Remove GetPairedPointer, GetPairedKeyboard in favour of GetPairedDevice.
commit 853ea337bdad17f8f6ec7d940de14ce2cbbbf93e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:13:02 2007 -0400
registry: Register XvMC extension protocol names.
commit 58c3240fcbec23aad122e1c340f6bb6d3b18f779
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:09:47 2007 -0400
registry: Register MIT-SCREEN-SAVER extension protocol names.
commit 3e07e73fefc100e491d1e465cb162373d1d82425
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 11:34:29 2007 +0930
dix: remove pairing/attachment from InitAndStartDevices.
If we enabled in the correct order, this has all been done already.
commit 4e274e90e16b1d954391e1af3e2074fb10f70ee7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:04:20 2007 -0400
registry: Register SHAPE extension protocol names.
commit 9f597f6c87e0b14cc382d8e5929e42f822db4329
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:01:20 2007 -0400
registry: Register SYNC extension protocol names.
commit 38baac71bdbb8c7e882e3e39133615cfed894a6b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 04:21:42 2007 +0930
dix: Set bidirectional pairing, don't allow pairing with already paired devs.
commit 70efd3d06a15093661933bda4ec21e306dece4a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 11:30:32 2007 +0930
dix: fix up Activate/Enable/Disable device.
Set isMaster for VCP/VCK.
Init sprites for master pointer devices.
Pair master kbds with master pointers (1:1 pairing!).
Attach other devices to VCP/VCK.
commit b504678ba5407a6fd8d47d051305f7c3d5606dfe
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:54:25 2007 -0400
registry: Register APPGROUP extension protocol names.
commit 204f2dc89ef662b57400b128c30c15e8cf32f323
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 04:13:06 2007 +0930
include: add "isMaster" field to DeviceIntRec.
Set to TRUE for master devices.
Also fixing up comment for paired field in spriteInfo, will be set
bidirectional from now on.
commit bd7d5255ce4865b684f7d8bcf80ba9872a1af22d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 11:18:31 2007 +0930
dix: add AttachDevice, needed to attach a slave device to a master device.
For now, we don't allow attaching slaves to other slaves, and we don't allow
pairing slaves with other slaves.
Pairing is for master keyboard->master pointer only.
Attaching is for slave device->master device only.
commit 6ec35a8cf539c900b334dd6df146b394f54e3706
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:46:56 2007 -0400
registry: Register BigRequests extension protocol names.
commit 1254cc399c53eadcc32eeabf69990ed2526c7ae0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:43:06 2007 -0400
registry: Register Fontcache extension protocol names.
commit e987648cf2c21dcbd77dd9a71793090a48e4f521
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:38:56 2007 -0400
registry: Register EVI extension protocol names.
commit be1565f6b8fb09eba9941d6f7c485bf5fb25fe7a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 01:53:54 2007 +0930
dix: Set core devices to ProcessOtherEvents, set sendCore and XKB.
Even the virtual core devices should send through ProcessOtherEvents.
commit ce9bf9a19185a36ac2f7ae75acd320ab8d03d247
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 01:50:40 2007 +0930
include: add "master" field to DeviceIntRec.
"master" points to the device this device is attached to. Event sent by the
device will also be routed through the master.
master and spriteOwner are mutually exclusive.
commit f6226d3bfe1515058e2092e8662ae87825501209
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:35:12 2007 -0400
registry: Register TOG-CUP extension protocol names.
commit 7e182a5d89d618e20dcc77850131690733322d39
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:13:39 2007 -0400
registry: Register MIT-MISC extension protocol names.
commit 32f6171862461d17ebea58a2fb6ddd16ac71358c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:10:14 2007 -0400
registry: Register XF86Bigfont extension protocol names.
commit 12766c5b5ffdab95255a63b2c8421ee773fd43b5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:00:46 2007 -0400
registry: Register Xv extension protocol names.
commit 35ae03871af88b2f420dd83448011a077852d7a0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 20:50:26 2007 -0400
registry: Register XC-MISC extension protocol names.
commit 32fe282d5b8306514d641e15bc6d9fd4ab360977
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 20:45:18 2007 -0400
registry: Register XTest extension protocol names.
commit 3877faf7d9fe00ed634077e38a198ae4b91a2bb4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 20:35:13 2007 -0400
registry: Register Multibuffer extension protocol names.
commit 16764a2d299c7c0c98002aadd52ab4a1a36758c3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 20:29:23 2007 -0400
registry: Register DPMS extension protocol names.
commit f077578e42eee424b0e534774574c84af9d6f85b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:43:02 2007 -0400
registry: Register XPrint extension protocol names.
commit 5c8b1a91726817816d20faefad21c7a68ab634cc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:35:04 2007 -0400
registry: Register Resource extension protocol names.
commit 48891d5696f56711f23743cb03be39cf6b26c522
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:32:01 2007 -0400
registry: Register EVIE extension protocol names.
commit 2c9646ad4e65bb061d910c9e2b1a8a978f21fa17
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:18:03 2007 -0400
registry: Register SHM extension protocol names.
commit 8964c6d8e14ae47798762191e359b2bf138ca32e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:10:51 2007 -0400
registry: Register RENDER extension protocol names.
commit c827db57e4d9ca14c82b099dcfc9b7a0c0b5ba0a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:06:01 2007 -0400
registry: Register RANDR extension protocol names.
commit 20db50b4c44a14f7eeac2b1de17ada68482521da
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:56:59 2007 -0400
registry: Register DAMAGE extension protocol names.
commit b38a91993364aa80cfd99721e319e1458d9fb760
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:50:06 2007 -0400
registry: Register XTrap extension protocol names.
commit 106758893b68033f14f69c4ee6591fb6a149ba37
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:31:40 2007 -0400
registry: Register XFixes extension protocol names.
commit ea09c9acc8f0d5577f54c864ff88b7f03d93b2f4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:25:12 2007 -0400
registry: Register Record extension protocol names.
commit 2e1e5be1d9067816525aa13a1d818e8ca6899599
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:18:57 2007 -0400
registry: Register DBE extension protocol names.
commit 4c3285c883cc50a91bc5262bbc9d073d816f860a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:04:47 2007 -0400
registry: Register WINDOWSWM extension protocol names.
commit 3815284e899b61731b6a63c4ba14c5d773e24eb6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:57:59 2007 -0400
registry: Register XF86DGA extension protocol names.
commit 2cd1b32b77e0ceeaccb3f01c4ac13a97c557668c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:37:58 2007 -0400
registry: Register XF86Misc extension protocol names.
commit 960677e876c068400fb45e1764bb5470cd8c389f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:30:00 2007 -0400
registry: Register XF86VidMode extension protocol names.
commit b7786724080fd3928ef7b8c294346661d7ffd90b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:15:34 2007 -0400
registry: Register XF86DRI extension protocol names.
commit eee46b4681ec55297604b0425705f2b18381f7ca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:06:22 2007 -0400
registry: Register APPLEWM extension protocol names.
commit b9f5ab98c8dea36dcce1ad15fd2e059a77e77c39
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 16:18:37 2007 -0400
registry: Register XINERAMA extension protocol names.
commit 3464b419230c6d17e940d967b567c5d2cb22d232
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 15:45:12 2007 -0400
registry: Register APPLEDRI extension protocol names.
commit 32f3f5a1e7654f8bb43ea16b9227b3994e616739
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 15:32:17 2007 -0400
registry: Register DMX extension protocol names.
commit 166ef972febc00c665e1d5aeb68e75d7bbcf9879
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 15:22:02 2007 -0400
registry: Register composite extension protocol names.
commit a5cf3f21f712e46dbf9bca289e67be75f2b531d3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 14:27:32 2007 -0400
registry: Register XKB extension protocol names.
commit 5277a6ff589b5ddb475b90e1aaf5dbd9172d9711
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 13:38:35 2007 -0400
registry: Register Input extension protocol names.
commit 8b5078b7d9ec08a588a78eb49096b698c6f4916b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Oct 15 13:10:10 2007 -0400
Fix byte swapping for GetFBConfigs.
commit c922d2eebe29f08f463ee76293dc9042712fb21c
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sun Oct 14 20:40:18 2007 +0300
glx: drop duplicate GetDrawableAttributesSGIX declarations.
They are officially autogenerated in indirect_dispatch.h now.
commit 3d4eb17b38dcb1468493f3686dc5ea3623ef9a73
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Oct 14 18:07:03 2007 -0700
mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI
commit ec0fc012e91e703bb399a380df2912f71957a220
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Oct 14 14:59:12 2007 -0400
Fix GLX byteswapping.
commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8
Merge: ccda4b6 17ffc34
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 12 19:28:39 2007 -0400
Merge branch 'master' of git://git.freedesktop.org/git/xorg/xserver
commit ccda4b66bdfc179e661b24adc8ec72bb7db75b2b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 27 14:43:48 2007 -0400
Implement ChangeDrawableAttributes so we can support GLX_EVENT_MASK.
We never need to actually send out the clobber event, so this should be
sufficient for GLX 1.3.
commit 695eb8b2e88abc9fa3a76d8da48c3214c7dd1f08
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 27 14:23:50 2007 -0400
Implement GLX pbuffers.
commit 516c181f57367847c3f317f8f8f5cc3211026f4c
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Aug 23 21:40:01 2007 -0400
Add dispatching for GLX_SGIX_pbuffer.
commit d7ded953c4d263e3dd3374dc03eea19e80c05bc6
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Aug 23 19:07:52 2007 -0400
Implment GLXPixmaps.
commit 526f40434c86548830c4f72940462b6253fe9790
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 12 18:18:00 2007 -0400
NULL is not a valid argument to CreatePicture, please use serverClient
as the client argument if no real client is creating the object.
commit 2b0847c7aaf95b6b10f062dfff601032b2430a9b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Aug 8 10:07:03 2007 -0400
Implement damage reporting for AIGLX.
commit 600028305cc047e824b18369a026f89c9eb7e437
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu May 31 22:55:47 2007 -0400
Move hyperpipe and swapbarrier extension funcs to screen private struct.
This gets rid of a couple more global arrays and gets the two extensions
more in line with the general extension mechanism.
commit 781515bb637de4fd79e3c83817cb6ffa8f2d8a4f
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 30 23:25:03 2007 -0400
Convert GLX module to use screen private indexes like everything else.
commit 72a3d68a2f5abcd09fef1a55e976e1a5731d4b02
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu May 10 11:16:50 2007 -0400
Update the AIGLX DRI loader to use the new DRI interface.
This lets us drop a bunch of workarounds and use the new DRI extension
mechanism.
commit 17ffc34ad5e9a8e2269afef05f209701f1895c01
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Oct 12 15:33:31 2007 +0200
Drivers include miscstruct.h which requires pixman.h.
commit eaf0e2a21c2cb14e19852e61a4521b3c240253af
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 22:31:24 2007 -0400
Fix another compiler warning
commit a5089af726b6a4f833b95a31274743c994277e20
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 22:24:31 2007 -0400
Fix a warning about the control logic in xchomp()
commit cdf29ff45a3cb45573c9d0cb8f82e6ee97953fb5
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 22:23:34 2007 -0400
Remove some unused variables
commit 3367091f7fa14497aab40e668cad179e244eef81
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 22:21:38 2007 -0400
Separate choosing driver from the file-based implementation
This clears the implementation out of the way to prepare for development
of a symbol-based resolution scheme
commit 3aa41bcb8215c037512ddbd68a3f7bcad3b80a1f
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 21:29:13 2007 -0400
Remove obsolete error message define from parser
commit e3e12221111886c4063d2da5d70d3830c56d39e2
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 21:27:07 2007 -0400
Don't bother validating the Device section of the conf file
All the previous tests can now be recovered from if not specified.
commit 28ef7f59416677be380561709197b04df0479bef
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 20:56:46 2007 -0400
Re-enable validation of the screen section of xorg.conf
This also fixes a problem where the server can't find the device section
when it is specified in the screen section.
commit ea2d4dc468dcebe6d38e676469ec51ed1d43490b
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 20:26:02 2007 -0400
When there's no xorg.conf, use the video driver autoloading function
commit fc092334ac0a323b80a9602cb8bf60ca9dee3bfa
Author: Eric Anholt <eric@anholt.net>
Date: Thu Oct 11 16:48:56 2007 -0700
Bug #10304,12784,11603: Add quirks for several physical size issues.
A lot of EDID writers apparently end up stuffing centimeters (like the
maximum image size field) into the detailed timings, instead of millimeters.
Some of them only get it wrong in one direction. Also, add a quirk to let
us mark the largest 75hz mode as preferred, which will often be used for
EDID 1.0 CRTs.
commit 6adeba17301a309be2f34cd51eca84a13d5503fd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 11 14:17:17 2007 -0400
dix: Add a new "registry" mechanism for registering string names of things.
Supports protocol requests, events, and errors, and resource names.
Modify XRES extension to use it.
commit 45cc03726b49f6ad4afe6c3fb4ad65d1051928b4
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Oct 11 18:23:25 2007 +0200
Make mode checking more tolerant like in pre-RandR times.
commit 8f23d40068151ad85cde239d07031284f0b2c4dc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 10 19:56:03 2007 -0400
xace: move the property deletion hook inside the DeleteProperty function.
commit 473bc6ec4c59e1a962b0b897c449a69aa5064ab0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 10 19:43:12 2007 -0400
xace: remove the special-cased "ignore" functionality from the property code.
There will be no more faking of Success to hide things. XACE does not
provide polyinstantiation.
commit 7e9e01a4a34fa45521067d43c5bbff942dd5d51a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 10 17:40:22 2007 -0400
dix: pass a valid ClientPtr to SetFontPath in all cases.
commit 8825d36a38c76ff8faf409c853061be2bd33430d
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 22:49:07 2007 -0400
Allow the user to not have a screen section
If none is present, a default one will be created. This will be attached
to either the first device section in the xorg.conf (allowing you to
specify something like using EXA without having a screen section) or a
default screen section if none is present in the file.
commit 8665cf3327b713f334b0483593a924c197f892f2
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 22:45:15 2007 -0400
Don't require that the screen explicitly attach the device section
This will allow the screen to not explicitly have a device section. If
this is the case and there is a device section in the xorg.conf, the first
one will be used. If there is no device section at all, a default one will
be created that loads the automatically determined module.
commit 37898b824fdc94735495e3494aa2b9a681d477b9
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 22:11:58 2007 -0400
Use the best guess heuristic as a fallback for autoloading
This prevents breaking the current behavior
commit 847fbbf4d25132e6c1f99fcf82fe757dbca94a34
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 22:07:49 2007 -0400
Fix autoloading of drivers for pci-rework
commit 6033d8150be3a115b90226eaa42f237bb0cf3369
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 21:17:27 2007 -0400
First pass at improved video driver autoloading
This is what we're currently shipping in Debian. Enables the ability for
drivers to ship a text file listing PCI ID's they support, and have the
server read them on startup when no driver is specified. This works, but
isn't the final solution.
commit 81d7b81146224f2b83278f5e21b3f9a36f30bd56
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Aug 25 15:00:30 2007 -0400
Load intel instead of i810 when autoconfiguring
commit fdef7be5c8d5989e0aa453d0a5b86d0a6952e960
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 9 18:44:04 2007 -0700
Sun bug 6589829: include zoneid of shm segment in access policy for MIT-SHM
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6589829>
<http://www.opensolaris.org/os/community/arc/caselog/2007/500/>
commit 49c8285e38e0e71c9ea43df63add08a4f2564ed1
Author: Christian Weisgerber <naddy@freebsd.org>
Date: Tue Oct 9 15:25:16 2007 -0700
FreeBSD/alpha server build requires libio (missed in modularization).
commit 042e16458b751ad0fcfa1ebbdd74d7d48036b22a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 9 23:07:51 2007 +0930
dix: change a few inputInfo.keyboard over to PickKeyboard()
commit 6aab6a6e2ae0ef5fdedae09cf2cdc86f382e3a8a
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Oct 8 13:25:38 2007 +0200
EXA: dude, don't validation driver hooks twice !
commit d42909b23a9be64a26aa349c1d6dcd8b228bffa7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 5 13:04:10 2007 +0930
dix: when disabling a device, make sure all paired devices are re-paired.
We re-pair them with the VCP, not a real device! If we would do otherwise,
somebody may change our keyboard focus and thus get us typing where we don't
want to type.
commit ff2351246da30b56a3a8f90654993c41b8eb3921
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 5 12:19:03 2007 +0930
dix: When pairing, only check for access right if client is set.
If the pairing client is not set, then the pairing is initiated internally
(e.g. when a new keyboard device is configured). In this case we _must_ pair
regardless of who is the pairing client.
commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8
Merge: ab11bad 3549a12
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 13:07:50 2007 +0200
updated from 'master'
commit ab11bad54707941eb41be62c025b983760ce3900
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 13:05:29 2007 +0200
Xephyr: remove a potential crasher
* hw/kdrive/ephyr/hostx.c:
(hostx_has_dri): be more defensive.
commit 06c8977966e76255ce7798f4839ef6e3530264a8
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 13:01:24 2007 +0200
Xephyr: better handling of the -nodri option
* hw/kdrive/ephyr/ephyr.c:
(ephyrInitScreen): try and detect when the host has no
DRI support. In that case, switch to the -nodri behaviour.
When in the -nodri case, make sure not to skip glx visual
initialisation.
commit ea94f59e9b8824b1a638c63e06ca16f0efd43869
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 12:54:26 2007 +0200
Xephyr: don't disable glx visual init by default
* hw/kdrive/ephyr/ephyrinit.c:
(ddxProcessArgument): disabling visual init here
is bad because it gets disabled even when we want
to use software GL, leading to Xephyr :1 -nodri
crashing in mesa.
commit a7f210e6fcda14eae4de64186904c6c676c758ee
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 12:51:08 2007 +0200
Xephyr: fix a compiler warning
commit 5d6eac1251f1e17baa74d0893bb225b775e8ec2e
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 12:47:05 2007 +0200
Xephyr: remove an unused variable
commit 8018733c39c283a931df424dcfd11e7aefbcd8cf
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 12:06:19 2007 +0200
Xephyr: better compilation without GLX
* hw/kdrive/ephyr/ephyrinit.c: protect GLX related code with GLXEXT
macro
commit 3549a1282365e69e70c7c2546cfa7d25923cce31
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 4 11:38:01 2007 +0200
EXA: Disable 1x1 pixmap fill optimization for drivers that handle pixmaps.
This reverts commit 1365aeff5499a051375e43a9fcbf54733ac93929.
It defeated the optimization for drivers that don't provide a CreatePixmap
hook. The optimization makes no sense for drivers that do anyway, so disable
it for them completely.
commit 604ebb5a6de372e6a8a96e0ee997db7929126860
Merge: 1365aef 4ba76a7
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Oct 3 16:13:16 2007 +0200
Merge Xephyr-XV/GL stuff into master
commit 4ba76a7e2b62d26f43c0e670de571afb75ec92f4
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Oct 3 13:03:34 2007 +0200
Xephyr: port XV/GL stuff of the new multiscreen architecture
We can now launch GL or XV apps in any of the
Xephyr screens we want.
* hw/kdrive/ephyr/hostx.c,h:
(hostx_get_window):
(hostx_create_window): make these functions be screen
number aware.
* hw/kdrive/ephyr/XF86dri.c : fix some compiler warnings.
* hw/kdrive/ephyr/ephyrdri.c:
(ephyrDRIQueryDirectRenderingCapable),
(ephyrDRIOpenConnection),
(ephyrDRIAuthConnection),
(ephyrDRICloseConnection),
(ephyrDRIGetClientDriverName),
(ephyrDRICreateContext),
(ephyrDRIDestroyContext),
(ephyrDRICreateDrawable),
(ephyrDRIGetDrawableInfo),
(ephyrDRIGetDeviceInfo): in all those functions, don't forward
the screen number we receive - from the client - to the host X.
We (Xephyr) are always targetting the same X display screen, which is
the one Xephyr got launched against. So we enforce that in the code.
* hw/kdrive/ephyr/ephyrdriext.c:
(EphyrMirrorHostVisuals): make this duplicate the visuals of the host X
default screen into a given Xephyr screen. This way we have a chance
to update the visuals of all Xephyr screen to make them mirror those
of the host X.
(many other places): specify screen number where required by the api
change in hostx.h.
* hw/kdrive/ephyr/ephyrglxext.c: specify screen number where required
by the api change in hostx.h
* hw/kdrive/ephyr/ephyrhostglx.c: don't forward the screen number we
receive - from the client - to the host X.
We (Xephyr) are always targetting the same
X display screen, which is
the one Xephyr got launched against. So we enforce that in the code.
* hw/kdrive/ephyr/ephyrhostvideo.c,h: take in account the screen number received
from the client app. This is useful to know on which Xephyr screen we
need to display video stuff.
* hw/kdrive/ephyr/ephyrvideo.c: update this to reflect the API change
in hw/kdrive/ephyr/ephyrhostvideo.h.
(ephyrSetPortAttribute): when parameters are not valid
- they exceed their validity range - send them to the host anyway
and do not return an error to clients.
Some host expose buggy validity range, so rejecting client for that
is too harsh.
commit ab88cb8d2e7c1410f9ed2be928b38f176b132e11
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 3 18:08:33 2007 +0930
Xext: add missing geint.h to Makefile.am (un-breaks make dist)
commit 9f2b493e34e93881101f31e631901d3fe56da4f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 15:35:41 2007 +0930
xkb: remove some warning comments.
Obsolete with 340911d7243a7f1095d79b5b2dcfa81b145c2474.
commit 1eebb03a3190947a8102f2ddc73766cf98d34c84
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 3 15:18:17 2007 +0930
dix: ignore passive grab if the client already has a grab on the device.
In some cases a button press may activate a passive core grab. If the client
owning the passive grab already has a core grab on another device, don't
actually activate it. Otherwise the client gets two simultaneous passive
core grabs, and may never ungrab the device again (only if the other grab uses
GrabModeSync).
Reproducable: fire up gnome-session, open up gnome-terminal. Click with the
ClientPointer onto the window decoration, then click with another pointer onto
an application icon in the panel. Drag the icon out, release the button and
voila - you just lost your second mouse.
commit 0b485067823620b5dbd9ef2b3e13bd35ad5a4410
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 3 14:22:55 2007 +0930
dix: send NotifyGrab/NotifyUngrab focus events regardless of semaphore state.
This is just papering over a problem. The whole focus system needs to be
revised.
commit 05106ac9839102c0e4a3ce5d9d83d19abf129f8a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 3 11:33:10 2007 +0930
dix: change Enter/Leave semaphore handling to accommodate for NotifyGrab.
This is a half-assed attempt at getting rid of some enter-leave problems. When
a grab is activated, the events didn't get sent before, leading to interesting
results. This commit papers over it but doesn't actually fix it properly. The
whole enter/leave (focusin/out) structure needs to be ripped out and changed
for multiple devices.
commit 1365aeff5499a051375e43a9fcbf54733ac93929
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 3 12:00:16 2007 +1000
exa: direct access to the pixmap sys ptr is bad if the pixmap isn't mapped
commit 566dd3b7d789ba60d0adf33b3f729cfb02ff33cd
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 3 11:59:52 2007 +1000
exa: add new flags to denote driver handles all pixmap migration/hiding
commit 1df1fee82d3565f6d8cfb91ce25a81c23a10a4b5
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 3 11:56:04 2007 +1000
exa: make sure we set fb_ptr to NULL
commit a358b87f45ce75e5d013fc904a07dfe394f74387
Author: Eric Anholt <eric@anholt.net>
Date: Tue Oct 2 13:13:51 2007 -0700
Just link against libcrypto instead of relying on openssl pkg-config.
Also fix incorrect library inclusion by kdrive which broke the build.
commit 439edc768eea17667846ce573c843b8377e0dfb4
Merge: c8ccf46 93ae6fe
Author: Eric Anholt <eric@anholt.net>
Date: Tue Oct 2 12:14:04 2007 -0700
Merge branch 'glyph-pixmaps'
Conflicts:
configure.ac
exa/exa_render.c
commit 59cebcd2e9302d15a52588ecafbbc2d2c5ae3a6c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 2 13:39:25 2007 -0400
xace: add creation hook for new input devices.
Unfortunately, more information is needed to properly label the device.
This will come from the configuration file, the hotplug messages, etc.
It will either have to be passed into this function,
or this hook moved down into the callers.
commit b77d272d7555c1e0f176ee74b8717030a6d6c7b0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 2 13:21:53 2007 -0400
xace: add hooks + new access codes: XTEST extension
commit c8ccf469dcb2d7609b23faa8b4999c436263051e
Author: Keith Packard <keithp@koto.keithp.com>
Date: Tue Oct 2 08:59:40 2007 -0700
Do not build hw/xfree86/os-support/bus/ix86Pci.c on Linux.
Linux has custom PCI bus support functions, so this generic code is
unnecessary.
commit dcb4db1bf5b6fcfaed4e7162eb6c7a3a509e14bd
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 19 15:46:09 2007 +0200
Xephyr: glx fixlet
* hw/kdrive/ephyr/ephyrhostglx.c:
(ephyrHostGLXQueryVersion): properly query
the host for its gxl version.
commit 6a435b00003fb00930299a0e0810c93afc23a72e
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 19 15:35:51 2007 +0200
Xephyr: check presence of extensions in host X
* hw/kdrive/ephyr/hostx.c,h:
(hostx_has_xshape),
(hostx_has_glx),
(hostx_has_dri): added these new entry points
* hw/kdrive/ephyr/ephyrdriext.c:
(ephyrDRIExtensionInit):
check presence of DRI and XShape extensions before
trying to use them.
* hw/kdrive/ephyr/ephyrglxext.c:
(ephyrHijackGLXExtension):
check presence of glx extension before we use it.
commit 2b217fc055300d4c709dd27c4e8ec8166183993b
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 19 15:00:43 2007 +0200
Xephyr: cleanup XF86dri.c a bit
commit f731b9da7dbafad50dd5a1e8da28ce86ffab19b7
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 18 18:41:18 2007 +0200
Xephyr: add -nodri and -noxv switches.
* hw/kdrive/ephyr/ephyr.c,ephyrinit.c::
add -nodri and -noxv to disable either DRI or XV.
When -nodri, mesa GL (non acceleretated) works.
commit 50674391388b3cfe987782a3ad81b4f240f3db67
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 18 18:37:49 2007 +0200
Kdrive: use fbcmap_mi.c instead of fbcmap.c
* hw/kdrive/src/Makefile.am: use fb/fbcmap_mi.c
and not fb/fbcmap.c. This allows kdrive to take advantage of
extensions redefining the entry points of micmap.c stuff.
For instance it allows Xephyr to have a working GL, which is not
possible otherwise, because GL redefines mInitVisualsProc
to initialise its visuals.
commit a5bd536869f646e4024befa84f6e677b990310bc
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 18 18:28:25 2007 +0200
fbcmap_mi.c: add a missing api
* fb/fbcmap_mi.c:
(fbSetVisualTypesAndMasks): added this entry point that was missing.
This is useful so that servers using this entry point can use fbcmap_mi.c,
and be obliged to stick to fbcmap.c. Note that fbcmap.c does implement this
entry point. Up to now, kdrive based server could not use fbcmap_mi.c because this
entry point was missing. The will allow Xephyr to properly use GL.
commit 6307ee77091041af2d34e93bc164352d4438a808
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 18 18:22:44 2007 +0200
GLX: allow skipping of visual init wrapping
* GL/glx/glxvisuals.c: added boolean to disable
calling init_visuals(). This gives a chance to Xephyr
to take over visuals manipulation and avoid a crash at
server shutdown in __glXMesaScreenDestroy(), due to the fact
that mesa might sees more visual than what it has actually created in
init_visuals(). It might see more visuals because Xephyr can augment
the number of visuals, dynamically.
* os/utils.c: the boolean is actually defined here.
commit ffe9ce6a843443606ad9367eca1645bf5e0635e5
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Sep 17 22:13:51 2007 +0200
Xephyr: fix a clipping issue xephyr-dri
* hw/kdrive/ephyr/ephyrdri.c:
(ephyrDRIGetDrawableInfo): force the back clipping rects
to equal the front clipping rects.
* hw/kdrive/ephyr/ephyrdriext.c:
(ProcXF86DRIGetDrawableInfo): properly overclip the clipping rects we
got from the client. This bug fixes a clipping rect that was too
small in height, basically. Also fix a possible mem corruption.
* hw/kdrive/ephyr/hostx.c:
(hostx_set_window_geometry): remove a useless XSync
commit 79782726617d4b5a4f9b376f21936d035fc870e1
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Sep 17 18:15:03 2007 +0200
Xephyr: properly clip GL drawables in Xephyr
commit 3816d64e50a59e0ef276ddd6cb250cab98a49392
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sun Sep 9 15:20:51 2007 +0200
Xephyr: oops, forgot to add ephyrdriext.h
commit cf58781eee7d91a3bbca701a2c4523a36f8e0abb
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Sat Sep 8 00:33:59 2007 +0200
Xephyr: make accelerated glxgears work in Xephyr
* hw/kdrive/ephyr/ephyr.c:
(ephyrInitialize): cleanup ephyrDRI extension init.
remove functions that belongs in ephyrdriext.c .
* hw/kdrive/ephyr/ephyrdri.c:
(ephyrDRICreateDrawable): create the drawable on the host X peer
window, not on the host xephyr main window.
(ephyrDRIGetDrawableInfo): get drawable info of the host X peer
window.
* hw/kdrive/ephyr/ephyrdriext.c: make ephyr DRI extention wrap
a bunch of screen ops so that it can update the host X peer
window whenever DRI bound drawable are moved in Xephyr.
Also code the building blocks of the management of the
host X window peer.
* hw/kdrive/ephyr/hostx.c,h:
(hostx_create_window): added this new entry point
(hostx_destroy_window): ditto
()hostx_set_window_geometry): ditto
commit 6d1e44d3d53b451d466d43197be589d0ecc4b9f6
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 4 18:28:16 2007 +0200
Xephyr: fix a host X hang.
* hw/kdrive/ephyr/ephyrdri.c:
(ephyrDRIGetDrawableInfo): quickly hook
this into getting the drawable info from the host
X server. For the time being, this only gets the drawable info
of the Xephyr main window in the host. It should really get
the info of a the peer drawable in the host X. So there should be a
peer drawable to begin with.
* hw/kdrive/ephyr/ephyrdriext.c:
(ProcXF86DRIGetDrawableInfo): some cleanups. Properly get the
the drawable info otherwise there is a host X hang.
* hw/kdrive/ephyr/ephyrhostglx.c: do not
(ephyrHostGLXQueryVersion): do not use C bindings of the glx protocol
calls. Some of those actually access DRI context directly, resulting
in the context having three clients. Instead all XF86DRI proto
fowarding request should be coded by hand and only forward the
protocol requests
commit a39b57d2f784f14e3198c8506f5eb865bacc2440
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Fri Aug 31 16:53:18 2007 +0200
Xephyr: add more logging to GLX forwarding
* hw/kdrive/ephyr/ephyrhostglx.c: added more logging.
commit 9e192d2118246ad715e23cf5626a038274eb1eaa
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Fri Aug 31 14:43:39 2007 +0200
Xephyr: better error handling in GLX forwarding
* hw/kdrive/ephyr/ephyrglxext.c:
fixed various logging functions
(ephyrGLXGetStringReal): make sure all the string is sent to clients
including the ending zero.
* hw/kdrive/ephyr/ephyrhostglx.c:
(ephyrHostGLXGetStringFromServer): better error handling.
(ephyrHostGLXSendClientInfo): ditto.
(ephyrHostGLXMakeCurrent): ditto
commit 4dd4be99df38b70d43b02d9cb19e09e0ed94462b
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 30 23:54:49 2007 +0200
Xephyr: Make glxinfo work on the ATI R200 free driver.
* hw/kdrive/ephyr/ephyr.c:
(EphyrDuplicateVisual): when duplicating the
visual, copy the color component masks and the class
from the hostX
(EphyrMirrorHostVisuals): don't mix blue and green mask.
* hw/kdrive/ephyr/ephyrdri.c: add more logs.
(ephyrDRICreateDrawable): actually implement this.
for the moment it creates a DRI drawable for the hostX window,
no matter what drawable this call was issued for.
(ephyrDRIGetDrawableInfo): actually implemented this.
for the moment the drawable info queried for its attrs is the
Xephyr main main window.
* hw/kdrive/ephyr/ephyrdriext.c:
(ProcXF86DRIGetDrawableInfo): properly hook this dispatch
function to the ephyrDRIGetDrawableInfo() function.
* hw/kdrive/ephyr/ephyrglxext.c: add a bunch of GLX implementation hooks
here. Hijack some of the xserver GLX hooks with them. Still need to
properly support byteswapped clients though.
* hw/kdrive/ephyr/ephyrhostglx.c,h: actually implemented the protocol
level forwarding functions used by the GLX entr points in
ephyrglxext.c. Here as well, there are a bunch of them, but we are
far from having implemented all the GLX calls.
* hw/kdrive/ephyr/hostx.c,h:
(hostx_get_window_attributes): added this new entry point
(hostx_allocate_resource_id_peer): added this to keep track of
resource IDs peers: one member of the peer is in Xephyr, the other
is in host X.
(hostx_get_resource_id_peer): ditto.
commit 8c78df0ea36abc7d46c4f59670289f4280f75507
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 30 22:31:47 2007 +0200
Xserver: fix potential crash
* dix/extension.c:
(AddExtensionAlias): don't crash when failed to add
extension alias.
commit 024abe825cd702334266f6b8da289907bbd05970
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Aug 28 15:59:45 2007 +0200
Xephyr: add logging in the DRI extension
commit 1dd589410c6c5e8b62b4d15ec681b01452ec68c6
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Aug 28 15:58:55 2007 +0200
mirror the visuals of the host X at startup.
* hw/kdrive/ephyr/ephyr.c: make Xephyr mirror
the visuals of the host X upon startup. This
is important for GLX client apps.
* hw/kdrive/ephyr/hostx.c,h: add a hostx_get_visuals_info()
to get the visuals of the host X.
commit 26da625055a3876c93a7a005520657b971748c4e
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Aug 28 15:55:05 2007 +0200
proxy the glXGetFBConfigSGIX call
* hw/kdrive/ephyr/ephyrglxext.c:
(ephyrGLXGetFBConfigsSGIX): proxy the GLXGetFBConfigsSGIX call.
It is a vendor extension to get the visual configs as a list of
name/value pairs.
(ephyrHijackGLXExtension): hijack the VendorPriv_dispatch_info
dispatch table to register our implementation of GLXGetFBConfigsSGIX
(ephyrGLXGetFBConfigsSGIXReal): added this where the real
implementation of GLXGetFBConfigsSGIX is. It support bytes swapping.
(ephyrGLXGetFBConfigsSGIX,ephyrGLXGetFBConfigsSGIXSwap): these are
the dispatch entry points. They just call
ephyrGLXGetFBConfigsSGIXReal.
* hw/kdrive/ephyr/ephyrhostglx.c,h: reorganize the proxies to get
visual params from the host so that they clearly support the different
methods of doing so.
commit 5af73f98c46dfe5640185ca90feb20c39c6e06fa
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Fri Aug 24 16:30:50 2007 +0200
EPHYR: Add an experiment proto proxy extension.
* hw/kdrive/ephyr/Makefile.am: add the proxy extension to
ephyr. The proxy extension is an experimental extension that
forwards protocol packets targeted at a given extension to the
host X.
* hw/kdrive/ephyr/ephyr.c: init proxy ext.
* hw/kdrive/ephyr/ephyrhostproxy.c,h: added this new file as part of the
proxy extension.
* hw/kdrive/ephyr/ephyrproxyext.c,h: ditto
* hw/kdrive/ephyr/hostx.c: add the hostx_get_get_extension_info() entry
point.
commit c06fa924b4781a35b86e4a78d95ff3e9d95b02d1
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 23 11:53:02 2007 +0200
XEPHYR: more GLX/DRI proxying work.
* hw/kdrive/ephyr/XF86dri.c: re format this correctly.
Make function decls honour the Ansi-C standard.
* hw/kdrive/ephyr/ephyr.c: protect glx/dri related
extension initialisation with the XEPHYR_DRI
macro. Initialize the GLX ext hijacking
at startup.
* hw/kdrive/ephyr/ephyrdri.c: add more logging to ease debugging
* hw/kdrive/ephyr/ephyrdriext.c: ditto. reformat.
* hw/kdrive/ephyr/ephyrglxext.c,h: add this extension to
proxy GLX requests to the host X. started to proxy those nedded to
make glxinfo work with fglrx. Not yet finished.
* hw/kdrive/ephyr/ephyrhostglx.c,h: put here the actual
Xlib code used to hit the host X server because Xlib stuff cannot be
mixed with xserver internal code, otherwise compilation erros due to
type clashes happen. So no Xlib type should be exported by the
entrypoints defined here.
commit 0b8545144975bf7ed43c2564d01c697144eb1244
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 16 17:30:13 2007 +0200
Implement ReputImage and StopVideo
* hw/kdrive/ephyr/ephyrhostvideo.c/h:
(ephyrHostXVStopVideo): add this entry point.
* hw/kdrive/ephyr/ephyrvideo.c:
Basically add ReputImage and StopVideo implementations.
Now, when other windows obscur the video window, the reclipping
seems to be well handled using StopVideo and ReputImage.
To do this, I was obliged to save the frame in PutImage, so
that I could resend it un ReputImage.
commit 810dc55866d1c2343512354646c7ab309ea1fad2
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 16 17:11:22 2007 +0200
Ephyr-Xv: add a new line to a log
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrQueryImageAttributes): add newline to log.
commit 47e6dff89e48249828e828502e98951eee7f85bc
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 16 17:07:36 2007 +0200
Xephyr-Xv: fix a crash when host X support several ports
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrXVPrivQueryHostAdaptors): properly set
port private luke. This fixes a crash when
the host Xv supports multiple ports.
Make sure number of ports cannot be zero.
commit a38ad562a6f50e9d76a37917b936035215ea460e
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Wed Aug 15 19:40:10 2007 +0200
make xephyr talk DRI protocol with hostX
* configure.ac,include/dix-config.h.in: define the XEPHYR_DRI macro.
define it when --enable-xephyr and --enable-dri are both turned on.
* hw/kdrive/ephyr/XF86dri.c: copy this from mesa source to enable
Xephyr to talk DRI protocol the host X. In mesa, this is used by libGL.so to
talk DRI protocol with the server.
* hw/kdrive/ephyr/ephyr.c: finally initialise the DRI extension
in the ephyrInitScreen() function.
* hw/kdrive/ephyr/ephyrdri.c,ephyrdriext.c: safeguard the compilation
using the XEPHYR_DRI macro.
commit e4239a48075c77e6a8d2d5cb21f58dd67687482f
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Aug 14 22:48:41 2007 +0200
Initial dri forwarding big bricks.
* hw/kdrive/ephyr/ephyrdriext.c: added this to implement a DRI extension
into Xephyr. Normally the DRI extension is only present in the
xfree86 server, but I have ported it to Xephyr. The extension calls
functions that declared/defined in ephyrdri.h ephyrdri.c that
forwards the DRI calls to the host X. It does not work yet, as this
entry is just to put the big bricks in place.
* hw/kdrive/ephyr/ephyrdri.c,h: declaration & definition of the
DRI client API that would hit the hostX server.
* hw/kdrive/ephyr/GL/internal/dri_interface.h: added this, otherwise
inclusion of /usr/include/X11/dri/xf86dri.h won't compile
commit e01d3dd98d1b596e75d25f94dd89c7d41223011d
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Aug 9 10:55:10 2007 +0200
Support clipping region in PutImage.
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(ephyrHostXVPutImage): make this support clipping region.
The clipping region is propagated to host using XSetClipRectangles.
This changes the API of ephyrHostXVPutImage.
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrPutImage): propagate the clipping region to the new
ephyrHostXVPutImage() entry point.
commit 39d3895469f07304d72800d8dcef6c7732f13d5f
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Aug 8 14:27:32 2007 +0200
make EphyrXVPriv be a singleton
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrInitVideo) make the EphyrXVPriv object be a
singleton instance, otherwise a new object is created at each
generation.
commit 4ed083095a13ec92bb4c8e705f26500f8312c138
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Aug 7 14:16:13 2007 +0200
add [Get/Put]Video and [Get/Put]Still support
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(ephyrHostXVAdaptorHasXXX): fix these.
(ephyrHostXVAdaptorHasGetVideo): added this
(ephyrHostXVAdaptorHasGetStill): ditto
(ephyrHostXVPutVideo): added this
(ephyrHostXVGetVideo): ditto
(ephyrHostXVPutStill): ditto
(ephyrHostXVGetStill): ditto
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrPutVideo): implement this
(ephyrGetVideo): ditto
(ephyrPutStill): ditto
(ephyrGetStill): ditto
(ephyrXVPrivSetAdaptorsHooks): advertise GetVideo and GetStill
when the host X supports it.
commit 6f7961bc218169aaa0d10cfad0952adb7fac2f00
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Aug 6 18:38:54 2007 +0200
advertise only the hooks implemented by host X
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(ephyrHostXVAdaptorHasPutVideo): detect if
host X has the PutVideo call.
(ephyrHostXVAdaptorHasPutStill): detect if
host X has the PutStill call
(ephyrHostXVAdaptorHasPutImage): detect if
host X has the PutImage call
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrXVPrivQueryHostAdaptors): make sure to create
atoms for attribute names otherwise subsequent
calls to get/set attribute from clients won't work.
(ephyrXVPrivSetAdaptorsHooks): don't hardwire advertising
of the PutImage call. Instead, advertise the calls advertised
by the host.
commit 1de89239bdfa68ded2ef25fbb7d08369f527f7a9
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Sat Aug 4 01:13:38 2007 +0200
don't crash when hostX reports an error.
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(ephyrHostXVLogXErrorEvent): add this to
log X error events. Heavily copied from libx11
(ephyrHostXVErrorHandler): new x error handler that
logs the error but does not exits.
(ephyrHostXVInit): add this to be called at the beginning
of xvideo lifetime. It sets an xerror handler that does not
exit.
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrXVPrivIsAttrValueValid): this validates an attribute
value.
(ephyrSetPortAttribute): before setting an attribute,
validate the new value so that we don't send a buggy
request to host X.
* hw/kdrive/ephyr/*.c: fix case in ephyrvideo code.
* hw/kdrive/ephyr/ephyr.c: fix a typo
commit 207714b60d18e94bbe2d755a431dbb29fe5677f7
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Fri Aug 3 01:10:39 2007 +0200
first implementation of putimage
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(EphyrHostXVPutImage): first implementation. does not
support clipping regions yet.
* hw/kdrive/ephyr/ephyrvideo.c:
(DoSimpleClip): clip using a clipping box. Does not
support regions yet.
(EphyrPutImage): first implementation.
Uses a simple clipping rectangle, no region yet.
* hw/kdrive/ephyr/hostx.c:
(hostx_get_window): added this to get the main
window of the host x.
commit aa478e09e25a1cb19b808e7e52b2ee155e34f03b
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Aug 2 12:49:36 2007 +0200
make properties setting/query code work and hopefully complete.
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(EphyrHostXVQueryImageAttributes): add this call. It calls
XvQueryBestSize xserver entry point. It uses the protocol
level machinery because Xvlib does not expose that entry point
as a C function.
(EphyrHostXVQueryBestSize): added this wrapper around XvQueryBestSize().
(EphyrHostGetAtom, EphyrHostGetAtomName): added this to get
an atom or atom name from the host server
* hw/kdrive/ephyr/ephyrvideo.c:
(EphyrSetPortAttribute): convert the atom into an host server
server atom before attacking the host server with it, because in
in its current form, the input atom is only valid in xephyr.
This fix makes this call work.
(EphyrGetPortAttribute): ditto.
(EphyrQueryBestSize): implement this.
(EphyrQueryImageAttributes): implement this.
commit 24c837c0be6f85a917582156ab61d6c9c69301f9
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Jul 31 23:18:52 2007 +0200
implement setportattribute and getportattribute calls
commit b8cd313be467fd14b8e5c9ba68e1a2029c1e888b
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Mon Jul 23 12:43:43 2007 +0200
make xvinfo work
* hw/kdrive/ephyr/ephyrhostvideo.c:
(EphyrHostXVAdaptorGetVideoFormats): properly get visual class instead of
returning the visual id.
(EphyrHostXVQueryEncodings): properly copy the fields because simple casting does
truncate some fields.
(EphyrHostAttributesDelete): XFree the whole array instead of trying to free invidial members.
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrInitVideo): fix a typo
(EphyrXVPrivQueryHostAdaptors): set XvWindowMask mask to adaptors type.
use host adaptor name. Don't forget to set nImages field.
(EphyrXVPrivRegisterAdaptors): report an error when KdXVScreenInit() fails.
commit aa2fae7b75f741e57bc4a9b754b5ea7518d78f47
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 23:56:13 2007 +0200
misc fixes.
*(EphyrHostXVQueryAdaptors): return the queried adaptors list
* (EphyrHostXVQueryPortAttributes): return port attributes number
commit 2bf7f3c223fd32cd4922f98eadda2e3f06d9e119
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 17:55:12 2007 +0200
link and init xv
commit 66b28532e533ff5688705c5286425e68d6403cee
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 12:08:39 2007 +0200
initial commit of xv support work
commit 1e8f8b36a56a884092ee01a0bb3f40436e30fa42
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 18:22:20 2007 +0200
works with no adaptors
Debug the early code to make work when the host has no video adaptors
commit 50ff2377cac50ae25218be5b30612fb8bf6046a6
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 18:20:59 2007 +0200
add -verbosity <level> option to command line
commit 8426eb2433f964ea19848f24dc99eb4588d10d1a
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 17:55:12 2007 +0200
link and init xv
commit 50a64c84e1556ef7f8efcc7f8655e0c5e023ef4d
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 12:08:39 2007 +0200
initial commit of xv support work
commit 95fadbd4022ec99f42ba78ec8a18a064903e8a7f
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Mon Jul 16 17:37:21 2007 +0200
Add basic Exa driver entry point validation.
In exaDriverInit(), quickly check if the programmer forgot to set some
mandadory driver hooks, in that case display a meaningful error message.
commit e5e6514ffa0fd132e0cc1b15b94119e6e8755f43
Author: Andrew Christan <andrew.christian@nokia.com>
Date: Tue Oct 2 13:25:51 2007 +0200
Xephyr: add "multiscreen" suport
* This patch adds multiscreen support to Xephyr. For instance,
the command line : "Xephyr :4 -ac -screen 320x240 -screen 640x480"
will launch with two "screens" - namely two main windows.
The first main window represents a screen that has the number :4.0, with
a geometry of 320x240 pixels, and the second one represents a screen
that has the number :4.1 with a geometry of 640x480.
The command line: "DISPLAY=:4.1 xclock" will launch the xclock program
on the second screen, for intance.
* this patch was edited by Dodji Seketeli <dodji@openedhand.com> for:
- better style compliance with the rest of the Xephyr code
- make sure Xephyr could be launched with no -screen option. By
default that creates a default screen of 640x480 pixel like before
- display full titles on the windows - with insctructions to grab
keyboard and mouse - like before.
commit 81692b628f41cb64329f3cccc0503fb216a2b8e3
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Oct 2 13:11:28 2007 +0200
Fix #12650: "windows not receiving mouse events in multiple screens context"
* dix/events.c, include/dix.h:
(UpdateSpriteForScreen): added this to update the mouse sprite context
when we switch from a pScreen to another.
* mi/mipointer.c:
(miPointerWarpCursor): as we are switching to a new pScreen,
don't forget to update the mouse sprite context.
commit f965a5f3454a95ddffb2faf9b291feff46305adf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 16:20:27 2007 +0930
dix: Ignore devices when deleting passive core grabs.
commit dc90d500085dd74e90073be008fc514bd97b160a
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 2 14:05:07 2007 +1000
exa: increase minor version number for pixmap allocation hooks
commit f15af2ae60bb8503c336bc3cba0560bd314a34bc
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Aug 3 16:33:33 2007 +1000
exa: only setup offscreen allocator if driver doesn't provide CreatePixmap
commit ffb58f4fa8d86e87f831430b8627f27d85f971a9
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 2 14:03:39 2007 +1000
exa: add hooks for drivers to take over pixmap allocation
This adds hooks for the driver to access Create/DestroyPixmap and ModifyPixmapHe
ader.
It allocates a 0 sized pixmap using fb and calls the driver routine to do
work of allocating the actual memory.
ModifyPixmapHeader is mainly required for hooking the screen pixmap which
isn't create by normal methods
commit 2b075e97ec913ebe19290181e36bb169410b820b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 13:28:40 2007 +0930
mi: switch core keyboard on XI events, not only on core events.
We only get core events through the EQ in exceptional cases, so make sure we
actually swap the core keymap for XI events as well. Gives us back the ability
to have multiple keyboard layouts simultaneously.
commit 31555af0005a0bc4d7ef785214696ac84681e29f
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 2 13:32:57 2007 +1000
exa: add a pixmap private pointer for drivers to retrieve.
commit 45ec6cd1fb242363c91ad8af1fd4a27a7f02621a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 13:19:07 2007 +0930
xfree86: fix DGA to use the correct devices.
DGAStealXXXEvent modified to take in device argument.
The evdev driver only sends one valuator when only one axis changed. We need
to check for DGA either way (xf86PostMotionEventP), otherwise we lose purely
horizontal/vertical movements.
Note that DGA does not do XI events.
commit 122ae65ed90195c584a770027b4d14ef65f72492
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 10:50:59 2007 +0930
xfree86: xf86DGA: some cleanup to use the correct devices instead of VCP/VCK.
commit 54ce7436b2579bb20728eab7c8d460b531c378af
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 10:49:46 2007 +0930
xfree86: update all pointers when calling xf86SwitchMode
Center the frame around the first pointer found and then update all pointers
on the same screen to move to the edges (if necessary).
Note: xf86WarpCursor needs to be modified, is using deprecated
miPointerWarpCursor and will kill the server when called with
inputInfo.pointer.
commit 113011221a4fcbd70bc592930b35f20d55809f1e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Oct 1 21:42:01 2007 +0930
Xi, xfree86: Remove leftovers of the XI wrapper code.
commit 50551ec693f40b91652fe4814e9fe2e1f9ab6517
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 28 15:04:33 2007 -0400
xace: remove obsoleted DRAWABLE_ACCESS hook.
commit 8b548657204000e18c7a38706a0071ae2f93159f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 28 13:34:18 2007 -0400
xace: add hooks + new access codes: XKB extension.
Removes "LookupKeyboardDevice" and "LookupPointerDevice" in favor of
inputInfo.keyboard and inputInfo.pointer, respectively; all use cases
are non-XI compliant anyway.
commit 5c03d131815cfe2f78792277ab8352e69e830196
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 28 08:02:00 2007 -0400
xace: add new hooks + access controls: XInput extension.
Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice.
commit a511c445debbd13e8c48146ecd2d7c97e793f788
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Sep 28 18:46:41 2007 +0930
Remove generation of core events, long live XI!
Let the drivers only generate XI events and put those into the event queue.
When processing events, generate core events as needed. This fixes a number of
problems with XKB and the DIX in general.
The previous approach was to put core events and XI events as separate events
into the event queue. When being processed, the server had no knowledge of
them coming from the same device state change. Anything that would then change
the state of the device accordingly was in danger of changing it twice,
leading to some funny (i.e. not funny at all) results.
Emulating core events while processing XI events fixes this, there is only one
path that actually changes the device state now. Although we have to be
careful when replaying events from synced devices, otherwise we may lose
events.
Note: XI has precedence over core for passive grabs, but core events are
delivered to the client first.
This removes the wrapping added in 340911d7243a7f1095d79b5b2dcfa81b145c2474
commit be466d8df808c4e4067a7963617bc3f506768f2d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 22:23:05 2007 +0930
dix: GetPairedKeyboard() always returns a valid keyboard (VCK if necessary).
We need it unconditionally in a few places, and the rest checked for NULL and
then set it to VCK anyway. So, fixing up all callers to appreciate the defined
return value.
commit 53434edc3d306137d019d95189ecdf0dbff75205
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 22:14:09 2007 +0930
dix: take paired keyboard instead of VCK (CoreProcessPointerEvents)
commit 2d93e69690d2c5d4a89a795ede6423796528e5df
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Sep 27 16:47:06 2007 -0700
Rework local client id finding code to be more uniform
commit c7ead3a68e5839cb92129e35b21f55007fba8445
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Sep 27 16:13:28 2007 -0700
xorgcfg needs $(DIX_CFLAGS) for pixman-1 include path
commit 62a9fb4cda988a896909a5620a68c51e46d0e403
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Sep 27 16:12:29 2007 -0700
Fix PCI rework build on Solaris (copy what BSD does)
commit cfe549d1ba28396c44af94133d8c1d323e3c7086
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu Sep 27 22:36:52 2007 +0200
EXA: Added back the maxPitchPixels initialization code.
This doesn't add real value yet, but it will be useful once I add code
that splits large render operations into smaller parts if necessary.
commit c11a27ef85674f1e77ffa7f083646b848e1dc0b8
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Sep 27 14:54:40 2007 +0100
Add the FB_ACCESS_WRAPPER checks
commit e0bb33b3d2e4f54cf20853cde9a1664a7dbd0dc7
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Sep 27 14:50:28 2007 +0100
Fix bug #12286
commit 6d5c1e0d896666bcb2b3c1de7bfa424f140be364
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:04:41 2007 +0200
EXA: Remove bogus pitch checks.
exaCreatePixmap should handle all cases correctly.
commit 598698678b07cb3a9406a9ee98bd3186366949e7
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:07:09 2007 +0200
EXA: Punt for all fallbacks in exaFillRegion*.
Now that PaintWindow is gone, all callers already handle fallbacks.
commit 006f6525057970a74382132237b2131286ad147c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:08:41 2007 +0200
EXA: Make sure tile offsets passed to drivers are never negative.
Thanks to Björn Steinbrink for pointing out the problem on IRC.
commit da7d9aa1fb60e13a59c9f842fed7aefc5b97c195
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:08:40 2007 +0200
EXA: Tile offscreen pixmap coordinate offsets are always 0.
commit d6f4764bf5f3a601a0034ded039857e8ea5563b2
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:08:40 2007 +0200
EXA: Remove some clearly bogus code from exaCopyNtoN.
Not sure what I was thinking when I wrote this... it would cause the box
coordinates to be off for exaCopyNtoNTwoDir or fallbacks.
Thanks to Tilman Sauerbeck for pointing out the problem on IRC and testing the
fix.
commit c7d6d1f589d729fa689d22d82fe30afbc6e1cacb
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:08:40 2007 +0200
EXA: Punt on fallback case not handled correctly in exaFillRegionTiled.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=12520 .
commit 1d938a80fd4fa58d1791c146b6b5c2dfe148dce7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Sep 26 19:42:46 2007 -0700
Remove unused pciAddrHostToBus functions from ix86Pci.c
Matches linuxPci.c changes made in 8279444a54f38c5e2e5d4c2d936a10d74990e0be
Fixes compiler errors:
"ix86Pci.c", line 194: too many struct/union initializers
"ix86Pci.c", line 204: too many struct/union initializers
"ix86Pci.c", line 214: too many struct/union initializers
commit de06a47d4ad9c845b098438d9492a5f42483a2ad
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 11:45:03 2007 +0930
dix: GetMaximumEventsNum() needs to return 3 + MAX_VALUATOR_EVENTS.
Raw events can be generated for pointer events, so 2 + MVE isn't enough.
commit 32d0440c7f6e604807cb14dd32349df6f22c903b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 11:44:03 2007 +0930
xkb: xkbHandleActions: let wrapping take care of event delivery.
This is hopefully better than hardcodey calling CoreProcessPointerEvent.
commit 27612748e0ec20f3a23839f0a12e39f598dd722c
Merge: b614614 3b114f2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 26 07:47:29 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
commit 3b114f2603fc2adeec7f5f8f20fe4870afb8dff1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 25 07:55:17 2007 -0400
Input: Properly swap DevicePresenceNotify events.
commit 31a7994ac7365562ef1d00e0a7b25f967a961a4e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Sep 24 13:33:01 2007 -0400
Input: Return errors to the dispatcher instead of sending them ourself.
Also fixed two "unused variable: stuff" warnings.
commit 56ffc381d32687242dd094395fcf2216339bab2a
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Sep 26 16:47:54 2007 +0200
EXA: Removed duplicated exaGetDrawablePixmap() calls.
commit aa0325db7e8ab11d9418cae14f11c488f443ccaa
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 26 15:26:42 2007 +0200
Xephyr: fix compiler warnings
* hw/kdrive/ephyr/ephyr_draw.c:
(ephyrDownloadFromScreen),
(ephyrUploadToScreen): fix compiler warnings
commit 8f9bf927e1beecf9b9ec8877131ec12c765e4d84
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 18:04:59 2007 +0930
xkb: Unwrap properly in ProcessPointerEvent.
Instead of hardcoding CoreProcessPointerEvent, actually try to unwrap properly
and then call the unwrapped processInputProc. Seems to be a better idea,
especially since it makes stuff actually work...
commit 3342b5ad47be25c6838321c0aafc28c329c308b5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 18:03:21 2007 +0930
Xi: fix the wrapper code for processInputProc wrapping.
Followup to [1].
If a core grab causes the device to freeze, it overwrites the processInputProc
of the device. [1] would then overwrite this while unwrapping, the device
does not thaw anymore.
Changing this to only re-wrap if the processInputProc hasn't been changed
during the event handling.
[1] 340911d7243a7f1095d79b5b2dcfa81b145c2474
commit e2cb8515661b1f7826981931d82dee6e05529f04
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 18:01:17 2007 +0930
xfree86: pass in the XKB event processing proc instead of the XI one.
We need to pass ProcessPointerEvent or ProcessKeyboardEvent to
XkbSetExtension, otherwise we lose the xkb layer.
commit 27bc1a8fef2bfd3d62fb44f7c7eb0d463ed08632
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:24:41 2007 +0930
xkb: XkbFilterEvents: Remove unused variable compiler warning.
commit bfc89c035542a10594f5f0cbde1c7e28b7d024a7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:23:37 2007 +0930
xkb: unify ErrorFs. Prefix all with [xkb].
Output for XkbUseMsg intentionally skipped.
commit 8b508f5d6bd0d3995294d5ff300a856754442999
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:19:53 2007 +0930
dix: unify ErrorFs. prepend all with [dix].
commit 394f3c1dbee7270a1d930846d49278424c3072d4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:19:37 2007 +0930
dix: GetPointerEvents: remove unused variable compiler warning.
commit 55fd50273ea67eb99a0c8a830349851931298387
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:15:34 2007 +0930
Xi: unify ErrorFs. Prefix all with [Xi].
commit 340911d7243a7f1095d79b5b2dcfa81b145c2474
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:12:49 2007 +0930
Wrap core event handling through ProcessOtherEvents.
When processing events from the EQ, _always_ call the processInputProc of the
matching device. For XI devices, this proc is wrapped in three layers.
Core event handling is wrapped by XI event handling, which is wrapped by XKB.
A core event now passes through XKB -> XI -> DIX.
This gets rid of a sync'd grab problem: with the previous code, core events
did disappear during a sync'd device grab on account of mieqProcessInputEvents
calling the processInputProc of the VCP/VCK instead of the actual device. This
lead to the event being processed as normal instead of being enqueued for
later replaying.
commit b2a4883bd89d406713d4f808e72721ecc1456d67
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 09:20:11 2007 +0930
dix: add comments to PlayReleasedEvents()
Also stick another warning in, more changes needed for XGE if panoramix is
active.
commit 275dc77c2972147407584323b866b8acc1654ea0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Sep 25 21:40:08 2007 +0930
dix: add comments to ComputeFreezes() and syncEvents struct.
commit ae8b4f7dcf1291a2f5a0d0159f3e6089eea0578a
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 24 22:06:52 2007 +0200
EXA: Added pitch limitations.
Drivers can now specify the max pitches that the accelerator supports.
commit b61461425eb15fcff2a58330d74fe5a5a1f226fc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 25 09:56:00 2007 -0400
xace: add hooks + new access codes: XV extension.
May need to revisit this extension in the future, depending on observed use.
commit 9bd04055a2175ec16756d3bf73ae03b5e163a28a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 25 09:33:51 2007 -0400
xace: change prototype of VALIDATE_DRAWABLE_AND_GC macro to allow access
mode to be passed to dixLookupDrawable.
commit 988f446fe00ac2b92c484a4440613dd82191eadd
Author: Eric Anholt <eric@anholt.net>
Date: Mon Sep 24 20:23:35 2007 -0700
[EDID] Ignore reserved bits in deciding monitor vs detailed timing descriptor.
Even though they're defined to zero by the spec, we've seen an EDID block
where the (empty) ASCII strings were stuffed in a byte early, leading to the
descriptor being considered a detailed timing instead.
commit 5d9f6cf51becdeb1d2be9bdeec4bb5d0c4dd0e8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 13 23:33:07 2007 +0930
dix: cosmetic change. Remove "pointer" variable, might as well use pDev.
commit c4db4d1fcf7fa2ba802a208beee6b3adc83921f5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 13 23:27:07 2007 +0930
include: remove register keywords.
commit 1c25c46f3d5f98be8dbf36684aad4302b220e163
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 13 23:22:27 2007 +0930
dix: fix compiler warnings about unused variables.
commit 68e0c4988e359e3c9da933946bc703cf8530bdbc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 20:48:48 2007 +0930
dix: fix "possible use of uninitialized variable" warning.
The device passed through to UnrealizeCursor isn't used anyway, so setting it
to NULL is enough.
commit b484451eab261a919fe94c0c0f56877f7571fc9e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 18:34:51 2007 +0930
dix: don't try to access "time" field for GenericEvents in PlayReleasedEvent.
GenericEvents can't be parsed to keyButtonPointer, and there's no guarantee
that it has a time field anyway. PlayReleasedEvent needs to store the millis
when we know it (core events, XI event) and just re-use them for GenericEvents.
Yes, this is a hack. But it looks like the time has zero significance anyway.
commit 1c38eac442a3ab9e8469e944f382251957996c5a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 18:09:57 2007 +0930
dix: fix comment for DeliverDeviceEvents.
DDE is not always called, grabbed or focused devices go through
Deliver{Grabbed|Focus}Event first.
Thanks to Eamon Walsh for spotting it.
commit 06188ce90d2a8146140773f9367f23404b464282
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 18:00:03 2007 +0930
dix: Make EnqueueEvent aware of GenericEvents.
GenericEvents can be > sizeof(xEvents), so we need to make sure we're
allocating and copying enough memory for the event.
commit 8840829ab93c4eb62eb58753c015da5307133fe5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 17:40:11 2007 +0930
dix: don't compress motion events from different devices (EventEnqueue)
commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 23 17:17:03 2007 +0300
Input: Generate XKB mapping changes for all core-sending devices (bug #12523)
When we change the mapping on a core device, make sure we propagate this
through to XKB for all extended devices as well.
commit 0e800ca4651a947ccef239e6fe7bf64aab92257c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 23 12:43:31 2007 +0300
GetKeyboardEvents: Reject out-of-range keycodes (bug #12528)
We can only deal with keycodes between 8 and 255, so make sure that we never
accept anything out of this range.
commit e1860f241b7322c54c109cf5727df45b54b73916
Author: Alex Deucher <alex@botch2.(none)>
Date: Sat Sep 22 17:54:51 2007 -0400
Document xf86_crtc_clip_video_helper better.
commit 19d30c1c771c0f5c9dfc0f4cfb084dd2e528d992
Author: Alex Deucher <alex@botch2.(none)>
Date: Sat Sep 22 17:51:27 2007 -0400
Revert "Fix possible crash if Xv window is outside of either crtc"
This reverts commit 92355314103d2193ca20786915eaf608922a36dc.
This changes ABI. False means there was a memory failure of some kind,
not that the video shouldn't be displayed
commit 92355314103d2193ca20786915eaf608922a36dc
Author: Michel Dänzer <daenzer@debian.org>
Date: Sat Sep 22 14:25:02 2007 -0400
Fix possible crash if Xv window is outside of either crtc
commit edd88170836ec985ab1a59179de69d50644b8dff
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Sep 22 13:02:08 2007 +0200
EXA: Check ABI compatibility earlier.
If the driver isn't compatible to the server, all bets are off anyway wrt
the contents of the fields that we're validating, which can lead to bogus
error messages.
commit abe0a51f3f790f8c055289465e130177c4b647cc
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Fri Sep 21 17:07:36 2007 -0700
So, like, checking return codes of system calls (signal, etc) is good.
Also, only restore an old signal handler if one was actually set
(prevents the server from dying on OS X).
commit eb82b19aa71333b46e927516cc228f25d3e05e4d
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 20 19:55:48 2007 -0700
XDarwin: build fix for X11.app
commit 5b08932bfbb7e4612733fffd2acc9682c6856d90
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 20 19:27:31 2007 -0700
XDarwin: pulling in Indirect GLX fixes from downstream
commit 742d5d6adc4d4a1b6fceeb3443d7931e107462f7
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 20 18:03:51 2007 -0700
XDarwin: Fixes to quartzKeyboard.c to prevent a crash using certain non-US keyboards
commit 374bd88d1025835fe36ca0ff6620eb1d3b0a06b0
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 20 16:50:49 2007 -0700
XDarwin: Merging misc changes from downstream.
The only functional changes in this patch are a removal of use of
Xtrans internals -- replaced by xcb, which doesn't seem to be used
elsewhere in the server? Pity.
Also, a fix to make all X11 windows pop to the front of the display
when the X11.app icon is clicked -- currently takes two clicks,
not sure why.
commit 3a965fdadccea7beff09a28c9c0ef4b4975eae38
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 20 16:22:24 2007 -0700
Don't segfault on shutdown if we never managed to connect to dbus.
commit 50fa8722d35c12e5f0322cebe25faf99c39d4f50
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 20 14:00:33 2007 -0700
Set noCompositeExtension to TRUE when failing to initialize the extension (e.g. when Xinerama is enabled).
commit a247886b082cea93fa8f8980616a9c388ba70111
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 13:06:38 2007 -0400
xace: add hooks + new access codes: XF86-Bigfont extension
commit f6532a81eec5f096e27285687964b77c17987f72
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 12:17:17 2007 -0400
xace: add hooks + new access codes: APPGROUP extension
commit 82f7195a628cc7ec94abc0cfe5bae2be8af443bc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 09:17:09 2007 -0400
xace: modifications to ChangeWindowAttributes special case: separate
Receive and SetAttr. Refer to 963e69b8efc39369915e7f0c6f370ac0d5d2b60f
commit 661b1328cf992d8855552677a94d60de1d8ce942
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 08:41:26 2007 -0400
xace: add hooks + new access codes: SYNC extension
May need to revisit this extension in the future, depending on observed use.
commit 90bacdef723e1e49c72775144916750758d3568c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 06:53:51 2007 -0400
xace: add hooks + new access codes: MIT-SHM extension
commit 12a18cc8903fac53c3c77b23dd8093187594a4f3
Author: David Nolden <david.nolden.git@art-master.de>
Date: Fri Sep 14 22:42:19 2007 +0200
compilation-fix in debug mode
commit e93cff52fed9074aa007c2e6ec6b578f69aef3cb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 14:48:20 2007 -0400
xace: add hooks + new access codes: DOUBLE-BUFFER extension
commit 082c0f7fb34458ebb303cf875d1d75686eca25e6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 13:59:35 2007 -0400
devPrivates rework: move devPrivates field in drawable structure types
to just below the DrawableRec. Wish there were a better way to do this
but it has to be in the same place for all drawable types.
commit 5b36b64192517e2470766ce7ff1d4dc04c936fad
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 11:11:54 2007 -0400
xace: add missing argument to hook call.
commit 963e69b8efc39369915e7f0c6f370ac0d5d2b60f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 11:11:41 2007 -0400
xace: add special-case for just setting the event mask on a window,
this should only check "receive" permission, not "setattr" permission.
commit c140d20f4ade973496dcbbd06453402ef0c0e85c
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 05:58:22 2007 -0700
XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore
commit bcb5e3e6276ce9ae7a4dae7434cf2247764da078
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 04:46:10 2007 -0700
XDARWIN: More fixes to Makefile.am
At least on my system (10.5 with the latest and greatest modules),
Xquartz now builds out of the box. It doesn't quite work yet, but
hey -- you have to start somewhere. ;)
commit 97c150b61bbe436453b05d3c07cd2173870aac40
Merge: 57907e0 547ad21
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 07:25:55 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
commit 5e209b21f3d6b3268fa7dab1e8df892d8352cc08
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 03:44:46 2007 -0700
XNEST: removed obsolete hack to build under Darwin
commit 378c7ebef444cdc9ae62ebf05c7111088a0c4bc1
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 03:43:40 2007 -0700
XVFB: Removed obsolete hack to build on Darwin
commit 7813392d1c9a38d01cfff17732278bb7798eee5d
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 01:52:58 2007 -0700
XDarwin: changes to Makefile.am to use new conditionals
commit 170fc77d9e73151f5c1c1f0f04598b3497db4284
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 19 09:54:09 2007 +0200
xserver: don't force DTRACE detection by default
this fixes a breakage caused by 7a4ec34e256bf36b041c011a083916ad75a1d8bc.
When running a non DTRACE aware system that is not darwin*, DTRACE was getting
required. Now it is not anymore.
commit 9b4f5157179a0d20756c16ea1f5130b171f72bb1
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Sep 18 21:40:32 2007 -0700
XDarwin: We build many many different targets, let's break them out into autoconf conditionals
commit 7a4ec34e256bf36b041c011a083916ad75a1d8bc
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Sep 18 20:37:09 2007 -0700
XDarwin: Disable dtrace support on Darwin 9 (since it doesn't work ... yet ...)
commit 3c19ec47b434d4ca84db58363cc053cc0b6aa413
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Sep 18 20:15:44 2007 -0700
XDarwin: changed XF86BigFont support default from yes to auto so XDarwin can disable it
commit 547ad2125ece93bbe01f6d09a3baf176ebd16bb3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Sep 17 20:33:56 2007 +0200
EXA: Make sure driver hooks get correct offscreen offsets from exaCopyDirty.
This should ensure the driver UploadTo/DownloadFromScreen hooks can always
work as intended.
commit 56cc24ffb21f7fd41f9ea9e8f969aa85021b9f53
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon Sep 17 20:33:56 2007 +0200
EXA: Don't crash in ExaCheckPolyArc.
See https://bugs.freedesktop.org/show_bug.cgi?id=12286 .
commit 7ac89060e02c7a803018afd580720f8326561fd8
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Sep 17 20:33:55 2007 +0200
EXA: Don't crash in exaGetImage when swapped out.
commit 3876c6c80534a6f7412ec806a2ba9ada22c5e505
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 17 18:47:45 2007 +0200
EXA: Fixed compiler warnings.
commit d5738ff2e0f93df4729c075ce31a1041d580e50e
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 17 16:59:03 2007 +0200
EXA: Added missing exaPrepare/FinishAccess calls in ExaCheckPushPixels.
commit a0dafd95e1e13a2f1b77ab9f82fd365a7be19de5
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 17 16:45:20 2007 +0200
Removed hw/xwin/winpntwin.c from Makefile.am.
winpntwin.c was removed in e4d11e58ce349dfe6af2f73ff341317f9b39684c.
commit 7bd65577018a574970b767b67967b65fcd5c2bf0
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Sep 15 14:01:57 2007 +0200
Initialize output->pendingProperties.
commit b9f7aeb20015290a8acf938a11bf9272bf3527cf
Merge: e4d11e5 06d27f8
Author: Eric Anholt <eric@anholt.net>
Date: Thu Sep 13 00:15:45 2007 +0000
Merge remote branch 'origin/master' into paint-window
Conflicts:
mi/miexpose.c
commit e4d11e58ce349dfe6af2f73ff341317f9b39684c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 12 13:58:46 2007 +0000
Remove the PaintWindow optimization.
This was an attempt to avoid scratch gc creation and validation for paintwin
because that was expensive. This is not the case in current servers, and the
danger of failure to implement it correctly (as seen in all previous
implementations) is high enough to justify removing it. No performance
difference detected with x11perf -create -move -resize -circulate on Xvfb.
Leave the screen hooks for PaintWindow* in for now to avoid ABI change.
commit 06d27f8045966c1fb154eafaff308a01b93f265b
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Sep 12 23:57:30 2007 +0100
Try again to fix drawable and tile offsets in miPaintWindow
Many coordinate spaces are hard. Let's go drinking.
commit dd3992eb86377684a5dbe86fa19c756a9e53cda2
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Sep 12 22:39:31 2007 +0100
miPaintWindow draw to window for background.
Instead of drawing to window pixmap for everything, draw to window for
background as that works for Xnest and Xdmx; draw to pixmap for borders
which neither of those X servers use.
commit 6da39c67905500ab2db00a45cda4a9f756cdde96
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 12 13:23:13 2007 +0000
Fix build on FreeBSD after Popen changes.
commit 257c8ed17f4f908e0d0d5e53aaf13aa3b1313f50
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Sep 12 12:11:49 2007 +0100
Rewrite miPaintWindow to draw to window pixmap.
miPaintWindow was drawing to the root window, or (sometimes) drawing to the
window after smashing the window clip list. This is losing, and easily fixed
by just drawing to the window pixmap.
commit 43dc41034735d84765233a78bd619f3f0e7ace75
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 01:43:37 2007 +0200
Replace a non-ascii char with the corresponding groff escape in exa.man.pre
commit a5b8053606d6e786cdcf6734f271acc05f9cc588
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Sep 11 11:37:06 2007 -0400
Ignore - not just block - SIGALRM around Popen()/Pclose().
Because our "popen" implementation uses stdio, and because nobody's stdio
library is capable of surviving signals, we need to make absolutely sure
that we hide the SIGALRM from the smart scheduler. Otherwise, when you
open a menu in openoffice, and it recompiles XKB to deal with the
accelerators, and you popen xkbcomp because we suck, then the scheduler
will tell you you're taking forever doing something stupid, and the
wait() code will get confused, and input will hang and your CPU usage
slams to 100%. Down, not across.
commit 2e3e08d31e908ceadeef16d6069cdaf8c61d7ed1
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 11 08:50:41 2007 +0200
xserver: test presence of strlcpy in configure
* configure.ac: define HAVE_STRLCPY when function strlcat is present
this serves at least to unbreak libxtrans code compilation.
commit e8c73ac697aa472e10b4d8c093a715df0bf545af
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 11 00:20:45 2007 +0200
Xephyr: fix compilation breakage.
* hw/kdrive/ephyr/ephyr_draw.c:
(exaDDXDriverInit): pExaScr->hideOffscreenPixmapData does not exist
anymore, so don't set it.
commit 321e0a21600e418bbeb164043a9a21a0ff80cbe9
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Sep 9 16:28:41 2007 -0700
fixed cut-and-paste typo
commit 0ff273fd1e2ea7242b3e6c5effb2a623ef32ec6f
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 6 18:52:26 2007 -0700
XDARWIN: fixes to make Xquartz build again
commit f8637137ab43818d45d249b337820cbf427a05ec
Author: Ben Byer <bbyer@bbyer.local>
Date: Thu Sep 6 05:39:57 2007 -0700
XDARWIN: build fix for quartz/pseudoramiX.c
commit e8093e15c7df7a3d5a9717bc9d7d7517b0743f29
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Sep 3 13:52:29 2007 +0200
EXA: Exclude bits that will be overwritten from migration in exaCopyNtoN.
Also plug a region leak in exaPolyFillRect.
commit e81af8ba643df3be53b0a46d9d4a0eaf21557c9e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Sep 3 13:14:29 2007 +0200
EXA: exaFillRegion{Solid,Tiled} improvements.
Use region to exclude bits that will be overwritten from migration.
Also make exaFillRegionSolid use the same logic as exaFillRegionTiled.
commit 5f7da4da8de7449e1c2a4c679632a0b2a5858b7e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 31 16:59:28 2007 +0200
EXA: Use exaShmPutImage for pushing glyphs to scratch pixmap in exaGlyphs.
commit be922b30486abce3a8c13996d579b211a7b56f0e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:59:07 2007 +0200
EXA: exa(Shm)PutImage improvements.
Improve exaShmPutImage performance and reuse its core in exaPutImage as it
seems faster than the previous code when the driver doesn't provide an
UploadToScreen hook.
Make sure all damage records are notified of the damage incurred by actual
ShmPutImage calls.
Remove superfluous manual damage tracking for actual PutImage calls.
commit ea92ea415665e294a1ba233e9a1d39b6daa0cee1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:54:18 2007 +0200
EXA: exaGetImage improvements.
Use the new migration infrastructure to cache FB bits we need in the system
copy, for the benefit of repeated calls.
commit aa2ed73e0ec881947c969b67269e3206da4de359
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:50:42 2007 +0200
EXA: Remove superfluous manual damage tracking.
These should all be covered by damage wrappers.
commit a634c9b03494ba80aeec28be19662ac96657cc23
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:48:03 2007 +0200
EXA: RENDER improvements.
Exclude bits that will be overwritten from migration.
Use exaGlyphs even when Composite can't be accelerated, to avoid PolyFillRect
roundtrip via offscreen memory.
Initialize mask pixmap in exaGlyphs in FB in addition to system if the driver
provides Composite hooks to avoid migration overhead.
Remove manual damage tracking where superfluous.
commit 1f457ff3db24178eefecfbbf177aaf6554adb204
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:44:20 2007 +0200
EXA: Improvements for 1x1 pixmaps.
Initialize system and FB copy in exaFillRegionSolid and adapt
exaGetPixmapFirstPixel to the new migration infrastructure.
This should mostly eliminate migration overhead for these, whether they are
used for acceleration or fallbacks.
commit 489bc7551ffc7360ba9648ca5c98b59c7e7a1fd1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:37:53 2007 +0200
EXA: exaImageGlyphBlt improvements.
As we can't actually accelerate anything interesting here, just migrate out
once and call fbSolidBoxClipped instead of taking a round trip via offscreen
memory with exaSolidBoxClipped.
Reuse pending damage region for extents and to prevent any actual migration of
pixmap contents when we're overwriting the whole pending damage region.
Remove superfluous manual damage tracking.
commit 2e0895a4ba27c1308713022820444c8f57f7a69f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:30:03 2007 +0200
EXA: Improvements for trapezoids and triangles.
Only migrate once in exaTrapezoids/Triangles instead of every time in
exaRasterizeTrapezoid/AddTriangles. Adapt manual damage tracking to new
infrastructure.
Also move definition of NeedsComponent() closer to where it's used.
commit 6c9d7ed61bc4a19d21c53717b8af3d90b5d82ca9
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 6 13:10:16 2007 +0200
EXA: Hide pixmap pointer outside of exaPrepare/FinishAccess whenever possible.
We finally want to catch all cases where the pixmap pointer is dereferenced
outside of exaPrepare/FinishAccess.
Also fix a couple of such cases exposed by this change.
commit 962eddd7a2863a8475f5fd8107d3112df08d1172
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 29 19:55:22 2007 +0200
EXA: Support partial migration of pixmap contents between Sys and FB.
The initiator of migration can pass in a region that defines the relevant area
of each source pixmap or the irrelevant area of the destination pixmap. By
default, the pending damage region is assumed relevant for the destination
pixmap, and everything for source pixmaps.
Thanks to Jarno Manninen for reassuring me that my own ideas for this were
feasible and for providing additional ideas.
commit f27931bdd26fc9a1e6bb5173b5537e32c51a98b3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 29 19:41:52 2007 +0200
Add DamagePendingRegion.
DamagePendingRegion returns a pointer to the region of a drawable that will
be damaged by the current operation for damage records that chose to get damage
reported only at the end of the operation.
commit 5c7ee3f47fa0c067102a17dee3f75a51cc0bdb3a
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 19:24:18 2007 +0200
EXA: Track valid bits in Sys and FB separately.
Also consolidate exaCopyDirtyToFb/Sys.
commit 8cfcf9973c765f11d1b45b95b8091ef7e01d7f01
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Sep 5 20:10:09 2007 +0200
EXA: Migrate out pixmap in exaPrepareAccess.
Also fix exaFinishAccessGC not to use the same index for tile and stipple.
commit e510a77ba4d65d5d6ead514cd698f1b1e3f8a2b6
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Jul 17 17:16:51 2007 +1000
EXA: Add a couple of missing exaPrepare/FinishAccess calls.
commit 72b347e681f5667b68257822e7cec02ab4c9cb6d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Sep 7 14:31:19 2007 +0930
dix: Enabling devices must not overwrite existing sprites/pairing.
EnableDevices is (amongst others )called after a VT switch. We must not create
a new sprite or re-pair the device, otherwise we lose the input device setup
that we had before the VT switch.
This requires the devices to be in exactly the same order as before
the VT switch. Removing a device while on a different VT is probably a bad
idea.
commit 57907e0943da0c3fd3bf6c128d210b544629ce72
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 6 16:55:51 2007 -0400
devPrivates rework: register an offset for every resource type, use
signed values so -1 actually works correctly, and provide a macro for
adding an offset to a pointer.
commit 84eb7e62248ddc2761af8cefe33d1b7147477528
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Sep 6 13:36:37 2007 +0100
Fix Xdmx build
commit 35ec8b89f4cdf5ec48b292d47b2dad42d2fb9534
Author: Ben Byer <bbyer@bbyer.local>
Date: Thu Sep 6 05:34:14 2007 -0700
DDX changes for XDarwin
Creating a real DDX section for XDarwin instead of
stuffing it into the XORG section in a half-assed manner.
commit d627061b48ae06d27b37be209d67a3f4f2388dd3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:57:00 2007 +0930
xfree86: wrap keyboard devices for XKB.
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.
Note that the VCK is still not wrapped, so core events will bypass XKB.
commit 5ee409794ee604fcf84886f70429fc2d6b1ff4f1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:52:02 2007 +0930
dix: add XI event support to FixKeyState.
FixKeyState needs to be able to handle XI events, otherwise we get "impossible
keyboard events" on server zaps and other special key combos.
commit 6334d4e7be18de5f237c12a6dc20f75aa23477d0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:49:57 2007 +0930
xkb: enable XI event processing for xkb.
XI events can now take the same processing paths as core events, and should do
the correct state changes etc.
There's some cases where XKB will use KeyPress as type for an event to be
delivered to the client. Stuck warnings in, not sure what the correct solution
is yet.
commit 49dbe9a757a3d7a0b9ab318242c6cc0cbd4dd1f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 17:27:28 2007 +0930
dix: close virtual core devices after other devices.
If a device is paired with the VCP, deleting the VCP before the device will
segfault the server when the sprite should get updated.
commit 03680a384aa423ece75b658f00b96db2628c39fa
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 15:43:47 2007 +0930
dix: don't change the device struct while processing core events.
The device state needs to be changed while processing the XI event. Core
events are always processed after XI, so by then the device is already set up
properly. However, we now rely on DeviceButtonMotionMask to be equal to
ButtonMotionMask. It already is, but stick a big fat warning in so nobody
attempts to change it.
This commit disables XKB for the VCK, thus essentially for all devices.
Temporarily anyway.
commit f3f614cd01ae56d84d61b4f5c907c6edd7c8c6d3
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 5 20:34:00 2007 -0700
Revert "configure.ac: exclude pci-access dependency from XDarwin"
This reverts commit 20c6677d1b5f8d77325dd878ffa3df1d0fb01864.
commit bf1641b94cffa54b786e18eaeff3839d8790b9f2
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 5 20:33:43 2007 -0700
XDARWIN: Add launchd support
This adds a bit of glue to configure.ac to support launchd detection;
on OS X (or other platforms which choose to implement launchd), this allows
the system to automagically start the Xserver as necessary to serve clients.
commit 71c21dea748ea0dcad758679c40ee39192d170f9
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 18:45:50 2007 -0700
added HAVE_LAUNCHD check to configure.ac (mostly for OSX)
commit 81c28ffd2b13a83770eadcfd7829d35d319d637f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Sep 5 17:46:23 2007 -0700
Fix key repeats during VT switch.
Add keyc->postdown, which represents the key state as of the last mieqEnqueue
call, and use it when we need to know the posted state, instead of the
processed state (keyc->down). Add small functions to getevents.c to query and
modify key state in postdown and use them all through, eliminating previously
broken uses.
commit e332335241af28ef0ab66b102d0cbc4e5c73ac68
Merge: 7381e91 accd71b
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 15:51:23 2007 -0700
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/xserver
commit 7381e9149e3cbb7e672070781a16e3f096202be9
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 15:51:11 2007 -0700
added an exclusion for setting XORG on darwin
commit accd71bda6f958ea6892ad3a10879232d345774c
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Sep 5 14:19:19 2007 -0700
Deliver correct event when releasing keys on VT switch.
In commit 41bb9fce47f6366cc3f7d45790f7883f74289b5a, the event delivery loop
for Xinput enabled keyboards was changed and accidentally used the wrong
index variable, causing random events to be delivered when returning from VT
switch.
In addition, in commit aeba855b07832354f59678e20cc29a085e42bd99,
SIGIO was blocked during delivery of these events, but not for the entire
period the xf86Events array was being used. Block SIGIO for the whole loop
to avoid other event delivery from trashing the key release events.
(cherry picked from commit aa7ed1f5f35cd043bc38d985500aa0a32e857e84)
commit 8b77dc7e808f61f1ed10fe05cf898bb47459a76d
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 14:48:38 2007 -0700
XDARWIN: build breakage fix
commit 20c6677d1b5f8d77325dd878ffa3df1d0fb01864
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 14:31:01 2007 -0700
configure.ac: exclude pci-access dependency from XDarwin
XDarwin doesn't need any of this pci stuff since it doesn't talk directly to hardware,
so it doesn't make sense to require it when building on OSX/Darwin.
commit ff01e44e33fd072958fb0157dae072f1b1c88944
Merge: 8ba8c16 47300ed
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 13:56:08 2007 -0700
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/xserver
commit 8ba8c16af773ec83a0b1c0661a23d746b401944e
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 13:46:30 2007 -0700
build fixes for XDarwin
commit 47300ed2be59d0ba7ea9345b954bf3104877c095
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 5 12:34:29 2007 -0700
Fix server version reporting to be the server package version.
Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense. Instead, just
report the package version.
When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch). The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).
This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now. While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.
commit 6c89d1237c4fdce961b30a8eaee964af5d56565e
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 5 17:46:49 2007 +0200
Kdrive: unbreak kdrive linking
* configure.ac: re-sort Kdrive libs so that symbols get properly resolved.
Basically, all some libs are present in both $KDRIVE_LIBS and $XSERVER_LIBS,
and some libs orders are not correct. So I made sure Kdrive servers don't have
to link against $KDRIVE_LIBS *and* $XSERVER_LIBS. They just have to link
against $KDRIVE_LIBS now.
* hw/kdrive/*/Makefile.am: update those makefile to reflect the change in configure.ac
commit 0003ccfcdfae1b473aa024342304b84256d378b9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 5 11:18:36 2007 -0400
xace: add new fields to resource access hook to allow parent resource objects
to be passed in at create time. Also added a missing devPrivates initializer.
commit 28e48cd8e6e4c412a49d7177daad6d3c93c28e08
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 5 04:43:17 2007 -0700
Another pathname fix for event_status_driver.h
commit b6c0697fd67323893a9ad3676c33f2f1ec48e15e
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 5 04:40:03 2007 -0700
fixed path for event_status_driver.h
(The path currently used is deprecated on Tiger and invalid on Leopard.)
commit c4fff050836feeef8390b7197f1de39af2997811
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 5 16:19:45 2007 +0930
Revert "Input: Fix stuck modifiers (bug #11683)"
This reverts commit 6b055e5d9751e3679ff98065e43225ec8a960053.
MPX relies on the XI event being delivered before the core event. Device grabs
break, amongst other things. I guess stuck modifiers need to be fixed some
other way.
Conflicts:
dix/getevents.c
commit bfe6b4d2d9952a80f8dbc63eec974ef894e5c226
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Sep 4 17:44:51 2007 +0930
xkb: Store the action filters per device in the XkbSrvInfoRec.
Using a global array for action filters is bad. If two keyboard hit a modifier
at the same time, releaseing the first one will deactivate the filter and
thus the second keyboard can never release the modifier again.
commit cc5c926267be099d793e6dfec17916f21c73c64d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Aug 30 15:51:22 2007 +0930
randr: RRPointerScreenConfigured needs to move all pointers.
Previous version only moved the VCP, causing "bogus pointer events" lateron.
Now we run through the device list, updating each pointer separately if
necessary.
Also stick a big warning into RRPointerMoved, not sure what device we need to
work on here.
commit 136fde2c7b5ed590bc6c63d11ede31e92dc679a2
Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
Date: Tue Jul 3 13:44:28 2007 -0300
Add Xserver man section about catalogue:<dir> FPE
catalogue:<dir> FPEs were introduced in libXfont 1.2.9
commit eb6a933dc60bec5601260794eeb973e946af37b6
Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
Date: Tue Jul 3 13:44:03 2007 -0300
Add xorg.conf man section about catalogue:<dir> FPE
catalogue:<dir> FPEs were introduced in libXfont 1.2.9
commit 205183a733237ea418a25c7423b689fcc8eae628
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 4 16:19:22 2007 -0700
Fix driver build by including an appropriate Requires.private line on pixman.
We'd previously been substituting PIXMAN_CFLAGS, but we've got a better tool
now, plus I deleted the PIXMAN_CFLAGS substitution without noticing.
commit d67e210f3458b62d7d4a6032aabfda0004d661c1
Author: Gerte Hoogewerf <g.hoogewerf@gmail.com>
Date: Tue Sep 4 16:09:38 2007 -0700
Add stub symbols to make xprint build.
commit f7f79724fdea0cc6fda0e90e56431df937d49335
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 4 15:10:49 2007 -0700
Increase despair by fixing xprint build after my _DEPENDENCIES changes.
commit e89d16be07e45e487913509788a9e8cb1ee09bc7
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Sep 4 14:49:49 2007 -0700
Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart.
commit bf5948518763b5e21eff806a0a9abc5f7757fa10
Merge: 4062db4 735da3d
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Tue Sep 4 22:40:31 2007 +0200
Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver
commit 4062db4020c671fc0921a3a4e7fe5d8dc1be2e1d
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Tue Sep 4 22:39:14 2007 +0200
typo in comment
commit ce9e83d913511fe619da42f805d7bcd1a2a60d90
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 4 14:01:55 2007 -0400
xace: add hooks + new access codes: Damage extension
commit 735da3dcd09f59c40f68eca8c9a91c2e826cd1b9
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Sep 4 16:42:57 2007 +0200
Fixing xf86I2CGetScreenBuses(), now dereferencing the correct pointer.
commit 7c5de093d499de63d39fe038d86da0a085262017
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Sep 4 15:07:17 2007 +0200
Fixing sig11 in xf86I2CGetScreenBuses().
Dereferencing a pointer once too often caused a
sig11 in xf86I2CGetScreenBuses().
commit 9adea807038b64292403ede982075fe1dcfd4c9a
Author: Hong Liu <hong.liu@intel.com>
Date: Tue Sep 4 08:46:46 2007 +0100
bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
This patch should fix bug 8080.
commit 529acb175440969af9d7fa38aab8d7dea0dc2661
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 2 15:16:01 2007 -0700
Fix Xorg build by listing circular dependency libraries twice.
One of these I introduced by listing dix and mi in the same library list to
simplify other servers. The other had been hacked around using libosandcommon,
which is now gone.
commit c56930e6ca90a61d2f4cbd845f7d0a51a66f83cb
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 18:27:41 2007 -0700
Remove backend.[ch] from neomagic to fix distcheck.
commit f98dfec79dadb70fa7bba84e7335f92b3a73dc02
Author: Keith Packard <keithp@koto.keithp.com>
Date: Sat Sep 1 21:14:22 2007 -0700
[COMPOSITE] Composite used for pixmap population on redirect. (Bug #7447)
compNewPixmap copies bits from the parent window to the redirected child
pixmap to populate the pixmap with reasonable data. It cannot always use
CopyArea as that only works across matching depths. Use Composite when
the depths do not match.
commit 1afdf8b0a92437dffe84fa98b6083b3d8fd55e27
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 31 22:11:13 2007 -0700
[RANDR] Don't mark Xinerama as active if no crtcs are enabled. (bug #11504).
Clients expect any Xinerama-enabled screen to report at least one
monitor, but with RandR, there may not be any enabled crtcs. In this case,
tell the client that Xinerama is not active.
commit 0dc2bb6101704d0fd25f36e2c3df79687f119f5b
Author: Marius Gedminas <mgedmin@b4net.lt>
Date: Fri Aug 31 21:36:37 2007 -0700
[RANDR] Compare only milliseconds of config time. (Bug #6502)
The timestamp transferred in the X protocol is a 32-bit number of
milliseconds.
The timestamp stored in the server is a structure that contains two fields:
months (!) and milliseconds.
When the server passes the config timestamp to the client, it discards the
months part and sends only the milliseconds part.
When the server receives the config timestamp from the client, it tries to
guess the "months" part by looking at the current time and then maybe adding
or
subtracting one. The guess is wrong after the server has been running long
enough (several hours).
I have added two ErrorF calls around the 'if' statement that returns
RRSetConfigInvalidConfigTimestamp in randr/randr.c and my Xorg.0.log has
this:
randr request got good config time: 0:-2103495671
for the first few successful xrandr calls, and
randr request failed with RRSetConfigInvalidConfigTime: client passed
1:-2103495671, server has 0:-2103495671
when it fails. The server has been running for 8 and a half hours.
The obvious fix would be to ignore the months field and only compare the
milliseconds.
commit 07630d897ef37cad8b79d073d9edc891d5a7bddd
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 15:16:01 2007 -0700
Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.
commit ca82d4bddf235c9b68d51d68636bab40eafb9889
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 13:00:23 2007 -0700
Bug #7186: Fix an excessive request size limitation that broke big-requests.
MAXBUFSIZE appears to be a leftover of some previous time. Instead, just
use maxBigRequestSize when bigreqs are available (limiting buffers to ~16MB).
When bigreqs are not available, needed won't be larger than the maximum
size of a non-bigreqs request (256kB).
commit a02db0d500cac20d0f0f107d27c064a175018421
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 12:24:07 2007 -0700
Convert servers to using _DEPENDENCIES to ensure proper rebuilds.
This cleans up server Makefile.ams a little bit, but also means that people
messing with configure.ac need to be careful with whether they put libraries
in the _LIBS or _SYS_LIBS targets. Hopefully the comment in configure.ac will
clarify the issues.
commit c9ceb4878063ca22487c708d9d1f86e367f2cec8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 31 11:03:54 2007 -0400
xace: add hooks + new access codes: Composite extension
commit fd04b983db6a70bf747abe02ca07c1fbbaae6343
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 31 09:55:27 2007 -0400
xace: add hooks + new access codes: Render extension
commit 3f42af8c0ef1e5379bc836f589e0cbee43c02ac5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Aug 30 18:22:12 2007 +0930
config: Use [config/dbus] consistently for error messages.
commit 0fcde83d94507eadd9f99d4e6a63584b221c989c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Aug 30 18:20:20 2007 +0930
config: return BadValue to caller if add/remove doesn't have parameters.
If message iterator cannot be created, the caller didn't supply any
parameters. Return BadValue, instead of dying a horrible death while being
stuck in an endless loop.
commit 87495fc7064d5e0a7575a0713b6895a4172df0fa
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Aug 30 21:57:41 2007 +0100
Allow yres_virtual to be greater for some kernel fbdev drivers.
(temporary fix for older fbdev drivers)
commit 1005b29cc6939851b40397cc9cd0de9476ad3046
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 14:48:24 2007 -0400
xace: Correct some access modes.
commit d8ab2353cbd7694b556b7b9d550104dc8c460a1b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 30 10:39:53 2007 -0700
Remove dead xf86GetPciSizeFromOS and xf86GetPciOffsetFromOS.
commit c2d80529fc7f514d80cf3cbed6f580cb999aca1b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 30 10:20:55 2007 -0700
Remove the now-dead PciAvoid symbol.
commit 53f346b158fa8e10de5a8777fa6d8d86f918878b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 13:20:04 2007 -0400
xace: add hooks + new access codes: SHAPE extension
commit 766c693ef3637ee6fc402df594060ed2c1346761
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 13:06:28 2007 -0400
xace: add hooks + new access codes: MIT-SCREEN-SAVER extension
commit cda92bbf12107865e93c03c71b901ef51466dc31
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 11:48:45 2007 -0400
xace: add hooks + new access codes: XFixes extension.
Required a new name argument to the selection access hook to handle
XFixesSelectSelectionInput.
commit 47ab4d648b31ea1d5800e0bc84cf5f25025bffe3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 11:40:39 2007 -0400
devPrivates rework: convert CursorRec and CursorBits over to new interface.
commit 1d11e4bc4ccb169fb23fc18583f0b648f0a6a4e0
Author: Egbert Eich <eich@freedesktop.org>
Date: Thu Aug 30 12:50:21 2007 +0200
Fixing a misleading comment which could suggest a GPL violation.
The author of the int10 code looked at the VBIOS POSTing code
in DOSEMU to get some initial idea on how to POST a VBIOS.
To give credit to the DOSEMU Team for this inspiration a comment
was added to the code which could suggest that code from the
GPLed DOSEMU was directly incorporated into this code.
This patch should clearify the situation.
commit 45efe85003195bd45501630cef08349abb180c3a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 29 16:05:51 2007 -0700
Remove stale changelogs from kdrive.
commit 5aaf00190157114780ab51f7268b396459ed1cad
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 29 16:05:23 2007 -0700
Add more generated files to .gitignore.
commit 87295b66a972a2bd194a79af6aa4f715018fcded
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 29 15:54:32 2007 -0700
Bug #9629: Remove badly-licensed neomagic kdrive files.
Licensing issues of these files include:
- They claim to be licensed under the GPL, yet we haven't allowed that in the
xserver repository in the past.
- They refer the user to the top of the tree for GPL license text, yet it isn't
there.
- They claim to be derived from the (MIT-licensed) ati kdrive code, yet don't
follow the licensing terms of those files.
commit 4795df62456b73c6790f271e0a20a83c60496490
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 29 14:40:10 2007 -0400
xace: add hooks + new access codes: TOG-CUP extension.
commit e39694789e31e221fc8dec44ace9c697daf7acad
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 29 14:16:46 2007 -0400
xace: drop map-window checking hook, add new hooks for controlling the
delivery of events to windows and clients.
This is tentative. It's likely that an additional last-resort hook will
be necessary for code that calls TryClientEvents or WriteEventsToClient
directly. It's also possible that new xace machinery will be necessary
to classify events and pull useful resource ID's out of them.
The failure case also needs some thinking through. Should event delivery
"succeed" or should it report undeliverable?
Finally, XKB appears to call WriteToClient to pass events. Sigh.
commit 41355a53c29bbf879da0c6ea562294fcc7ef89ff
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 28 15:10:20 2007 -0400
xace: add hooks + new access codes: core protocol input requests
commit adf46b57ce6c69ab13a38b09a8104c802d54d052
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 28 10:08:38 2007 -0700
Replace BSD custom PCI code with a stub implementation thanks to pciaccess.
Note that pciaccess doesn't yet have Net/OpenBSD support, but the relevant
code should go there instead of disconnected code in the X Server.
While here, remove the now-disabled INCLUDE_XF86_NO_DOMAIN from the headers,
and un-disable xf8StdAccResFromOS for those OSes without domain support which
will need it.
commit 4017d3190234e189a0bbd33193a148d4d3c7556b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 28 09:28:25 2007 -0400
devPrivates rework: since API is already broken, switch everything
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5
Merge: 860a09c 7d54399
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 28 07:25:21 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
commit 3fe67d23edaae3ddde20cd5f349aa5dfde1d26a3
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 27 19:02:41 2007 -0700
Remove the BusAccWindows resource code which is now unused.
This was a bunch of poorly defined resource ranges per OS/platform combination
which were supposed to represent what regions could potentially have resources
allocated into them.
commit 9e2112b2b56af099a7f380ece9b5c1d25b20cce4
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 27 18:50:34 2007 -0700
Remove unused xf8GetBlock and xf86GetSparse entry points.
commit 801c359574d08ff2d6ac75a3325ff522bc862e30
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 27 15:46:05 2007 -0700
Fix fbdevhwstub for pci-rework.
commit 7d54399cfdaa7f54e28828267a76b89c4e8e798f
Author: Keith Packard <keithp@koto.keithp.com>
Date: Sun Aug 26 22:11:45 2007 -0700
Add XSERVER_LIBPCIACCESS to xorg-server.h when using libpciaccess
commit affda73a1d6e291516880dfbcb74b661374524c6
Author: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>
Date: Mon Aug 27 00:41:03 2007 +1000
Xprint: fix handling of TrueType font name
Debian bug #272368
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=272368
In certain locales, some characters from some TrueType fonts were not
appearing in the Xprint postscript output due to the font not being
identified in the postscript output.
commit 6f44a2c8a8d6e8f95681ebc7b2dd5ad9c3a02c6e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Jul 29 14:16:10 2007 -0400
Refactor PictureInitIndexedFormats.
The plural version is now static, which is fine since it was only ever called
from within picture post-init anyway. The body of the work is now done with
a one-shot (public) function that operates on a single format at a time.
commit ae7f71a8b3d6756161e55d998d6eec37d2695c98
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Aug 25 15:08:20 2007 -0400
Implement core protocol backing store exclusively in terms of Composite.
Composite's automatic redirection is a more general mechanism than the
ad-hoc BS machinery, so it's much prettier to implement the one in terms
of the other. Composite now wraps ChangeWindowAttributes and activates
automatic redirection for windows with backing store requested. The old
backing store infrastructure is completely gutted: ABI-visible structures
retain the function pointers, but they never get called, and all the
open-coded conditionals throughout the DIX layer to implement BS are gone.
Note that this is still not a strictly complete implementation of backing
store, since Composite will throw the bits away on unmap and therefore
WhenMapped and Always hints are equivalent.
commit bf0883ae5081bd75569115a3eb27c6d3d336c9f2
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Aug 25 14:53:17 2007 -0400
Fix bug in debugging info related to pci-rework merge
commit 4eed88af8b7b6881b44ccf9f4a5c5875af6d2b78
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Aug 24 18:06:50 2007 -0700
Remove files made obsolete by pci-rework.
commit 1ab4b3e183d04bb20fb5039f7d2671752ab24cf6
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Aug 24 16:00:31 2007 -0700
Bump video driver ABI for pci-rework.
commit 91f358336f77c0e4f577be65cca977d17298e36c
Merge: b9a806f 8b6b40b
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Aug 24 15:04:21 2007 -0700
Merge branch 'pci-rework'
commit b9a806f0b3d495c7616b469281e5892ae7f3f6b3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 19:04:55 2007 +0200
exaPolyFillRect: pGC->alu doesn't matter with a single rectangle.
commit d0f0d1092c7587a02404e1db07740e6334462ba6
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 14:10:13 2007 +0200
exaGetImage: Don't migrate pixmap out of FB with no DownloadFromScreen hook.
Based on the assumption that GetImage is relatively rare, so the overhead of
the migration is probably bigger than any potential savings.
commit 5d9e2c282145897008d7d941e2a0a3fdc71f2373
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 14:03:14 2007 +0200
EXA: Improve ShmPutImage.
Share as much code with exaPutImage as possible, and fall back to fbShmPutImage
when that fails.
commit 6085522d91e875c0e1ab8d4300e7378701c19b7c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 14:02:35 2007 +0200
Export fbShmPutImage to modules.
To be used by EXA.
commit c19f227b468d039c5ea136cc8a53c420da30263b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 13:05:52 2007 +0200
EXA: Only mark offscreen memory as used when it really is.
commit 095850596114178119a8cc854716ce0cc6e05121
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 13:04:48 2007 +0200
__glXDRIbindTexImage: Fail if no texture bound to pixmap's texture target.
We would most likely crash somewhere in Mesa if we tried to continue in this
case.
commit 8b6b40b7271acd81a9548f502c18f46f3b640640
Merge: ab7a6d8 3305d17
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 23 18:19:17 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
commit 93ae6fe18c417a22f1fccb22add4890a20cae713
Author: Carl Worth <cworth@cworth.org>
Date: Thu Aug 23 16:33:05 2007 -0700
Avoid leaking a Pixmap for every glyph
commit 3305d17195e3a0a5555300555bd7703312fa489f
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Thu Aug 23 22:48:19 2007 +0200
Fix indentation.
commit a66c0f1dca2958835ff65a5b50579e3304ed316a
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Aug 23 22:11:56 2007 +0200
Remove an extra cast.
Thou should not apply patches manually without testing.
commit 12d27cf33c6d963eae77795c0d247175907162a5
Author: Otto Moerbeek <otto@openbsd.org>
Date: Thu Aug 23 21:59:25 2007 +0200
A high resolution device that's moving fast can potentially generate
an int overflow, making dx*dx+dy*dy negative. Now pow(negative,
non-integer) yields NaN, so you loose. Use fp math to avoid that.
commit ff089e6cae634ac3eb509abd448a250bcbb17275
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu Aug 23 19:38:53 2007 +0200
glx: fix crash when freeing visuals
Don't set screen->num_vis to a value greater than the actual number of visuals.
X.Org Bug #10809 <http://bugs.freedesktop.org/show_bug.cgi?id=10809>
commit 943dd6ad99670c283a6869ea6c5f751acbd73134
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Thu Aug 23 12:15:03 2007 -0400
Revert "Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"" since the pixman changes have been pushed now.
This reverts commit 57f7f2a5327a2d967a726bb4706e4f6b2f4b2cea.
commit 13949f997289068354e83bc83e50d97b8232efb1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 23 11:27:33 2007 +0200
Get rid of the type1 font module.
It is completely replaced by freetype these days.
commit 88a9828ef906bba973debc191e35ea669b7ec271
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Aug 23 18:02:10 2007 +0930
dix: Only check device events for possible ACLs.
We shouldn't be able to restrict events like Expose, etc. with device based
ACLs. So we just ignore all non-input events when checking for permissions.
commit 76bf3cd7b8c6189b6b08518cde00c8bd991bdfb7
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 23 16:22:03 2007 +1000
randr: fixup crtc and output destroy
if you are moving pointers, you want to move the pointers not just a byte
commit 81f8b652d99ee0f7116c1e34aed0e585d23a91fb
Author: Alex Deucher <alex@botch2.(none)>
Date: Wed Aug 22 19:26:34 2007 -0400
Add _X_EXPORT to exported functions in hw/xfree86/modes/*
Also add missing exports to hw/xfree86/loader/xf86sym.c
commit 57f7f2a5327a2d967a726bb4706e4f6b2f4b2cea
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 22 09:02:03 2007 -0700
Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"
The corresponding pixman code hasn't been pushed, so revert until the code is
ready.
This reverts commit 53941c8e68014619d3ded7f8bc0f07d9a38bb9b1.
commit d0dc9698ae4324d44ed4c0482d6858d0b73bff33
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 22 09:00:45 2007 -0700
Revert "Fix <pixman.h> include to <pixman/pixman.h>"
The pixman headers have been located under pixman-1/ instead of pixman/ since
around 2007-08-06, and pixman-1.pc has the updated include paths to account
for this.
This reverts commit feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68.
commit bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 17 12:14:16 2007 -0700
Fix overly-restrictive integer overflow check in EXA pixmap creation.
The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
created, due to treating a pitch value as a width.
commit feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Aug 22 16:54:29 2007 +0100
Fix <pixman.h> include to <pixman/pixman.h>
commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0
Merge: 53941c8 6ef4ecd
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Aug 21 14:26:34 2007 -0400
Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/xorg/xserver
commit 53941c8e68014619d3ded7f8bc0f07d9a38bb9b1
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Aug 21 14:26:14 2007 -0400
Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix
bug 11620 (reported by Jens Stroebel.
commit 6ef4ecd82670c37a354243166750d76a97959c8b
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 21 18:17:35 2007 +0200
config: fix default xkb model (pc105, not keyboard)
commit 1834cfb4470341aace64a2fa47d04f85dbf98a47
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Aug 21 10:44:37 2007 -0400
Fix an error message to not point to @xfree86.org.
commit 265a633cf1fcbf497d6916d9e22403dffdde2e07
Author: Keith Packard <keithp@koto.keithp.com>
Date: Sun Aug 19 20:29:37 2007 -0700
Screen size changing should leave FB alone when X is inactive.
xf86RandR12ScreenSetSize must protect calls to EnableDisableFBAccess with
suitable vtSema checks to avoid invoking driver code while the X server is
inactive.
commit 7dc8531548cc9573e28bb04363dcbb3af5864c9a
Author: Keith Packard <keithp@koto.keithp.com>
Date: Sun Aug 19 20:28:05 2007 -0700
Ref count cursors used in hw/xfree86/modes code.
The multi-crtc cursor code in hw/xfree86/modes holds a reference to the
current cursor. This reference must be correctly ref counted so the cursor
is not freed out from underneath this code.
commit 1f6ddae003ec65d6bc567831bf32bf75dfefdd6c
Author: Alex Deucher <alex@botch2.com>
Date: Tue Aug 21 00:37:33 2007 -0400
add xf86_crtc_clip_video_helper to xf86sym.c
commit c839859d1bc35451923a2cbd5dfac4f3ca5eb3f9
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Aug 20 21:09:27 2007 -0400
Move module defaults from the header to the source file.
This is where they should have been in the first place. All the rest of
the code in the server defines such things in the source files, not the
headers.
commit 53c04351c462d2ae307684e50d5960debe1ee557
Author: Alex Deucher <alex@botch2.com>
Date: Mon Aug 20 19:46:38 2007 -0400
move intel crtc xv clipping helper to the xserver
The code is generic and can be used by any overlay-based card when
adding randr 1.2 support. Tested on radeon.
commit a1fe36b772f7edc162ea97368f86588c0fb77148
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 20 12:57:06 2007 +0200
xfree86: Fix build on Linux/alpha.
A bunch of CFLAGS had gone missing, so the build failed with errors like:
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:7:19: error: input.h: No such file or directory
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:8:24: error: scrnintstr.h: No such file or directory
commit 2c1431a76e7219e3bd14fd7f7888a8bc4fea0f58
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Aug 20 10:06:13 2007 +0930
dix: ProcChangeActivePointerGrab: make sure variable is initialised.
Thanks to Ben Close for spotting it.
commit 65a49f0ca198e0366175367729a101211388b16b
Author: Blair Sadewitz <blair.sadewitz@gmail.com>
Date: Sun Aug 19 20:29:22 2007 +0200
Autoconfiguration of wsmouse for NetBSD.
commit 3c448b0eb67337b56641e09a6d168aad6745e3ef
Author: Fredrik Höglund <fredrik@kde.org>
Date: Sat Aug 18 19:02:18 2007 +0200
EXA: Fix a couple of logic errors in exaGetPixmapFirstPixel.
The fb pointer would be left uninitialized when exaPixmapIsOffscreen
returned false. When it returned true and the pixmap was damaged,
fb would be initialized from the pixmap's devPrivate.ptr before the
exaDoMigration and exaPrepareAccess calls, at which point
devPrivate.ptr would still be pointing at offscreen memory.
commit 23fbd5292d356067e85e1eec4eb4f743532b0503
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 17 15:29:16 2007 -0700
Actually build Secure RPC authentication support (missed in modularization)
commit 6a32a96d8df184c3ace4847beb48fdcb846d2286
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Aug 16 17:43:29 2007 -0700
stride is in FbBits-sized chunks, but xoff is not.
Fixes corruption problems with composite rendering to redirected windows in
depth 16.
commit 32666d77227fcd2c066de16bf3c07366f92b0457
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Aug 16 14:57:18 2007 -0700
Bug #12015: Use the right offsets in the dst arguments of pixman_blt.
commit daee59b1703ac07c2def9e9fecc479e59b93f761
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Aug 15 19:19:11 2007 +0200
EXA: Wrap Trapezoids to prevent excessive migration of the alpha pixmap.
miTrapezoids creates an alpha pixmap and initializes the contents
using PolyFillRect, which causes the pixmap to be moved in for
acceleration. The subsequent call to RasterizeTrapezoid won't be
accelerated by EXA, which causing the pixmap to be moved back out
again.
By wrapping Trapezoids and using ExaCheckPolyFillRect instead of
PolyFillRect to initialize the pixmap, we avoid this roundtrip.
commit 860a09cfb8afc0a293c7eb5e01762724eb86847a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 16:10:44 2007 -0400
devPrivates rework: Nevermind, can't const due to return value warnings.
This reverts commit 6fd0a0b08de912421718aca17fe34a55ae285ae7.
commit 6fd0a0b08de912421718aca17fe34a55ae285ae7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 16:01:42 2007 -0400
devPrivates rework: add const qualifier to key type.
commit b2b7817497dd5da73d23ec9cc637c563041fc490
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 15:30:25 2007 -0400
devPrivates rework: use camelcase standard for name of key type.
commit 0a994d4f859a4e48d41a90ed9d2a282bb528c555
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 12:54:35 2007 -0400
xace: add hooks + new access codes: core protocol selection requests
commit 3ef2e9e623819c625a92f464fb14f1e5c181df42
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 12:27:48 2007 -0400
xace: add hooks + new access codes: core protocol pixmap requests
commit be536b79f2a364399937314cfa6c88bf8188da9c
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Thu Aug 16 11:23:28 2007 -0500
Update for support on NetBSD and DragonFly. From
Joerg Sonnenberger and pkgsrc.
commit 1d4bea6106d7a1c83e1dfe37fad8268589feaa0b
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Thu Aug 16 11:20:12 2007 -0500
Add some more support for DragonFly. From Joerg Sonnenberger
and pkgsrc.
commit fe9bc481efb0821134e10760c23993c6a7386450
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 12:02:59 2007 -0400
xace: add hooks + new access codes: core protocol font requests
commit e89301c8790df9fc49de13dd7c7f36e5340c0c31
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 10:57:49 2007 -0400
xace: add hooks + new access codes: core protocol client requests
commit 5bee8db003a5d552ee1d85bb6c40a3cb93bd6b2b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 10:44:51 2007 -0400
xace: drop background-none checking hook, add new hook for controlling
access to other clients.
commit b82557c9fb60f11fd2696c8fb2ae17b9dfd915ed
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 10:36:05 2007 -0400
xace: add hooks + new access codes: core protocol screensaver requests
commit 568ae737d1d5d476a0bf85659d88910c4e0ef5e0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 15 14:14:45 2007 -0400
xace: add hooks + new access codes: core protocol server requests
commit 14c13b8d62eb37cba8a044daffcddec578ba1644
Author: Dave Jones <davej@redhat.com>
Date: Thu Aug 16 09:46:27 2007 +0200
Kdrive: fix nasty thinko in TslibEnable()
commit 026534f945ae5652592a090a9d41375ca37ab618
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 15 16:47:53 2007 -0700
Update pci.ids to 2007-08-15 snapshot
Remove nvidia ids in extrapci.ids that are now in pci.ids
commit 6cef7b9611297cb1d93cefe3890b26b69c87bce2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 15 16:44:49 2007 -0700
Correct XErrorDB path and make it configurable (used by DTrace support)
commit 3c9553ac2cac7f3a41966def44a50d722d7e645b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 15 14:14:25 2007 -0400
xace: rename hostlist security hook to "server" as this hook will be used
for other types of server access besides just the host list.
commit dc84bb3418933297a8c005070902d9a91ed3d18f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 15 14:13:53 2007 -0400
xace: add hooks + new access codes: core protocol cursor requests
commit b424e01ec59d9600a02823f1522949325797268c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 14 13:20:42 2007 -0400
xace: add hooks + new access codes: core protocol property requests
commit 14d0397cded699378fa3c19f4e61dbab7d3a9b2c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Aug 15 22:12:29 2007 +0930
dix: ProcUngrabKeyboard: make sure grab is initialized.
This should fix the random segfaults with ProcUngrabKeyboard.
Thanks to David Nolden for spotting it.
commit 0f9e89b4e309e570d7d366489d250ca2143f0ad7
Author: Fredrik Höglund <fredrik@kde.org>
Date: Tue Aug 14 22:47:49 2007 +0200
Fix the value comparisons in the IDLETIME wakeup handler.
LessThan/GreaterThan comparisons were used in the wakeup handler,
and LessOrEqual/GreaterOrEqual in the block handler.
Change it to use LessOrEqual/GreaterOrEqual in both functions,
since this is what XSyncNegativeComparison and
XSyncPositiveComparison imply.
commit 42d6112ec21949a336ee8b34469f2695273ee2d6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 14 13:09:38 2007 -0400
xace: add hooks + new access codes: core protocol GC requests
commit 9a183d7ba50e31afa133cc03aee7991517a283ea
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 14 11:39:26 2007 -0400
dix: remove caching of drawables and graphics contexts. The security checks
simply bypass the cached values so they are unused.
commit 2763056ab5ae31bed422a0948198d98c6ace6d55
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 13 13:40:47 2007 -0400
xace: add hooks + new access codes: core protocol window requests
commit 6a195e816b9d60f728d77cc1c23538e7af00a879
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 13 10:43:48 2007 -0400
Revert "Implement damage tracking for AIGLX."
This reverts commit 2243b30e54df07892f75e3d65b687abe5b183cf3. The existing
DRI interface doesn't let us get from a __DRIdrawable to the corresponding
X drawable, and thus, we can't implement AIGLX damage tracking with the
current interface.
commit f367285fd5825e0adc271982a529c9904ad65c89
Merge: b1272ee ff4bd3a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Aug 12 15:31:10 2007 +0930
Merge branch 'master' into mpx
Conflicts:
Xi/exevents.c
dix/devices.c
dix/getevents.c
include/dix.h
mi/mieq.c
commit 03f9da672466b9ab9a9814d784b8c44f1030587e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Aug 12 03:07:04 2007 +0200
xfree86: Improve default mouse handling on the Hurd
Make /dev/mouse the default device. This makes Xorg works with empty
or missing InputDevice sections.
commit c5741438a3a171f493e9da32a6b39f73403f6993
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 10 16:13:55 2007 -0700
Only use evdev drivers in Xephyr #ifdef linux
commit 59961e47df4ea621a6713a8c7d060555f8746c3a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 10 16:08:41 2007 -0700
xorgcfg needs PIXMAN_CFLAGS in order to build libc_wrapper.c
commit 2243b30e54df07892f75e3d65b687abe5b183cf3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Aug 10 15:53:05 2007 -0400
Implement damage tracking for AIGLX.
commit ff4bd3addb48df3eacc4b121cc249a7f38eb981a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 8 14:24:42 2007 -0700
Fix the swapped decode of the EDID DTD h/v sync polarity fields.
As a result, we can remove the quirks that existed to flip the bits back around
for us. This is not confirmed in all cases due to lack of bugs containing EDID
blocks associated with the quirks, but is likely true.
commit 2926cf1da7e4ed63573bfaecdd7e19beb3057d9b
Author: Gustavo Pichorim Boiko <boiko@mandriva.com>
Date: Thu Aug 2 18:09:52 2007 -0300
[PATCH] Allocate the right number of entries for saving crtcs
commit b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Aug 8 12:16:12 2007 -0700
RRScanOldConfig cannot use RRFirstOutput before output is configured.
RRFirstOutput returns the first active output, which won't be set until
after RRScanOldConfig is finished running. Instead, just use the first
output (which is the only output present with an old driver, after all).
commit b1272eefd9a3e340d65c14903f337747ec82d021
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Aug 8 15:00:02 2007 +0930
Fix typo from last commit. Oh well.
commit c02128532e910e813fba94983733942d30c2d5cb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Aug 8 13:10:00 2007 +0930
dix: Allow flexible devices for passive core grabs.
A passive core grab doesn't specify the device, and is thus created with the
ClientPointer as device. When this grab is activated later, don't actually
activate the grab on the grab device, but rather change the device to the one
that caused the grab to activate. Same procedure for keyboards.
Makes core apps _A LOT_ more useable and reduces the need to set the
ClientPointer.
Only applies to core grabs!
commit ab3f601149e15789edfb7c9a0c33387070279582
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 23:17:32 2007 -0300
Updates some piece of the dead mouse evdev code under the new hotplug scheme.
I exported the evdev driver to Xephyr server. I'm running it using something
like:
$ ./hw/kdrive/ephyr/Xephyr :1 -mouse evdev,,device=/dev/input/event4 -keybd \
evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br
It also closes /#5668.
commit 7d1a749b210ba5b9f8d0e5a1feb9a9ef9fa4d992
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 22:59:12 2007 -0300
Export device path key options to be called by the command line of server.
commit aee3588a4a6829326770c84b860061f47f2cbcae
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 22:49:07 2007 -0300
Update KdUseMsg() for completeness.
commit 30259d5a4e95ff20b30807e5e207ab5995a3fdaf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 7 20:58:49 2007 +0300
Hotplug: HAL: Fix error handling
Don't use our DBusError for property getting, because we simply don't care:
this fixes D-Bus error spew to stderr. Thanks Michel Dänzer for debugging
and testing.
commit aef255425a3521d66c3405d34f7787628a22703e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 7 16:37:42 2007 +0300
Config: HAL: Use input.xkb namespace
Use an explicit input.xkb.foo namespace, not input.xkb_foo.
commit 838e59c02ec06446fc180fb9d86fa8793c7b9903
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 6 16:07:20 2007 +0300
configure.ac: Add $CONFIG_LIB to server libraries
Make sure all DDXes get $CONFIG_LIB. Build-tested with Xvfb and Xdmx.
commit b4193a2eee80895c5641e77488df0e72a73a3d99
Author: Keith Packard <keithp@koto.keithp.com>
Date: Tue Aug 7 12:45:53 2007 -0700
RRScanOldConfig wasn't getting crtcs set correctly
The output crtc is set by RRCrtcNotify, which is called at the end of
RRScanOldConfig. Several uses of output->crtc in this function were wrong.
commit 2b93cbb5f8bac9b1b75f723baaa728430b5fefff
Author: Keith Packard <keithp@koto.keithp.com>
Date: Tue Aug 7 12:44:19 2007 -0700
Decrement mode count when removing RandR output mode.
Removing an output mode without decrementing the mode count scrambles the
output mode array badly.
commit fef4c7a6f1a1ef34233b36137bb66d9a657307fb
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 09:01:14 2007 -0700
Fix driver build after pixman changes.
commit 1339e57485db5a285cfbecbe0bba7154458680ad
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 04:24:34 2007 -0300
Fix typo.
commit d9ee5f3e3a3a814ebcd257736c305b41139cc354
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 04:22:26 2007 -0300
Clean a little bit the code.
commit 7a5eb3e96b74daaaeb6babf46b13d698280aa3f6
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 02:16:44 2007 -0300
Let xkb options be passed through command line in kdrive servers. I start my
Xephyr using something like:
./hw/kdrive/ephyr/Xephyr :1 -fp /usr/share/fonts/X11/misc/ -mouse ephyr -keybd ephyr,,xkblayout=br,xkbmodel=abnt2
commit 955d5f6c0d14fae63bfe7c4ab39ee0a708919479
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 01:39:29 2007 -0300
When we call Xephyr with '-pointer' a new pointer is added inside the server
and the Xephyr virtual mouse keeps alive. With this patch the semantic changes
turning '-pointer' && 'Xephyr virtual mouse' always false.
Now we can open a device pointer and pass its options in Xephyr's command line
without having other pointer unused.
commit b8abeaf74ee8296d4bc3164a5a253624f984a6d4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Aug 7 12:32:46 2007 +0930
dix: get the paired keyboard for a passive grab (ProcGrabButton).
Taking the VCK is only correct if no physical device is connected, and even
then it's not really a good idea.
commit a0b87f87fb8753955505958bf3d438eef191302d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Aug 7 10:49:33 2007 +0930
dix: check for core event to determine if grab is a core grab (CreateGrab).
Checking for VCP/VCK is simply not a safe way to check if a grab is a core grab.
commit aa3c6aaaab213200591d29ddb2921adfb87ee5b4
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Aug 6 19:00:59 2007 -0400
Require pixman-1 0.9.4, update pixman includes to new scheme
commit 74feba4d77d74979a0ea478d666439ffc55001e5
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Aug 1 14:30:03 2007 -0700
Don't unwrap too early in libwfb for Composite.
Don't call fbFinishWrap until the pixman_image_t that stores the pointer is
actually freed. This prevents corruption or crashes caused by accessing a
wrapped pointer after the wrapping is torn down.
commit f6aa2200f2fb4f4d4bb51e67d68e86aabcac0c4b
Author: Roland "Test-tools" Bär <roland@verifysoft.de>
Date: Mon Aug 6 12:37:52 2007 -0700
Probable off by one buffer overflow in .../xorgconfig/xorgconfig.c
X.Org Bug #11858 <http://bugs.freedesktop.org/show_bug.cgi?id=11858>
Patch #11005 <http://bugs.freedesktop.org/attachment.cgi?id=11005>
commit d744df32a15103aa14237175f506350d25b2fec0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 6 12:23:21 2007 -0400
xace: add hooks + new access codes: core protocol colormap requests
commit acc9a42c926a3f84159780de12ecc1dc6186068a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 6 12:16:59 2007 -0400
Temporarily disable Security and SELinux extensions
while changes to XACE are being made.
commit 102df4f9bac59d95963572d1a7f31d1a064ca4ca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 6 09:16:30 2007 -0400
xace: drop site-policy and declare-extension-security hooks, add 2 new hooks
for controlling access to screens and screen savers.
commit 9eddede039f6cbcc323b7e3e4e841c43d3ed4f43
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jul 16 18:01:00 2007 +0930
mieqEnqueue: Don't try to update the time for GenericEvents.
Doing so may overwrite the event's length field and cause havoc. Also check if
realloc'd memory did actually return valid pointer.
commit e717eb82dc2e55f852919312d04f5cfc8ee55bc8
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 2 10:50:01 2007 +1000
xserver: stop bcopy from going really slow
The outport is most likely unnecessary on any currently used hardware,
the byte copy is necessary from what I know on IA64 and friends so leave it.
Add a new API entry point which lets a driver select the old behaviour if
such a needs is ever found.
This gives me ~20% speed up on startup on 945 hardware.
commit 600ef07113caa7a901c7d486bc8ebd1ae47f885c
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Fri Aug 3 15:33:41 2007 -0300
Fix kdrive command line parser.
commit 375864cb74cced40ae688078b1f7750998972535
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 3 13:23:34 2007 -0400
security: drop support for XC-QUERY-SECURITY authorization method.
commit d445d2f22b5c97fa010370f4ba9cb0555df4a853
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 3 10:56:18 2007 -0400
security: drop the "declare extension security" dix call. Use the
SecurityPolicy configuration file instead.
commit 0a71e1542a07abc5e32501973a7cf6de3f641317
Author: Carl Worth <cworth@cworth.org>
Date: Thu Aug 2 22:48:32 2007 -0700
Create a Picture as well as a Pixmap at the time of AllocateGlyph
This avoids some inefficiency in creating a temporary Picture
for every glyph at rendering time. My measurements with an i965
showed the previous patch causing a 10-15% slowdown for NoAccel
and XAA cases, (while providing an 18% speedup for EXA).
With this change, the NoAccel and XAA performance regression is
eliminated, and the overall EXA speedup, (before any of the
glyphs-as-pixmaps work), is now 32%.
commit a2af34d5a861982a03afad8e586bb0181b72bbd0
Author: Carl Worth <cworth@cworth.org>
Date: Wed Aug 1 15:48:30 2007 -0700
Use per-screen Pixmaps for glyphs
Instead of system-memory data which prevents accelerated
compositing of glyphs, (at least without forcing an upload
of the glyph data before compositing).
commit 19b3b1fd8feb343a690331cafe88ef10b34b9d98
Author: Carl Worth <cworth@cworth.org>
Date: Tue Jul 31 17:04:13 2007 -0700
Use strong hash (SHA1) for glyphs
Using a cryptographically strong hash means that comparing the
hash alone is sufficient for determining glyph equality (no need
to compare the glyph bits directly). This will allow us to replace
system-memory copies of the glyph bits, (which we've only been
holding onto for comparisons), with Pixmaps.
commit 516b96387b0e57b524a37a96da22dbeeeb041712
Author: Carl Worth <cworth@cworth.org>
Date: Mon Jul 30 17:31:47 2007 -0700
ProcRenderAddGlyphs: Avoid allocating a glyph just to find it cached
This is a cleanup without any real savings (yet). Previously, the
implementation would allocate a new glyph, then (often) find it in
the cache, and immediately discard the allocated object. This
re-organization first uses a new FindGlyphByHash function and only
allocates the glyph if nothing is found.
This isn't a real savings yet, since FindGlyphByHash currently still
does a temporary glyph allocation, but this is expected to be replaced
immediately as we switch to an alternate hashing mechanism (SHA1).
commit 4c6abe1c7c8abcf203572bbf86b21d97ea4e756f
Author: Carl Worth <cworth@cworth.org>
Date: Mon Jul 30 21:43:20 2007 -0700
Split HashGlyph functionality out into HashGlyphInfoAndBits
This is in preparation for a future change that will take advantage
of being able to compute a hash for a separate xGlyphInfo and chunk
of bits without a combined Glyph object.
commit 363d764ea32b938f3dff35df7cf3370363c04d5c
Author: Carl Worth <cworth@cworth.org>
Date: Mon Jul 30 15:10:11 2007 -0700
ProcRenderAddGlyphs: Take advantage of the for loops to simplify the code a bit
commit dc8a528cd6b9a4da3e60fa31428c37f5b34a897f
Author: Carl Worth <cworth@cworth.org>
Date: Wed Jul 25 14:57:13 2007 -0700
ProcRenderAddGlyphs: Convert while loops to for loops where more natural
commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74
Merge: 32c0dcc f3955c0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 2 14:27:03 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
commit f3955c0a020b39021050cd33c20a17f14fc4b579
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
Date: Wed Aug 1 21:04:22 2007 +0300
XFree86: xf1bpp: distclean generated files as well
Make sure we clean up after ourselves: not sure why distcheck didn't flag
this one.
commit a04c95f4446e5c169dea71019321d790ab4fa139
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 1 20:37:05 2007 +0300
configure.ac: Fix argument quoting for argv[]
m4 quoting. Yar boo sux.
commit 99a88826e5e8cfa25c5f8a88c12799d33114729c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 20:34:58 2007 +0300
configure.ac: Actually use -lrt in monotonic clock test
If we need -lrt to use clock_gettime, then make sure we link with it.
commit 1c80e04f876e9254b93ef87eadfcff71234340c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 20:08:31 2007 +0300
configure.ac: Disable D-Bus config API support by default
This is problematic, so don't even bother with it unless someone wants it.
respeclaration is dead, long live HAL.
commit c46663367329615bd2c9b63e93c9534036e5a2ae
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 1 18:32:09 2007 +0200
GLX/DRI: Remove some unused variables.
commit 17cb4f64e3c39725e83b1e311c09422d7e1c0e52
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 1 18:13:18 2007 +0200
GLX_EXT_texture_from_pixmap: Use client provided texture target when available.
This prevents situations where the server doesn't use the target the
client thinks it does, usually resulting in the texture being sampled as all
white.
commit a4197db9504adae6af005b2218eee36b8af0d98b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 14:04:51 2007 +0300
GL: GLX: Make sure glxbyteorder.h is distributed
commit ad7421fc764e2b82e20d90f12225a03a1d636f18
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:30:00 2007 +0300
Bump version to 1.3.99.1 for development
This is not actually .1, just bumping for a different devel version.
commit 43e71a54502d9ab28ece7f6296d1416d60948dad
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:16:35 2007 +0300
XFree86: xf1bpp: Fix previous build system commit
Amateur error.
commit 6d6bc93b0a13c5356544561e326d4aedf33e61c2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:11:22 2007 +0300
Build system: Add missing files
A couple of headers weren't added to the build.
commit 505ec436af3a173e0ba32c6f14b4cf9837a553eb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:11:08 2007 +0300
XFree86: Properly clean up after ourselves
CLEAN is not a useful variable. CLEANFILES/DISTCLEANFILES, on the other hand,
are useful variables.
commit 1ace9770fed4a2ba354ff06a96189428beb36088
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:10:38 2007 +0300
Build system: Non-dtrace distcheck hacks
automake 1.10 really wants foo.c for foo.O, so give it some dummy files to
deal with if it really needs them.
commit cacbdf18ee771d43228c2e96e8ef9a32251ceb55
Author: Daniel Drake <d.drake@mmm.com>
Date: Wed Aug 1 08:08:37 2007 +0300
Remove duplicated licenses
Some files had two copies of the same license.
commit bd49332e4772bd57ffb76c829f0e4770ab876057
Author: Daniel Drake <d.drake@mmm.com>
Date: Wed Aug 1 08:07:08 2007 +0300
Add proper COPYING file
I went through the entire xorg-server distribution and aggregated all
the licenses I could find (except the questionable GPL files, see my
last mail).
There are many many permutations on essentially the same license terms,
but I have been pedantic and treated slight differences as separate
licenses.
Here is a description of the process I used:
tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2
cd xorg-server-1.1.1
find -name '*.c' -o -name '*.h' | xargs gvim
egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \
| grep -v "\.in$" | xargs gvim
cd ..
tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2
diff -urNp xorg-server-1.1.1 xorg-server-1.3.0.0
git clone git://anongit.freedesktop.org/git/xorg/xserver
cd xserver
git diff xorg-server-1.3.0.0..
For each file, licenses have been aggregated as follows:
If 2 files have identical license text but different copyright notices,
the copyright notices are aggregated and the license text
is included only once.
Note that by identical I mean really identical, i.e.:
'AUTHOR(S)' is not the same as 'AUTHORS'
'KEITH PACKARD DISCLAIMS' is not the same as 'KEITH PACKARD AND COMPAQ
DISCLAIM'
Otherwise, licenses and accompanying copyright notices have been
stacked.
When going through the changes from 1.1.1 to 1.3.0.0 then HEAD, licenses
have been added and removed (so I have reflected this since the original
version of my COPYING file). It's slightly concerning to see that even
between 1.3.0.0 and HEAD, new license permutations are being added. I'd
suggest that a primary license be chosen and this would be indicated at
the top of this COPYING file.
commit 51b735394f0aa9f953f9c320617c7a56028ec458
Author: Daniel Drake <dsd@gentoo.org>
Date: Mon Apr 30 11:37:46 2007 -0400
[PATCH] xserver: Add COPYING terms
I went through the entire xorg-server distribution and aggregated all
the licenses I could find (except the questionable GPL files, see my
last mail).
There are many many permutations on essentially the same license terms,
but I have been pedantic and treated slight differences as separate
licenses.
Here is a description of the process I used:
tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2
cd xorg-server-1.1.1
find -name '*.c' -o -name '*.h' | xargs gvim
egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \
| grep -v "\.in$" | xargs gvim
cd ..
tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2
commit 7fa58385724fa7f441107a1793b601ba3dcb1f4c
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
Date: Wed Aug 1 08:01:28 2007 +0300
XFree86: xf1bpp: Fix parallel build
One of the constructs wasn't parallel-build safe: fix that.
commit 18ab4d559409d4b682aab99fb75f8d861122eab6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 07:27:53 2007 +0300
Darwin: Remove missing file
Xserver.m is missing and still hasn't been added, so just remove it for now.
commit 0bd6fe7401b2524cf34793c0b0c642e3d32fae00
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 07:27:30 2007 +0300
Config: Add missing include
commit 48b3034d13bbbb69072eb11f4579389cc32b0850
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 07:01:51 2007 +0300
Config: Add current FDI file
Add the FDI file we're using at the moment, until it gets into upstream HAL.
commit 82b720cf3e09d8a6adcd40b25c4d48b34ba1ae80
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 06:57:11 2007 +0300
Config: Fix merge detritus
commit 6b055e5d9751e3679ff98065e43225ec8a960053
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 06:55:36 2007 +0300
Input: Fix stuck modifiers (bug #11683)
Disclaimer: It's 6:51am. I'm trying to be as understandable as possible.
What was happening previously was this:
* Press Alt
* Extended event generated and processed: state is now Alt down once
* Core event generated
- keyboard switched: inherited state is Alt down once
- event processed: Alt down twice
* Release Alt
* Extended event generated and processed: state is now null
* Core event generated and processed: Alt down once
If we switch the order:
* Press Alt
* Core event generated:
- keyboard switched: inherited state is null
- event processed: Alt down once
* Extended event generated and processed: state is now Alt down once
* Release Alt
* Core event generated and processed: state is now null
* Extended event generated and processed: state is now null
When we carry over the previous state, it needs to be the _previous_ state
(state and modifiersPerKey), assuming that we're going to catch now-core
events for any of these. For example, if Ctrl is held down as we pivot, we
need to carry Ctrl over with a count of one, for which an extended + core
release will then clear. Carrying over the union of the previous state _and
the state resulting from the immediate action_ was what broke things.
commit 0e0174d45ecbeb7b6dddc4af53da9d6211038e0e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 03:30:07 2007 +0300
XFree86: Allow disabling of HAL
If NoAutoAddDevices is given as a server flag, then no devices will be added
from HAL events at all. If NoAutoEnableDevices is given, then the devices will
be added (and the DevicePresenceNotify sent), but not enabled, thus leaving
policy up to the client.
commit cd8e99e56ec5d02026e401cc15e0f8d75f2a4727
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 03:29:12 2007 +0300
Input: Don't enable devices when we open them
Thanks to Xi's braindead design, it's otherwise impossible to query input
devices without enabling them. Hurrah.
commit 0a31db14b7c7c21ef550dbcc73a9f649f3613cbe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 02:54:14 2007 +0300
Config: D-Bus core: Fix hook removal
Make sure we properly initialise the entire hook when adding it, and
bust out when we're done removing.
commit 89f628394f7d831f2ba1e45c5884c3983bef6031
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 02:08:02 2007 +0300
XFree86: Input: Fix whitespace
commit aec0d06469a2fa7440fdd5ee03dc256a68704e77
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jul 31 16:33:37 2007 -0700
Fix a crash when rotating the screen.
Remember output->crtc before setting a NULL mode because RRCrtcNotify now sets
output->crtc to NULL. Use the saved crtc to set the new mode.
commit a93033b0bc14ed0bb95c680ded26b63cfe5fd1d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:53:08 2007 +0300
XFree86: Module: Bump input version
config_info changes the size (and ordering) of DeviceIntRec, so bump the
input major.
commit 1150969b826e2bd6d8345fa245ed499f2e4cf101
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:52:20 2007 +0300
Convert all my license statements to the standard form
Convert all my license statements to the standard, accepted form:
cf. <20070717142307.GD13478@fooishbar.org>
http://lists.freedesktop.org/archives/xorg/2007-July/026451.html
keithp's license on configure.ac changed with his verbal permission.
commit 8658f5d923a69fb55b4cd9e1e84c2d271679f6e2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:10:50 2007 +0300
Hotplug: Add HAL support
Add support for HAL-based hotplugging, in which we just get the list of
input devices and properties from HAL. Requires an FDI which is not yet
in mainline HAL.
commit aa75b3481724834da2f855d8dd2ff36074bd5706
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:09:07 2007 +0300
Hotplug: D-Bus: Dispatch harder
Dispatch until we've got nothing left to dispatch, since apparently
dispatching will only ever fire a single message ...
commit 4d238c5c67461ed747aa6c021d1532734f4c63fe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:08:26 2007 +0300
Input: GetPointerEvents: Deny events from devices without valuators
For some reason, my keyboard has 25 mouse buttons, but zero valuators. This
causes GPE to blow up spectacularly, trying to get (and set) co-ordinates from
devices without valuators. For now, just prevent this from ever happening,
and whack a dirty great FIXME in.
commit 7c9e8fd56e1830f7a971187d14877ebbdf35c4b0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 00:19:14 2007 +0300
Input: Allow enabling and disabling of devices
Add DEVICE_ENABLE to KDrive and XFree86 to allow us to enable and disable
devices on the fly.
commit 0afeb0241a83796575da827bd81375c99ff10af5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 20:48:57 2007 +0300
DIX: Clean up null root cursor handling
Move the null root cursor handling out of main() and into CreateRootCursor.
commit 62ec6d09b3adaea82ff52c8672e6f611c15ec56d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 20:47:28 2007 +0300
dix.h: Remove duplicate ffs() prototype.
commit 4d3379d418a781938358e511fd41deb4115a032c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 14:31:35 2007 +0300
Fonts: Fix builtin fonts
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
commit 9ac7e8a559fe6008cafc95e8264680c50e72ba19
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 14:30:53 2007 +0300
Hotplug: D-Bus: API version 2
Use uint32s instead of int32s where practical, and add an API version
request. Also, try to return all devices added, not just the first,
and box device arguments.
commit 1cdadc2f43d9069572814510d04b1a560c488fcb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 14:28:58 2007 +0300
Hotplug: Separate D-Bus into core and hotplug API components
Break up D-Bus into two components: a D-Bus core that can be used by any
part of the server (for the moment, just the D-Bus hotplug API, and the
forthcoming HAL hotplug API), and the old D-Bus hotplug API.
commit 8bfa41e1bf3f588780d7e9f6f900b1fde0570a7e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 04:29:43 2007 +0300
gitignore: Add automake lex/yacc wrapper
commit 06dd2748da8b7af343f6cab409b9f351567de5f3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 00:27:40 2007 +0300
configure.ac: Properly check XFree86 proto modules
Not sure why these are conditionals, anyway. This one really needs
revisiting, but at least causes configure, rather than the compilation,
to bomb out.
commit fd10312b4224197b937d9e696b53dc2a16c8912f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 00:26:26 2007 +0300
configure.ac: Fix KDrive VESA/fbdev conditionals
Make sure we actually respect anything explicitly given on the configure
line, instead of just stomping it with what we detect.
commit f37612c6f2375ca904411e6caa0be19fa24f032c
Author: Nicolas Trangez <eikke@eikke.com>
Date: Sun Jul 8 00:23:57 2007 +0300
Hotplug: Remove unused function definition from hotplug.h
configDispatch hasn't been used in a long time.
commit 951c058e7800308f7c472e77178c14400f45c1b3
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jul 31 14:23:58 2007 -0700
Don't fail compScreenInit if the driver added its own alternate visuals.
commit 722d73a0ef54c2ebd8ef38c4a6afa0e7c5aa3e30
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 31 10:34:56 2007 +1000
Revert "Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms."
This reverts commit 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4.
This screws my cursor up just starting a bare X server on Intel,
I get the X more like <> than ><..
commit 57b5b97a0710fc043b8a1c01d756cdb73dfe4567
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Jul 29 11:02:47 2007 -0400
ReduceCompositeOp returns a Render op, not a boolean.
commit f62beb6f3609e8b6e61325ac89017590811bbd07
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Jul 27 13:23:15 2007 -0400
Remove all trace of Option "BiosLocation".
This code was deeply dangerous. If anyone actually had a use for this code,
we should find a better way of doing it.
commit 486fd4145aed93093d1f1655de40c0a8582bb8b1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Jul 27 13:10:39 2007 -0400
exaGetPixmapFirstPixel: avoid framebuffer readbacks if possible.
If the pixel in framebuffer memory isn't modified since we uploaded it, we
can just read from the system memory copy, wihch avoids both a readback and
an accelerator stall.
In principle this function is still wrong, and all the framebuffer pixel
access should be going through (w)fb so we can get pixel layout corrections.
commit 50cb6c7e4419e067c1f080d1de940811d21fc725
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Jun 15 15:29:00 2007 -0400
Don't map the front buffer in libdri if the ddx driver doesn't set the size.
This lets drivers map the front buffer themselves
by setting dontMapFramebuffer.
commit cec793ef7a6dac9fa2a6538683e363a72672cde9
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 26 11:49:46 2007 -0700
Include picturestr.h in xf86Crtc.h to pick up definition of PictTransform.
commit 27845fe197b74bf453d99f352e83513e201fdaae
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 26 09:32:16 2007 -0400
libconfig shouldn't be an installed library.
commit 276f8e2ca42eec982d16b86d67217d68ff98f81d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jul 25 17:42:23 2007 -0700
Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4
commit eba2be448bdd298ff2f7b8603bd9e976da1fdf72
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Wed Jul 25 20:53:45 2007 +0200
Minor fixes in cvt and gtf manpages
Reported by "A. Costa" <agcosta@gis.net> in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432065
commit 8d230319040f0a7f72231da2bf5ec97dc3612e21
Author: Gustavo Pichorim Boiko <boiko@mandriva.com>
Date: Tue Jul 24 16:19:19 2007 -0300
Fix the output->crtc initialization in the old randr setup
commit 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jul 25 17:04:04 2007 +0200
Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms.
Doesn't seem necessary to do anything here...
commit 5b424b562eee863b11571de4cd0019cd9bc5b379
Author: Gustavo Pichorim Boiko <boiko@mandriva.com>
Date: Mon Jul 23 18:27:41 2007 -0300
Set the crtc before the output change is notified
Set the new randr crtc of the output before the output change notification is
delivered to the clients.
Remove RROutputSetCrtc as it is not really necessary. All we have to do is set
the output's crtc on RRCrtcNotify
commit 7da38bb6a15247948c90e00a59230453fcf13cbd
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jul 21 15:27:40 2007 -0400
Partial redundancy elimination in PropertyNotify generation.
commit 0f91abd5c68eb044d09733d18ef0f6b8ed128200
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 19 20:37:26 2007 -0400
Fix alpha build failures
Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and
<unistd.h> instead
commit dc9c5196282ba61bd542e198dfe0d53d93181591
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Jul 19 13:28:00 2007 -0700
Make PreferredMode option in config file override EDID mode preferences.
When the PreferredMode option is selected in the config file, remove the
M_T_PREFERRED bit from all other preferred modes to force the config file
mode to be selected.
commit 73a93c5a6b68f7ba21f9e75f50b1032603a3b39e
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Jul 19 13:26:36 2007 -0700
Query modes on disabled (but not ignored) outputs.
Code that disabled mode detection on disabled outputs would confuse
applications by listing said outputs as connected but without any modes.
This makes the disabled state in the config file affect only the initial
configuration and not subsequent modifications by RandR.
commit 9fc36a391c11170cde1a28f548a2cae5f6f20d5b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 12:36:15 2007 -0700
Make pending property changes trigger mode setting.
The DDX code was ignoring pending properties for computing when mode setting
was required. This meant that configurations differing only in property
values would not cause the mode to be set.
commit aed6569309223ecc7e26fa84e4d430e422455607
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jul 14 15:21:46 2007 -0400
Refactor how Composite adds visuals to the screen.
Besides being slightly simpler to read, it's now trivial to add a depth-16
visual to a depth-24 screen just by adding a line for it in the alternate
visual list. Visuals for indexed depths are slightly tricky still.
commit 21bbd7d64b5f74915afd7a312e589654442f3461
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:42:50 2007 -0500
Delete some pre-dlloader debugging scaffolding.
If your loader is as bad as elfloader, then it makes sense for the
server to have some stubs for you to assign to / break on. However it
is no longer 1996.
commit 1f71f0c0574bafb36da20fec669f9a1138c69a47
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:28:03 2007 -0500
Remove (long-)deprecated xf86EnablePciBusMaster.
commit 0a63d874e9c2f4fe4b38839a744461f9d41040b2
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:22:49 2007 -0500
Always normalize the module name.
commit 9a1c6afd12caf0143483f72bfbba0c4c3daaa6ff
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:19:50 2007 -0500
Remove dead code for screen crossing.
commit 8ca2fe8914af1a67bf597f99025e5cbe9b08da57
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:11:13 2007 -0500
Delete dead module test code.
commit e2413cc7cae4e578b8e9b408ea85bef596b03ea3
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:07:37 2007 -0500
Remove MEMDEBUG
This existed (but may not have worked) in the monolith, but is gone now.
commit d1d65a84150dfbc3a4dbe108f237a85ab6e09bbb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:01:08 2007 -0500
Dead ifdefs for BITMAP_SCANLINE_UNIT == 64
This appears to be a legacy of cfb24 not being smart enough to deal with this
case. But since cfb24 unexists, die die die.
commit cbe74394a5ed21ed80c0aab6eefd2716122cce11
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 20:44:34 2007 -0500
Nuke dead X -configure code.
commit 5657fb065cc79ba3ca5a836f45637ba9894f9abf
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Jul 17 12:12:02 2007 +0200
exaDriverInit: Fail if pScreenInfo or a member of it is invalid.
EXA may attempt to use the invalid value and crash otherwise.
commit bbe7ce10fa93017374d7a4611427b70a22d7507a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jul 16 17:25:59 2007 -0700
Update pci.ids to 2007-07-16 snapshot
Remove nvidia ids in extrapci.ids that are now in pci.ids
Add nvidia ids to extrapci.ids that are in xf86-video-nv but not pci.ids
commit ac979c165128704116cd40086320b6edc79018e2
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 12:13:17 2007 -0700
MakeAtom needs length without trailing NUL. sizeof("string") includes NUL.
I made a mistake in some new code using MakeAtom, passing the size of the
string instead of the length of the string. Figuring there might be other
such mistakes, I reviewed the server code and found four bugs of the same
form.
commit 393171034c15d8a1b82232b8f9455a358035e932
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 09:03:40 2007 -0700
Add RandR reflection support.
Replace the ad-hoc transformation mechanisms with matrices.
Prepares for more general transformation as well.
commit 8773ad023eb28950eb0f802d2ca31a67f84adddc
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 08:47:50 2007 -0700
Screen size bounds check in ProcRRSetCrtcConfig not masking out reflections.
When checking how to validate the selected mode and position against the
current screen size, the test against 90/270 rotation did not mask out
reflection, so that when reflection was specified, the 90/270 test would
never succeed. This caused incorrect bounds checking and would return
an error to the user instead of rotating the screen.
commit 881a620b4d6ea7a54af14c8f8fbe6924c9aa9291
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 08:45:10 2007 -0700
When sync'ing logfile, also flush it.
When the logfile is set to sync, the actual sync occurs whenever the log
file is flushed. If the log file is not also set to flush, no syncing
occurs.
commit 031b009ea678809bf1ddca883c2082b304c408c9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jul 13 14:54:45 2007 -0700
Use %S instead of %s for strftime seconds when printing build time
commit c0e91777a9874fe2cd9a7e9180263f512c1e8f8d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 12 16:37:11 2007 -0700
Add __SOL8__ to xorg-server.h.in since xf86-input-kbd needs it to build
commit 6b4231e3b5b49b731c9a00930ae465fff8539831
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 12 16:36:27 2007 -0700
Use kbd driver when xorg.conf specifies "keyboard" or "Keyboard" (bug #11301)
X.Org Bug #11301 <https://bugs.freedesktop.org/show_bug.cgi?id=11301>
Sun Bug #6560332 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6560332>
commit 9fcb30ebf7b7b2137955f759e95c1d58c4f27a11
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 12 13:00:32 2007 -0700
Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10
commit 7c0ca27f6dd0a800dc27429a33dbc8e133f9a9c1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jul 11 17:15:29 2007 -0700
"fbpict.c", line 215: void function cannot return value
commit 0a4e9311158ed3ecda0722640f860ace2f87a97e
Author: Hanno Boeck <hanno@gentoo.org>
Date: Thu Jul 12 10:17:07 2007 +1000
xnest: fix linking since dbus
Fixes bug 8955
commit b2f9ca6ac400d426d7a1ef0162f7e7ce28288dd1
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 10 21:33:34 2007 -0700
Redirect fix: Manual + Automatic - Manual = Automatic
A window with redirect manual *and* redirect automatic which loses the
manual redirecting client becomes redirect automatic.
commit 561989f2f0fc31e3d3bf8df978a9cb3d4c85af59
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 10 21:06:51 2007 -0700
Generate ChangeLog file for make dist.
Copy Makefile.am snippet which generates a complete git change history to
the ChangeLog file during the distribution generation process.
commit e316fa59fea8b7b18cdf3a227890351a9567ec65
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Jul 10 14:20:55 2007 -0400
Add per-monitor config file option for maximum pixel clock.
commit ffdf8f3e452638e6b050fccabee465d6c0300f45
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jul 10 13:56:38 2007 +0930
DeliverEventsToWindow: ensure that genericMask has a defined value.
commit 161624a5a45808fd56141dc2c64be729944f03ed
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jul 10 09:02:40 2007 +0200
GLX: Only build code dealing with GLXPixmap damage field when DRI is enabled.
commit 4abd00dab7e648dab8172f6009371e4e63d0c521
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jul 10 09:02:08 2007 +0200
Make sure DRI drawables are cleaned up when client dies.
The previous scheme didn't work when the client didn't create the core drawable,
e.g. the root or composite overlay window. Use refcounting via special client
resources to fix that.
commit 583e988b9f7cfb9293144c8309023c0dd1766715
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jul 10 09:19:02 2007 +0930
Install geext.h, otherwise drivers won't build.
commit 9809715afaafee9baf2aef348c1ebda7e8b3f076
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jul 9 10:42:03 2007 +0930
Change CheckMotion to ignore non-pointer events but acknowledge XI events.
Call CheckMotion from ProcessOtherEvents() to make sure absolute XI events
update the sprite before an event is sent.
commit 62efc3951a96648cf975302aa6651cb67b87fa64
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jul 6 17:00:20 2007 +0930
DeliverGrabbedEvent: stop segfault when gemask == NULL.
commit 3312e4dd5e055b2cb445b5d5c617aa7a611eedc1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jul 6 16:41:52 2007 +0930
Call CheckMotion for all core events.
We need to do this to update the sprites x/y coordinate before we assemble a
button event. Absolute devices may send a buttonEvent with valuators attached.
If we don't update the sprite before assembling the event, the valuators are
lost and the button press is delivered to the previous position of the device.
Doesn't have any effect on relative devices.
commit c1a6841a64576b7e688e9ca0d3e0db8acf52d4ae
Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
Date: Tue Jul 10 10:08:44 2007 +0930
ProcX{Change|Query}WindowAccess: change device list from char* to XID*.
commit 5957aa6fdc580ccad4557eeefa0636ffad823f33
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 9 08:47:05 2007 +0200
Fix regression from recent composite changes.
One pWin->redirectDraw test was converted incorrectly, causing incorrect
rendering in some cases.
commit 5ccc09b18244f91a06b3bea20b02a97280d1a229
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jul 6 15:43:08 2007 +0930
Use the same struct for generic event masks throughout the code.
Renaming those structs too.
Previously grabs were using a different struct than windows, which was
reasonably stupid.
commit bcb23527421578bd4c9397d4c2c19cbefa22fc59
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 5 15:56:25 2007 -0400
Clean up unused #ifdefs from fb.
commit 9ff7ff2fda30f334515b16ef0867c1500c41bc0f
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Jul 4 23:38:27 2007 -0700
Fix MEMORY SMASH in XkbCopyKeymap.
XkbCopyKeymap reallocates the destination keymap when it is not large enough
to hold the source data. When reallocating the map->types data, it needs to
zero out the new entries. The computation for where to start bzero'ing was
accounting for the size of the data type twice, once implicitly in the
pointer arithmetic, and once explicitly with '* sizeof (XkbKeyTypeRec)'.
This would often lead to random memory corruption when the destination
keymap had existing map->types data.
commit 9131d560a0d42067cc4e726e445e060216c9acdc
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Jul 5 02:47:34 2007 -0300
Postpone options variable assignment to fix segfault when we got a device but
its driver is incorrect. Also if (!ki && !pi) can never be true.
This one also adds the device option field.
commit 41b485d5507821e41c3281c3c565647ae7582101
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Jul 5 02:40:07 2007 -0300
kdrive must to know that devices are unplugged.
commit a92dc6b5295e4f352115fed2856169929819863f
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Jul 5 02:28:14 2007 -0300
Remove redundant linking in kdrive. Fix configure.ac variable name and clean
it up a little.
commit 41b5155c8be75c4e171c0f64616cc09598b8ec54
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Jul 5 01:57:41 2007 -0300
For each kdrive server put a dependencie on its own libraries.
commit 16e429bcbf2f62cfc58162ab2857afb7376dda41
Author: Jonathan Lim <jlim@sgi.com>
Date: Wed Jul 4 20:08:49 2007 +0200
Bug 5000: Fix domain support for SGI Altix
commit f106c04b627d9f57b38627971dc79c75129e66d6
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:47:19 2007 -0700
Have Composite always report server version.
It was reporting the lessor of the server and client versions, which doesn't
make sense with the 0.4 semantic change in clipping.
commit 4f88d68bdb90cc7d12170355105b4fd020acd306
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:43:17 2007 -0700
Force advertised Composite version to 0.4 instead of using header version.
Installed protocol header version may be newer than the server code base.
Use internal version number for Composite extension to make sure the server
doesn't advertise capabilities it doesn't support.
commit 866f092ca0160a366add01b48ad03438926c4d16
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:29:11 2007 -0700
Make Composite manual redirect windows not clip their parent.
This patch changes the semantics of manual redirect windows so that they no
longer affect the clip list of their parent. Doing this means the parent can
draw to the area covered by the child without using IncludeInferiors. More
importantly, this also means that the parent receives expose events when
that region is damaged by other actions.
commit 2a75c774975b50dd4e71b7dbea7bd65ca2984a43
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Jul 3 11:00:29 2007 +0200
ExaOffscreenMarkUsed: Don't crash when there's no offscreen memory.
commit 0ede39a25cf5b0b6c2c89677f810c21ce42b95df
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jul 3 10:55:13 2007 +0200
Fix build when int10 doesn't use x86emu.
commit 028a00bc518dc6908839e8ce7c50ab1837100945
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Jul 2 18:41:55 2007 -0400
Make x86emu's I/O cycle tracing more useful.
Print debug messages only when the appropriate debug bit is set in the
8086 state vector, so you can focus in on the call you're actually
interested in.
commit 00e8295b7e0c7c0ba97707903004272818e3d87d
Author: Gero Mudersbach <geroxp@web.de>
Date: Mon Jul 2 11:40:11 2007 -0700
Bug #10814: Add needed quirk for Samsung 225BW like the 226BW.
commit 667e95f2e8389d9f23c50446d6d664eddd16d260
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 2 11:36:11 2007 -0700
Correct the xf86EdidModes.c file description.
commit 3de1f0d03b329b01856f664651db23ffefb58646
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 29 10:08:58 2007 -0700
Fix documentation of association of outputs to monitor sections in xorg.conf(5)
commit c1a16bdcfe7aa907fe78f27dc606a8e5a2699952
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 27 18:08:03 2007 +0930
Add 'evfill' field to GEExtensions.
We need this to allow extensions to fill in extra data for an event before it
is sent to the client. This is probably to be used like
FillUpEventsFromWindow().
commit 4d76075dbb618a47ff9fc15c4be2e2d34210fa8d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Jun 29 14:06:52 2007 -0400
Death to RCS tags.
commit 2691c05fd647d9fa10f791ac397ecb9c423a076f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jun 29 11:56:18 2007 +0930
Make sure window->optional is allocated before assigning it.
DeletePassiveGrabFromList() may remove the window optional, so we need to
re-alloc it if it isn't there anymore.
Thanks to Colin Harrison for spotting the bug.
commit f7f3fe7fe7233a2ffc43106c48f44cbbd82b7c19
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 28 18:59:05 2007 -0400
Remove the remnants of OS/2 support.
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
commit 8a06ff9ffa4816d192e58e43e7fe569b97b4dd7c
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 28 16:41:28 2007 -0400
Fix another usage of MAX_PCI_DEVICES.
Fixes cases where the VGA device is above the 128th device on the system.
commit 928836a5abd85466e920eb487fab9ccb295e0c5b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 28 16:29:28 2007 -0400
Bug #10770: "Inputdevs" isn't a valid config file keyword.
commit 62f43d8b33f67d8f3d0bd65787ffae9e6b634d65
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 16:24:42 2007 -0300
Relink properly all kdrive servers when changes happen.
commit 3860996d5666b76600b1537e2cbd58e36b086308
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 16:06:12 2007 -0300
Remove double-defined.
commit 1e189ed1daab58c1de67d387306fde0a9e7984a4
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jun 27 10:16:40 2007 -0700
Handle tileStride > 1 in fbEvenTile.
Patch courtesy of James Jones.
commit bf1ad1aa4270dccf1540943d97e80b317c0adb56
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 27 09:19:28 2007 -0400
Add VBE PanelID support.
Originally found only in the i810 driver.
commit d73835efda4995a310188537233a984f4b73628d
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 03:34:13 2007 -0300
More janitor work. Remove 'defined but not used' warnings from kdrive and some minor cosmetic.
commit 38f8e536684193c3f70b23be22d818053c676072
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 03:19:37 2007 -0300
Janitor work. Remove 'defined but not used' warnings from xorg and other cosmetic.
commit 1340f34ec98c41781164018d43bd7bb858d8132b
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 03:04:55 2007 -0300
Fix kdrive XKB.
commit 08779c62ba2f4cbfa47e3cf738daf8abd74b60cf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 27 11:16:55 2007 +0930
Reset grab->next to NULL when we're creating a grab.
This is definitely necessary in CheckDeviceGrabAndHintWindow (thanks to Paulo
Zanoni for spotting it). We're resetting it everywhere else too, just to be
save.
commit 49136d3e9fe2d065090ee90c18a49f65fb027c9f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 26 19:43:54 2007 +0930
mieqEnqueue: use modulo for queue tail wrapping.
This was previously committed by Michael Daenzer, but was lost during a pull.
commit 8396bf7c8b4eb6b8f2d1e1ef19887064c69591da
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 26 12:58:37 2007 +0930
Init genericMasks to 0, make sure list is NULL terminated.
commit 9725516b4274ceaf9d6caf372c5439b4c9db2316
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jun 22 17:05:21 2007 -0700
Split checks for dtrace & getpeerucred()
commit edb9ccf3ecb4e35a840aa13815979c5fbd73f32d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 25 10:51:38 2007 +0200
Make sure DRIScreenPrivIndex is -1 when no DRI screen private is allocated.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=11340 .
commit c4e850a781e3b85631cb386d24efcca2a835d4c9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 25 13:38:25 2007 +0930
Quickfix to stop core key events from doubling up.
commit 4c601b904ee6fb01da3343ff9ef00d36f1341fcb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 25 10:53:05 2007 +0930
configFiles(): don't return anything when declared as void.
commit bec4e47d128ec40b58a2c9aae475f6a6fc4323c3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 25 10:51:42 2007 +0930
NULL-terminate device list when synthesizing core devices.
This fix is required for 93ca526892c0d22afa05cce6496198c652043a19 to work.
commit 8e5102b9f01821048e72e7f068193a0b3e1816f9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 15:47:48 2007 +0930
Set the detail field for DeviceKeyEvents to the keycode.
(cherry picked from commit 0c33dc152e372cdc8ae59d9a5696b0774bcd03b7)
commit 87564543d92c1ee1f8cb6fb9716a15d693e08cf5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 18:20:05 2007 +0930
Only decrement buttonsDown when the button count is greater than 0.
Device drivers flush their buttons on device init and cause a button down
event to be generated. If we unconditionally decrease the buttons, we won't be
able to ever get a passive device grab.
Format documentation for CheckDeviceGrabs to make it readable.
(cherry picked from commit 3e894974cdd6a75683d4601f71622d1da7ec4395)
Conflicts:
Xi/exevents.c
commit 24ee89fd60f489f2d3af0399e0d667057df74d02
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 15:31:56 2007 +0930
Add a few comments to devices.c
commit 93ca526892c0d22afa05cce6496198c652043a19
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 13 15:28:15 2007 +0930
Split up memory for devices configured in the config file.
If we're using a continuous block here, we segfault when a device removal
triggers an xfree call.
commit b141b85c254afff3ce2221d899787fab3dc295bd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 13 15:26:03 2007 +0930
Check for identical grabs when adding a new passive grab. If an identical grab
exists, remove the old one and prepend the new one.
X.org Bug 2738 <https://bugs.freedesktop.org/show_bug.cgi?id=2738>
commit 19cde59c41cf167cc609debfee75bfc015beac12
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri Jun 22 00:38:50 2007 -0400
In fbFill() make sure the drawable is validated when pixman_fill() succeeds.
In fbSolidBoxClipped() don't return when pixman_fill() succeeds.
commit d2177c80915f2fe2e8a5c948d4ba2fa51dbfbea2
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Jun 22 02:08:21 2007 +0100
Skip driver mode detection/configuration when !vtSema.
When the server is not active, make sure the driver functions related to
mode setting are not called.
commit 32c0dcc8c0d1edba5d7e418fd2dc916847a4f069
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 21 15:39:19 2007 -0400
xselinux: adjust the config file format to that expected by libselinux.
This file will eventually be moved out of the X source tree.
commit 2030e9e5395be43bd8eab15b65c21ca4c2f1e619
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 21 15:37:18 2007 -0400
xselinux: use new libselinux support for context labeling.
Remove all the config file parsing code and use the new lookup interface
instead.
commit 4d5df14f2c4a3108a8c8adfcf4766c0d1a9daad2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 18:24:30 2007 +0930
Save processInputProc before wrapping it and restore it later, instead of
using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to
process DeviceKeyEvents after the first key press.
This should be the correct fix now.
commit f6f3322fc7562dbfccaf798b05d42ea222860ba8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 18:16:21 2007 +0930
Revert "Save processInputProc before wrapping it and restore it later, instead of"
Mixed up source trees, this was a very bad fix.
This reverts commit 8431f6083076cf1e701366767d8f8d32a628200f.
commit 8431f6083076cf1e701366767d8f8d32a628200f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 17:00:41 2007 +0930
Save processInputProc before wrapping it and restore it later, instead of
using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to
process DeviceKeyEvents after the first key press.
commit 0c33dc152e372cdc8ae59d9a5696b0774bcd03b7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 15:47:48 2007 +0930
Set the detail field for DeviceKeyEvents to the keycode.
commit e523859a952d49b20f3d10152cc0ef695d2c12a1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 20 17:54:38 2007 -0700
Include module name in "already built-in" message
commit 5138f710a1574fef6f553f3fe2fccac0620d2584
Author: Arcady Goldmints-Orlov <arcadyg@nvidia.com>
Date: Wed Jun 20 16:31:55 2007 -0700
Fixed fbSolidBoxClipped() to fill the right place.
Changed an X2 to a Y1.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit c9b79a355845c895aca8303a39798264d80b6212
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jun 20 18:56:06 2007 +0200
exaPolyFillRect: Don't track damage explicitly.
All callers should already do it.
Also don't leak pReg.
commit 87966c5d2889873cea6cbc16b7e4399490dfaec1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jun 20 18:42:00 2007 +0200
exaGetImage: Don't migrate or try to accelerate for 1x1.
This is mainly to avoid wasting effort for XSync(), but just reading a single
pixel directly is probably faster than DownloadFromScreen anyway. Though in
light of the latter, even larger thresholds might be useful.
Also move the swappedOut check before the migration checks because migration
can't actually occur when swapped out.
commit 1f97a7647606226cde61d6ad7a94f2b0b571a06c
Merge: 5dee64f 2e7fef7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 17:20:52 2007 +0930
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
hw/xfree86/common/xf86Xinput.c
hw/xfree86/loader/xf86sym.c
mi/mieq.c
commit 40f27a2df4906d9ceb1c78f6163a62c497321535
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jun 19 09:11:16 2007 +0200
mieqEnqueue: Make local queue tail variables unsigned.
So the modulo arithmetic actually works as intended... thanks to Peter Hutterer
for pointing out the problem.
commit 5dee64fc99f34e091abce65d47c4b6f026ab4849
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 11:31:22 2007 +0930
Add a few comments to ProcXGrabDevice.
commit 9e257029c760883c4ea0715d4fd06476f3fe8053
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 11:28:07 2007 +0930
Add implicitGrab field to GrabInfoRec.
Is set when passive grab is implicit as result of a ButtonPress event. If this
is the case, we need to store the XI mask as well as the core mask to ensure
delivery of XI events during the grab's lifetime.
Remove all core grabs on other devices when client issues a GrabPointer or
GrabKeyboard request. Let's assume that the client really only wants one
device to interact, so this seems like a reasonable solution.
commit ab7a6d860d4a275a810a64b1ba7b13726ed10575
Merge: e9130b8 2e7fef7
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jun 18 16:51:13 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
commit 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Jun 18 12:08:39 2007 -0400
Make xf86{En,Dis}ableInterrupts no-ops on Linux.
commit 831d3b7f8d053aba649c8d04af3bef96376bdc3a
Author: Lennart Buytenhek <buytenh@wantstofly.org>
Date: Mon Jun 18 12:05:55 2007 -0400
Compile fixes for Linux ARM platforms.
commit 562ca3f2f9005e7c5ed0a24b0759051ded2173e9
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 18 12:00:49 2007 -0400
In NewInputDeviceRequest, only call EnableDevice if xf86Screens[0]->vtSema is
true, preventing unwanted behavior in the case where a device is added while
the user is in a different VT.
commit 3e894974cdd6a75683d4601f71622d1da7ec4395
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jun 15 17:16:16 2007 +0930
Only decrement buttonsDown when the button count is greater than 0.
Device drivers flush their buttons on device init and cause a button down
event to be generated. If we unconditionally decrease the buttons, we won't be
able to ever get a passive device grab.
Format documentation for CheckDeviceGrabs to make it readable.
commit 42c2e14b254f6f882b3e79444360ab855db43e27
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Fri Jun 15 00:14:02 2007 +0200
swap xOrigin and yOrigin in SProcRenderSetPictureClipRectangles.
Fixes Xrender clipping rectangles when X server and client are of
different endianness, shown by xterm 225 among others.
commit 0aaf51546666f71e8d1711978bc7988ec2ecc7d9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 12 16:55:26 2007 +0930
Zero deviceMask and genericMask when creating a grab via CreateGrab().
commit 78179ae827bb5d19abb1340084362bc51ad5c1e5
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 22:46:42 2007 -0400
Remove fbmmx.[ch] files
commit eb2d7fe02f9cbca57b462bba05498e2d59316fbc
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 22:43:01 2007 -0400
Replace fbFillmmx() with pixman_fill() and remove fbmmx.[ch]
commit f52ae237d3eec79ccd64cdd77271aeacc37af70c
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 22:02:39 2007 -0400
Require pixman 0.9.2
commit d1d85c04e248f46b1cf1b1d25fdd56aa69b8f0ee
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 21:25:42 2007 -0400
Delete fbBltmmx().
commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0
Merge: 878cac7 3f9adb1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 11 15:29:11 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dixutils.c
commit 3f9adb18f127318d054f30a57e3a77176e14c692
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 15:19:27 2007 -0400
Port a few forgotten fbSolidFillmmx()'es to fbFillmmx(). Use pixman_blt() instead of fbBltmmx()
in fbCopyNToN().
commit 878cac71aa0018deee861b297638c0744dba631b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 11 14:19:37 2007 -0400
xselinux: use new libselinux support for private Flask definitions.
Removes indirect dependency on kernel headers.
commit d06099b38e8445e6e31f5178ffefcc31a71080ef
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 13:28:24 2007 -0400
Remove fbCopyAreammx() and fbSolidFillmmx()
commit d4a034370c8ae71b2cc4fe824ceee58b19624f35
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 13:26:24 2007 -0400
Split fbSolidFillmmx() into a new FbFillmmx() function. Call that from fbFill().
commit 3210902a7334f3d8d6c18a34a3cb3f55803b0043
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 13:14:50 2007 -0400
Split fbCopyAreammx() into a new fbBltmmx() function; call this
function from fbCopyNToN().
commit 8d5f4368eac1b259db3e61f877a4cc10f04efa2f
Author: Clark Rawlins <clark.rawlins@escient.com>
Date: Mon Jun 11 16:53:38 2007 +0200
Really make sure BUILD_TIME doesn't have a leading zero.
date +'%k%M%S' still gives a leading zero in the hour after midnight...
Add a leading 1 and remove it in xf86PrintBanner().
commit 54e023cec07aa7e392da36e11d0a4667b8341370
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 09:16:46 2007 -0400
Don't pass regions to pixman_image_composite() anymore.
commit 5cbec267b6426960c90f6bcff1d051af5084538c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 12:38:41 2007 +0200
Make sure BUILD_TIME doesn't have a leading zero.
It causes the compiler to treat it as an octal constant instead of decimal as
intended, which could even cause a build failure in the cases of 08 and 09.
Thanks to Clark Rawlins for pointing out the problem.
commit 1aceec61ff203848576c47a1eab13f90a67d7176
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:19 2007 +0200
DRI: Clip cliprects obtained from DRIGetDrawableInfo to screen dimensions.
This is to avoid issues with redirected windows which are located partly or
fully outside of a screen edge, resulting in unusual cliprects which the 3D
drivers generally can't handle. The symptoms in such cases would be incorrect
rendering or even crashes or hangs.
commit 5d896e43fd056d935935b4eb66562791edc247a1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:19 2007 +0200
DRITreeTraversal: Stop walking tree when we've seen all DRI windows.
commit 0fb44c6f9a0415184818ba8357a21ff920e907dc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:19 2007 +0200
DRI: Fix build warning.
commit 644f7ddc0cb029e2ebca43742fd8a46a1a3f4c9f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:18 2007 +0200
dixLookupClient: Use access parameter.
commit 30a3297fed9af3a594aba0875a8f58a0a38b33fc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:18 2007 +0200
mieq queue handling cleanups.
In particular, fix handling of wraparounds in mieqEnqueue.
commit c1a49a9269f14b6975a1a2c751bb179757373f11
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Jun 10 22:14:57 2007 -0400
GNU is wrong and ` is not left-quote.
commit 67a0a4da1a225ee3bd6bbd1846f8141fe333c884
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Jun 11 11:55:11 2007 +1000
update xproto dependency to at least 7.0.9
commit c079cce9d884ab03f305b3fba4a4e1247c023480
Author: Daniel Ciocea <daniel.ciocea@eosystems.ro>
Date: Fri Jun 8 18:12:21 2007 -0700
Fix sync polarity on Samsung SyncMaster 205BW monitor.
need to use standard VESA sync polarity instead of the
EDID provided -hsync -vsync values.
commit 9c47b86bd9a4633fda5fd305a09ac8623187efa0
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jun 7 13:57:12 2007 -0700
Add new fb symbols to wfbrename.h.
Avoids crashes when wfbComposite calls the wrong image_from_pict.
commit 567b5bf765254a4ae9cc7711bb6acfa89a9fd61c
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Jun 5 20:26:49 2007 -0400
Delete fbCompositeCopyAreammx()
commit 49ed31c0b323dd8c5887a803c199875e6f2330d8
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Jun 5 17:44:21 2007 -0400
Remove most of the fast-path MMX operations from fbmmx. fbCopyAreammx
and fbSolidFillmmx are still needed by other code.
commit dfbe32b5b828cc4e3da36a0e2e6ad641164eaa5e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Jun 4 18:07:00 2007 -0400
Remove the old Kerberos 5 authentication code.
Before you complain, this code hasn't seen material change since at least
X11R6. It certainly does not build with any modern version of Kerberos.
Anybody wanting krb5 auth to their X server should probably be using
GSSAPI instead of internal krb5 API anyway.
commit 793470a8356976ddd427280a738dfb6e1c0e4e70
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 4 12:33:49 2007 -0400
dix: fix null pointer dereference in new resource lookup function.
commit 75dece08fb72803d5116e6776e9f1534ff20e37b
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 09:09:20 2007 -0400
xf86PostMotionEvents[P] calls xf86SendDragEvents, xf86SendDragEvents
unconditionally checks device->button->buttonsDown.
Let's make it possible to have a device with motion, but no buttons.
Without segfaulting.
commit fbb9b203950e9d0e82574cde5b3e006b0e6b404f
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 06:59:42 2007 -0400
Let's not do a calloc and a free on every call to xf86PostMotionEvents.
commit 3f4295e643ca56c40f33af7966e8efd367ef8749
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 06:48:06 2007 -0400
Add xf86PostMotionEventP, takes a pointer instead of a variable number of
arguments.
Bump input ABI to 1.1 since we export this.
commit a4f3473c88370b8411e016ebab619cffd33e58f9
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 06:39:02 2007 -0400
Fully init the AbsoluteClassRec in InitAbsoluteClassDeviceStruct.
(Specificly, we were missing the screen field.)
commit 0cbc3a4da2ddb6e4f30f60d2bc7f405d31aa554a
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 02:03:44 2007 -0400
Print the build time as well as the date if we can.
commit 9a7aaeb3f6ff79af60fde91cd0575a54ba0b9587
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 28 13:54:16 2007 +0300
XFree86: Input: Assume core events per default
Assume that a device will be sending core events, unless explicitly
specified otherwise.
commit 94361cbba7f866144691f6f5e9251a550e0e0cb8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 28 13:54:47 2007 +0300
XFree86: Input: Perform case-insensitive comparisons on option names
commit e5ce982381c4092252d6b55fcefcc9a3cd21e656
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun Jun 3 09:40:37 2007 +1000
Include pixman.h from fb.h or compile of some files will fail
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 90eb22656c34d2d08a8dccaf05e6d081c56bd7f3
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jun 2 16:49:26 2007 -0400
Minor cleanup/robustification to config parsing.
commit f6a983533bdc84752562ef0be25b320678bf08a1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jun 2 16:37:39 2007 -0400
Don't warn about default behaviour when autoconfigging.
commit 21e8f4eb02842f877336db08c332d8ee4a381ee0
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jun 2 16:13:01 2007 -0400
Don't print lack of DRI support as an error in AIGLX init.
commit 0e1384d8318637f75d04d3d1b7600f7cad40117e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jun 2 16:07:20 2007 -0400
Delete VDIF support; it was never used anyway.
commit 66702f3c1c6c884e83744c72da173cc32f22b2f4
Author: Henry Zhao <henryz@localhost.localdomain>
Date: Fri Jun 1 23:55:40 2007 -0700
Need to use minPitch in miScanLineWidth() to get the shrinked
linePitch.
commit 26b21157cf934ae387b15faa9ebb060120e6a0d6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 31 17:05:14 2007 +0930
Add a deviceMask to the GrabRec and don't interfere with passiveGrabs.
This quickfixes event delivery problems with XI events when a grab was on.
deviceMask is only used when the grab was from a ButtonPress to preserve
potential XI event masks.
This is not an ideal solution but it works until I have time to work on
PassiveGrabs.
commit fa877d7ff25c4ec45288e1fea70d4f5e1baf3ef3
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed May 30 13:06:45 2007 +0100
Fix mode validation against the maximum X/Y values configured
at server startup, and not against the virtual X/Y parameters
as they can change.
This fixes an issue when canGrow is TRUE and modes get dropped
when using the virtual X/Y parameters.
commit 182ab3a3d5b28daa86e6d6155e76ce759687ae6d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 30 17:44:31 2007 +0930
Fix up comments for event.c
commit b5db863945fa8045995b3bf742c44e40f2650f04
Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
Date: Wed May 30 16:15:15 2007 +0930
Allow value None for windows when setting ClientPointer.
We need this for clients that need to set the ClientPointer but don't have a
window on display yet. If used, it will set the device as the ClientPointer
for the requesting client.
commit 99eae8bea6724a24477375ad5b2d31cc4883cf6b
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue May 29 22:04:36 2007 -0400
I/O enable/disable update for the Hurd
commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 29 22:01:30 2007 -0400
Make sure that the ramdac symbols are present in the server
The former ramdac module is now built into the server, so its symbols need to
be explicitly exported to drivers (Debian #423129).
commit ee20c481eede0954f4a8bef5113979b101863c32
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 14:54:27 2007 -0600
Remove wscons keyboard handling stuff that doesn't belong there anymore.
commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0
Merge: 3a6549a 2f13b7c
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 12:14:49 2007 -0600
Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver
commit 3a6549a163aba26bf4ac58b050c493fba0df14c6
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 12:14:23 2007 -0600
Make this build on OpenBSD
commit 2f13b7c113c17239e382dd3640e9c29201d8ab1f
Author: Drew Parsons <dparsons@debian.org>
Date: Wed May 30 02:13:36 2007 +1000
Update Xprint build for pixman.
Xprt links libfb, which now uses pixman. Update configure.ac to
require module $PIXMAN for XPRINT.
Also, use $(top_builddir) to reference libfb.la and other local
libraries, rather than using the relative reference ../..
commit ba0b7d47ab0c24d5a29228f8af583044060464bd
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 28 21:57:04 2007 -0400
Fix for GNU/kFreeBSD
commit 2267bf48b385c93243e26c3bb84ebb04c7fdb39f
Author: Bastian Blank <waldi@debian.org>
Date: Mon May 28 21:55:05 2007 -0400
Fixes for s390
commit 857ddbb660a21cad1c16f4fb2dc8a904d6655304
Author: Eugene Konev <ejka@imfi.kspu.ru>
Date: Mon May 28 21:53:02 2007 -0400
Allow configurable serverconfigdir for security policy location
Allow the location of the SERVERCONFIGdir variable to be defined at
compile-time. This allows us to specify where the security policy will be
located (Debian uses this to put it in /etc). The default is to the
previous location.
commit 78d01d1008973899d931ef44b47d5f0b5f220b0d
Author: Gerhard Tonn <gt@debian.org>
Date: Mon May 28 21:48:58 2007 -0400
Miscellaneous fixes for S/390.
commit d98bd4bf908c2c51fcfd3a4c3230de17f2567244
Author: Branden Robinson <branden@debian.org>
Date: Mon May 28 21:44:59 2007 -0400
Overhaul xorg.conf manpage
Major stylistic cleanups, greatly expanded cross-reference ("SEE ALSO")
section and some typo fixes.
This patch by Branden Robinson. Forward-ported by Fabio M. Di Nitto.
commit 6bf8d5019313ee2251a44dfb7ad3435a3c6db7eb
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 28 21:42:10 2007 -0400
Read ROM in chunks
This patch speeds up reads of the ROM by reading in large chunks rather
than one byte at a time. This patch was by Dann Frazier.
commit 6fdd134a0c3e6fdde9b089100e8783705c9cc6ac
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 28 21:39:12 2007 -0400
Fix up xnest manpage
I believe this patch was originally by Branden Robinson
commit 6a870992d81a6bacfa9d313c15784fdb281d474f
Author: Keith Packard <keithp@dulcimer.keithp.com>
Date: Fri May 25 20:33:08 2007 -0700
xf86XVFillKeyHelper assumed root clip never changed.
When the root window changed size, xf86XVFillKeyHelper would not revalidate
the GC, leaving the clip at the old size causing lossage (and possibly
memory corruption if the screen and frame buffer shrank).
Fixed by just using a scratch GC; saving memory, eliminating bugs and
shrinking the code.
commit 3c982bc1a49509dda7bc469b0eced44df02755b3
Author: Luo Jie <luojie@nlsde.buaa.edu.cn>
Date: Thu May 24 11:13:03 2007 -0700
Reinstate an apparently mis-deleted ';' from a for loop with no body.
Fixes an error returning "No core keyboard" with multiple keyboards.
commit 4d7469f75fadfc4a59664e88e18eb304203670f4
Author: Luo Jie <luojie@nlsde.buaa.edu.cn>
Date: Thu May 24 11:04:06 2007 -0700
Fix a typo in using memcpy in xwin.
commit 0b988450462ddb005311e68502357baf272e6371
Author: Luo Jie <luojie@nlsde.buaa.edu.cn>
Date: Thu May 24 11:02:28 2007 -0700
Fix os/utils.c compile with mingw.
commit 1f48995d66c0072caa7e5ce2845be642221dd56d
Author: Luo Jie <luojie@nlsde.buaa.edu.cn>
Date: Thu May 24 11:01:15 2007 -0700
Fix build of composite, dix, and randr when Xinerama is disabled.
commit 8f98be7db303bc3db650054efb86843c70114451
Author: Eric Anholt <eric@anholt.net>
Date: Thu May 24 11:00:04 2007 -0700
Fix bswap detection on BSD (mis-added '_' in function names).
commit 9616a042855399f0ee9c6489ea824621ea5fee18
Author: Matthias Drochner <drochner@netbsd.org>
Date: Tue Apr 10 16:15:40 2007 -0700
Fix build on NetBSD/amd64.
commit ddb26bccd275f4fc011f7a2be685d1ce58555a00
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu May 24 12:20:24 2007 -0400
dix: Add a bunch of new access codes.
These were determined through an analysis of the core protocol and 35 of
the most common protocol extensions. There remain four bits for future
use.
commit 649e7f82d8d4333443493056b81eb20d6cf022bc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu May 24 12:10:05 2007 +0200
Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
This avoids a crash in xf86XVReputVideo and also cleans up the code slightly.
commit 047bf3349bb697c73c95729a8bbf15f72605901f
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 23 16:56:05 2007 -0400
Delete trapezoid rendering code; replace with pixman calls
commit 9d87ef4e0dff40ea39f1b209c67b90079fc79065
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 23 15:50:25 2007 -0400
- Make image_from_pict() non-static
- Delete fbedge.c and fbedgeimp.h
- Use pixman_rasterize_edges() in fbtrap.c
commit 2a960c442bd7560630f52b55d82ec0517542ee5a
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 23 13:08:26 2007 -0400
Port renderedge.c to pixman
commit 3ba3ede9bbdfc6376b6f6e0b6ce8280a05e6584d
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 23 12:56:04 2007 -0400
Add missing offsets for window coordinates - reported by Colin Harrison
commit 2a4aa63a23ddd816b647b851a01865861827a7eb
Merge: 9cee4ec cc648e6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 22 14:50:26 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
commit cc648e609d472472bac4a2e568eb3598b3690ba3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue May 22 10:51:56 2007 +0200
EXA: Export ExaOffscreenMarkUsed.
Can be used to inform EXA that an offscreen area is used outside of EXA.
commit e6a7198e7cd96f1fe0654cc6811a977821579258
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue May 22 10:51:55 2007 +0200
Bug #8991: Add glXGetDrawableAttributes dispatch; fix texture format therein.
Adapted to master branch by Michel Dänzer <michel@tungstengraphics.com>.
commit 6324bfc468f7a645d2fee59f1c921a4328a4639f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue May 22 10:51:53 2007 +0200
AIGLX: Zero-copy texture-from-pixmap.
When available, use the 2D driver texOffsetStart hook and the 3D driver
setTexOffset hook to save the overhead of passing the pixmap data to
glTex(Sub)Image.
The basic idea is to update the driver specific 'offset' for bound pixmaps
before dispatching a GLX render request and to flush immediately afterwards
if there are any pixmaps bound. This should ensure that the 3D driver can
use pixmaps for texturing directly regardless of the X server moving them
around.
commit 5006d08d7fc56d3d380cc6b75297f94e8594eb54
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue May 22 10:51:52 2007 +0200
DRI: Add TexOffset driver hooks.
To be used by AIGLX for GLX_EXT_texture_from_pixmap without several data copies.
The texOffsetStart hook must make sure that the given pixmap is accessible by
the GPU for texturing and return an 'offset' that can be used by the 3D
driver for that purpose.
The texOffsetFinish hook is called when the pixmap is no longer being used for
texturing.
commit ff2eae86b6a8760befbbc5d605debebe7b024c05
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 21 19:50:04 2007 -0400
Fix boolean thinko that prevented working without a server layout
commit 56fd92715567cd32e4b725b3791de9ac4e3879aa
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon May 21 20:00:25 2007 -0400
Remove fast path code from fbpict.c
Remove the various fast path functions from fbpict, and instead use
pixman_image_composite().
commit d0e8f474099dea40bbea555427772724ccb787d1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 21 13:06:21 2007 +0930
Change GrabDevice's parameter name back to "coreGrab".
Was changed during a global search/replace for
5c680e94938c16e04a4349715cf11796b80400db.
Otherwise people like me introduce bugs (e.g. in
333bab4b235801efd2b2de5b60df5b0c44048d3e)
commit 167e1773de0fb566559d4362ff929eedcdb6d055
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 21 10:45:10 2007 +0930
Remove unused include "gestr.h"
commit 7e2c935920cafadbd87c351f1a3239932864fb90
Author: Fredrik Höglund <fredrik@kde.org>
Date: Fri May 18 20:06:14 2007 +0200
Add a new IDLETIME system sync counter.
This counter exposes the time in milliseconds since the last
input event. Clients such as screen savers and power managers
can set an alarm on this counter to find out when the idle time
reaches a certain value, without having to poll the server.
commit 756acea23a0cc56c470bcd77c6f5638d923ab3d1
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri May 18 13:39:12 2007 -0400
Use pixman_image_set_indexed() to make 8 bit work
commit 7916419a0092b8bf9713c0840f9e969950d7aa85
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri May 18 11:58:24 2007 -0400
Comment out setup of general MMX code
commit 998164bac648756e5b5254aa36e075ae360d3972
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri May 18 11:36:20 2007 -0400
Move fbCompositeGeneral() to fbpict.c and remove fbcompose.c
commit a2e3614eb8f0fa198615df492b03ff36bc9c1121
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri May 18 11:33:11 2007 -0400
Break image_from_pict() into a few subfunctions.
commit c5ef84c325440af5fbdf9f44c3781d99a0392df9
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Thu May 17 21:31:08 2007 -0400
Make the general compositing code create a pixman image and call
pixman_image_composite(). Leave the general code commented out for now.
commit 076d070e186afeb416976ae74fbfd50c86db10c5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu May 17 20:24:18 2007 -0700
Use Screen block handler for rotation to draw under DRI lock.
DRI uses a non-screen block/wakeup handler which will be executed after the
screen block handler finishes. To ensure that the rotation block handler is
executed under the DRI lock, dynamically wrap the screen block handler for
rotation.
commit 915563eba530c5e2fdc2456cf1c7c3cc09b3add0
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu May 17 20:22:43 2007 -0700
Disable all outputs and crtcs at startup.
Leaving devices enabled during server startup can cause problems during the
initial mode setting in the server, especially when they are used for
different purposes by the X server than by the BIOS. Disabling all of them
before any mode setting is attempted provides a stable base upon which the
remaining mode setting operations can be built.
commit 0375009a97c2ab7f0e0f0265463d45c0580388c6
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Thu May 17 12:59:24 2007 -0400
Remove excessive unrolling in fbCompositeSrc_x888x8x8888() and fix bug where
the source alpha was used instead of 0xff.
commit 0b4db74922299df785e6273fdb1bf65c38d36070
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 17 18:00:07 2007 +0930
Squish the flags into the upper bits of the mode field for EnterLeave events.
This way we have enough space for the detail field.
commit 333bab4b235801efd2b2de5b60df5b0c44048d3e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 17 17:59:02 2007 +0930
Clean up, correct some comments.
Send event type down with the RawEvents.
commit bc334286b060bc8d0c829b18acebadf24fbdaf19
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 17 10:36:46 2007 +0930
Init device axis with -1,-1 minimum values.
This is needed to be able to cross to screens located east/north of the
current active screen.
commit 546465ee6aa6584780aec6357f32d205c807ae71
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed May 16 17:42:04 2007 -0400
Make fbFetch_b8g8r8() actually write the read value to the buffer
commit 0fcd17c9181901c419cc32bc24c07fe5a6934d81
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 15 17:59:13 2007 -0400
Use pixman short formats, revert the gradient_stop change
commit f4c1d5fc28a5a7fe2592505350f9e2331f6049b7
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 15 17:12:22 2007 -0400
Use pixman types for transforms and vectors
commit f2e30e7d0a1d075e7e83c5b5ceca9e4752951138
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 15 16:51:21 2007 -0400
Use the pixman fixed point types and macros
commit 3da842bf930d7875599ca0c06cb4a09cfa987ac5
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 15 14:57:14 2007 -0400
Revert various fast path functions to their pre-pixman-merge state
since they fail rendercheck. Remove their associated macros.
See bug 10903.
commit 1568b6b6a0d7337f29c7b87cc46ae64b3b0f8fdf
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Sat May 12 20:33:23 2007 -0400
Port large amounts of the region code to pixman
commit dde0ceac4ea7639d0096bfd26f37c5851778854c
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Sat May 12 17:41:47 2007 -0400
Add new InitRegions() function called from dix/main
commit e037052ac522150786abf44d3a04c813cc490050
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Sat May 12 16:58:54 2007 -0400
Turn boxes and regions into typedefs for pixman types
commit 8e56f5be4b70773c899f01b9ccd2e88d523327e4
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri May 11 11:45:37 2007 -0400
Add dependency on pixman 0.9.0
commit a8c56372ba8aa36bac09877c478ff53ea5358df7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 15 10:24:22 2007 +0930
Revert "Allow events to grabWindows event if the device is not grabbed."
This reverts commit 339b73e710a0920608a3fbcb20b406f0f6c4e0f6.
Allowing those events can lead to race conditions.
Conflicts:
dix/events.c
commit 81fc6a128b64ad412064405ed45db0175398e3f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 14 18:12:56 2007 +0930
Add ungrab support to ExtendedGrabDeviceRequest handling.
Polish the code a bit.
commit 5c680e94938c16e04a4349715cf11796b80400db
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 14 12:34:53 2007 +0930
Remove double-grab option. We only want one grab per device.
commit 4dc973f08c54294e06bc831bd2839fd3aa24ecfb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 14 10:42:03 2007 +0930
Add ExtendedGrabDevice handling.
Add XGE handling in DeliverGrabbedEvent.
We can now grab something selecting XGE events, but the current code is a
bit messy and doesn't work too well yet.
commit a277f04ab08514462b7f10b4dd92eb326af85501
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed May 9 22:03:12 2007 -0400
Remove mfb and cfb from include paths where they're not needed.
commit 20c5250e487e032d392e2e4624021fccb1bfb72c
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed May 9 21:49:44 2007 -0400
Use system copy of cbrt() if available.
Also move the replacement inline into miarc.c, since that's the only user.
commit 8dcc37520d5e8c8b52cee81faa67fd5205548377
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed May 9 18:57:05 2007 -0400
Use _X_INLINE instead of ad-hoc #defines.
commit 6ff239cb4e67c0a2ea497a1714e5585c1d941af3
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed May 9 18:38:33 2007 -0400
Make the use of ICEIL slightly less ugly.
commit 178d426311bb3c7160f72b5d95b0a137eda09ba9
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Fri May 11 10:08:42 2007 +0100
Missing piece from bug 9808
commit ebaa6c920c82401952a0ccc991b94574306449bd
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu May 10 15:25:31 2007 +0200
Disable Simba PCI bridge routing code (Bug #8020).
The code in hw/xfree86/os-support/bus/sparcPci.c:simbaCheckBus()
is trying to mimmick VGA routing by disabling I/O space responses
behind the Simba PCI-PCI controller.
Unfortunately, doing this also happens to disable access to the
IDE controller I/O space registers, thus crashing the system. The
granularity of the I/O disabling in the Simba controller is not
fine enough to disable VGA without also disabling the IDE controller
registers.
commit 86c4941727f7c673ae6bb88c67443fa25935c7f5
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Wed May 9 16:55:27 2007 +0100
fix an occasional crash in GetWindowName() (bug: 9798)
commit be44018a3c6172caf3e91c36ea321420d104e79f
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Wed May 9 16:55:09 2007 +0100
Fix bad use of hwnd (bug: 9808)
commit d3248b66a650c6c629cd66240e25004869217d2e
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Wed May 9 16:54:46 2007 +0100
Migrate some code to the new mi apis
commit 021e5df85d7c9373a2fed55512751d16e08128db
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 7 21:03:40 2007 -0400
Add more informative logging for module default loading
When the modules section is parsed, if a module is set to be loaded by
default, this will be logged. If it is redundantly specified in xorg.conf,
this will also be noted. None of this logging will happen if the xorg.conf
lacks a modules section.
commit 1b3a0508a7aee1c7b14cd62216b4727fcc9181d4
Author: Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>
Date: Sun May 6 01:30:59 2007 -0700
Fix documentation for Copy hook -- it can copy memory to the scanout
buffer too.
commit 030a578391c634bc68add6ada3f251cf3f8c3069
Author: David Nusinow <dnusinow@debian.org>
Date: Thu May 3 22:51:07 2007 -0400
Provide UseDefaultFontPath option
This provides a new option, UseDefaultFontPath. This option is enabled by
default, and causes the X server to always append the default font path
(defined at compile time) to the font path for the server. This will allow
people to specify additional font paths if they want without breaking
their font path, thus hopefully avoiding ye olde "fixed front" problem.
Because this option is a ServerFlag option, the ServerFlags need to be
processed before the files section of the config file, so swap the order
that they are processed.
commit e91b9ddc7aa95abc2d4d314e8db204860771a099
Author: David Nusinow <dnusinow@debian.org>
Date: Thu May 3 22:00:23 2007 -0400
Improve modules loading defaults
Provide default modules that may be overrided easily. Previously the
server would load a set of default modules, but only if none were
specified in the xorg.conf, or if you didn't have a xorg.conf at all. This
patch provides a default set and you can add only the "Load" instructions
to xorg.conf that you want without losing the defaults. Similarly, if you
don't want to load a module that's loaded by default, you can add "Disable
modulename" to your xorg.conf (see man xorg.conf in this release for
details). This allows for a minimal "Modules" section, where the user only
need specify what they want to be different. See bug #10541 for more.
The list of default modules is taken from the set loaded by default when
there was a xorg.conf containing no "Modules" section.
A potential problem for some users is that some users disable a module,
most notably DRI, by commenting out the "Load" line in their xorg.conf.
This needs to be changed to an uncommented "Disable" line, as DRI is
loaded by default.
commit d2f813f7db157fc83abc4b3726821c36ee7e40b1
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 2 19:10:22 2007 -0400
New fbWalkCompositeRegion() function
This new function walks the composite region and calls a rectangle
compositing function on each compositing rectangle. Previously there
were buggy duplicates of this code in fbcompose.c and
miext/rootles/safealpha/safeAlphaPicture.c.
commit e0959adcd8df2c61e98e76e708fceef9c7cd54eb
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 1 13:41:48 2007 -0400
Add fbCompositeRect() as another special case in the switch of doom in fbpict.c
This is phase one of getting the two region walkers in fbcompose.c and
fbpict.c merged together.
commit cb22bdbe678a9948eda75d464d6701a729664ef0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 3 10:05:58 2007 +0930
Add selected RamDac functions to xfree86LookupTab.
Adding those makes drivers for s3 and tga work again.
commit c1e1d6b98a6708860e5b5f6e21d8d5b1d8ce9075
Author: Brian <brian@yutani.localnet.net>
Date: Wed May 2 15:55:40 2007 -0600
In __glXCreateARGBConfig(), insert the new GL mode at the _end_ of the linked list.
Previously, the new mode was added at the head of the list. This caused the
positional correspondence between modes and the XMesaVisuals array to be off
by one. The net result was GLX clients failing when they tried to use the
last GLX mode/visual.
We still have the problem of DRI drivers not being able to use the extra
mode/visual introduced by __glXCreateARGBConfig(). glXCreateContext fails
with BadAlloc if it's attempted. This is also the source of the often-
seen warning "libGL warning: 3D driver claims to not support visual xxx"
Look into fixing that someday...
commit bd0abb2844ef9faf28703e592cfebb886004234c
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed May 2 17:20:48 2007 +0200
Bug #10823: Fixed default OSNAME value.
We try to get OSNAME from uname by default now.
commit 71fc5b3e9309182978ead676965d65ca93a4e3b9
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 2 11:41:11 2007 +0200
Fix for a divide by zero that can be triggered by a malicious client.
Problem reported by Derek Abdine of rapid7.com. Thanks.
commit c03d9a7217f9895feed8cfed3ede4752faf6187c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 2 18:16:40 2007 +0930
Cleaning up a bit.
Register correct event in EventSwapVector.
Fix up event swap for GE events, register XI's swap function at GE.
commit e6fd4a24ebd205013b41e44aacbbfb847709d2fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 2 17:49:20 2007 +0930
Add handling for FakeDeviceEvent request.
Fix a stupid bug from last commit, mask names were wrong.
commit af25720598bb35d9d953ac8d9a07528289ebfb4a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 2 13:51:16 2007 +0930
Add missing files for ProcXiSelectEvent.
Should have been a part of 5e439109292e54b5c4d1a7bc7b6ac0e42ee285f7. Oh well.
commit 58c0fd29272fb6c2f193cff82fb0b0573c607eec
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 2 13:50:09 2007 +0930
Adjust EQ to support long events.
Add RawDeviceEvent (pointers only for now).
This commit changes the event queue to use EventLists instead of xEvent
arrays. Only EQ is affected, event delivery still uses xEvent* (look for
comment in mieqProcessInputEvent).
RawDeviceEvents deliver driver information to the client, without clipping or
acceleration.
commit 0214d0b96a9b900a8cf5c7f2183add3a411441f3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 15:49:41 2007 +0930
Start devices after windows are initialized.
This fixes the hotplug segfault introduced with the multihead changes and
cleans up the code a bit as well.
commit 11d0e2109b699714055e263e8963f2c39eded28b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 14:16:36 2007 +0930
Correct enterleave semaphore value for root window.
commit 8b42ba64e169a35df2a90528dcb0cd06be0f67a1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 12:12:58 2007 +0930
Send PointerKeyboardPairingChangedNotifyEvent using XGE.
Needs updated inputproto and libXi.
commit 325380adb20ec2b82e176d75599fd4bc97a3b918
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 11:02:05 2007 +0930
Check and re-set paired devices when initializing sprites.
If we don't do this, a device that is paired before a sprite has been
initialized for the paired device will not actually get the right sprite and
segfault the server on focus events. Happens for the VCK.
commit b043a184509cfe5c4c4691ecde1a4a065e53d575
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 09:54:33 2007 +0930
Check VCP's and VCK's ids when searching for a new device id.
Both VCP and VCK are not in the inputInfo.devices list anymore, so we need to
check them separately. If we don't do this, we end up re-using ids 0 and 1,
causing all sorts of grief for clients.
commit 873ef75b1e8c94d39670c981c4d830ab8bcc018b
Author: Colin Guthrie <gmane@colin.guthr.ie>
Date: Mon Apr 30 10:33:12 2007 -0600
fix __glXErrorCallBack() proto
commit 6b33459bf5aac23c3ecc7002d091c02f327d907a
Merge: 18252a5 3c91a99
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 30 10:26:19 2007 -0600
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/xorg/xserver
commit 5e439109292e54b5c4d1a7bc7b6ac0e42ee285f7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 30 12:57:42 2007 +0930
Add GenericEvent extension to Xext.
This adds (unconditional) support for the GE extension. Anything from now on
that sends events in MPX will have to use the GE extension. No GE, no MPX
events. GE is not actually used yet from anywhere with this commit.
You will need to update x11proto, xextproto, libX11, libXext and xcb to the
matching xge branches. Things will _NOT_ work without the updated protocol
headers and libraries.
commit 3c91a993e8c752002adf85c317216e1487c20780
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:49:41 2007 +0200
EXA: Fix OffscreenValidate build with DEBUG_OFFSCREEN enabled.
commit a261e1325057974d58440812b93c00c0caa4423a
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:49:35 2007 +0200
EXA: Remove DrawableDirty.
Convert the remaining callers to PixmapDirty.
commit b1b6674a919943a8ac37e54d02e8d0d23a642b1d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:49:28 2007 +0200
EXA: FillSpans improvements.
* Don't need to track damage.
* Always migrate for fallbacks.
commit 584697a2231ac782f362a925e1489c15483a8791
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:49:09 2007 +0200
EXA: SolidBoxClipped improvements.
* Centralize handling of fallbacks and damage tracking.
* Always migrate for fallbacks.
commit 982d7c2c0b948ba04c8eefa475d660981e6ed9f9
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:48:59 2007 +0200
EXA: CopyNtoN improvements.
* Centralize handling of fallbacks and damage tracking.
* Always migrate for fallbacks.
commit d2245386eed200e77a8c84bdda36ab29e39fd593
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:48:31 2007 +0200
EXA: GetImage improvements.
Only migrate when appropriate. In particular, don't migrate to offscreen in the
no-fallback case as copying from system memory should usually be as fast if not
faster than DownloadFromScreen, in particular if the bits need to be uploaded
to offscreen first.
commit 0880aaac9c83019fec2e3d32871f74c7a407f8b3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:48:19 2007 +0200
EXA: PutImage improvements.
* Migrate for fallbacks when appropriate.
* Add damage tracking in ExaCheckPutImage.
commit 7fca16901187ade48e83e6a2684ef464b1912357
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:48:11 2007 +0200
EXA: ImageGlyphBlt improvements.
* Don't waste effort on invisible glyphs.
* Only track damage for bounding box instead of each glyph separately.
* Always migrate for fallbacks.
commit a8d6ebdf9338dc2f6ff9a532e6fec460a70d3b1e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:47:53 2007 +0200
EXA: Defer to FillRegionTiled in Composite when possible.
Committed separately as this case is hard to hit and has only been tested
lightly.
commit 81b055605c34b5823f6c5f63cc0f92f43c6b7252
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:47:43 2007 +0200
EXA: Composite improvements.
* Defer to simpler hooks in more cases (inspired by XAA behaviour).
* Move damage tracking from lower to higher level functions.
* Always migrate for fallbacks.
commit ce317a5b76c053f449122c46e1372bf8e067cb4c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:47:16 2007 +0200
EXA: Glyphs improvements.
* Don't waste effort on invisible glyphs.
* Add damage tracking where necessary.
* Always migrate for fallbacks.
commit 0c8905ebc91cf654facef84ee52231a358deec5c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:47:08 2007 +0200
EXA: PolyFillRect improvements.
* Convert rects to region and use it for damage tracking.
* When possible, defer to exaFillRegion{Solid,Tiled} using converted region.
* Always migrate for fallbacks.
* Move damage tracking out of ExaCheckPolyFillRect.
commit 567f18a09bfb05f448be40c7ebe0f210f955601c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:46:49 2007 +0200
EXA: FillRegion{Solid,Tiled} improvements.
* Support planemasks, different ALUs and arbitrary tile origin.
* Leave damage tracking and non-trivial fallbacks to callers.
* Always migrate for fallbacks.
This is in preparation for using these from more other functions.
commit e869573b52fac69fb88cea120daaeec59c7a3461
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:45:48 2007 +0200
EXA: exaAssertNotDirty improvements.
* Return early if the valid region is empty or the pixmap is pinned.
* Fix loop for several cliprects.
commit d3f8667341bfe6dc7d0258c4ad69377f37d88d95
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:44:27 2007 +0200
EXA: Fix exaEnableDisableFBAccess for nested disables and enables.
commit 5e4b3232dafe3b0dec65bf639bebaba4774210b7
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:38:22 2007 +0200
Fix fbCompositeTrans_0888xnx0888 build for wfb on big endian.
commit 2866e0bac9b8dd3892c5e68abcfc6c97cebaf88a
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:38:13 2007 +0200
Fix a couple of picture repeat fields incorrectly compared to RepeatNormal.
commit 78a20455356ccc310f73cfc65ad65a7677eee7e5
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 27 15:20:24 2007 -0400
Pixman merging
More msvc++ porting
commit 6c4f1826bf2c5f30f5fe6e489a02b6375478b380
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 27 08:13:08 2007 -0400
Bug fix in fbCompositeIn_nx8x8888
Make sure both halves of the dst word is set to zero when the masks
are both 0.
commit f28eea0647f007c2e2415ecc6fceef46201faad4
Merge: 339b73e ae04f2c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 27 16:34:36 2007 +0930
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
dix/events.c
commit 339b73e710a0920608a3fbcb20b406f0f6c4e0f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 27 13:24:27 2007 +0930
Allow events to grabWindows event if the device is not grabbed.
This kinda makes popup windows useable if the WM doesn't set the
ClientPointer. Kinda.
commit ae04f2cb0a068cdc1e519627bf745de0c9e4a85a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Apr 26 15:28:04 2007 -0400
Fix the 'relink' target for kdrive servers.
commit 6c8152d6ee9eeb21a68a8bbfed1540939e5bcd1f
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Apr 26 14:59:04 2007 -0400
Remove old edid_modes.c, it lives in hw/xfree86/modes/ now.
commit 2208c6087d6bffcb24a30891a56430e28735874c
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 14:40:30 2007 -0400
Change expand_alpha_rev to expand_alpha in mmxSaturateU
commit a300ef84cee26febfbe08c497d0d063588130bdd
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 14:37:53 2007 -0400
Fix typo in previous commit
commit 0ebe48be59368b55c618f60d4656300bd7f52ed9
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 14:36:32 2007 -0400
Pixman merge
- Changes to support MS Visual C++
- use inline instead of __inline__
- Fix rounding errors (Billy Biggs, from xserver via pixman)
commit 4fe918b38553133c27e5ae672e5c43984a9bbaea
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 12:41:01 2007 -0400
Fix bug 8871 - scrolling corruption with a compositing manager
Call miHandleExposures() in CopyArea/CopyPlane explicitly in cw to
generate GraphicsExposes correctly.
commit 0ff7c94fcf6497ee8575f81cf97eeeb3a857739e
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 10:56:02 2007 -0400
Pixman merge
Make use of fbCompositeSrcAdd_8888x8x8mmx
commit 701ccb4a22cfd646ccb7f19b7b3a476aeb5ce2da
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 10:49:06 2007 -0400
Pixman merge
- Remove stray default label
- Integrate new MMX ops SolidMaskSrc_nx8x8888mmx, In_8x8mmx, and
In_nx8x8mmx
- Formatting changes to reduce diff noise
commit a54ef54db19dcd36ed86b33cff2bc369f9690a15
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 10:24:25 2007 -0400
Pixman merge
Make sure fbCompositeSrc_x888x8x8888mmx and fbCompositeSrc_8888x8x8888mmx
are used when possible.
commit 3571b8e65b0857322d12e291305cfe29ea497c3c
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 09:45:11 2007 -0400
More pixman merging
- Move some code around to minimize diff noise
- Add mmx ops from pixman that never made it into X
- Merge Jeff Muizelaar's bugfixes to fbCompositeSrc_8888x8x8888mmx and
fbCompositeSrc_x888x8x8888mmx.
commit cfc01115af4136b2dad8218ba6b389513a356a2e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 26 22:18:35 2007 +0930
Fix cursor rendering for multi-head.
Before putting anything on the screen, check if the GC was made for the
ScreenRec we want to render to. If not, toss the GC and create a new one. This
is not the best solution but it does the job for now. Same thing for ARGB
cursors except that it's even uglier.
Also remember the screen the cursor was rendered to and check for the right
screen in the BlockHandler, SourceValidate and a few others. Only remove or
restore the cursor if we are rendering to the same screen, otherwise we get
artefacts that are both funky and really annoying.
commit 82f97e1c0cc15b050edc82a8f3b9a423d6cf5fe7
Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
Date: Thu Apr 26 15:58:50 2007 +0930
Enable event delivery for multiple heads.
Requires moving the spriteTrace into the DeviceIntRec and adjusting a few
functions to take in device argument, most notably XYToWindow().
Cursor rendering on the second screen is busted.
commit c0346e57e6d3857994f7af76060c502c2fdea294
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 26 12:02:45 2007 +0930
Require inputproto 1.4.2.
Requirement was introduced with c7e2ba0c9b9b1fc1aed8f91f86471c4c8e650b78.
commit 67347739b0571b2978468e8088480b105f505ad2
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 14:19:39 2007 -0400
Don't treat convolution filters as transformations.
Some rearrangement of code to get it closer to pixman.
commit c056ce95d89ef1df57edf47149fc34cd3925496e
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 13:21:47 2007 -0400
Port MSVC++ CPU detection code from pixman. (Vladimir Vukicevic).
commit c19ece1d8c32dc81740a4036a642661f54064e75
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 12:34:19 2007 -0400
Integrate optimization from xserver from David Reveman where repeats
get handled by fbFetchTransformed() rather than in the region walking
code.
commit 48c73dfc369fdf8f6023436ebe82bb604f76bb80
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 12:09:22 2007 -0400
Add function fbCompositeSrcAdd_8888x8x8(), and fix a bug where
srcRepeat = FALSE would be set in the wrong place.
commit 66ba3d758a368bf83d75bab8b08bdb6b34925e40
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 10:31:38 2007 -0400
Various fixes from xserver via pixman (Billy Biggs)
commit c09e68ce30dabd6b7068b163b9d2382d85d0d0bc
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Apr 25 16:46:26 2007 -0400
Paper over a crash at exit during GLX teardown.
commit 9c80eda826448822328bb678a7d284cc43fffb17
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Apr 25 16:35:04 2007 -0400
Disable RANDR's fake Xinerama protocol when there's more than one screen.
... in the protocol sense. Xinerama doesn't have any provision for more
than one protocol screen each with its own geometry.
Red Hat bug #231257.
commit d322608dc929d5f8cda07a53143a4f28423e0460
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Apr 25 16:29:48 2007 -0400
Fix a buffer overrun on machines with excessively large PCI busses.
Formerly we sized an array with a compile time constant, then initialized
its size to the same constant, but the Linux PCI init code would increase
that "constant". So if you happened to have more than 128 PCI devices,
you'd happily scribble into whatever variables happened to be in .bss
after that array.
Only really fixed for Linux atm. Other OSes will simply (still) fail to
work on video devices above the 128th PCI device.
commit 3ba1e8ab6d69566e1a3f8f0eb4605631aeffc8e5
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 24 17:20:14 2007 -0700
Include xf86Rename.h in xf86RandR12.h.
commit 0a2fe443d25b1ca25349aba3f748df986952e20f
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 19:02:44 2007 -0400
Use READ/WRITE macros for new functions introduced in previous commits.
commit 7e16da7b78c422f96387502b9cc29eaa1741543f
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 18:15:34 2007 -0400
Remove #if 0'ed blocks
commit 18252a515d4989b983a3b7389636045e06d0f246
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 24 14:10:09 2007 -0600
bump release date to reflect input code updates
commit 2d9a7a768747ca39a800475f12c424c298018dc6
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 14:46:59 2007 -0400
From pixman (Jeff Muizelaar)
Fix up the fast-path compositing operators; those are useful for
sources without alpha, but can't be used for sources with
alpha. Also, replaced fbCompositeSrcSrc_nxn with call to fbBlt as
this function must handle 1, 4, 8, 16, 24, 32 bpp objects. Would
be nice to optimize fbBlt for common cases involving 8, 16, 24 and
32bpp.
From Keith Packard.
commit fde4a5adf02d3067a064ebf6bdd666aa5784cfe9
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 13:30:43 2007 -0400
From xserver via pixman (Jeff Muizelaar)
Add some optimizations from jaymz. Also adds some compile
warnings that will hopefully go awa y as we continue merging.
commit 13e1d5ea55b0a3b7729316c8e37d3d8fca2075b5
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 12:59:18 2007 -0400
Fix format vs formatCode in previous commit
commit 077a5d4555676d5775e990468a697b6890c6d609
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 12:57:55 2007 -0400
Add functions fbCompositeSrcSrc_nxn() and fbCompositeTrans_0565xnx0565
from xserver via pixman. Add READ/WRITE and fbFinishAccess as
appropriate.
commit 09436fb7c38a9819bde770c4c21143591671c4d7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 24 22:52:33 2007 +0930
Disable devices before removing, remove unrecoverable devices.
commit c7e2ba0c9b9b1fc1aed8f91f86471c4c8e650b78
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 24 21:34:47 2007 +0930
Use DevicePresence events to tell the client about enabled/disabled devices.
Include the device id in the event sent to the client.
commit ce099a9b78195540ec251a6a3dbe26019c1a686d
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 23 12:34:01 2007 -0600
fix bug in which maxKeysPerModifier wasn't getting set
commit b5e1f7869b2f12a1c2baa7f699ae609fc9ad50aa
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Mon Apr 23 14:16:30 2007 -0400
Remove #if 0'ed merge leftovers
commit 84838268b34661d598f8e4856fab355f414930d9
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Mon Apr 23 13:19:54 2007 -0400
Gradient fixes
* Port fix for bug 7685 from pixman. Patch by Carl Worth
* Add projective version of radial gradient code.
* Make sure that all Pict*Gradient types have PictGradient as prefix,
since code in various places relies on that.
commit 38d14e858980a1b0c087344d24bf6aebf755663c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Apr 22 18:04:27 2007 -0700
Adjust the screen pixmap's dimensions in xf86RandR12ScreenSetSize.
commit ca784df84e07227a4cc0a1add079884f557b7a00
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Apr 22 16:26:01 2007 -0700
Fix unbalanced fbGetDrawable added in commit 0a9239ec.
commit 55bd8668e7d4100579bcd6c16a804d9f25267070
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 14:53:37 2007 -0400
Remove #if 0'ed leftovers from merge
commit 41dd7ab067adde8f66cd9f74c5a6570c325518a5
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 14:51:40 2007 -0400
Fix gradient walker to not reset needlessly
Previously the gradient walker was doing excessive resets, (such
as on every pixel in constant-colored regions or outside the
gradient with CAIRO_EXTEND_NONE). Don't do that.
Carl Worth, from pixman
commit c1b73f0f2acd56b423b91a04f1e1b3cdcad0069f
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 14:34:13 2007 -0400
Fixing gradient repeat mode computations in previous patch. From David
Turner.
commit 38f718799c68995c2d9a1680355bd55fd925009e
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 13:59:11 2007 -0400
Remove a few memory references in fbFetchTransformed
commit 9c4b14d4f6a1fe018acd64789434216cd1560a4a
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 13:23:58 2007 -0400
Integrate David Turner's gradient optimizations from pixman
commit cd2c1714eb4946bf7b1fc194fe074f8024a2ec23
Author: Brian <brian@yutani.localnet.net>
Date: Sat Apr 21 12:40:51 2007 -0600
add slang_mem.c
commit 67545333ec0b08db783e94e9e3ec55873dea19a3
Author: Brian <brian@yutani.localnet.net>
Date: Sat Apr 21 12:40:33 2007 -0600
replace occlude.c w/ queryobj.c
commit 39bc8bb0fdc854dcf9bbc0857fec84d50fa4f3b2
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Apr 20 14:22:42 2007 -0700
Don't call xf86RandR12TellChanged if it doesn't exist. Add some exports to xf86Rename.h.
commit 3daa5c1a991d659b1386a09e33b044470d489cb3
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 09:43:16 2007 -0400
Fix pixman bug 5777, patch by David Reveman
commit 9c2e955f6792e80fb84f848ed9e6ebbfd79f7130
Author: Brian <brian@yutani.localnet.net>
Date: Fri Apr 20 07:21:19 2007 -0600
regenerated to add GL_CLIENT_ATTRIB_STACK_DEPTH (bug 9823)
commit 96ef0f78438b60436c3940817980a3ab4070c7e8
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Apr 19 17:39:51 2007 -0700
Disable SourceValidate in rotation to capture cursor.
SourceValidate is used exclusively by the software cursor code to pull the
cursor off of the screen before using the screen as a source operand. This
eliminates the software cursor from the frame buffer while painting the
rotated image though. Disabling this function by temporarily setting the
screen function pointer to NULL causes the cursor image to be captured.
(cherry picked from commit 05e1c45ade9c558820685bfd2541617a2e8de816)
commit 7ca4baffb5569ea12b578a4a3f69e93d272d6c6d
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Apr 19 17:37:18 2007 -0700
Was accidentally disabling rotation updates in mode set.
Setting a mode on an unrotated CRTC was causing all of the rotation updates
to be disabled; the loop looking for active rotation wasn't actually looking
at each crtc, it was looking at the modified crtc many times.
(cherry picked from commit 8b217dee3a6c46b13fc9571a4a9a95bc55686cdb)
commit 806a537e644d8cc9e53f3ac52efb49453e5aa1fb
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Apr 19 17:49:34 2007 -0700
Revert "Suppress software cursor removal during rotated shadow buffer drawing."
This reverts commit 999b681cf3973af4191506e49cde06963b11a774.
Replacing this with simpler code that just disables SourceValidate
during rotation redisplay.
commit 0a9239ec258828ec1da6c208634a55fc4053d7da
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 19 18:19:34 2007 -0400
Merge David Reveman's gradient optimization patch from pixman
commit d0e55774e0da641ba85c5173f27f68de27372747
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Thu Apr 19 11:39:53 2007 +0200
libdri: Make sure the new DRIInfo keepFDOpen member is honoured.
commit e1f0b3e70b696d7ea4cf9e6ed30d751e7fdbc577
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 19 12:00:24 2007 +0930
config: Return errors as negative numbers, device ids as positive numbers.
Update dbus-api documentation.
commit c6972c893359f8fa7631ae674330f3f4f7010ba0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 18 12:10:05 2007 +0930
Change dbus 'listDevices' call to not require an argument.
Update dbus-api documentation, plug memory leak on dbus reply error.
commit d61ed6c8a2823a3532439d5cb9f355129c93f523
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 19 18:08:55 2007 +0930
Check for NULL devices in CloseDevice().
commit 9c30f7422121a0443c8d612d06181e17d8af9730
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 19 12:00:24 2007 +0930
config: Return errors as negative numbers, device ids as positive numbers.
Update dbus-api documentation.
commit 999b681cf3973af4191506e49cde06963b11a774
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 18 14:33:27 2007 -0700
Suppress software cursor removal during rotated shadow buffer drawing.
commit 28bb34eec63bf3c98f38ba7fc044f6419aaa3307
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 18 13:48:28 2007 -0700
Belatedly bump XORG_VERSION for 7.2.
commit 5d8e8a7f4b3226bffd9e4d6d9326688f475b0183
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 18 13:22:26 2007 -0700
Remove libminimi build.
It appears to have been a leftover of a previous incarnation of the build
system that didn't handle miinitext.c well.
commit 53fb42e65c2b2ff58a4a324b7f05cff8a587720a
Author: Erik Andrén <erik.andren@gmail.com>
Date: Tue Apr 17 21:34:47 2007 -0700
Syncmaster 226 monitor needs 60Hz refresh (#10545).
I've managed to solve my own bug (#10545) by applying the following
patch to the xserver.
Please apply.
<Conspiracy mode on>
This monitor is "Vista Certified". I wonder if this is a pure coincidence...
<Conspiracy mode off>
With kind regards
Erik Andrén
(cherry picked from commit a63704f14a1d97b9a00fef6fa290e74e51b9732b)
commit ae75afcb1b5419102c5be10b8826ceed50d2ef5d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 18 12:10:05 2007 +0930
Change dbus 'listDevices' call to not require an argument.
Update dbus-api documentation, plug memory leak on dbus reply error.
commit 9cee4ec5e6e06d23aafb302494b082c77ade4623
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 17 16:01:56 2007 -0400
xace: change the semantics of the return value of XACE hooks to allow
arbitrary X status codes instead of just TRUE/FALSE.
The dix layer in most cases still does not propagate the return value of
XACE hooks back to the client, however. There is more error propagation
work to do.
commit 47bd311e3dcc501cbb202ce79a55ac32e9db50f2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 17 13:46:55 2007 -0400
security: remove debugging code.
commit 1f06d32ef58749d0f0c062193d237ee98f60e90f
Merge: cf962a8 fc162c6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 17 12:10:22 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/privates.c
commit b6aec7f6f906a18d13586d63afabf1ee4fbb11c3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 17 16:51:16 2007 +0930
Change FocusIn/Out semantics to match Enter/Leave semantics.
commit 451d5464b4e8a2516b8a4598b3c4eb14656be90e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 17 11:17:04 2007 +0930
Change enter/leave semantics for events with detail Notify{Nonlinear}Virtual.
Core enter/leave events with detail Notify{Ancestor|Inferior|Nonlinear} are
only sent for the first/last pointer to enter/leave. Events with detail
Notify{Nonlinear}Virtual are sent at all times, but not to those windows that
currently have one or more pointers inside their boundaries.
commit fc162c6cfa06f0b012743d6d79cef45cf0166229
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 16 09:55:58 2007 -0700
Allow outputs to be explicitly enabled in config, overriding detect.
Option "Enable" "True" will force the server to enable an output at startup
time, even if the output is not connected. This also causes the default
modes to be added for this output, allowing even sync ranges to be used to
pick out standard modes.
(cherry picked from commit a3d73ba2cb7e13a6d129cd88d6a7f7d756e2ced2)
commit c41e3bd713206c0bbd8ab8cef4c83eb7ba7e1c3c
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 16 09:53:42 2007 -0700
Use default screen monitor for one of the outputs.
By default, use the screen monitor section for output 0, however, a driver
can change which output gets the screen monitor by calling
xf86OutputUseScreenMonitor.
(cherry picked from commit f4a8e54caf6b9431711383a39f55a18e7fd654f4)
commit 97a2c2579c56c304705c934f3b536473645747df
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 16 09:39:47 2007 -0700
Using wrong log level in extension to built-in message
was: typo in built-in module log message
(cherry picked from commit 00cfd1f765895b4d1b2234f3203727a8871b64b0)
commit deda7791dfa34d0563c8d7fa2a0660ac27e6858c
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 16 11:35:22 2007 -0600
remove sources deleted in Mesa
commit 02d42f344ce020c9b84723671cb9c68d5c064933
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Mon Apr 16 17:24:53 2007 +0200
Changes for single-entity multi-screen DRI.
The entity (device) has a locking SAREA and a master file descriptor
that optionally isn't closed between server generation.
The locking SAREA contains the device hardware lock.
Each DRI screen creates an new SAREA containing the drawable lock,
drawable-and private info, the drawable SAREA.
The first screen optionally shares its drawable SAREA with the
device SAREA.
Default is to close the master descriptor between server generations,
and to share the drawable SAREA of the first screen with the device locking
SAREA. Thus we should (hopefully) have full backwards compatibility.
Mesa changes to support single-device multiple screens are pending.
commit b5823ea3e1ed5a0449d44da05165a46719dcf287
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Apr 15 22:59:19 2007 -0300
RandR 1.2 spec says CRTC info contains screen-relative geometry.
Was reporting mode size instead of adjusting for rotation.
(cherry picked from commit e2e7c47a528447e90cff6cf10d2ce457742ef48d)
commit cc4eb1c7ea1bace7ed69cfd80c99d22933282ae1
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Apr 13 15:04:29 2007 -0300
Add quirk for Acer AL1706 monitor to force 60hz refresh.
This Acer monitor reports support for 75hz refresh via EDID, and yet when
that rate is delivered, the monitor does not sync and reports out of range.
Use the existing 60hz quirk for this monitor.
(cherry picked from commit 1328a288e9030a472a915077160f090d1afd4126)
commit eba81a0a01f8a61151d8bf9f3d83bda85ca26e73
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Apr 14 18:30:09 2007 +0300
glx: move __glXMesaProvider from GLcore module to glx module.
This treats the GLcore provider similar to DRI provider, using a subset of
XMesa as the GLcore interface.
commit 6b040b79f0e247b6f2da8f7d239443743e96de67
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Apr 14 18:29:52 2007 +0300
glx: drop xmesaP.h include from xf86glx.c
The declarations for the xfree86-specific XMesa functions were moved up to
xmesa.h, requires Mesa as of 2007-04-13.
commit 2c833f60acb3dc358815a99cd295ef7fc695c45d
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Apr 14 18:29:25 2007 +0300
glx: drop stray CAPI define.
SI imports/exports were dropped from Mesa.
commit ea27b09d3a973d9a4943f205b24940b8624cf405
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 13 17:15:22 2007 +0930
Deliver FocusIn/FocusOut events for all devices.
Don't use VCK in SetInputFocus and DeliverFocusedEvent.
commit 7ccebc50b98ac175fdbdfaab081bcead62e60ee3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 13 13:08:44 2007 +0930
Documentation for events.c.
commit 2bb3c81fc1ca98c909309f3af7e9c8ca6b695657
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 16:35:43 2007 +0930
Use paired kbd instead of VCK for EnterLeaveEvents, sanitize variable naming.
commit e7b47b1758ed20e75ee267b3a09e91bf2861f6fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 16:24:42 2007 +0930
Change core enter/leave semantics for multiple pointers.
Send EnterNotify when first device enters the window, LeaveNotify when the
last device leaves the window. Additional devices will not cause additional
Enter/LeaveNotifies.
commit 547d720938b3668666d60110d79b150b1e9325c6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 11:16:19 2007 +0930
Remove workaround for a NULL core pointer in ProcessInputEvents.
This workaround is obsolete with 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
commit d4dad6f84f82a4ade5005c3aa93511c1295875b8
Merge: f1f8b56 33a5d96
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 11:11:03 2007 +0930
Merge branch 'master' into mpx
Conflicts:
configure.ac
dix/events.c
hw/xfree86/common/xf86Xinput.c
commit 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 11 18:28:57 2007 +0300
XFree86: DGA: Don't call ProcessInputEvents from CloseScreen
By the time CloseScreen gets called, we can't call ProcessInputEvents, as
the event queue will get unhappy. So just unregister our hooks instantly,
and hope that they don't get called.
commit 0910540e4322bba72a2fa0a907072eab2547a7b6
Author: Remigiusz Marcinkiewicz <enleth@enleth.com>
Date: Wed Apr 11 01:09:26 2007 +0300
Config: Extend D-BUS API
Return device ID where available.
Add listDevices call, which does what it says on the box.
commit aecbc712144dd1aaf462bd758821438b1d22d957
Author: Remigiusz Marcinkiewicz <enleth@enleth.com>
Date: Wed Apr 11 00:38:16 2007 +0300
Input: Allow a pointer to a device to be returned in NIDR
Allow a pointer to the first device added to be returned, so we know which
device(s) were added by the NIDR call.
commit 4f05f9591e5492c72f3856bd7a2ff13378f59f2b
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:57:48 2007 +0300
Input: Always add devices with first available ID
Scan the device list when adding a new device, and make sure we can use
the first available ID, instead of always incrementing.
commit 20674dcbb2373a0af287883bc008fb6fb23d4466
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:55:36 2007 +0300
Config: Fix memory leaks
Fix memory leaks that could occur along the error path.
commit 82962bbae2b4fda274625d1712ef839ce1ab9dc8
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:54:32 2007 +0300
Input: Add DeleteInputDeviceRequest
Add DIDR, which asks the DDX to remove a device, analogous to
NewInputDeviceRequest. Only implemented for XFree86 at the moment.
commit 7b82a836c66ba88566255052caff63577e1a0384
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:52:08 2007 +0300
XFree86: Fix memory leaks, option parsing, in NewInputDeviceRequest
Plugged some possible memory leaks, and added some more checks on the
options, particular for driver/identifier. Added an unwind.
commit 4771fa8747791498e504d73afccfb5833499a38b
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:48:00 2007 +0300
XFree86: Fix memory leak in option parsing
Fix option parsing functions and callers thereof to not leak memory.
commit 07c56abf84080c020a3e7b7703a447c7f996975c
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:43:58 2007 +0300
Input: Plug memory leak in device free
Remember to also free the motion history, if we're using the DIX-managed
history.
commit e92743bc9839c36914a44f3e5bc8cd85773ac794
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 8 14:02:02 2007 +0300
getevents: Copy modifier state from extended to core devices
Make core events carry the same modifier state as the extended events, so
that holding down Ctrl on keyboard A and pressing Q on keyboard B won't
cause your app to quit.
commit e49f836d6fa2768cd6d2a6d0227b5dbf516013dc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 8 13:56:41 2007 +0300
mieq: Use larger default queue size
Use a default queue size of 512 rather than 256, else Xephyr is too slow
without a host cursor, so events get stuck in the queue.
commit 4aae2de74b9224bac2b2e2522637dac09abc3837
Author: Jared D. McNeill <jmcneill@netbsd.org>
Date: Tue Apr 10 12:57:15 2007 -0700
Add a real xf86EnableIO/xf86DisableIO for NetBSD/PPC.
commit f77a8ea849d171a8ca00b2b7334866ace1ffbf73
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 9 14:29:46 2007 -0700
Rotate screen size as needed from RandR 1.1 change requests.
Screen size must reflect rotated mode size when setting rotated mode using
RandR 1.1 SetScreenConfig request.
(cherry picked from commit efcec7dbd3c2736c7b421d29c4d37e231aa681d2)
commit bcf17df69a232e5e84609abacdca36274316e170
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 9 14:12:27 2007 -0700
Disable CRTC when SetSingleMode has no matching mode. Update RandR as well.
xf86SetSingleMode tries to resize all crtcs to match the selected mode. When
a CRTC has no matching mode, it now disables the CRTC (instead of crashing).
Also, poke the RandR extension when xf86SetSingleMode is done so that
appropriate events can be delivered, and so that future RandR queries return
correct information.
(cherry picked from commit dc6c4f6989f87149d8605604f4514f5cbf11de67)
commit 67e1c98895a566f927e1ae2384d56cfca104f971
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Apr 9 19:08:52 2007 -0400
Look for the PCI ROM file elsewhere in sysfs.
/sys/devices reflects the bus topology, and we don't care that much.
Easier (and more reliable) to just look in /sys/bus/pci/devices, which
is a flat view.
commit a08d5157f70567a0aa9583d4a15e62437340cf34
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Apr 9 19:04:56 2007 -0400
VT activate or waitactive are fatal if they fail.
Also, be sure to waitactive on the way down, to make sure we're off the VT
before exiting.
commit 72b477f964c748a1ab668781643cc11877f19738
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Apr 9 18:59:01 2007 -0400
Don't write out empty sections from the parser.
commit 1f6741db19d4c91b1eacb497dff1814acb1bf0c3
Author: Stefan Huehner <stefan@huehner.org>
Date: Mon Apr 9 14:33:15 2007 -0700
Bug #10560: Code-Cleanup: function declarations () -> (void)
X.Org Bugzilla #10560: <https://bugs.freedesktop.org/show_bug.cgi?id=10560>
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511>
commit f24391dbfd12a84253dfec794ee7884afd52e197
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 9 12:30:31 2007 -0700
In AIGLX EnterVT processing, invoke driver EnterVT before resuming glx.
As the driver EnterVT function generally re-enables the hardware and
prepares it for rendering, it must be called before any gl functions are
called which could touch the hardware.
commit 4c2e28b0916b5f75cfefb6df9fa0a7a09675539a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 9 12:28:53 2007 -0700
Add setrlimit call in -core option to make dumps occur.
Default core size limit for most environments is 0, which disables core
dumps. Add code in the -core option processing path to set the core limit to
the maximum value.
commit f1f8b562aaaa6ec32ab0d0697f964d92d6d536a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 19:31:59 2007 +0930
Alloc sprite memory in devices' devPrivates, allow undisplaying cursors.
Improve memory usage by allocating the sprite's memory only to devices that
actually have a sprite and provide means to remove a device's cursor from the
screen (more hotplugging, yay!).
This commit breaks ScreenRec's ABI.
commit 7cef789fa13ae53bfba6dc7b5a7928b7362b2522
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 18:37:48 2007 +0930
Close down virtual core devices when closing all devices.
commit 6081b8c76f7d934bd4e9584a2f6d55636c5289d2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 18:35:47 2007 +0930
Don't explicitly init sprite for VCP, EnableDevice() will take care of that.
commit 00b1d52f4103a07568dcebcdaa860b9b51f19b4d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 18:32:00 2007 +0930
Adding some comments to devices.c.
commit aa77ffb510abe004802ab9acc6996e4c6fe3ebb2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 18:27:22 2007 +0930
Fix: pick new ClientPointer when device is closed.
commit 4beeab8424774ea4c3142f29b90e33f1fc7cb154
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 8 13:39:06 2007 +0300
XFree86: Treat evdev and vmmouse as mouse drivers (bug #10512, #10559)
When we see an evdev or vmmouse section, assume that it's a mouse, and
don't add a default mouse device. This will break users who have an
evdev keyboard section but no mouse, and want the mouse to get added
by default.
commit 0a6ac992363343487dfe0a0fc985ea55bd448382
Author: Brian <brian@yutani.localnet.net>
Date: Sat Apr 7 12:41:57 2007 -0600
regenerated to fix bug 10371
commit 7e385598613778de14c0feea0d32f17d7aa66a8e
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 6 13:38:12 2007 +0300
GLcore: fix after moving xf86glx_util.[hc] to Mesa.
commit cf962a849db2b259ca558c6265ea7e3328a4d312
Merge: 5ad5625 5a804f2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 5 14:41:39 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
configure.ac
commit 5ad562565ac8ef9257da3afb0de1ae4f90f80fe9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 5 14:18:05 2007 -0400
devPrivates rework: properly free devPrivates on compatibility structures,
type pixmap. Requires ddx'es to call the free function from DestroyPixmap.
commit 5a804f2e97ab59745482660a635b801ac2b9e769
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Apr 5 19:14:31 2007 +0300
configure: minor cosmetic, move GLX extension options together.
commit a4e2fc703484fffed8dd50c1b4b24c564be4d3cd
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Apr 5 19:13:47 2007 +0300
glx: Remove stray __GLinterface.
__GLinterface was droped from glcore.h
commit 38ca7d388c47c4800c74442172d6595a9b3dfcc7
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Apr 5 19:13:14 2007 +0300
glx: fix symlink, glcontextmodes.c was moved to mesa/src/glx/
commit 1d550bb2c5cb5b3e588f0e0b68a421dc1cb8bd7c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 5 12:12:58 2007 -0400
devPrivates rework: minor fix; use calloc and avoid initialization.
commit 5c4deb71a1cb981ea7e2e25d2b3a1179f27efa5a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 5 14:21:46 2007 +0930
Synthesize WarpPointer events for the actual device rather than the VCP.
commit ed75b056511ccb429c48c6c55d14dc7ae79e75a3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Apr 4 12:00:15 2007 -0400
dix: add new, combined resource lookup function. Move all dix lookup API
deprecated so far to a new file dix/deprecated.c. Remove the deprecation
warnings for the time being.
commit 63e46e4fc3e98751f2edbed9c79ef3d5dc2dadc6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Apr 4 15:59:51 2007 -0400
devPrivates rework: properly free devPrivates on compatibility structures,
excluding pixmap.
commit f8482967ae8080f49dd1bbb0b79cc65020df679f
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed Apr 4 12:28:48 2007 +0200
Add an EXA driver callback to determine whether a pixmap is
"offscreen" in exa terms, which means accessible to the GPU.
Bump exa minor. The change is backwards-compatible.
commit 7f36ba57062096e9c67889d5b7dd64e2fb0004e7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 4 17:38:10 2007 +0930
Allow for multiple animated cursors.
commit 676188531b2bd7679ee1831b5c517df3e6d215c5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 4 17:35:06 2007 +0930
Unrealize cursor only once, not per device.
commit c10df5b967d4da4e11786520317e2917de5541fa
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 3 15:47:01 2007 -0700
Swap RRScreenChangeNotifyEvent dimensions when the screen has one crtc and it's rotated.
RandR 1.1 clients expect the size fields in this event to be the unrotated
dimensions of the screen. This behavior is "weird", but that's the way the old
code worked so we need to be bug-compatible with it.
commit 1cb84768f376b477a08a558854609b0743f2bd29
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 3 15:31:16 2007 -0400
security: rewrite to use new devPrivates support.
commit 14aea12cadef647369e44639ff5024dd7034570a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 3 15:23:56 2007 -0400
xace: forgot one of the hook call arguments. Add it.
commit 353e19fd5e18ad55a0dd12a7b63f6af9df7bfe6b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 3 14:06:02 2007 -0400
devPrivates rework: zero out newly allocated private space.
commit e1dea151db6405e12d991feacba9446320739ee8
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 3 11:21:50 2007 -0600
Implement a minor hack in dmxCheckFunctionKeys() to detect special keys.
Keep track of status of (left) alt/ctrl keys so that ctrl-alt-q to exit
can be detected. Not ideal, but works for now.
commit 0ee40c935750e25a9e178cdd70f6b2c667e79344
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 3 09:31:00 2007 -0600
s/intead/instead/
commit 23974f20bf0e0c2786cc75af026af5484f6dc331
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 3 09:30:24 2007 -0600
add DDXRingBell() stub to solve link problem
commit a240c039c47c0be22ea5e100692307b26d938747
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 3 09:27:57 2007 -0600
Split the xserver/fb/fbcmap.c file into two files.
Now, fbcmap_mi.c contains the fb functions which just wrap mi functions.
Previously, these were in fbcmap.c and compiled when XFree86Server was defined.
Now, clients of fbcmap should either use fbcmap.c or fbcmap_mi.c and not worry
about setting the XFree86Server symbol.
commit 1cc8db72816cd079f30255046e10043c350bf683
Merge: 645d87c a39f297
Author: Matthieu Herrb <matthieu@roadrock.(none)>
Date: Tue Apr 3 16:04:45 2007 +0200
Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver
commit 645d87cf8ef724d4591614f9994cdc4d7549a7a8
Author: Matthieu Herrb <matthieu@roadrock.(none)>
Date: Tue Apr 3 15:47:18 2007 +0200
CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
commit 207f710d16337839c2427aa16fad70a49834153e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 19:02:14 2007 +0930
Delete all grabs from all devices when deleting a window.
commit 5f382c9c7fbda6eccf8e76c28a90b55ff2f0aef3
Merge: 9b0b340 f09ee16
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 15:07:18 2007 +0930
Merge branch 'master' into mpx
commit f09ee168e234d0a9416e15f2916726b975cad293
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 15:07:00 2007 +0930
Revert "o fix minor error in comment for GetPointerEvents()"
This reverts commit 96ce17aa94413c4b8bcb61cae71167050130a307.
commit 9b0b3406682b5a3161e6c3895771523214c37207
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 15:06:26 2007 +0930
Make GrabDevice differ between core grabs and device grabs.
commit a39f297ada4fa87c858395ae2aacefac5f8fba05
Author: Keith Packard <keithp@viola.jf.intel.com>
Date: Mon Apr 2 14:15:36 2007 -0700
Don't erase current crtc for outputs on CloseScreen
Erasing this variable causes some outputs (SDVO on intel) to fail
to be correctly reset at server reset time.
(cherry picked from commit 56262a4ee943f328d089a8eb4aa70b9a4bd5d135)
commit 11797ffdcc22160317a5ebbc9291472570a51c6d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Apr 2 18:21:58 2007 -0700
Move modes/ debugging output under Option "ModeDebug" in the Device section.
commit e44f106ffc796c025abdfb66717c06db8b12b4e4
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 16:26:15 2007 -0600
clean-up, debug code
commit 8d8bc8927760fad631bef83fa2841b455ff6d511
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 16:21:57 2007 -0600
fix formatting
commit 3e482de7b145a5eed79b81c30c359fe43647824a
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 15:38:15 2007 -0600
checkpoint: more clean-up
commit 76a7a5ca1f068c27c9b5fbd49d5a1da80ed6f488
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 15:24:05 2007 -0600
formatting fixes
commit 69baad321d35dae0bfa535be0c6ed2131fed1e60
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 15:21:22 2007 -0600
clean-up dmxCoreMotion() dmxCoreMotion2()
commit 44eb15adeee3b299677070f39625daa53679bd13
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 15:12:04 2007 -0600
checkpoint clean-up
commit 0f873a9d4f02b399c37b4058c6a9a2e21aa205e8
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 14:51:38 2007 -0600
remove some debug code
commit 3a0ce1084a18e17a3c8a009d99c228652b8763a9
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 14:51:21 2007 -0600
for completeness, init dummy's min/maxval[1] values (vertical axis)
commit 12016f20f7f5365f30cfbeb05568b3fb89759e5a
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 14:50:48 2007 -0600
As for normal mouse device, init valuator maxval[] to real values, not zero.
commit 0aaf28e5633a59563b89a2e42d19fabc84adc3ed
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 12:41:30 2007 -0600
In dmxBackendMouGetInfo() initialize the info->minval[], maxval[] arrays to the size of the backend display.
It seems that the changes to X input exposed a problem that wasn't detected
before. The axis clipping code in GetPointerEvents() uses those limits to
constrain the pointer's coordinate range. The max was zero so the pointer
couldn't move.
commit 0013bf6ddb3867c9a504603434d8c2ec83f3f3bc
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 12:39:04 2007 -0600
undo 1280 valuator hack
commit 08a88d1803f672555141011e082fbc0edeedcf05
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 12:28:14 2007 -0600
Pass num_valuators=0 for ButtonPress/Release. This seems to fix the button coordinate problem
commit 70683e338dacc48e3adf489d66ec33b29dfc3b77
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 12:26:27 2007 -0600
formatting fixes
commit e8777a91f37d828b9df839bf3d9cf2f954bdddb0
Merge: a120547 96ce17a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 2 15:36:26 2007 +0930
Merge branch 'master' into mpx
Conflicts:
Xi/closedev.c
Xi/exevents.c
Xi/extinit.c
Xi/listdev.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
include/extinit.h
mi/mipointer.c
commit 96ce17aa94413c4b8bcb61cae71167050130a307
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit a12054757d21edacc1c24c3077b9214726652829
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 2 11:20:44 2007 +0930
Xi: fix ProcXListInputDevices to include the virtual core devices.
commit f2808005f4ee72c5fd7f5f3dcca181306485113e
Author: Alberto Mardegan <mardy@users.sourceforge.net>
Date: Sat Mar 31 16:51:24 2007 +0200
Bug #6620: Fixed a missing 'else' in ATIPseudoDMAInit().
Before this, we'd write some registers twice on R200 hardware and also
possibly end up with a bad value in atis->cce_pri_size.
commit 5257b32e492bd2082bef6a4cd0fea03ce093c0f8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Mar 28 15:51:24 2007 -0700
Bump video driver ABI to 2.0 for cw change (commit 6ed08949af4f7ac09170d3d9581e4092b24a84ee).
commit 73fdc16bc4f4e21ff604b3f9ded23b40398fb1b6
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 16:07:26 2007 -0600
formatting fixes
commit ebdc8ce5c108dc3b6b0004e7c7939d1a5bef8676
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 16:05:46 2007 -0600
Checkpoint DMX updates: things are working much better now, but still not 100% right.
Use new dmxCoreMotion2() function which enqueues motion events with
GetPointerEvents()/mieqEnqueue().
The clipAxis() code in GetPointerEvents() is causing some grief. The
limits seem to have always been (0,0) according to the original calls
to InitValuatorAxisStruct() in dmxinputinit.c.
Terrible hack for now: Call InitValuatorAxisStruct() with hard-coded max
values of 1280 (my screen width).
commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48
Merge: 2c6d471 92e8cdb
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Mar 30 13:39:15 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 3c7413e0c2f87e154aa8aa4a83bd585a6d1091e8
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 14:07:04 2007 -0600
Tweak some parameters, etc. Things seem a little better now, but still a ways to go.
commit 7989dacdcb1449b10d7733dda11cd96e260e9fae
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 13:44:24 2007 -0600
num_valuators=1 for GetPointerEvents(), hack ButtonPress/Release position
commit 1ea842960fddbc6363cc6e7f914d70ba45525a6b
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 13:43:15 2007 -0600
more debug
commit 92e8cdbd32b0d86cabd4ad88e3240bf90c018b9a
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 13:19:33 2007 -0600
Checkpoint fixes to DMX for X input changes.
Xdmx builds and runs now.
Keyboard seems OK, and mouse pointer moves, but everything else is flakey.
Something is still seriously wrong.
commit d92da3d5f309392ac398c0975ef17bb04312d5e2
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 12:56:34 2007 -0600
more formatting fixes
commit 44acb2517d9fb07790d9d799aa9cc727d1b7d35c
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 12:54:22 2007 -0600
Fix some bad formatting.
Doing this:
if (something) stmt;
is evil if you're debugging and want to break on stmt!
commit 9f24798af50896cc3262c1201f75c10a688f2a83
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 12:49:34 2007 -0600
ompile fbcmap.c w/ -DXFree86Server instead of linking libfbcmap.a.
The former works, the later doesn't (DMX blows up on visuals/pixel formats).
This undos Daniel's patch, which undid my prev patch. Revisit someday.
commit 76756f27561c6386cba0d338441e8ec7b98500ce
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Nov 30 04:20:32 2006 +0200
Make xf86glx.c unaware of Mesa internals
Use newly added XMesaCopyContext() and drop the GlxSetRenderTables() call
for Xgl, as this is now done inside XMesaForceCurrent(). This leaves xmesaP.h
but only for the declarations of the three XMesa/XFree86 functions. Also,
GlxSetRenderTables() stays but is only used in hw/xgl/glxext/ .
Also drop xf86glxint.h, no longer used.
Depends on mesa commit 7439a36785b6a2783e80a40a96c09db8f56dc2bc of 2007-03-30.
commit 63d8f01819ef44ea3bf0d4fb20ba1d698ae91cd2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 30 14:59:43 2007 +0930
dix: Fix wrong cursor refcount.
Calloc cursor struct to ensure devPrivates are zeroed out and don't
increase the refcnt for devices automatically when allocating a new
cursor. Use new DeviceIsPointerType() to detect if device is a pointer
_before_ device has been activated and can thus be identified and set
up grab functions accordingly. This way we can increase the refcnt
when we get a pointer grab.
commit 20e4314b178e1a093bce85e93329d4bcfb4f4210
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 29 19:12:32 2007 +0930
dix: Try to get closer to the correct refcnt for cursors.
This commit introduces a memory leak, as the refcnt never seems to get
down to 0 and thus cursors will not be freed. Solves the problems with
GNOME segfaulting every 30 seconds though.
commit 307d2b57bbfcc281656011533627bea6ab98189e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 29 15:23:41 2007 +0930
Xi: remove 'register' keywords.
commit 0c607f4b1902f993597e09ea7a2c83bc1cca9b96
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 29 14:43:50 2007 +0930
dix: Pick keyboard instead of using virtual keyboard in Grab/UngrabKey.
commit 82a8b99a6c46018885600011913267d8af9dfe13
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Mar 28 15:17:02 2007 -0400
Move the XAA private indices to be static.
Technically this is an ABI break, if you aren't smart enough to be using the
getter functions. Cope.
commit 8c7f56d92d8471ee059c14d322af5f7f555dd5c6
Author: Tomas Janousek <tomi@nomi.cz>
Date: Wed Mar 28 14:46:30 2007 -0400
Bug #10296: Fix timer rescheduling.
commit 327bc332a61294209d39286228199f54bdde73d1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 28 13:00:03 2007 -0400
xace: minor comment fixes.
commit 299ff4c82998d2a32204bfbecde4993dfbd3d4a5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 28 12:57:11 2007 -0400
xace: provide creation-time resource hook call in CreateWindow().
commit 99b220969f2f8ba829bc8294b27ca90fd9311be4
Merge: 728ad64 82a8b99
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 28 12:54:04 2007 -0400
Merge branch 'master' into XACE-SELINUX
commit 5ba4d9eedf1b4ce4795bf910cd184872e2d9b3fc
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Mar 28 12:03:19 2007 -0400
Refuse to create tiny modes from EDID detailed timing.
commit 2c6d47108880584f1221ff86c6c8947627f9f607
Merge: c4fe1bc 8522044
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Mar 28 08:08:04 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
commit 85220446359a75ea2c359b418b4051c04eea739c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 28 13:03:32 2007 +0300
GL: Update for Mesa changes
Added s_fragprog.c to fix the build.
commit 1af2ef0b25fd8017a3271e624a5f1548f02b09f9
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 27 13:13:45 2007 -0700
Enable Composite by default now that it disables itself in the known bad cases.
commit 0bfc3cc22db94ec6867596606fe93228e315c847
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 27 13:12:21 2007 -0700
Disable composite when Xinerama is active.
It will likely take a decent bit of work to make that work right.
commit 5e7936371c9e1ac48e19bf1e9e3f71f037fd9b5d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 20:18:18 2007 -0700
Disable Composite when the screen's visual is pseudocolor.
Rendering fails badly in this case, and I don't care enough to fix it.
commit 8afc7e2eb3ebec48d3879bf269143259c8bc18c8
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 15:55:38 2007 -0700
Refuse to initialize Composite if Render is not present.
Composite relies on the presence of Render, in particular for the automatic
compositing.
commit 6ed08949af4f7ac09170d3d9581e4092b24a84ee
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 27 17:31:28 2007 -0700
Move libcw setup to the only renderer requiring it (XAA).
Additionally, protect libcw setup behind checks for Render, to avoid
segfaulting if Render isn't available (xnest).
The previous setup was an ABI-preserving dance, which is better nuked now.
Now, anything that needs libcw must explicitly initialize it, and
miDisableCompositeWrapper (previously only called by EXA and presumably binary
drivers) is gone.
commit e76b6349516d5d1c8f7167d6f5419e0d06a546c3
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 16:04:50 2007 -0700
Fix indentation of fakexa help text.
commit 728ad64d979fd9e5cca28e8c15118c18d707c431
Merge: 0331c6a 6a0bed1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 27 13:16:40 2007 -0400
Merge branch 'master' into XACE-SELINUX
commit 6a0bed16e80a91891cee6c7033c90875bc2af193
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 27 16:51:12 2007 +0200
Fix typo in GL/mesa/shader/slang/Makefile.am.
commit b8f846a9dfc6697d59ad5482ba7c9d738875318e
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Mar 27 14:17:40 2007 +1000
gl: oops dodgy s appeared pointed out by jcristau on irc..
commit a63ee90bc2d490f6c5c1802c164391963cf6c1d9
Author: Dave Airlie <airlied@pegasus.(none)>
Date: Tue Mar 27 11:05:52 2007 +1000
gl: update for latest mesa glsl-compiler merge
commit d387a3ddf76716791e5e8b8f0954ca0df3c579d6
Author: Dave Airlie <airlied@pegasus.(none)>
Date: Tue Mar 27 11:00:13 2007 +1000
fix loading of GLcore after recent loading changes
commit 92ba435bd9aa7b6eca9aef8e5193576ef62fc9db
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 12:44:58 2007 -0700
Update xorg.conf manpage for new RandR 1.2 monitor options.
commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413
Merge: 84a066c f7c5aa0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 26 10:28:05 2007 -0400
Merge branch 'master' into XACE-SELINUX
commit f7c5aa0dc0fa3569a2ee412c4f996960f936b6ed
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 26 10:21:44 2007 -0400
Remove dead NEED_DBE_BUF_BITS code.
commit 2e3cc861f90415f200826bc71dab6298d759c42b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 22:01:34 2007 -0400
Since ddc, i2c, and ramdac are in core now, remove their ModuleData stubs.
commit e88fa75c9b468b88bb7b87b1da235c6eb2fe8164
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 18 17:39:08 2007 -0400
Static cleanup on Xi/
commit 4b5802ddbd45271be3cadeae0a83a6742df2515b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 17:57:54 2007 -0400
General DIX static and dead code cleanup.
commit 04b87d6dfae02e4ecdb5216d12c6cdafd1e8c2b4
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 17:57:22 2007 -0400
Static and dead code cleaup for Xext/
commit af769892a91c9af59de53ca3bcd77fc4967daffb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 17:56:32 2007 -0400
Static and dead code cleanup from mi/
commit 62224e39727fd6f1cf11a461983662f615a9fea1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 17:55:15 2007 -0400
Static cleanup for xf86 ddx.
commit e8bc1988d9ff10b65717574175f70df3c4d6334d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 15:13:05 2007 -0400
Un-staticise VTSwitchEnabled, since kbd wants it apparently.
commit 70e493d223b1e943e652191150bd0b7e1a6ebcfb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 14:55:28 2007 -0400
Static and dead code cleanup over afb/
commit f36bf1a3e4ce9465ea4a6159c209924a3cafbe58
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 12:28:13 2007 -0400
Delete a dead file.
commit 9a0f25de7ca3c68af867b38936103d17daa92ac6
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 12:27:01 2007 -0400
Static cleanups, dead code deletion.
commit ac2356843e38b3400142bc54b65393c12976fc07
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Mar 25 09:41:33 2007 +0930
dix: Increase allocation size for core keyboard keymap to avoid buffer overrun when copying keymap from extension devices.
commit 5f9c10e8da0d9d96cc00a38cdf9a8c3030063e03
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Mar 25 15:00:03 2007 +0930
Clean up DeviceIntPtr, prepare for Server 1.4 ABI. Move sprite-related
information into a new SpriteInfoRec, remove isMPDev flag.
commit e54311395e1e7ae458c8ce59da0914706c4a04f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Mar 25 09:41:33 2007 +0930
dix: Increase allocation size for core keyboard keymap to avoid buffer
overrun when copying keymap from extension devices.
commit 1072b88a8f352484e70bc749e300c936e5600480
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Mar 25 10:06:00 2007 +1000
loader: fix already built-in message
commit 804080a7096347d48c686f2c8fbfd06326bce400
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Mar 23 23:41:36 2007 -0700
Make pending properties force mode set. And, remove AttachScreen calls.
Yes, two changes in one commit. Sorry 'bout that.
The first change ensures that when pending property values have been
changed, a mode set to the current mode will actually do something, rather
than being identified as a no-op. In addition, the driver no longer needs to
manage the migration of pending to current values, that is handled both
within the xf86 mode setting code (to deal with non-RandR changes) as well
as within the RandR extension itself.
The second change eliminates the two-call Create/AttachScreen stuff that was
done in a failed attempt to create RandR resources before the screen
structures were allocated. Merging these back into the Create function is
cleaner.
(cherry picked from commit 57e87e0d006cbf1f5b175fe02eeb981f741d92f0)
Conflicts:
randr/randrstr.h
randr/rrcrtc.c
I think master and server-1.3-branch are more in sync now.
commit 1f77120775dc05fc84a00dd55190af2fa50ae509
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Mar 23 14:39:10 2007 -0700
Ensure that crtc desired values track most recent mode.
desiredX and desiredY were not recorded during xf86InitialConfiguration.
desiredX, desiredY and desiredRotation were not recorded during
xf86SetSingleMode.
(cherry picked from commit 36e5227215e0912ddf8a010db042467f00efe0fc)
commit 84a066cc88fe4326ddacd04ab5e1158a80571c33
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Mar 23 10:33:53 2007 -0400
xace: pass serverClient as default argument to dixChangeWindowProperty
instead of NullClient.
commit 476f2b5aefa518262b69e487555e6094818d857a
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 01:17:14 2007 -0700
Incorrect extra memory copy in RRChangeOutputProperty.
Left over from previous version of the code, this memmove will break when
the mode is not Replace.
(cherry picked from commit 945aa0aa556429b50dea8e8ebc0008304b093eb7)
commit 7093367c3976bef5b9d219d9f2a7dc7dd3eeb091
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 01:05:55 2007 -0700
Fix Pending property API, adding RRPostPendingProperty.
Pending Properties take effect when the driver says they do, so provide an
API to tell DIX when a property effect is made. Also, allow driver
to reject property values in RRChangeOutputProperty.
(cherry picked from commit 8eb288fbd69e2ffd02521d2c6a964c8180d08ec8)
commit 86d76390eb182f271f5fa5dc19205e97a867f7e7
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 01:03:40 2007 -0700
Make sure RandR events are delivered from RRCrtcSet.
Some paths were skipping the event delivery stage.
(cherry picked from commit 9ca7ba5d6012295a77ed773c656e786440da973d)
commit 510eaa346e68fd82c852c7b41fb0e2c5be12da78
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 00:59:11 2007 -0700
Clean up xf86CrtcRec and xf86OutputRec objects at CloseScreen.
Erase pointers to structures which are freed at server reset time.
(cherry picked from commit 492c768065f49306a2194a88edf96b85de0ff4ff)
commit 479b2be4badab0a67b1f091feb83c1364e27d783
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 00:57:18 2007 -0700
Clear allocated RandR screen private structure.
Use xcalloc instead of xalloc when allocating this structure to ensure
consistent contents at startup.
(cherry picked from commit 16f4c0c1750824f2e5a001cef82a4122a7a2beb0)
commit b63e0d2545bb75e14d9de019a88f31e20a2f7377
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Mar 20 07:17:27 2007 -0700
Clean up Rotate state on server reset.
The rotation state is stored in the xf86_config structure which is not
re-initialized at server reset time. Clean it up at CloseScreen time.
(cherry picked from commit f8db7665dcd7af78ca4db2461e0bf787ec662cb1)
commit e1cc68add0bcdd5e0e4e15cf6ee8a3da136d3534
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 17:33:16 2007 -0400
xace: drop the name argument from the property callback.
commit c9fb8a35332d101897607d8f06ed5a6512eac7cf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 17:23:26 2007 -0400
dix: move access codes to separate header file, add DixCreateAccess.
commit 1b766ffc0647d5e9a9bf6938d33548d977b5535e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 15:55:35 2007 -0400
dix: reorganize property code to better support xace hook; requires new API for
changing a property, dixChangeWindowProperty, taking an additional client argument.
commit 1b58304ac837735920747ed0f0d10ba331bdaeb7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 13:06:50 2007 -0400
xace: add new argument to property hook for property structure itself.
commit 5486be4898766205149fadce71529724eb78fbf3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 10:59:21 2007 -0400
dix: devPrivates support for PropertyRec.
commit f8cd19bd1692d12a6047c088a626a6ae715d469d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 22 17:47:01 2007 +1030
Xi: add GetClientPointer and GetPointerPairing requests.
dix: use PickKeyboard for ProcSetInputFocus and ProcGetInputFocus instead
of the core keyboard.
commit a3296d111dc4d76aa3afa7e338cbab93eb390ec4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 21 17:01:26 2007 -0400
xace: add access_mode argument to selection hook.
commit 4c1fb8069d5dd30a73277698503e9dcc2e9d64c6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 21 16:17:14 2007 -0400
dix: add new selection fields supporting redirection.
This is a minor ABI break.
commit 4fa482b4be1150bcffeabb64d018c00ac5951e41
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 21 14:49:56 2007 -0400
xace: bump major version since the hooks have changed.
commit 9c144f8ac5cea25deaa543767dbaf371d029c608
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 21 14:39:00 2007 -0400
xace: add XACE_SELECTION_ACCESS hook for selection redirection/access.
commit 3e9f7a5504ab41d845e88f293d8498c963d8a7d8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 02:35:31 2007 +0200
XFree86 DGA: Guard against NULL pointer dereferences.
Ass, u, me ...
commit f292de2ef13dc994a38029cee9e2642576893332
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 02:04:12 2007 +0200
XKB: Fix size_syms calculation bug
Apparently it needed to be nSyms*15/10, not *12/10; make it match the
other allocation code.
commit f34b9a20b0181d3c2641c305e91180711afbd4b9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 02:03:37 2007 +0200
XKB: Be a tiny bit more conservative with type allocation
Make sure size_types will _always_ be 0 if we don't have any types.
commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 18 16:31:19 2007 -0400
Static markup and dead code cull over xkb/.
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header. Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
commit 9398d62f27ee1b287e4458fd8b011c10f7b59efd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 00:18:24 2007 +0200
XFree86 input: Add backwards compatibility for motion history
Add the old motion history API back, as a shim around the new mi API.
commit 0f75c47e0c5f4b2778930a6fabf894fc1dffd9d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 00:12:02 2007 +0200
xfree86 input: Re-enable DGA support
Re-enable DGA support for relative mouse motion.
commit 80d29475b9a2ebbb303a8e324e09a15c528d5556
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 00:10:38 2007 +0200
mieq: Allow event handlers for arbitrary events to be set
Allow arbitrary events to use mieq by letting custom handlers be set.
commit b8df961843a95b29258ae9c5d46ccfc620d8de1c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 19 18:03:26 2007 -0700
Define XF86PM on Solaris x86 builds now that we have sun_apm.c
commit 2945deba1d4a7dce4f6dd0c568297a1c537fdfb4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 19 17:09:10 2007 -0400
xace: drop XACE_WINDOW_INIT hook, it has been superseded by ResourceStateCallback.
commit 78c962da76efe644b8d485265f1ecdda84b45d27
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 19 17:04:51 2007 -0400
xselinux: use the new ResourceStateCallback instead of the XACE_WINDOW_INIT hook.
commit 6a89106e9c963a495fd40427d242ba0abd44f764
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 19 16:51:29 2007 -0400
xselinux + security: remove confusing CALLBACK macro.
commit 0acf993e2878d0866fd4e2db8252c1ea6841e494
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 19 16:11:01 2007 +1030
dix: Move sprite initalization/pairing from ActivateDevice to
EnableDevice.
zero out spriteTrace, otherwise GetCurrentRootWindow() may return
invalid data.
Evdev adds previously hotplugged devices on its own when rescanning,
and ActivateDevice does not get called for those devices. Sprites need
to be initialized or paired before the device gets started, so the
safest place to do so is EnableDevice (which actually does get called
by the evdev driver).
commit 015d728bcde5b16a72a976579755421e3023626b
Merge: 65b0eb6 b167583
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 19 09:42:56 2007 +1030
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
dix/events.c
mi/misprite.c
commit 720f302d241e88e6e9f2962207da1aa9a79728b7
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Mar 17 20:14:05 2007 -0700
Slow down DDC I2C bus using a RiseFallTime of 20us for old monitors.
This time value makes the bus run slowly enough for even the least reliable
of monitors. Thanks to Pavel Troller for finding the necessary change.
commit b5a8a71e64c76b8dd42962cbd7984215c6ce4aa8
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Mar 17 17:26:11 2007 -0700
Remove extra (and wrong) I2C ByteTimeout setting in DDC code.
The DDC code sets the I2C timeouts to VESA standards, except that it had an
extra setting of the ByteTimeout value which was wrong (off by a factor of
50). Removing this should help DDC work on many more monitors. Note that the
Intel driver duplicated these settings, along with the error. Yay for cult
and paste coding.
commit 2489dae9f7def788910eee5733931392df83a0d6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Mar 15 20:26:07 2007 -0700
Correct ref counting of RRMode structures
RRModes are referenced by the resource db, RROutput and RRCrtc structures.
Ensure that the mode reference count is decremented each time a reference is
lost from one of these sources. The missing destroys were in
RRCrtcDestroyResource and RROutputDestroyResource, which only happen at
server reset time, so modes would be unavailable in subsequent server
generations.
commit 9d0c3b52f25df89738fb1a62ccffda8c8cbb4689
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Feb 20 23:04:26 2007 -0800
Eliminate RRModeRec devPrivate field.
The xf86 mode setting code was mis-using this field to try and store a
pointer to a DisplayModeRec, however, each output has its own copy of every
DisplayModeRec leaving the one in in the RRModeRec devPrivate field pointing
at a random DisplayModeRec.
Instead of attempting to rectify this, eliminating the devPrivate entirely
turned out to be very easy; the DDX code now accepts an arbitrary RRModeRec
structure and set that to the hardware, converting it on the fly to a
DisplayModeRec as needed.
(cherry picked from commit 3506b9376c2b0db09bfff58d64e07af88a6e8195)
commit 2c93083edd29a65e73bb2e8eff9d353e92845c9b
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Sun Feb 18 23:49:38 2007 -0800
Add support for user-defined modelines in RandR.
The RandR protocol spec has several requests in support of user-defined
modes, but the implementation was stubbed out inside the X server. Fill out
the DIX portion and start on the xf86 DDX portion. It might be necessary to
add more code to the DDX to insert the user-defined modes into the output
mode list.
(cherry picked from commit 63cc2a51ef87130c632a874672a8c9167f14314e)
Conflicts:
randr/randrstr.h
Updated code to work in master with recent security API changes.
commit b167583fe234a536aa6187e17f21da85be4f0b7f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit 65b0eb60b0b9e6405aa2e3d4c712ec4d2f0da070
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 16 15:52:24 2007 +1030
Xi: move IsPointerDevice into dix.
dix: IsPointerDevice and IsKeyboardDevice, use same ways to identify type
of device as XI does for the XListInputDevices reply.
Autopair each non-pointer device with VCP when activating, pair with
real device after activation.
Don't return non-keyboard devices when calling GetPairedKeyboard or
PickKeyboard, otherwise we segfault for 'evdev brain'.
commit 3bffb281260476d2f74f0bf451d85d2f7cacd6c4
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Mar 15 16:16:16 2007 -0700
Don't wedge when rotating more than one CRTC.
Rotation block handler was re-registering the rotation damage structure,
creating an infinite loop in the damage code. Track registration of the
damage structure to avoid this.
(cherry picked from commit b14f003b0ed1252766c9e3b1c086ea2809521047)
commit 9562b6abe1da566cf73a08c4f4c4339fb67fbc71
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Mar 15 10:50:45 2007 -0700
Allow xf86_reload_cursors during server init.
xf86_reload_cursors is supposed to be called from the crtc mode setting
commit hook; as that happens during server initialization, check for this
case.
(cherry picked from commit 5b77bf2d020b1ee56c1c5f2db089a8f7f64a76a6)
commit 3b71b0f89f1db837da91650baa0ef4bb7ef2e98f
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 15 13:21:00 2007 -0700
Set the RandR version returned, rather than just passing the proto's version.
commit 2fe74ef339c3a4902ae8214f5a0454662895422c
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Mar 15 16:56:01 2007 +0100
Fix calculations in x86 emulator for the long long case (Andreas Schwab).
commit 456f429ad655ab4d80e30c58291d801966a613b2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 15 21:48:19 2007 +1030
dix: fix: don't return when device is same as argument.
fix: set access default rule to 0 on init.
commit ae75019ccf1edac9e8be31b6a96293624f672ccb
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Mar 14 23:59:29 2007 -0700
Create driver-independent CRTC-based cursor layer.
This moves most of the cursor management code out of the intel driver and
into the general server code. Of course, the hope is that this code will be
useful for other driver writers as well.
Check out xf86Crtc.h for the usage information, making sure you add the
needed hooks to the crtc funcs structure for your driver.
(cherry picked from commit 4d81c99a4660a0bf9014f789de55edabd185bd14)
commit c5b07fb717289f61b54d7b093421bcb92124b839
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Mar 14 17:42:30 2007 +1030
kdrive: update kdrive to new mi API with additional device argument. Includes
an update of ati_cursor.c and i810_cursor.c
commit c3eb248cf93a3afd9168acfb88254606beddd7a8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Mar 14 13:21:33 2007 +1030
dix: fix: don't skip first item in list when seeking for a device cursor.
commit ce9409acebd994cf1809050f2cc8e1db66130f12
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Mar 13 19:16:56 2007 +1030
dix: Get the state from the paired device and the real device to fill the
state field in the event, rather than using the virtual devices.
ProcessPointerEvent: name argument "device" instead of "other".
Add GetPairedKeyboard().
commit 4bf1b280f7cb676ec2b172f26dd2ad9bac2eb2ca
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Mar 9 14:18:14 2007 +0000
Set pScreen on context
commit c366b82bd50066019cf82b3464445d5bc27d6f9f
Author: Jay Estabrook <Jay.Estabrook@hp.com>
Date: Fri Mar 9 12:26:55 2007 +0000
Ensure domain is stripped from the bus ID.
commit 577464af4362e5a32cf7165b5128655dd86c6200
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 9 17:13:05 2007 +1030
dix: restore commit b3b2a6a0d43d1724e04d69588f8a55c3270e5523 that for some
reason got wiped.
fix ProcGrabKeyboard to use PickKeyboard
fix PickKeyboard to actually work.
commit 07806f4081f8dcd3b5733b590eb6e5b4cae734ad
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 9 15:45:25 2007 +1030
Xi: Add SetClientPointer request handling.
commit 405483496538f1c82cbd7fe1e76c5d94e1a90525
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 9 14:16:23 2007 +1030
mi: remove 'register' keywords.
commit fe05ba75a10ec080e7ec34bff6936103185586b3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:14:30 2007 -0500
devPrivates rework: pass address of pointer to private callbacks instead of
the pointer itself.
commit 18339375cd332f0ab1cbdade3dcd9140212ce1ca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:14:06 2007 -0500
xselinux: remove context validation function for now.
commit b9cff1670f29949a5bc41afc19aca443f434febb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:13:52 2007 -0500
Add ResourceStateCallback similar in function to ClientStateCallback.
commit 2fcb45eb5dc1803b372df8b5765f6a43bea83611
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:13:36 2007 -0500
devPrivates rework: redo field offset registration, drop RC_PRIVATES class.
commit 947f8d249bac61beb10669d935888c4c280b5062
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:13:18 2007 -0500
devPrivates rework: redo interface again, dropping parent and type parameters
as well as preallocation routine.
commit c45f6762080ef00b41d9f73441a9f0e605253008
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 11:22:42 2007 -0500
devPrivates rework: hook up new mechanism in backwards-compatibility mode
on existing structures that support devPrivates.
commit b3b2a6a0d43d1724e04d69588f8a55c3270e5523
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 8 22:16:17 2007 +1030
dix: Check if client has a grab on any other device before mouse/kbd
event is delivered to the client. Client's don't cope well with
receiving core events from other devices when having a grab on a
pointer or keyboard.
commit 63169ce52d354b4345dcfc46b89f0ea88379718f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 8 17:50:19 2007 +1030
dix: remove 'register' keyword for all variables.
commit ceca5670fee99b5feceaa2453f1ac32d1bfe7dcd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 8 17:17:23 2007 +1030
dix: Each device needs to differ between a core grab and an XI grab,
otherwise a Xi grab may overwrite or release a core grab.
Replace grab and associates with coreGrab and deviceGrab structures,
adjust rest of dix/Xi/etc to compile.
xfree86: Don't check for core devices, we'll have the virtual ones anyway.
If we check, the first mouse device is duplicated and sends
double events.
commit 40ae4f246d8818410490236ab183204a84765629
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Mar 7 20:52:31 2007 -0800
Remove stale monitor data when output becomes disconnected.
Remove parsed EDID and EDID property from disconnected outputs.
(cherry picked from commit ae9d5aa479dd50cc81b755079fcf96a0d02f135a)
commit b5fde366e2e21234ac0b81222fd5c42ca3e49cba
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 12:29:55 2007 -0500
Properly free device devPrivates - memory leak fix.
commit a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Mar 7 11:02:47 2007 -0500
XORG_VERSION_CURRENT, not XF86_VERSION_CURRENT.
If only this was the least wrong thing in this code.
commit aaef4d6a4121d9341b670a0ce8fabc3b491049cf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 09:57:02 2007 -0500
devPrivates rework: move reset functions into a single call.
commit bb111291d854b4329e47367ce3c67e8a2785e6e9
Merge: 74175e0 e9bfb2b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 09:03:46 2007 -0500
Merge branch 'master' into XACE-SELINUX
commit 537bc2ead4d154552cbdc3a19e335f82af63792c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Mar 7 18:19:20 2007 +1030
Xi: Don't deactivate core grabs from non-core button/key releases.
dix: set coreGrab flag for grabs caused by GrabPointer and button presses.
remove virtual core devices from device list, only real devices are in
the list now.
Auto-pair each keyboard with a real pointer if one is available,
provides multiple keyboards automatically after startup if devices
are configured.
fix GuessFreePointerDevice() to do what it's supposed to do.
mi: fix: call miPointerMove from miPointerWarpCursor.
fix: remove unused id field from miCursorInfoRec
don't update sprite for virtual core pointer.
commit e9bfb2b3d7dfaafd90d2ad0fa3d0e1acced4380b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Mar 6 23:19:30 2007 -0800
Add hw/xfree86/docs/README.modes, documenting new mode setting APIs.
This document covers both API and xorg.conf usage of the new mode setting
APIs.
(cherry picked from commit a59c31b0f7b94ed1f395c7586c37ef5fe7ba2a25)
commit 72a23d88d73a8c72ed18847b004db05092d3e7be
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Mar 6 23:15:34 2007 -0800
Add xf86CrtcScreenInit to share initialization across drivers.
xf86CrtcScreenInit performs initialization that needs to happen at
ScreenInit time.
(cherry picked from commit 558a4f5588ad2ec11254e0b5d6ce9515b137369e)
commit 81526232bc0119d2ec7b8590be4f78cf066ae359
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 6 17:19:11 2007 -0500
remove PIXPRIV check as this flag is always set.
commit a7cd53deb99957dec27a55ffd75e548b322ae0ce
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 6 15:32:13 2007 -0500
remove PIXPRIV checks as this flag is always set.
commit 024bbc7cbb924daaf3e305ddfc8e74509acd1e15
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 6 16:18:59 2007 -0800
Bug #9931: Fix linear allocations with a non-1-byte granularity.
This was introduced in 83080809f9a1c1d24b0318e54632f25f5940da25. Instead of
aligning the offset, it doubled it. Results were appropriately spectacular.
commit 9d94c137596d3f9d9118ec70455b7a30b3582046
Author: Ben Byer <bbyer@apple.com>
Date: Tue Mar 6 11:09:30 2007 -0800
updated todo list
commit 81d581e655fc989da3be4256b83849a63b8607b7
Merge: a05ffca d5aba03
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 10:37:29 2007 -0800
Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver
commit a05ffca8dd0da9bdb5c1bf4c481028aeabf21e34
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 10:36:51 2007 -0800
rewrote event handling, Xquartz now has working mouse and keyboard. use it\!
commit d5aba03feff41722c72b4c6193f09d141cbf1678
Author: Drew Parsons <dparsons@debian.org>
Date: Tue Mar 6 23:53:23 2007 +1100
Xprint: shorten font filename to fit in tar length limit
The length of the Xprint font file NewCenturySchlbk-BoldItalic.pmf
pushes the full path over the traditional 100 character limit for
tarballs (when module version number is included). Shorten it to
NewCentSchlbk-BoldItal.pmf to get back below the limit and rename
other font files in that family to match.
commit 3206e9225897989638ad553e1f392b918ac4d21f
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 02:31:59 2007 -0800
moved new event-handling code from X11Application.m to darwinEvents.c in preparation for making all Darwin servers use it
commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e
Merge: ec1ef8a 9b6bb06
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 01:04:50 2007 -0800
Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver
commit ec1ef8a56d6217ca2b04899043874ce0bcad9784
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 00:57:23 2007 -0800
Fixed Darwin's Makefile.am to fix a problem building X11.app
commit 9b6bb06f13a71f6078f762b4a78fa516faccb638
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Mar 5 23:49:35 2007 -0800
Allow relative positions to use output names or monitor identifiers.
Previous version used monitor identifiers if present, otherwise output
names. That caused existing working configurations to break when additional
information was added to the configuration file.
(cherry picked from commit 3f5cedf00a82f08a433c95ffbb7f8ac69dcf6a50)
commit bed76caa6caaea6a6598755b82a54425a9d9f73e
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Mar 5 23:36:00 2007 -0800
Use EDID data to set screen physical size at server startup.
Screen physical size is set to a random value before the RandR code gets
control, override that and reset it to a value based on the compat_output
physical size (if available). If that output has no physical size, just use
96dpi as the default resolution and set the physical size as appropriate.
(cherry picked from commit 843077f23a1b49bd712d931421753e3a09d4008c)
commit 47f8361c3a64834587e54507653d8d5b258c2530
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Mar 5 22:07:01 2007 -0800
Add xf86SetDesiredModes to apply desired modes to crtcs.
xf86SetDesiredModes applies the desired modes to each crtc (as selected by
xf86InitialConfiguration initially and modified by successful mode settings
afterwards). For crtcs without a desired mode, pScrn->currentMode is used to
select something workable.
(cherry picked from commit bcade98ccaa18298d844a606cb44271f0254c185)
commit 33d2cf93fb50464941e74efe246b10aee212223a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Mar 3 23:10:31 2007 -0800
Move xf86SetSingleMode into X server from intel driver.
This function applies a single mode to the screen (as from RandR 1.1,
XFree86-VidModeExtension or XFree86-DGA) using a policy that selects one
output to reconfigure to the requested mode and then makes all other outputs
fit within that size.
(cherry picked from commit 5a595c1f767a8d666348b845d18934aee0cfe38f)
commit 689d52b6242434507a64a8fff27b01607628c393
Author: Jens Granseuer <jensgr@gmx.net>
Date: Mon Mar 5 15:31:44 2007 -0800
Bugzilla #7145: fix build with gcc 2.95
Bugzilla #7145: <http://bugs.freedesktop.org/show_bug.cgi?id=7145>
Patch #8987: <http://bugs.freedesktop.org/attachment.cgi?id=8987>
commit 74175e0af74c530cb712a6772d3c5d61d1be9748
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 5 12:34:37 2007 -0500
devPrivates rework: remove some debugging code from dixFreePrivates.
commit 23fc429aad5b2721911862617772c314e1036bb0
Merge: e684824 fe7b8f4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 5 12:18:54 2007 -0500
Merge branch 'master' into XACE-SELINUX
commit e684824709fa8ffe03dde3c8dfbc58c267515a4f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 1 15:00:02 2007 -0500
devPrivates rework: redo interface and implementation.
commit fe7b8f4237874e3e45fe25a6bf06faddfa1ab8e1
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Mon Mar 5 03:48:27 2007 -0800
began to factor out code to move to darwinEvents.c
commit 537dc5ecde46d0525c503d1d2b39b6eb89a1298e
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Mon Mar 5 02:30:56 2007 -0800
started moving new input code into darwinEvents.c so that it may be shared by the three servers
commit 39aa79177196e21bcdbaf8e44adead9ef91e6ee5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 5 15:31:16 2007 +1030
dix: Add GuessFreePointerDevice(). Runs through device list and tries to
find a pointer that hasn't been paired yet.
xfree86: Use GuessFreePointerDevice() for newly connected non-sprite devices.
commit 8ba5e8d82014b774a52f3e050ddbbb8bde4e0933
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Mar 5 13:46:41 2007 +1100
add a standard connector type and name for us as an output property
commit 2e31872e05c2408d53ba0182bcddc5dabb3615fe
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Feb 26 09:40:00 2007 +1100
modes: add commit/prepare hooks
commit 1f0075786fedde538a95e2f39681052e25021d88
Merge: 57aa5e9 12175b6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 5 12:37:17 2007 +1030
Merge branch 'master' into mpx
Conflicts:
configure.ac
dix/getevents.c
hw/xfree86/ramdac/xf86Cursor.c
mi/mipointer.c
xkb/xkbUtils.c
commit 06b01186f6ae17aafdd1f628c306466ddea9e065
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Mar 4 17:15:24 2007 -0800
Remove debugging ErrorF from rotation code.
(cherry picked from commit e6af7569f201842b4754aec6e72b30dc2daefdfb)
commit c14507b6837387d867792a24778786311b2b38d5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Mar 4 17:06:37 2007 -0800
Handle non-zero origin rotated crtc. Damage crtc area on re-rotate.
Box transformation from source to dest area was broken, leaving the wrong
areas painted when the crtc origin was non-zero.
When rotating from left to right, the pixmap doesn't get reallocated, and so
no damage was left in the pixmap from xf86RotatePrepare. Separately damage
the whole crtc area when this occurs to repaint the area.
(cherry picked from commit 2a50ca2160bc05af1c24421ec079e902ff730277)
commit 97978b515b7af5fbaaa32b1729e835f3bfb9f5c6
Author: Drew Parsons <drew@pug.localdomain>
Date: Sun Mar 4 16:28:54 2007 +1100
Xprint: fix font symlinks
Change symlinks to Xprint base fonts in model/PSdefault using local
relative links. This facilitates moving the Xprint config files, for
instance for FHS compliance placing data files in /usr/share rather
than /usr/lib. Also ensures NewCenturySchlbk-BoldItalic.pmf is
installed.
commit 215e3691b76a63e6af19865790193b20b105ec5a
Author: Ben Byer <bbyer@xyzzy.local>
Date: Sat Mar 3 21:52:56 2007 -0800
stopped using XTrans internals in X11.app because they're apparently no longer public
commit ea8dcc458ea8870126cf8d3e21cab9d63d094c5e
Author: Ben Byer <bbyer@xyzzy.local>
Date: Sat Mar 3 21:51:20 2007 -0800
Makefile fix for X11.app
commit 18508212599bf0964c450c69b9790208e5d428be
Author: Ben Byer <bbyer@xyzzy.local>
Date: Sat Mar 3 21:41:33 2007 -0800
fixed X11.xcodeproj to get CFLAGS and LDFLAGS from autoconf script
commit 7f2b9f3790456044d01bf8e6404f9a1239b41da6
Author: Ben Byer <bbyer@xyzzy.local>
Date: Sat Mar 3 19:27:53 2007 -0800
autoconf fixes for XDarwin (created DARWIN_LIBS)
commit 12175b668a94e23994f724b366a691ec312cce69
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit ea1a72946d1aa4c256e6afb9d834c582ba4ac3a1
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Feb 28 14:26:47 2007 -0800
Add a canGrow argument to xf86InitialConfiguration.
canGrow indicates to the DDX that the driver can enlarge the desktop via the
xf86_config->funcs->resize hook. If so, xf86InitialConfiguration will set
virtual[XY] to match the configuration it chooses and will leave the crtc config
size ranges alone. If FALSE, it will bloat the screen to fit the largest probed
mode and also set the crtc config max size to limit the desktop to the initial
virtual[XY] size.
commit 04d15da95d608766c7832a7aa881be499c1395ba
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Feb 28 13:36:58 2007 -0800
Add a screen resize hook to xf86CrtcConfigRec.
This hook is called when the DDX needs to resize the screen. The driver is
responsible for changing virtualX and virtualY, along with any other related
screen properties (devPrivate.ptr, devKind, displayWidth, etc.).
Use the size range from the crtc config instead of randrp->virtual[XY] when
reporting the min and max screen sizes to the DDX.
commit b11dfac287d65de7b83f63749087cba4e8ddaf4a
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Mar 2 12:30:26 2007 +0100
Legacy framebuffer support wasn't compiled if Xorg wasn't explicitly enabled.
commit 57aa5e908dc11d5d8c27ed705c526f1416c1e8ad
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 2 17:14:37 2007 +1030
dix, Xext, Xtrap, Xi: replace inputInfo.pointer with PickPointer where
possible. More replacements to come.
commit e43b8a4e40991ca6e545bda4cf9b9bd7a2bf22e2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 2 15:21:46 2007 +1030
dix: Add ClientPointer to client, used for picking which pointer to use in
ambiguious request. PickPointer and PickKeyboard are used for getting
the appropriate pointer when situation is unclear.
Fix some issues with InitializeSprite.
dix, xfree86: Remove last traces of InitSprite.
commit 2dafc46e3d814e02b25e5a2fa2e931f0257402a8
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Mar 1 17:44:39 2007 -0800
Fixed pointer events in Xquartz -- Keyboard events work, but
the keycodes are incorrect.
commit 74f1de1de9633119c2cf26086875717181c8a6f7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 1 12:07:33 2007 -0500
devPrivates rework: unhook resource system; will try a different approach.
commit 39ecd6fff4f946deebe310b4b26b171c842db223
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Thu Mar 1 01:45:19 2007 -0800
Rewrote parts of the Xquartz event-handling code (thanks daniels and whot!)
It should still be considered a work in progress, but mouse events almost work.
commit ed7ccc481ad1caaa518cafe944c2327a5d0b6c65
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Thu Mar 1 00:51:10 2007 -0800
AIGLX support for Darwin -- works well enough to run
glxgears and glxinfo, but still needs more testing.
commit 43bd35fcf85b51b7e5714844bade90184dbd746f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 1 17:19:37 2007 +1030
dix: Remove InitSprite, work can be done by InitializeSprite.
Free sprite struct if a spriteOwner is paired.
xfree86: Use PairDevices instead of passing booleans around when creating a
sprite.
Xext: Switch back to using LookupPointer/KeyboardDevice instead of
inputInfo.xyz.
commit 90ca76ba28fcd8bed945e33cf9674784fa2eb533
Author: Jay Cotton <jay.cotton@sun.com>
Date: Wed Feb 28 17:40:58 2007 -0800
Add sun_apm.c for Suspend-and-Resume support on Solaris
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6205248>
commit 06c3021aec720837bef432656e88ae9b4e35101d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Feb 28 16:09:11 2007 -0800
Don't crash setting a NULL mode with a randr classic DDX. Also remember to update the screen size during modesets.
commit 68c64ad7b1eea79c786b5a7f3459076780163a47
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 1 09:51:20 2007 +1030
Xext: Update device's lastx/lasty when sending a motion event with XTest.
commit 8b245758845523d5f8f017bb9d0e9aa57b616c28
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Feb 26 17:45:40 2007 -0800
Return BadMatch if a client tries to clone non-cloneable outputs.
commit 2a35d44b6d87f96a7ce90dc8f0142f48cc176e95
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 28 15:43:06 2007 +1030
Update device valuators on XTest motion event, otherwise the cursor jumps
between coordinates stored in device and coordinates sent by the event.
commit d9bcb22d199e8444b9762a35754e04d327dd5915
Merge: 272d934 c16343a
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Feb 27 16:28:20 2007 -0800
Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver
commit 272d9341d0f7c3e9e0c9b9a8c0d4d8779cdcc5cf
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Feb 27 16:27:26 2007 -0800
fix for hw/darwin/Makefile.am to properly use XSERVER_LIBS
commit c16343ac2ca18391b21022b2edd02ad9f413d2b3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 27 14:14:47 2007 -0500
Make mfb, cfb, and afb support configurable at build-time.
commit 5680efc0d2baf0a9451e82e490e3690fc23dda0f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 27 09:55:48 2007 -0800
Sun bug 6529003: Xorg should not be including <sys/immu.h> on Solaris
<sys/immu.h> was removed from the latest Solaris Nevada build, but it's
been useless to Xorg for a long time (it only declared a couple of kernel
variables)
<http://bugs.opensolaris.org/view_bug.do?bug_id=6529003>
commit ab0fc8c1ad7ea2dc3389a4a4bb1c45bbded5e7ad
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Feb 27 00:14:35 2007 -0800
verbiage corrected per daniels
commit cdd4c84572cc3bdd004f8dca6d8b64e710344ac0
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Mon Feb 26 23:57:02 2007 -0800
added hw/darwin/README.apple file with some todo items and props.
commit 776d4d6587c57f94bca8732f915d07a0d4e137c8
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Mon Feb 26 23:40:00 2007 -0800
X11.app now builds correctly
commit 154d2c13f4ec22b7e6332808bbcd049d63784891
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Mon Feb 26 19:39:26 2007 -0800
more changes for X11.app
commit fa06e11f972e2a75c84b2f1586997ffc1239cbd9
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Mon Feb 26 17:06:53 2007 -0800
added hw/darwin/apple directory, which contains source and data files to build
a version of the X11.app shipped with Mac OS X, using the X.org server.
commit a16360733ea393ec1fc267e88fc604d9d7534484
Author: Jay Estabrook <Jay.Estabrook@hp.com>
Date: Sun Feb 25 19:58:26 2007 +0000
Fix root bus/domain selection on alpha
commit 566610680c4e1cab3e7fc7146adbeaba52fdd0ad
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Feb 23 15:20:35 2007 -0500
Don't install libi2c.a
commit 81372f9096b952f4be545654b0b44ac37ef4f2c2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 23 13:23:12 2007 -0500
devPrivates rework: hook up new interface in resource system; add new
resource-adding function that takes an additional ScreenPtr argument.
commit 16f2b8892d9ebcef6410a675d10549043223f617
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 23 13:20:43 2007 -0500
devPrivates rework: add new interface implementation.
commit 779faccfb78648a9f7e70b77dcfa9f6e19559772
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 23 13:19:53 2007 -0500
devPrivates rework: add dix header file containing new interface.
commit bc4ae25433e38a25a2012f9f233d500665172a4b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Feb 23 12:06:51 2007 +1030
xfree86: Don't initialize sprites for devices that don't own a sprite (stops
keyboard hotplug segfaults)
commit af550ea91c451cf4f831c2413266a19d1f211d0e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 22 14:38:40 2007 -0800
Move SecurityPolicy file format from Xserver(1) to it's own man page
Don't make users looking for Xserver information page through pages of
details only interesting to the handful of people writing security policies.
commit b1142cdbce76fed8cb22ba6d7ac027751dd56a76
Author: Brice Goglin <brice.goglin@ens-lyon.org>
Date: Thu Feb 22 12:26:04 2007 -0800
Bug #10034: 'man Xserver' typos: s/dqoute/dquote/
Bugzilla #10034: <http://bugs.freedesktop.org/show_bug.cgi?id=10034>
Patch #8780: <http://bugs.freedesktop.org/attachment.cgi?id=8780>
commit 4b8b0e377a27ec904b2028c89aed11c6416af26c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 22 20:00:59 2007 +1030
Xi: Add access control request handling.
dix: New file access.c to handle all access control for devices.
commit 9a3eb0357e779d5d5f76858f23667956c4c5d721
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 16 19:30:03 2007 -0500
devPrivates rework: add RC_PRIVATES class, make ResourceRec visible in
the API, and add extra fields and structure supporting private storage.
commit cd0af7a7856e8246e27acc5513d219a094211625
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 21 10:08:41 2007 +1030
Xi, dix: Only one client at a time can change the pointer-keyboard pairing,
using xRegisterPairingClient request.
commit 3344a4eda704edc7dc30037f095de277a60a70bb
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Feb 15 16:27:50 2007 +0100
DRI: Make sure number of DRI windows is accurate in driver ClipNotify hook.
Always call DRI{De,In}creaseNumberVisible (which in turn calls
DRIDriverClipNotify) after updating pDRIPriv->nrWindows.
commit 3c7a27dc77595ad018bb7c4f7cef6bc178268cb6
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Feb 14 16:17:18 2007 +0100
DRI: New ClipNotify driver hook.
The hook is called whenever the clipList of any DRI window changes, be it via
DRIClipNotify, DRICreateDrawable or DRIDrawablePrivDelete. This allows the
driver to keep track of which DRI windows are visible where.
commit eedf148e5a1273ebbf4dc8dcac9c435712fc00ea
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Feb 2 18:27:40 2007 +0100
Track number of visible DRI windows separately for transitions.
This allows e.g. doing page flipping with multiple DRI windows as long as
only one of them is visible.
commit 8a42af6a935b1cf0e15102e986bb527f4fab31a8
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Feb 19 15:28:37 2007 -0800
Check for clientGone before sending events from XFixes (bug #1753).
Freeing resources during client closedown can cause cursor changes which
attempt to send cursor events through the XFixes extension; a client in the
process of closing down has no file to send events to, causing a crash when
this path is hit.
commit 4660eaaffb36f526f71d5847ae1309c10ee133c6
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Sun Feb 18 14:09:51 2007 -0800
configure fixes for darwin
commit 5631a67f648f5f151a849a918ee12871c71c32e9
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Feb 16 10:06:22 2007 -0800
Don't set subpixel order during startup; the screen won't be ready.
in xf86CrtcSetMode, scrn->pScreen will be NULL during server startup time,
so don't try to set the subpixel order. subpixel order will be set in the
randr initialization anyways.
(cherry picked from commit 5f6f8616d862ce4a37f6d3df4bdbc44fd21cc82a)
commit 096965ec9c7514f0c9fc0d17e5166f2d26781f87
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Feb 16 02:17:11 2007 -0800
Ensure drivers can use new modes header files.
New modes header files required a few minor changes to be used by external
drivers, the most notable of which is the publication of the config file
parser header files.
commit 55797dd252382d35ebab5d9e18a5e0e77872d775
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Feb 16 00:56:00 2007 -0800
Respect rotation in initial screen size computation.
commit e4507825bf0328ea59673f2bbe652de3a9105c86
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Feb 16 00:41:29 2007 -0800
Enable startup-time rotation; change rotation pixmap creation API.
Add monitor "Rotate" option taking one of "normal", "left", "inverted" or
"right". However, because initial mode selection is made before the screen
is completely initialized, we cannot create the shadow pixmap object at this
point. Pend the shadow pixmap creation until the block handler.
Note that this code is not completely functional yet.
commit 8606aeb9b2ab2dafc11e64436db4d3a7e67dbcc0
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 22:23:16 2007 -0800
RRConfigureOutputProperty is a variable length request.
Replace REQUEST_SIZE_MATCH with REQUEST_AT_LEAST_SIZE
commit a88844eccb0e423e71d4fcb286866a026308babd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 17 20:35:07 2007 +0200
configure.ac: disable dmx per default
Disable DMX until it gets ported to the new input API.
commit e9a2cc7d9fcc73e16576be2522522cce675dc3f3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 17 16:17:48 2007 +0200
config: error message cleanup
Demote failure to connect from ErrorF to DebugF.
commit 81876bc5ddc2f3eda5078fe4bd101917fb32e586
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 04:07:11 2007 -0800
oops, missed a spot
commit d287b76471f66c9aea54f969d050b35643cb2501
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 03:47:42 2007 -0800
cleaned up some linking ugliness in hw/darwin/quartz
commit 81444486be4f182dde778bac6f7edcbfc4368482
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 02:23:11 2007 -0800
autoconf goodness for XDarwin, courtesy of pogma
commit cf4994b0db2fef4c10ce8804adef766bc5118daf
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 01:21:43 2007 -0800
dix mods for Darwin
commit cece0601571f6304e392a3a40505664544b249f3
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 01:00:13 2007 -0800
build fix for configure.ac / BUILD_DARWIN, oops
commit 00b0657b815b95964401c3e36eed54063afbd003
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Sat Feb 17 00:55:32 2007 -0800
glx fixes for XDarwin
commit 93777c7b96e560da087963040e372aecbfca7bbc
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Sat Feb 17 00:22:39 2007 -0800
more patches to make the Quartz part of XDarwin work again
(thanks Peter and Torrey!)
commit 612144c811fdf06b7c03cf48a321388fe411acd4
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Sat Feb 17 00:09:58 2007 -0800
More build fixes / updates for XDarwin:
quartz/cr: "Cocoa Rootless" support (deprecated in favor of xpr?)
quartz/fullscreen: Fullscreen support using Xplugin (not yet functional)
commit 68d39d8571d8717d26cedc84015d537549520a14
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Feb 16 23:02:13 2007 +0200
kdrive/ephyr: fix keysym type confusion once and for all
Take keysyms in as an XID in hostx_load_keymap() and explicitly
convert them to CARD32 for loading into the server. Fixes Xephyr on
AMD64, wa-hey.
commit 5507cb885d861e974be240120ada2ace2a980a72
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Feb 16 23:01:27 2007 +0200
kdrive: delete input debugging, yet again ...
I have no idea how this keeps on coming back.
commit 2534f5a9027c196f677923aaa38fa9ed9917f73d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 16 15:33:48 2007 -0500
Remove nasty function pointer type from DevUnion, return to documented type.
commit 84efe23ae834dd3a4d3f3e08832b69469c7382aa
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Fri Feb 16 04:37:38 2007 -0800
updated darwin/quartz/xpr (libXplugin interface for Mac OS X) support
commit 5e7f7436a755a33e48ab91831cc6af710a8344ef
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Fri Feb 16 04:12:26 2007 -0800
merged in miext/rootless changes for XDarwin support
commit f350909d1696fcfda87e8f12c729254d762313c9
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 21:50:48 2007 -0800
Kludge around duplicate code added in hw/xfree86/modes.
Code added in hw/xfree86/modes came from the server-1.3-branch.
Portions of this code had previously been integrated into xf86Mode.c
and edid_modes.c.
To preserve hw/xfree86/modes as much as possible, the duplicate code from
the other files has been disabled; a more careful review would figure out
where that code actually belonged.
commit 258beebc77510f84fbea66d6ebf29c5097bd11db
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 20:13:15 2007 -0800
Report correct RandR 1.0 sizeID. Report correct subpixel order.
RandR 1.0 sizeID must be computed the same way every time, so when reporting
it in the ScreenChangeNotify event, just construct the usual 1.0 data block
and use that.
subpixel geometry information can be computed by looking at the connected
outputs and finding any with subpixel geometry and using one of those for
the global screen subpixel geometry. This might be improved by reporting
None if more than one screen has information and they conflict.
commit ef6b1235fd7d6dc422e8a150c089496a8e648067
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 11:27:35 2007 -0800
Allow new modes code to build inside drivers as well as server.
Use config.h for driver builds where xorg-config.h isn't available.
commit 3dbe8f6b6ea32a9a137ad6e9235f74009b095bd8
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu Feb 15 17:51:01 2007 +0100
Distribute hw/xfree86/modes.
commit d4eb4d065032112a38444e36f791cb468a5ca8f4
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 20:36:20 2007 -0800
Merge crtc/output-based mode selection code.
This code comes from the intel driver, so there's no history in this tree.
As the crtc/output-based mode selection code uses ddc, the ddc and i2c
modules have been merged into the server. Attempts to load them are safely
ignored now.
commit 37fe4c49dc3a5faf2d3d56112b6bd78453045f6a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Feb 16 09:57:57 2007 +1030
mi: Move WarpPointer event generation to miPointerMove to avoid duplicate
events, cache event array allocation.
commit c2f3f705f1db8ca78292912544a7e416116175f3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 15 14:38:24 2007 -0500
Bug #6988: Change behavior of Security extension per user feature request.
commit 811675733e97416c990e6dc9c19271b43d96248d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 19:09:00 2007 +0200
os: fix client privates leak
Minor leak here. Oops.
commit 8f6961d385bda92703f18090cff551409d2710c9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 19:08:46 2007 +0200
configure.ac: add xdarwin stubs
Add stub AM_CONDITIONALs to at least fix the build.
commit a3b62623b8aac56b219633bdb2c2f6de19b0580b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 17:07:42 2007 +0200
change versioning for new server version scheme
See:
http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446
commit f452507ca9209598401d15da0039aaa4e1fed1a3
Merge: 0463283 8116757
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 15 09:47:20 2007 -0500
Merge branch 'master' into my-XACE-SELINUX
commit 04632835b7402456fdcf6c8fa01970cd2804e27c
Merge: 88f89b9 9ecf79c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 15 09:27:05 2007 -0500
Merge branch 'master' into my-XACE-SELINUX
commit 0f6dd4aea6176507dbe1c90c950d332fecbcaacb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 16:14:57 2007 +0200
kdrive/ephyr: free screen struct
Free screen->driver on screenFini, instead of just leaking it.
commit 9ecf79ca0111dd899ca88dd54156f71013220fcc
Author: Ben Byer <bbyer@apple.com>
Date: Thu Feb 15 05:22:21 2007 -0800
Beginnings of an update Darwin driver
commit 136bb4874aadf4a731d7eb8671e8bb641f9980a7
Author: Ben Byer <bbyer@apple.com>
Date: Thu Feb 15 05:14:38 2007 -0800
iokit support for XDarwin
commit 3ead1afe78d2913f08c8144cb2d3813c6b159488
Author: Ben Byer <bbyer@apple.com>
Date: Thu Feb 15 05:09:29 2007 -0800
Beginning of patches to add XDarwin support to the modular tree;
special thanks to Torrey Lyons and Peter O'Gorman for making this possible.
This is the automake framework for the XDarwin.app interface files.
commit f6c3b9fa97ccf85e96f15435d564a1c261e40532
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 15 13:51:20 2007 +1030
xfree86: mouse and keyboard hotplugging support. New mouse devices will get
new cursors, keyboard devices use VCP's focus until paired.
commit d570ff7c81858a3174686b46a088f67563b4a2d5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 14 17:09:33 2007 +1030
fix: WarpCursor needs to send MotionNotify.
commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a
Merge: e540d57 d570ff7
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Feb 14 15:39:52 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit e540d572c5acba877b3ce01e7b31e399dac2d44a
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Feb 14 15:38:10 2007 -0800
Merge fix missed on previous commit.
commit 81aa7f059d3cfd8d28420b7932b8ff7e06d67979
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 14 12:48:15 2007 -0800
Add missing dirty marking in a couple of fallback cases in the exaGlyphs path.
commit a5f19c5150a7b3dc2ff3ad759ee1a6ab0ad8925c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 14 10:39:46 2007 -0800
Mark sync when UploadToScreen succeeds in exaGlyphs().
commit a492d494f51caf15a5cb979dc335387486c105d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 13 18:32:59 2007 -0800
Update Xvfb man page: remove monolith build instructions, use /var/tmp instead of /usr/tmp
commit 25104ed2e6050f86691104b34eeaf3147eb83c4a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 14 11:26:53 2007 +1030
dix: fix typo in condition.
commit 33ef546b942977bb2573156eaba5269350d16f99
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 14 11:18:43 2007 +1030
dix: Clean up GetPointerEvents. If pDev == inputInfo.pointer, assume that
we do not want Xi events.
mi: Remove POINTER_CORE_ONLY flag.
commit a23b0b069cac8a48e2b306b2095515d75f647705
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Feb 12 17:50:00 2007 -0500
Typo fix.
commit d21c95f80bdba2f29eedd57fb0b00e580391c08e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Feb 12 17:22:39 2007 -0500
Hook up --with-builderstring for vendor build identification.
commit 46784d24c11767455a4986449a8037295912dcee
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Feb 12 17:18:29 2007 -0500
Remove spurious LIBADD from xf4bpp
commit 16eb7254f861465f988ae3861ac3449c2c966062
Merge: 3814862 c4b7e9d
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Feb 9 12:38:49 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit c4b7e9d1c16797c3e4b1200b40aceab5696a7fb8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Feb 6 14:57:22 2007 -0800
Add an RDTSC implementation to the x86 emulator.
This instruction is being used in some debug VBIOSes. This implementation
doesn't even try to be accurate. Instead, it just increments the counter by a
fixed amount every time an rdtsc instruction in encountered, to avoid divides by
zero.
commit 262b9b104a04e55969593ef96a16004e53ecd00a
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 17:30:22 2007 -0500
Use the new 8888x0565mmx function in fbpict.c
commit 876b806ec09d5ff0c6cd19df91006c4eefedfaa6
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 17:16:23 2007 -0500
Reapply patch to fix AMD CPU detection
commit 13568d2aa43da4216bbcb46e1125ff28c323ac54
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 17:12:01 2007 -0500
Revert "Fix for AMD cpu detection. Bug 9614, Dan Williams."
This reverts commit b2cd3b133748cc5aa541905a703a6fdb1cbbb1e6 since
unrelated changes in fbpict.c broke the build.
commit 5a3334410367a2186b2c667fa1eb6cf0baf93e95
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 17:11:01 2007 -0500
Add new fbCompositeSrc_8888x0565mmx() function, based on patch by Dan
Williams. Bug 9682.
commit b2cd3b133748cc5aa541905a703a6fdb1cbbb1e6
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 16:43:37 2007 -0500
Fix for AMD cpu detection. Bug 9614, Dan Williams.
Credit for the fixes in this patch goes to:
Marco Gritti <mpg at redhat dot com>
Jordan Crouse <jordan dot crouse at amd dot com>
commit 7cd73b00a29469d37a7f526cc9b35cc927a13ae2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 5 14:48:48 2007 +1030
dix: If POINTER_CORE_ONLY is set, GetPointerEvents() only creates a core event
mi: fix: Create motion event in miPointerMoved
commit 760a38c4c7ab66ae653d3acb92f5cda4bd44edd6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Feb 5 03:39:36 2007 +0200
XkbCopyKeymap: fix copy-and-waste accident
When we reallocated modmap, we accidentally clobbered syms with the
result, leaving syms definitely too small, and modmap also potentially too
small (as well as not actually allocated anymore).
commit 17d85387d1e6851d35474b65929e268ca64ef65b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 18 15:23:57 2007 +1100
dmx, vfb, xnest: fix fbcmap compilation
Don't always define XFree86Server, but only for damn fbcmap.c.
Split fbcmap.c into its own library to achieve this.
commit a309c936bb79e2fea04a96ce33c7da99ed902484
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 5 11:38:44 2007 +1030
xkb: Daniel's patch to stop evdev keyboard segfaults.
mi: Remove quickfix from ba547d4f6a2707f51f0d826389d2d418fb62367a
commit 236f04b638e7d4d1656c6bedd8a6e8d7cec285ec
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Feb 5 09:09:12 2007 +1100
remove array_cache from everywhere
commit eb228e8d1eaa78911541b2fec5d04a74c1299718
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sun Feb 4 22:06:59 2007 +0000
clean up more of the vbo fallout
commit fb1bc1c65b88527b42a0e4abed23e5ddaae711b7
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Feb 4 18:39:58 2007 +1100
add vbo to .gitignore
commit d8e148ec841d340327e6813127b0e0ffc4db712d
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Feb 4 18:39:04 2007 +1100
update xserver for vbo code in mesa
commit 5dcad9e9d7d9993d65f989219bee94a060bbf476
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Feb 2 14:44:55 2007 -0800
Fix bus error on startup in 64-bit Xephyr
hostx_get_visual_masks takes unsigned long * arguments, but was being
passed pointers to CARD32's.
commit 170a55022ebc7b148bff93886eda152a0d5ce79a
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Feb 2 20:56:12 2007 +0000
remove file
commit e6a505be84f5f72349d6860dc5a5058367516019
Author: Dan Nicholson <dan@conor.dwcab.com>
Date: Fri Feb 2 20:53:01 2007 +0000
The array_cache sources don't exist anymore in the Mesa tree,
so we shouldn't try to build them.
commit af20485ec370801f2aabfaeae17bbd030a849bd1
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Feb 2 19:14:46 2007 +0000
Remove array_cache for recent Mesa changes
commit cf5b29d75dad7c74543f49f010c817623a3df747
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Feb 2 12:57:38 2007 +0200
dmx: drop leftover __GLXdrawablePrivateRec struct.
commit 4f2f3233c808fd86bf9f6c09937feda9e0b367fd
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 1 15:10:29 2007 -0800
Fix the size expectations of xRRSetCrtcGamma.
It was using REQUEST_SIZE_MATCH (client request length must equal request size)
rather than REQUEST_AT_LEAST_SIZE (client request length must be at least
big enough for request size), and this request has data following the request
structure.
commit 8274ea6aa97b06a56b7468c3908894c0ff72b687
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 1 12:15:54 2007 -0800
Set the Damage version supported in the server, instead of using damageproto.
This was caught by distributions upgrading damageproto to 1.1, before the
server they had supported it. The server then advertised the new version
without supporting the protocol.
commit 8bce182568f14edfb03911d8c5d791fd83bb6222
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 29 17:30:59 2007 -0800
Restore a few important lines killed in the previous commit.
Typical results were failure to sync, and a black screen.
commit 3814862a869ee83d307eb01225d5949039f435d8
Merge: a216de9 31f2d4a
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 29 15:14:31 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/linuxPci.c
commit 31f2d4a57e04f5ea635fbb50c508405c4fc37b65
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 29 09:39:33 2007 -0800
Bug #9680: Remove bogus blank length limiting in xf86SetModeCrtc().
Our modes typically come from EDID or default modes, and when the monitor
asks for a specific mode, deciding to tweak it usually results in incorrect
display. And if the user is specifying a mode by hand, tweaking it then is
still pretty rude.
Reviewed by: ajax
commit 4aaaa70d1b52346213fad46777c006a93c4ece5d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 29 18:23:24 2007 +1030
Xi: Adding ChangePointerKeyboardPairing request
Adding PointerKeyboardPairingChanged event
Correct error values for XWarpDevicePointer
dix: Adding device argument to SendMappingNotify
Adding spriteOwner flag to devices
commit f3418b52dcf2ab4982504856ab9fae3e726ee6d2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 29 16:10:03 2007 +1030
mi: Fix cursor rendering issues.
commit 15a81b6325d359990017b8e9f17ce18a7eff1354
Merge: 3759254 cc3d66d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jan 28 17:18:57 2007 +1030
Merge branch 'master'
commit cc3d66d4a53fee8f1d940bb8c7f032c94b9c25f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit 3759254c0967ae83bdcbf097d9e8a58733c8e6f9
Merge: ba547d4 ca5ebe3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jan 28 17:05:55 2007 +1030
Merge branch 'master'
commit 1627af54497bee659ea30f2850b39cbbf576e22d
Author: Jonathan Lim <jlim@sgi.com>
Date: Fri Jan 26 13:00:45 2007 +0100
Call linuxPciOpenFile() for r/w access if applicable.
Currently, the call to linuxPciOpenFile() is always made for read
only access which causes the subsequent mmap call to fail when the
memory is mapped read/write.
Xorg #9692
commit a216de9b7ff55e2b73c487d037f248f00bd2e63b
Merge: 24506ea cf7ca9d
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 25 10:17:32 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit cf7ca9d09cba14d107152a5179de38e5ef7bd784
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 24 20:20:48 2007 -0800
Plug memory leak in doLoadModule()
commit 5abd50e37ceda134897891ed32e05215db67e0b4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 24 18:54:38 2007 -0800
Correct help lines for configure's --with-vendor-name flags
commit b32a40817fc0e2ac2edf2fa22a8813087fce2e7b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 24 16:29:49 2007 -0800
Correct variable descriptions in comment for SecurityCheckResourceIDAccess
commit 24506ea65be4cb29c5e1486aa0a529a40ce5c230
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 24 15:33:49 2007 -0800
Move xf86ReadLegacyBIOS to the one place that uses it.
xf86ReadLegacyBIOS is only used by one function in int10/generic.c.
Move a generic implementation of that function there, rename it to
read_legcay_BIOS, and delete all remnants of it from all other places.
commit fdb3a0798f0d17e72ec7293d59a7a81b5ffdf95b
Merge: 39b51e1 a53586e
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 24 14:49:39 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit a53586eebc166e35c1f48942205832810061daee
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 24 13:36:25 2007 -0800
Warning fix for RRCrtcSetRotations().
commit 7a12952fd437b105ea0d013d680f9c3a775a183c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 24 13:34:29 2007 -0800
Bug #7639: Only swap out pixmaps (rather than everything) on VT switch in EXA.
This is a new behavior for version 2.1 of EXA, and only takes effect if the
driver has requested that. Otherwise, the previous behavior remains the same.
commit b6b855932109b4bc3454f07bef8cb079d79ca369
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 25 00:29:20 2007 +0800
Make Xinearama screen information reflect CRTC rotation.
commit 39b51e1bfc4924fc3bda4342ef9c6c0125d9f4fa
Merge: 637b19b 788cfce
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jan 23 13:25:56 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit 788cfce911793a26aed16f38f30678ecee82c873
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jan 23 10:15:22 2007 +0100
Bump video driver ABI version to 1.2.
This is necessary because server-1.2-branch bumped to 1.1 for xf86CVTMode and
we have xf86XVFillKeyHelperDrawable on top of that.
commit 637b19b3ee7345c2d449ce94ceabe998d817c02e
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 09:58:33 2007 -0800
Eliminate pciControlBridge, pciGetBridgeBuses, and pciGetBridgeResources.
commit a232e4ae938fa3a68f7614995676eda7929260db
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 09:16:45 2007 -0800
Convert xf86GetPciHostConfigFromTag to get_parent_bridge.
Convert xf86GetPciHostConfigFromTag to a new function called
get_parent_bridge. This name better represents what
xf86GetPciHostConfigFromTag is used for: walking up the lists of PCI
bridges from a device.
commit 844560a02fa6c4ce18ea2af3ec27beaa60b7af11
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 09:13:59 2007 -0800
Elminiate ARCH_PCI_OS_INIT.
Never, ever use the ix86Pci stuff on Linux. This renders the whole
ARCH_PCI_OS_INIT mechanism useless. Remove it.
commit 7dfb3cea913b02a6b36c308d1330bd40abe6b41f
Merge: c279d5f 2dc8662
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 08:44:36 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit 2dc866252c84ed0e7b3afa25e8a5312f448d405b
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 22 08:41:50 2007 +0800
Really fix optimized render cases being hit when they shouldn't.
I don't know how this define slipped in there. Fixes
6fdfd9dad91d7b7aa292f8c4d268dd27c34de8d3.
commit 88f89b9ac1b92a0916c46488350ff68c3ffdd490
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 19 19:15:49 2007 -0500
Policy updates: use x prefix in property and ext types.
commit 2fb8b7f8199c35ae0870cb54b40ee28a4e01d479
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 19 19:14:51 2007 -0500
Split ObjectSIDByLabel into two functions since property labeling now
involves an additional compute_create lookup.
commit 0d6d373af95d0004d33b987d14ad7e04dd5d2003
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 19 14:52:23 2007 -0800
Update Xserver man page to match commit ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61
Remove unused -xkbdb and -noloadxkb options. Rename -ar1 and -ar2 to
-ardelay and -arinterval, respectively.
commit c279d5fdc53612a90f33fafe9e9c59ced008dd51
Merge: 88f248e 14d6a9b
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 19 12:59:54 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit 700fccf863593cbea1691789f1f1cafc08a32fee
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 19 14:56:38 2007 -0500
Remove the root window context line from the configuration file.
This context will be derived through a type_transition rule instead.
commit 3a9791b456f35adb252a9059b19265c6c447f1ba
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 19 14:53:09 2007 -0500
Policy updates.
commit 14d6a9b327381a6bb2dac59c62728e5fd0f0bcfb
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jan 19 18:30:21 2007 +0100
fbdevhw: Only deal with RGB weight if default visual is True- or DirectColor.
commit 27a01e100bff21ac0b70c6d72071d7226fc91264
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jan 19 18:28:05 2007 +0100
fbdevhw: Consider mode set equal to mode requested if virtual width is larger.
commit 65f4690ecb4576f60396fcccff8e5bd5d4b6645f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jan 19 17:54:03 2007 +0100
__glXDRIscreenProbe: Use drmOpen/CloseOnce.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9275 . Based on patch from
Alan Swanson.
commit 8b3a591cd39f2d51209dc71b641cac79663e1b16
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 18 16:03:30 2007 -0800
Update pci.ids to 2007-01-18 snapshot
(includes a whole bunch of ATI device id updates)
commit 0f0c321adf2850b3d7aafe281362bfe424cb0ca1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 18 15:31:53 2007 -0800
Make xf1bpp build correctly with compilers that don't support -include
commit a811e92104028ae60ba69f73e32ee1e0533b088c
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 18 14:28:01 2007 -0800
Account for CRTC rotation in the cursor containment code.
commit df147c10ce597c56c16cbca552e8a3e3ecb3cdaa
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 17 16:47:07 2007 -0800
Xserver man page: remove bc, add -wr
commit 2dfd1aab244a2c8da3b62b522b9a8434e474af17
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 17 14:39:28 2007 -0800
Always include compiler.h in cfbmskbits.h instead of checking #ifdef XFREE86
commit 42a48786acf54f83167de4f561526986d4e27033
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 17 14:34:42 2007 -0800
Add a setter for randr_crtc->rotations.
commit 88f248e67143175532cbafd6faf8fc6df97c7894
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 14:04:43 2007 -0800
Replace PciBusId with 'struct pci_device *'
There's no need to store the slot information for a PCI device as its
ID. Instead, skip the middle man and just store a pointer to the
pci_device structure.
commit 0361611080267727f570e17f2212aaa890223f6e
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 13:06:04 2007 -0800
Convert xf86IsolateDevice to a 'struct pci_slot_match'.
This change was accidentally not committed on the previous commit.
commit c1808f148405a28256e0480d6f8714691b0e964e
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 13:02:27 2007 -0800
Convert xf86IsolateDevice to a 'struct pci_slot_match'.
commit d2f8c42c48ecc398d224d9e3b280a66042e68664
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 12:59:17 2007 -0800
Convert xf86FindPrimaryDevice to use a static buffer and snprintf.
Rather than allocate a 9 byte buffer on each invocation, use a static
16 byte buffer. Use snprintf for safety. This commit should probably
be cherry-picked to the trunk.
commit 28976bebec8b6475d0703f8356edd116e25d40b2
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 12:15:09 2007 -0800
Eliminate unused fields in pciAccRec.
commit f36a447d20c0a89b78c5899eeb303cab568ebac6
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jan 16 14:49:19 2007 -0800
Eliminate use of Tag field.
The Tag field was removed from the int10 structures in commit
ca9c41e09ddb72d150d86f5d372eb07eeca7c1a2. This file was over looked.
commit cde17015dff1ced2aabb8b76c08f9110237821a5
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 16 13:01:03 2007 -0800
When changing a non-pending property, call the screen rrOutputSetProperty hook.
commit e3add7c8ecbb2a0a662860f208f6ae7d1857c717
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 16 12:59:34 2007 -0800
Don't forget to add the property we configure to the properties list.
commit 780b55ec6f97864b50f00170b201e93eba188f1b
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 15:30:16 2007 -0800
Fix accidental commit (bug) in linuxOpenLegacy.
commit 31bd8d150749c548eb70404395b4a52d46412f43
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 15:19:30 2007 -0800
Fix domain insanity.
Eliminate xf86GetPciDomain. The domain from libpciaccess is the
domain. Period. This means that 0 is a valid domain. Make sure that
INCLUDE_XF86_NO_DOMAIN is *not* set. Always run in "domain mode,"
even if the only domain possible is 0.
commit 079a6a55a516778871a8b2f8e9c8dd9162105a76
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 11:39:24 2007 -0800
Convert to new pci_device_cfg_write_u* interface.
commit d8bd0c41de11d12976a5ea9f185b7ac6c7060b71
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 11:38:22 2007 -0800
Convert to new pci_device_cfg_write_u* interface.
commit a87af8218f97da76433a5192d5e51aca0d5c3ed0
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 11:21:37 2007 -0800
Remove unnecessary files from the sources list.
commit 1c326bf75fc0d2c39507834d159d031291eddac4
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 12:07:19 2007 -0800
Eliminate unused INCLUDE_XF86_MAP_PCI_MEM define.
commit 3936caa00535d0b7543be5a4b315562111a6b3ab
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:59:35 2007 -0800
Refactor pciTagConvertRange2Host and pciConvertRange2Host.
commit 1a493509e30412a0f6c6f8f8e47a446678dbbc1a
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:58:59 2007 -0800
Fix typos in conditionally compiled code.
commit 8279444a54f38c5e2e5d4c2d936a10d74990e0be
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:41:03 2007 -0800
Eliminate unused pciAddrHostToBus infrastructure.
commit e32fa10a04a15ce1b15c6faa7a64e68ee3906d59
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:33:17 2007 -0800
Remove prototype for pciGetBaseSize.
commit 7411f5c389db73a6731d853d603029b8cf0a66ba
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:32:04 2007 -0800
Eliminate pciHostAddrToBusAddr from interface.
pciHostAddrToBusAddr is no longer used anywhere in the tree. Remove
it with extreme prejudice.
commit 60c5e023e8ddaae8e011f80736e7cc3e8c12583d
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:24:03 2007 -0800
Eliminate some dead code.
commit dd12a94885bad9c9d064dcf7e0d9a7a7114ae3e6
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:21:25 2007 -0800
Eliminate xf86GetPciEntity from public interface.
xf86GetPciEntity was folded into the only place (xf86CheckPciSlot) in
the tree that still called it.
commit c3016a29964761478305cf2f5241c563ff3eab0a
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 09:56:00 2007 -0800
Missed file from previous commit.
Convert xf86ReadLegacyVideoBIOS to take a 'struct pci_device *'
parameter instead of a PCITAG.
commit ca9c41e09ddb72d150d86f5d372eb07eeca7c1a2
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 11 21:09:20 2007 -0800
Convert int10 and vgaHW to use 'struct pci_device' instead of PCITAG.
Convert all uses of PCITAG in int10 and vgaHW to 'struct pci_device'.
This allows the conversion of xf86ReadLegacyVideoBIOS and
xf86MapDomainMemory to 'struct pci_device' from PCITAG.
commit ba547d4f6a2707f51f0d826389d2d418fb62367a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 12 14:42:02 2007 +1030
mi: Quick fix to stop segfault on non-core keyboards.
commit 5e2f8dee6331645fcbd2734c43698eb4f9c5b116
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 11 14:05:39 2007 +1030
mi: remove core pointer special handling. No event has core pointer as
device now.
dix: zero pSprite memory, stop segfaults on server restart.
commit 7fccec91c46baac4f8d2965180dc535b4eb7d65c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 10 13:10:43 2007 -0800
Bug #9555: Always define _GNU_SOURCE in glibc environments.
This keeps us from having to define _POSIX_C_SOURCE, _BSD_SOURCE, and
_XOPEN_SORUCE to get the C environment we want in different places. It also
fixes the build on linux due to RTLD_DEFAULT having not been defined.
commit 78f9592c112d4245f6119b98c244bbb4cae3e5aa
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Jan 10 16:04:20 2007 +0000
lnx_ev56.c has to be built with -mcpu=ev56. Fix it.
commit ea82333dc1799a7e013205adbc89874bc8d273cb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 10 14:52:13 2007 +1030
Xi: add missing call for SProcXChangeDeviceCursor
add DeviceEnterNotify and DeviceLeaveNotify
fix: QueryDevicePointer crashed if called with keyboard device
commit 6a2fb2928714ce77ee342cdc23a1178e5e766cf2
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 9 16:34:40 2007 -0800
Track rename of DamagePost -> DamageAdd.
commit da09964a931cc64d05ab571bf545fdad35a6d395
Merge: e1f73d2 e3aa6ad
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jan 9 15:27:34 2007 -0800
Merge branch 'origin' into pci-rework
Conflicts:
hw/xfree86/int10/generic.c
commit e3aa6ad201eb20862c11c000e76206e317a96dc9
Author: Matthieu Herrb <matthieu@blues.laas.fr>
Date: Tue Jan 9 14:14:19 2007 +0100
Multiple integer overflows in dbe and render extensions
CVE IDs: CVE-2006-6101 CVE-2006-6102 CVE-2006-6103
commit 359d20532bdcef6a540a551578d000afbb609c2d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jan 9 09:53:45 2007 +0100
Require glproto >= 1.4.8 for GLX.
It builds against 1.4.7 as well, but it hardcodes the GLX_EXT_tfp tokens that
were finalized in 1.4.8, so GLX_EXT_tfp breaks if the client side was built
against an older glproto. This will hopefully alert people to rebuild other
components (in particular Mesa) against the new glproto as well.
commit 88740c4855babedbea420b5e1b35ae105d1f1026
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jan 8 17:36:07 2007 -0800
Use PKG_CHECK_EXISTS(libdrm) to determine if DRI should be enabled on Solaris
commit 282a4dcaabc5f0cd6f7d3819aa648333b93b265e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jan 8 19:22:41 2007 +0100
Attempt to fix drawable type checks in dixLookupDrawable().
Not sure this is 100% correct either, but it fixes at least one reproducible
crasher where it returned a pixmap to dixLookupWindow().
commit a7ab7932938820a795bb6fb8e0444e0824433b99
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 8 17:31:16 2007 +1030
xfree86: fix XI86_SHARED_POINTER flag setting
commit 95e1a88050dde61e9b2407428042a43e47b46e18
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 8 12:31:18 2007 +1030
Xi: Adding ChangeDeviceCursor request
commit 0b73a7eb17fd848c6bdc6a65ba835aa2cbfc3cfd
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 5 18:12:04 2007 -0800
Add support for the DamagePost (XDamage 1.1) request.
This makes damageproto >= 1.1 a requirement to build.
commit dfb2c10413e22afd8d486a982870f874326d5ef4
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 5 10:15:09 2007 -0800
Add missing #else from previous commits.
commit f90c3e226b105bf77beb94723fc08bdff14834be
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 15:38:16 2007 -0800
Re-regenerate from Mesa scripts.
DO NOT HAND EDIT THESE FILES! For cryin' out loud, there's even a
comment to that effect in the file's header...
commit b7ca5d14ce7ba410b0dab5c2289f6d7b75e763df
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 15:37:33 2007 -0800
Incorporate new byte-order related configure changes.
commit 8dd5771a1b91c331860b667fb18e484452000aad
Merge: 45aa26c 7d2ec92
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 15:01:38 2007 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
GL/glx/indirect_dispatch_swap.c
GL/glx/swap_interval.c
commit 45aa26ccb4f61c2919ce2475d0907c6e1b177da2
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 14:55:51 2007 -0800
Regenerate from Mesa scripts.
Regenerate source files from Mesa scripts. This causes the generated
files to use glxbyteorder.h.
commit 6d603bb47ff9d238637adbf30c6e9697e6e7e6fa
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 14:49:26 2007 -0800
Add new header file containing byte-order wrappers.
Move the byte-order related wrappers out of the individual source
files into a dedicated header file. Modify the single hand-coded
source file that uses the byte-order wrappers to use the new header
file.
commit 7d2ec92170ebbdfa10a05734cb7cfaac97d19d65
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 4 12:24:48 2007 -0800
Keep track of how many visuals we set up for GLcore, to avoid an invalid free.
The proper fix would involve actually setting up the ARGB visual for GLcore,
but I just want the server to not crash at exit.
commit aab2ca204279b638c7e5bb6b8427c58be9704c57
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 21 09:16:19 2006 -0800
Try dlsym(RTLD_DEFAULT) first when finding symbols.
The previous mechanism failed when finding drm symbols now that libdrm has
moved to being linked by libdri instead of being linked into the server.
commit 2fd4626fa6969b84d8e2f9db16d6e2d44c4bc499
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 3 15:44:55 2007 -0800
Make GLX byteswap macros more portable
- Use autoconf tests instead of platform-specific #ifdef's to decide
which macros to use.
- Provide fallbacks for platforms like Solaris that don't provide any
of the existing known forms.
commit 66fa87292ef26bd0f464481287f3af992cd5741c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 3 10:27:07 2007 -0800
Fix BSF and BSR instructions in the x86 emulator.
Patch courtesy of Michael Yaroslavtsev.
commit 3b5b7ef5c2ab1d196806f6359e0972fd78d204dd
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Jan 3 21:05:35 2007 +0100
Move the code for resetting the DPMS mode in response to input events,
from WaitForSomething to mieqProcessInputEvents.
mieqProcessInputEvents already handles resetting the screen saver.
commit 953a9ef949b4c57d28daeec57031fe1ce368c27c
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Dec 21 23:50:39 2006 -0800
Track physical screen size and send out updates when that changes.
Events and internal data structures need to be updated whenever the physical
or pixel size of the screen changes. The code was ignoring the physical
size, so changing only that would not be registered anywhere.
(cherry picked from f42e3cea236fa0091ed398a818fc8e17b0e1b3df commit)
commit e79602fca2f2cced66136729cdda4d356b0bdda0
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Dec 30 21:52:22 2006 -0800
Use RRScreenSetSizeRange in 1.0 compat. Check RRGetInfo for error.
The RRScreenSizeSetRange function is used externally for 1.2 API drivers,
but can also be used in the 1.0 compatibility code. This also ensures that
the right changed bits are set so that clients are correctly notified when
the range changes.
RRGetInfo can return an error, use that to return BadAlloc to clients
instead of blindly going on with various requests.
(cherry picked from f05dd384d38c76dd9662933a03625dfef5b1c81f commit)
commit dc5eb4523298f966bd5fd9ae6672160034b5e82c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Dec 31 17:59:44 2006 +0100
fbdevhw: Override RGB offsets and masks after setting initial mode.
This is a hack, but it should be a NOP for all the setups that worked before
and actually seems to fix some others...
Based on a patch by Peter Teichmann from
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338241 .
commit d077c0da470ab7291e8d838eaace57b066477d6f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Dec 31 17:23:31 2006 +0100
fbdevhw: Use displayWidth for fbdev virtual width when appropriate.
The fbdev API doesn't allow setting the pitch explicitly, so we have to set
the virtual width to the pitch we're using for drawing. This fixes corruption
after changing the virtual width with RandR.
commit c385bcf0bde38dd869f7065f859dd4b4126f5690
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Dec 30 16:44:31 2006 +0100
fbdevhw: Fix some issues with the previous commit.
Fix a TRACE_ENTER typo and only update the internal fbdev mode state cache
after actually setting a mode.
commit f6815cb68b0f6698497348fc6e4214dacef33b95
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Dec 30 10:18:28 2006 +0100
fbdevhw: Consolidate modeset ioctl calling, report failure if it modifies mode.
The fbdev API allows the driver to 'accept' modes it doesn't really support by
modifying it to the nearest supported mode. Without this check, e.g. vesafb
would appear to accept all modes, even though it actually can't set any modes
other than the bootup mode at all.
commit 083b790515faaf134a78abc4b0a7ef0d6ea5db75
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 28 13:21:25 2006 -0800
Switch the default migration heuristic for EXA to "always".
This has been what has been used the most successfully post-damagetrack.
The current thinking is that:
1) We should be able to accelerate basically everything. So we don't need to
try to migrate trees of pixmaps permanently out of framebuffer to speed
CPU drawing up.
2) Migration is cheaper in the thrashing case, so we don't want to go to a lot
of effort to try (and fail badly) to find a working set.
commit cfbc7379f0232bb336461f6d2a8496d3d0763e7e
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 28 13:15:11 2006 -0800
Export exaMove{In,Out}Pixmap().
commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b
Merge: 05f9150 9563b2e
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 27 16:11:31 2006 -0800
Merge branch 'exa-damagetrack'
commit 05f915050cad72d4fb39cbb886be57beeac18749
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 27 16:38:06 2006 +0000
dix/events: take screen number, not pointer, in PostSyntheticMotion
Since we were using PostSyntheticMotion incorrectly anyway, update the
declared API to match.
commit c1674660a7115ebf993dcde78f4e45f756e4c951
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Dec 24 06:28:44 2006 +0200
os: test for userland, not kernel
It doesn't matter which kernel we're running on, the relevant part when
dealing with includes is what our userland is.
commit 83080809f9a1c1d24b0318e54632f25f5940da25
Author: Marc Aurele La France <tsi@ualberta.ca>
Date: Sun Dec 24 06:28:21 2006 +0200
xfree86: deal with pitch that isn't a multiple of the granularity
When the pitch isn't a multiple of the granularity, allocate more space to
compensate.
commit 329f6417275bb1201ba66c29b202028eeab3a355
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Dec 9 22:51:59 2006 +0200
XkbCopyKeymap: make sure sym_interpret is always valid
Make sure we're not copying sym_interpret across from an empty source.
commit 43a4376bd72ef1b6486cddb60ad57b2d6169292a
Merge: 4b1c9ac d9e079d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 22 13:53:55 2006 -0500
Merge branch 'master' into my-XACE-SELINUX
commit d9e079d2a385203fdd18d958cfc19d759cab4ba8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 22 13:07:09 2006 -0500
Zero out client devPrivates on allocation.
commit 4b1c9ac3d13767e395b47e76b37f9f3a569e7be1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 22 13:04:50 2006 -0500
Policy updates.
commit cd71e861830081807e5b93ae89c73c17986c6330
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Dec 20 13:45:24 2006 -0500
Naming change: Security*Access -> Dix*Access.
Clarify some error message strings.
commit 9fd2f167ec02ee170b87f02ddca89eba0b2e2389
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 16:30:36 2006 +1030
xfree86: fix xf86ProcessCommonOptions() core and shared pointer assignment
TAG: mpx-0.3.0
commit 056c919d849a78c8d507bfcecfa74c0b0165751a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 14:49:17 2006 +1030
removing MPX extension files
commit b55e1239ac3b2962a33d8af1f911cc0f01f40f23
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 14:43:38 2006 +1030
xfree86: fix xf86ActivateDevice(): only set to MP device if not a keyboard
commit 202b46eb6bf0d5f94973c2bf1e4ebe9d154eadbf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 13:05:53 2006 +1030
xfree86: Changing "IsMPDevice" to "SharedPointer" option. Devices will default
to MP devices.
Xi: Adding QueryDevicePointer request/reply
Adding WarpDevicePointer request/reply
commit e437f357b6850a6c87ca6696870b3abd40e5b8ed
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 19 16:38:34 2006 -0800
xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA"
commit a81dbaae0597492f0245080c6f5af7158e05e2d0
Merge: fb6d676 d442998
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 19 16:11:19 2006 -0500
Merge branch 'master' into my-XACE-SELINUX
commit d442998e39611be6805ea261f2286a2fd00f49b1
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 8 13:35:36 2006 -0800
Only do the _POSIX_C_SOURCE hackery on linux where it's required.
On other OSes, the nasty hack was resulting in prototypes being hidden, so just
don't do it.
commit 228b9f77696190e47d4c96d6e0809bf645751557
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 8 13:32:22 2006 -0800
Include sys/select.h to get FD_ISSET.
commit 9563b2eea2f61246b6a9e14e00c701f693efa4e1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 18:57:22 2006 +0100
EXA: Lots of damage tracking fixes.
Mostly due to exaDrawableDirty() now calculating the backing pixmap coordinates
internally, for cases where they aren't trivially known. There's a new
exaPixmapDirty() function for the other cases.
commit 467c00cf450826e0bf06fe94470ec193af625d68
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Tue Dec 19 18:45:25 2006 +0100
exaGlyphs: mark dirty for software path also.
This affects drivers with no UploadToScreen or UploadToScreen failures.
commit 4334860e69e7d5b156082bd05c7a86708e5bad4c
Merge: 7e47176 fdcc22c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 16:29:26 2006 +0100
Merge branch 'master' into exa-damagetrack
Conflicts:
exa/exa_accel.c
exa/exa_migration.c
commit fdcc22ca1704d3519156c66804528c21b04fea65
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 16:11:17 2006 +0100
exaCopyNtoN: Fix usage of 'dx' and 'dy' instead of 'reverse' and 'upsidedown'.
commit 67c2a86e59e915d9a5681e9d233478cfea3e51ed
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 15:44:18 2006 +0100
EXA: Compare backing pixmaps instead of drawables against driver limits.
The driver operations are always contained within the backing pixmaps, it
doesn't matter if the drawables are bigger.
commit 6b1e354dbb6e8ed9f2c654bbe7f8bbf241843d1c
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 19 15:24:19 2006 +0100
EXA: Disable SHM pixmaps.
See https://bugs.freedesktop.org/show_bug.cgi?id=6772 .
commit ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba
Merge: 4d07b50 1b029fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 19 10:51:01 2006 +1030
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit 2d0a63126b3d3a17005b7e122617ee0c5f44a55b
Merge: d8b5394 1b029fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 19 10:31:40 2006 +1030
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit 1b029fd896b76096905c516925ce0214fe14632c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 18 14:51:04 2006 -0800
Xorg & Xserver man page updates for 1.2 release
- Added -extension & +extension to Xserver man page
- Changed Xorg synopsis from X11R6 to X11R7
- Clarified Xorg ancestry description
- Moved Solaris to free/Open Source OS list
- Removed references to MetroLink module loader & getconfig
- Converted (1) to (__appmansuffix__) in a few more places
- Replaced http://www.freedesktop.org/cvs/ with http://gitweb.freedesktop.org/
commit d8b5394eda9d92b7193004931caa6c24a337b2e6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 18 17:35:34 2006 +1030
Cleaning up ifdef MPX from remaining files, removing it from configure.ac.
Removing building mpx extension from Makefile.am
commit 03c554283e49e449fd1282cf32564d15d9fd2c77
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 18 15:33:54 2006 +1030
mi: removing MPX ifdefs
global sprite renaming in mipointer and misprite
fixed: multiple remove cursor call in miSpriteInstallColormap
fixed: wrong core pointer usage in miSpriteStoreColors
dix: bugfix in CheckCursorConfinement
removing MPX ifdefs
removing MPX event generation (using Xi solely now)
bugfix GrabDevice: uninitialized field in grab struct caused segfault
xfree86: removing MPX fdefs
Xi: removing MPX protocol events
commit a5fcf1e5e7452c9be82f63b6c2be2a25c4109523
Author: James Steven Supancic III <arrummzen@arrummzen.net>
Date: Sat Dec 16 12:02:38 2006 -0500
Fix RENDER issues (bug #7555) and implement RENDER add/remove screen
support (bug #8485).
commit c92f7bef54fa737766d65fe32c200f405f39228c
Author: Kevin E Martin <kem@freedesktop.org>
Date: Sat Dec 16 12:01:49 2006 -0500
For Xvfb, Xnest and Xprt, compile fbcmap.c with -DXFree86Server
commit 012807356883128fde58bb2d4f91dd356d6418fc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 18:27:16 2006 -0500
Add loud warnings to deprecated lookup functions.
Hopefully this will alert external driver maintainers.
commit ab1d5b0c31a1cfce95ab6b1d06f209f2c44e19ac
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 17:26:58 2006 -0500
Convert callers of LookupClient() to dixLookupClient().
commit f11dafaafc68f5cff1a1538d9566907786d8ab72
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 16:51:58 2006 -0500
Convert callers of SecurityLookupDrawable() to dixLookupDrawable().
commit 10aabb729d1586db344f9c1abdf1cf45e7ddaa7a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 16:36:29 2006 -0500
Convert callers of LookupDrawable() to dixLookupDrawable().
commit 25d5e0a629f82d95bd71daf9a920a70e095b5188
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 15:50:46 2006 -0500
Convert callers of SecurityLookupWindow() to dixLookupWindow().
commit 04c721854fbf1bd6379c165a53fab2bdc09961c0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 14:11:40 2006 -0500
Convert callers of LookupWindow() to dixLookupWindow().
commit 670bbb87310503fcc17203cecfa6f4f2f5db51d2
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Dec 13 01:21:32 2006 -0800
RandR 1.2 rotation code must adjust width/height.
Mode lines reflect the monitor mode, not the projected size into the frame
buffer. Flip width/height around so that the dimensions are oriented
correctly.
(cherry picked from 612a8e61803da8db0e305cbb093696b8e4284572 commit)
commit 6c6901434ab469dd03b79fc98cd4a2b64d339305
Author: Keith Packard <keithp@mandolin.keithp.com>
Date: Wed Dec 13 00:58:54 2006 -0800
RandR 1.0 refresh rates unscrambled. SetScreenConfig uses RRCrtcSet right.
RandR 1.0 refresh rates were scrambled when working with a 1.2 driver that
returned sizes in a mixed order. SetScreenConfig was treating RRCrtcSet as
returning an RandR status instead of a Bool.
(cherry picked from 6dc711833d7387372012fdff1ce1df3aefa2d234 commit)
commit 628c7daeb12713d28e85e6b49fa037a7748dff83
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Dec 12 22:59:03 2006 -0800
RandR: config time updates when hardware config changes.
The config time in the RandR protocol reflects when the hardware state has
changed. It was getting changed anytime the driver changed the usage
of the hardware as well.
(cherry picked from 98d18a6578130adb411ca4bcc776fcb7e07f189f commit)
commit d742025f435f3eb7458cf8284d59300bc9a850aa
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Dec 12 20:16:49 2006 -0800
RandR mode list needs both output and crtc modes.
When an output no longer reports the current mode, it must still be included
in the list advertised by the X server. Walk the crtcs to ensure it is
included.
(cherry picked from 78689d0d6630afcbcd3ce5394d12c2564a489f45 commit)
commit 9e32bf98bc9ab17a137664d01f59a8f426f7ff3b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 19:31:58 2006 -0500
Remove now-unused macro definitions from dix.h.
commit 00f0705b3bb444ac934fc902cd23130f1777eab2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 19:15:21 2006 -0500
Remove instances of macros SECURITY_VERIFY_GEOMETRABLE and SECURITY_VERIFY_GC.
commit 5e334f06a1ef89891f9df2a371e4662340bec26b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 18:27:09 2006 -0500
Remove instances of macros VERIFY_GEOMETRABLE and VERIFY_GC.
commit 51b69ff499c05f59cb1e577c4e8abf6f7f283b3e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 17:53:43 2006 -0500
Remove instances of macro SECURITY_VERIFY_DRAWABLE.
commit 0cf75e74322e2b6a6efc7acf892e04365fde503b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 17:27:12 2006 -0500
Remove instances of macros LOOKUP_DRAWABLE and VERIFY_DRAWABLE.
commit ab1886df73b73360fa3bd7ce8e01affc074cbc8d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 15:42:19 2006 -0500
Add new, combined dix lookup functions (tweak).
commit 60cdc592fe042c03ceb5d4c3344acfbbf5d8ae28
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 14:46:03 2006 -0500
Add new, combined dix lookup functions.
commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 14:45:42 2006 -0500
Naming change: Security*Access -> Dix*Access
commit a96788058e48f3e97c66da6dafd58828f0c2ce53
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Dec 14 10:50:18 2006 +1030
mi: removing MPX ifdefs
global sprite renaming in mipointer and misprite
fixed: multiple remove cursor call in miSpriteInstallColormap
fixed: wrong core pointer usage in miSpriteStoreColors
dix: bugfix in CheckCursorConfinement
removing MPX ifdefs
removing MPX event generation (using Xi solely now)
commit b88ad820fac81d0dfd557a384bf0406e8893e7af
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Dec 13 12:13:11 2006 +0000
Set Int10Current->Tag for the linux native int10 module
Fixes bug #9296
(cherry picked from 731952c561a3972d09d1315f4fd31466e459ccb9 commit)
commit fb6d676de5aa606d943715437a12a68d9a41f386
Author: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue Dec 12 16:17:51 2006 -0500
Add xserver object class to list of object classes.
commit 7b90944258eba66b61328480759833ad7589bcca
Author: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue Dec 12 15:59:38 2006 -0500
Change MLS levels in config file contexts to more sane defaults.
commit 568c09481e5d62091d032837171a36f409f39379
Author: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue Dec 12 15:59:08 2006 -0500
Split AssignClientState() into two routines, new routine is server-specific.
commit 62e7722ebd8d341a23eb56cb330eeb00e6a975a6
Merge: e124806 f3c6090
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 12 13:54:33 2006 -0500
Merge branch 'XACE-SELINUX' into my-XACE-SELINUX
commit e124806994675e16ca8e3937388f2cadeb529fc3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 12 13:35:22 2006 -0500
Remove trailing whitespace (whitespace police).
commit ca77c121075a9de1f47d42f6aaf91c20185231de
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 12 13:26:52 2006 -0500
Naming change: Security*Operation -> Xace*Operation
commit a60da1db7cced28c07960a713eb18deb45beb432
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 29 22:19:57 2006 -0500
Add required root window context to config file.
commit 5719afe6d3a246985709e6f045617c1e16a7da51
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 26 20:20:57 2006 -0400
Change symbol in libaudit library test.
commit 354c80da66af141e8ba6d75fed75a0f482987956
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 5 16:07:26 2006 -0400
Improve error handling, messages during initialization.
commit 3714d9149928754afcd6b2466a1371ca32e17985
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 4 16:23:35 2006 -0400
Experimental window property holding security context.
commit 7f16c38ae2b47b195609d8fedefb7b28f612b2d4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:31:18 2006 -0400
Add SELinux extension configure-time support.
commit a7f4bbea87ada1d699bfd9e3b6a98f06191650f6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:17:01 2006 -0400
Add SELinux extension to the module/extension loader.
commit 28e80cd65b1207b123c02f895851bb6d207aa3c1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:15:19 2006 -0400
Add SELinux extension configure-time support.
commit 83aad2be8a80890f349c2f9caf84786333f7cc8c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:11:04 2006 -0400
Add SELinux extension source files.
commit 81281cb298a5825bc7a2e692375a86199293bbbe
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Dec 12 11:28:24 2006 +0000
Fix bad commit
commit 792e0f71c6a435b2e28f8a4cdcc790f3b982e62c
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Dec 11 14:54:49 2006 +0000
Fix Xming fails to use xkb bug
bug #5049 (Colin Harrison)
commit 27d4b84f268ac21601f7f52a7e257f70753396b3
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Dec 11 14:50:08 2006 +0000
Fix Tooltip from minimized clients
Bug #3678 (Colin Harrison)
commit ae3c24da34cd8eeb77a6389861856fd51e0841f5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 11 18:09:59 2006 +1030
dix: Moving SpriteRec into DeviceIntRec
removing global sprite structure
beginning to remove MPX ifdefs
xnest: Fix to make xnest compile again
commit fb8364bca30fe9268e807b0a9a3ebf875ee1fce2
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Dec 10 11:24:05 2006 -0500
Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible.
commit e1f73d220873fa091695e46b7fcd008663a95a6f
Merge: 27d682f d56249a
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Dec 8 17:24:15 2006 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86Configure.c
hw/xfree86/common/xf86Helper.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/lnx_pci.c
hw/xfree86/scanpci/Makefile.am
hw/xfree86/utils/pcitweak/Makefile.am
hw/xfree86/utils/scanpci/Makefile.am
commit d56249a15ead51ad4d2117d5538ada24af05b693
Merge: f1f8df1 ec84f72
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Fri Dec 8 15:52:37 2006 -0600
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit f1f8df1889ab656bb57596e2f85408f15f42cd5d
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Fri Dec 8 15:51:44 2006 -0600
For MANDEFS, also replace __mandir__ for $(mandir) which includes
the prefix. Noticed wrong path to man pages on both Ubuntu and on
NetBSD with pkgsrc.
commit ec84f72d077eaf2e7768a1f5398f65a5e1714d08
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 8 21:31:47 2006 +0200
XkbCopyKeymap: always initialise map and preserve
If we don't have map or preserve in the source map, make sure the
destination is initialised to NULL, and freed if it's a valid type.
commit e59aeac1ff13ea53f44dba1ac7800f37f4532ca1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:44:06 2006 +0200
xfree86: remove stray debug line
commit 729fca33a417ae3dfb180caf0ea8946ef9eee1df
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Dec 7 12:09:18 2006 +0100
Revert "xfree86 DDX: Delete DDX screens in ddxGiveUp()."
This reverts commit a6381e69845f58d2b3282992b1f881015190f1bc.
See https://bugs.freedesktop.org/show_bug.cgi?id=9224 .
commit 4ea6dfb984063117eef5c2f931205b1c3eb3108b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:24:39 2006 +0200
whitespace police
commit 4cba1a1ebfbdd7ab489b1b1ffb6656cbe88eb61e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:21:38 2006 +0200
config: bus reconnect support
Add support for reconnecting to the bus when it restarts.
commit 0c5dab5c8eaa174f28054b9d20244a709c015210
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:21:15 2006 +0200
config: move config.h to hotplug.h
Also, move configInitialise to after OsInit, since the next commit will
make it use a timer.
commit 72e7f2ac6cf0db474d0defa7918f2a3ba76c0e46
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:18:52 2006 +0200
GetPointerEvents: always send valuator events for MotionNotify
Always chase a DeviceMotionNotify event with a DeviceValuator, which is
not required in the spec, but will silently break the lib if you don't
include.
commit c458a70d650bd62b8f4706f022d1f3f347636db1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 20:30:44 2006 +0200
GetPointerEvents: fix typo
Fix typo that resulted in inverted axes when using an absolute positioning
device that didn't report y, and thus relied on the previous value.
commit edabf45425f9ed79547f918cc0dfff4c268de386
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Dec 2 16:37:19 2006 +0200
configure.ac: add CONFIG_LIB to Xvfb
commit 8724af248cd6c93182fecd060fed09a556361080
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Dec 2 16:20:34 2006 +0200
kdrive/mga: fix compiler warning
Change a case that only made one test for an if, preventing the compiler
warning about all other PICT_* types being unsupported.
commit 2f0a800ffdc881cdb3adf84f1ed97bbb63cba34c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 27 22:22:53 2006 +0200
config: move to block/wakeup handler
commit 99378b58dbc63160382ad9c41f9cb0dd2a24e9d1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 27 22:22:33 2006 +0200
kdrive/tslib: remove vendor-specific hacks
Parts of the KDrive merge accidentally contained a bunch of
vendor-specific hacks; sorry.
commit 8884a73a3f4efa8276c5e38b9573201574c4f1f6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 27 22:39:56 2006 +0200
xfree86/input: re-add support for disabling drag events
commit f2903c12bb4bb0b7c94b96c55af8fa55507f9d7d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 7 11:13:32 2006 +0200
SyntheticMotion: don't dereference sprite.screen when not using Xinerama
(cherry picked from aa052e43c6c293e14f78837e00c6b7581f9713bb commit)
commit d17ec01e8395a8f14b75a10c8bf082b3f5a4fb36
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 1 00:41:41 2006 +0200
remove CID support (bug #5553)
Remove CID from all our fontpaths.
(cherry picked from 69820a10e33e4582c192360996e866007114639d commit)
commit abe5e079af715713097ab0daad29a3e9f523c398
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Dec 6 07:58:03 2006 -0800
Update pci.ids to 2006-12-06 from pciids.sf.net
commit 724f9cb578086e8483a2d0636dd6eb05d664d31c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Dec 5 13:44:05 2006 -0800
Bug #9219: Use pWin->viewable instead of pWin->realized to catch InputOnly windows too.
commit 3690de9b1b0902d395bc7d071fc05ebc8f75be2b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Dec 5 12:42:12 2006 -0800
Bug #9219: Return BadMatch when trying to name the backing pixmap of an unrealized window.
Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap
if !pWin->realized.
commit eb1d9f51af19dab20a95c2830ca1c508d8ee66bb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 5 18:50:19 2006 +1030
Ironing some glitches caused by the merge
commit 3c8f166022a2d19af14eb670fa382503ba1451cd
Merge: 2a51149 f9f7d7f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 5 18:28:33 2006 +1030
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx
Conflicts:
dix/events.c
commit 2a511492f9a235d3f5390ab87b6c643cbea92d88
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 5 15:45:18 2006 +1030
Xi: adding MPX checks to ProcessOtherEvents
mpx: adding QueryPointer request and reply
adjusting names of requests to Xlib compatible naming (xMPX*** instead of
mpx***)
commit f9f7d7f3be53c808abb5eaceb7a1abc55744a210
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 4 13:36:30 2006 -0800
Check for __sparc as well as __sparc__ for compatibility with Sun cc
(gcc defines __sparc__, Sun cc defines __sparc)
commit ac90ce58ba1da3ed605adf75f4d54c34b578c402
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 1 21:12:21 2006 -0500
Naming change: Security*Operation -> Xace*Operation
commit f44f14fe564d834568a0afefba944223a73ea0f5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 1 20:48:15 2006 -0500
Define calls away when not building XACE, allowing ifdef's to be removed.
commit a5d6499d666fea4a9988118ddd3a5e4c9cfcc32c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 1 16:42:37 2006 -0800
Fix syntax error in configure check for SYSV_IPC that broke with Sun cc
commit 89b2aa9be81613cb1a06bd535bf50ecf2a00208d
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Nov 27 21:40:24 2006 -0800
Destroying RandR crtc or output overwrites memory.
RRCrtcDestroyResource and RROutputDestroyResource had matching
bugs that would overwrite memory past the end of the storage
of the crtc or output arrays. Oops.
(cherry picked from 4202b23ed86405a4cebfdcf239df1b023c1d10ca commit)
commit 23ba72323af785516db6cbcf6c1b2fa907a8232f
Author: Keith Packard <keithp@ukulele.keithp.com>
Date: Thu Nov 30 23:16:42 2006 -0800
RandR ListOutputProperties has nAtoms element, not nProperties
Earlier RandR 1.2 encoding revisions used 8-bit nProperties field.
Final RandR 1.2 spec uses 16-bit nAtoms field instead.
(cherry picked from 66b6358a393972946f16394918db2401c51dc5ed commit)
commit 416f1bb99a6d4557f2863ae941868e47e11bbb3b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 1 15:56:52 2006 +1030
mpx: SelectEvents and GetEventBase requests.
Some renaming and cleaning up in extinit.c
MPXLastEvent added
Xi: ShouldFreeInputMask() from XI is not static any more, used in mpx
dix: GetPointerEvents() allocates MPX event for MPX devices.
DeliverDeviceEvents() caters for MPX devices.
commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0
Merge: 9423ac1 82912ad
Author: Drew Parsons <drew@pug.localdomain>
Date: Fri Dec 1 15:21:57 2006 +1100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 9423ac134a2a9800787c4978d384827cc4e61fc8
Author: Drew Parsons <drew@pug.localdomain>
Date: Fri Dec 1 15:21:05 2006 +1100
GNU/FreeBSD support in GLX: include byteswap.h for FreeBSD systems
defining __GLIBC__, as done already for Linux and Hurd (cf. bug #5613).
Also includes some more __GNU__ checks on top of those made in
commit ade4bf09076d13dbf3549c0a2d987a0afe76d5c1.
Thanks Petr Salinger (Debian bug #400869).
commit 82912ad7709e8cf4a5f8a9fa6b47f789842a3fe9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 30 20:13:52 2006 -0800
Make solaris version of xf86OSRingBell return void like other OS'es
commit 8956f63a941bf0a5f157d47b33e6221601a75040
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 30 19:53:29 2006 -0800
Tell automake to STFU about the *.O files
automake will not stop whining about the *.O files not being in normal library
name format, so just tell automake they are PROGRAMS so it builds them without
bitching.
commit f3c60900e575e65254cd2576cc6c90b97c8f63ae
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 29 22:19:57 2006 -0500
Add required root window context to config file.
commit 143558500a89a5c887c75c03798bae68c953cac9
Merge: e3d3d29 ee9bdd3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 29 20:41:41 2006 -0500
Merge branch 'master' into my-XACE-SELINUX
commit ee9bdd3f4a14a42fb0747acc420966f0f669129b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Nov 29 12:01:43 2006 -0800
Add DIX_CFLAGS to util builds.
Fixes a build breakage when $(top_srcdir) != $(top_builddir) because
-I$(top_srcdir)/include is missing for the cvt, ioport, pcitweak, and scanpci
builds.
Signed-off-by: Adam Jackson <ajax@nwnk.net>
commit a6381e69845f58d2b3282992b1f881015190f1bc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Nov 29 19:25:09 2006 +0100
xfree86 DDX: Delete DDX screens in ddxGiveUp().
This allows video drivers to clean up in the FreeScreen hook things they set up
in the PreInit hook.
commit afd6af65510b0147f16f08314045b3506bfa9d89
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 29 17:55:15 2006 +1030
mpx: Infrastructure for MPX extension, GetExtensionVersion request works.
commit b0c8558b9d9a9984c0067960392e28f5a7622b29
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Nov 26 19:31:48 2006 -0800
Ensure RandR resource types are registered before resources are created.
Now that resources can be created during server initialization, make sure
the crtc, output and mode resource types are created before attempting to
create associated resources.
(cherry picked from commit ec83d674167e7045d5317b179c9998e3172a26dc)
commit 6245e9dd4719c5dc15ff45d49cf626123794038b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 21 16:52:28 2006 -0800
Allocate correct size for RRPropertyRec (oops).
Neglected to change the allocation size from sizeof (PropertyRec) to
sizeof (RRPropertyRec). Lots of fun crashes this way.
(cherry picked from commit 0626eb8e5c9fa05de6bdc9aa0c654f5148bf7cff)
commit 24abce8032940e96bb2ccf9e463a7fff6f36283a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 21 01:15:26 2006 -0800
Change RandR property datatype to include pending/valid values.
This patch tracks the protocol changes which introduce more complex
semantics for RandR output properties including pending and valid value
information.
(cherry picked from commit af55c65bea40669fdc038aa34c6a1ec9ecb33e87)
commit f62ac3ec39c6593df476985c630e499864c19c72
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:31:40 2006 -0800
Separate DDC mode list creation from MonPtr creation.
This will be used by the intel driver, and likely other RandR 1.2 drivers.
commit fbd09443385c533416fa530399d54f130afaf985
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:15:51 2006 -0800
Replace bad mode name-setting code with xf86SetModeDefaultName().
commit 4ad0bde661be2af4a17771d66066d49736e85cbe
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:12:02 2006 -0800
Clean up a bunch of long lines and trailing whitespace.
commit 05778432dc6e688bc0beff0c20ffd7e27b74888e
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:07:57 2006 -0800
Move code to get a mode list from EDID data from ddcProperty.c to edid_modes.c.
commit 38ecc66cd9c61346a46697bbf1d8319f4f6f9800
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:06:15 2006 -0800
Typo that was missed in testing.
commit 834e4b079866594b50be64ae79f3cb2a5baa2070
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Nov 28 18:57:13 2006 +0100
Fix potential NULL pointer access in timer code.
https://bugzilla.novell.com/show_bug.cgi?id=223718
commit bdf718907b3202815a04ec28a868689708f43da9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 28 18:06:34 2006 +1030
dix: missing parameter to SetCursorPosition in CheckMotion ifndef MPX
mi: missing include in misprite.c ifndef MPX
commit e88bc0e55a6937ff0b47fe38f60bfa8991196578
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 28 14:34:36 2006 +1030
mi: Bugfix: FreeCursor ignores negative refcounts.
mieq: Bugfix: Motion notifies did overwrite DeviceMotionNotifies
commit 5dbcd34a0a6c0d10dbfea8fdc9d7dfe7a0261b19
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 16:26:14 2006 -0800
Register dependency on new RandR protocol.
commit 16f8f10dc2106bc6253b2d89a1f8efee8d80e2ba
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 16:21:31 2006 -0800
Move mode handling helpers from ddcProperty.c to xf86Mode.c.
commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618
Merge: 64de3ba d6cd031
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 15:43:15 2006 -0800
Merge branch 'randr-1.2'
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
commit d6cd0313c7f23f32c9c7dda00ff739e772bf7db3
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 14:46:50 2006 -0800
Add some mode helper functions from the intel driver.
This also removes static from some other functions that had been copied out
to at least the intel driver, but perhaps others that were doing mode list
handling.
commit 85ea408e38f452bcf9109f14fd1016d159692a99
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 18:07:16 2006 +1030
mi: malloc checks for misprite and midispcur, code cleanup
removed IsMPDev()
commit 023da4e804ad260eaf0c50d2ec7213dd514e2113
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 15:54:33 2006 +1030
mi: mipointer.c cleanup, reducing code duplication, using MPHasCursor()
instead of IsMPDev()
commit a2340a73687dfd93affb6de28a33d73fd808c96b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 14:47:23 2006 +1030
mi: free allocated memory in miDCCloseScreen and in miDCInitialize in case
of errors.
Some copyright notices.
misprite.c passes DeviceIntPtr around and down to DC (previously
miCursorInfoPtr and the plain device id).
Large cleanup in misprite.c to avoid code duplication.
commit 1c7568b8a1417257fa67c7fca69aa253099b9461
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 23 17:15:14 2006 +1030
mi: closing memory leak, miPointer is freed in miPointerCloseScreen
bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
adding DeviceIntPtr parameter to ScreenRec's cursor functions.
cleanup of miPointer code to use same scheme in each function
dix: MPHasCursor() function determines checking whether to invoke
cursor rendering.
animcur: adding DeviceIntPtr parameter to cursor functions but animcur relies
on the core pointer right now.
xfixes: adding DeviceIntPtr parameter to cursor functions but xfixes relies on
the core pointer right now.
rac: adding DeviceIntPtr parameter to cursor functions but RAC relies on
the core pointer right now.
ramdac: adding DeviceIntPtr parameter to cursor functions but ramdac relies on
the core pointer right now.
commit 64de3baf85f6df274f71f736016f0848567cd9f6
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Nov 22 14:46:51 2006 -0800
Add a -showDefaultLibPath option.
A corollary to the previous change, this option prints $libdir.
commit 0a2a6e4070718b90af7ca0e047f028e0cabdfb9d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Nov 17 18:27:23 2006 -0800
Add a -showDefaultModulePath option.
As discussed on the mailing list, people would rather have an X command-line
option to print the module path so installers can know where to put modules,
rather than the installers using `pkg-config --variable=moduledir xorg-server`,
since some distros choose not to install xorg-server.pc.
commit 61832cb94c8a4d62cddb92188caeed86519e9d62
Author: Brian <brian@i915.localnet.net>
Date: Wed Nov 22 09:16:43 2006 -0700
Regenerated from Mesa w/ latest gl_API.xml file
commit 61863f09d22935406371e92bb75173d55ff9b29f
Author: Brian <brian@i915.localnet.net>
Date: Wed Nov 22 09:16:17 2006 -0700
Regenerated from Mesa, fixes glMap* protocol problem (bug 8899)
commit f52d53e060d0468b658a565688d1f92c156405c7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 22 17:58:57 2006 +1030
dix: DeliverEventsToWindow adjusted for MPX
mi: sprite debugging disabled
commit 8c16f21d5df08b028e93440d632939a5fdbf5876
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 22 17:06:47 2006 +1030
dix GetSpriteWindow() adjusted for MPX
added device dependency for MPX to DoEnterLeaveEvents,
EnterLeaveEvents, EnterNotifies, LeaveNotifies and
FixUpEventFromWindow.
commit 70383105de279df553874efa56b37a7b3e426ea1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 22 15:27:16 2006 +1030
mi: added DevToSprite() conversion function
fixed miSpriteRealize to use passed pDev argument instead of looping.
dix: changed sprite dependency and added MPX functionality to parts of
events.c (XineramaChangeToCursor, XineramaCheckPhysLimits,
XineramaConstrainCursor)
Xi: fix: accessing other->buttons for keyboard segfaulted the server
commit 33ff4cec5ff7533ec725f71d357c096dfb0acb79
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Nov 21 21:23:17 2006 +0000
Issue CloseDownDevices() in os/log.c and remove from dix/main.c.
This ensures that all calls to FatalError() will shutdown the input devices.
commit efd4f3c6ffec804c68ba5df17cc117da264fb7c4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 20:31:30 2006 +1030
dix: WindowsRestructured() calls CheckMotion() on all devices
mi: core pointer was checked twice in miSpriteReportDamage,
miSpriteInstallColormap, miSpriteStoreColors, miSpriteSaveDoomedAreas
and miSpriteRealiseCursor
using damage bug (see comment in file) to avoid artefacts
commit 9db851c22d4befb95bfb074b96620261d8e32ac9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 18:15:04 2006 +1030
dix: moved sprite from static to be pointer of type SpritePtr
added SpriteRecs for MPX devices
changed sprite dependency and added MPX functionality to parts
of events.c (ConfineToShape, PostNewCursor, XineramaCheckMotion,
CheckMotion, XineramaChangeToCursor, ChangeToCursor, CheckPhysLimits,
PointerConfinedToScreen)
added DeviceIntRec param to GetSpritePosition(). This required some
minor changes in ddx, xtest, xkb and xfixes.
mi: changed miPointer to pointer instead of static struct.
commit fd8b9a6eaee28a453a00af14195b81ef1890a577
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 15:24:43 2006 +1030
TAG: MPX_BEFORE_DIX_API_BREAK
commit 447efdc01d4f8922205ba26e52c9e5ff9f5cb90e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 14:46:00 2006 +1030
mi: constrain MPX cursors to screen
commit 1107d8bea22eea26f7b666f1c00a53360b7d237e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 14:00:46 2006 +1030
mi: added device ID to miSpriteCursorFuncRec functions
added MPX code to midispcur.c
BUG: Core pointer changes whenever MPX cursor changes shape.
commit 3bad452d12d620df91b1f37d06c650ded96bfafe
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 11:26:21 2006 +1030
mi: added MPX to miSpriteReportDamage
added id field to miCursorInfoPtr, required to pass through to miDC
core pointer uses mpCursors array as well.
added miDCBufferRec for future use with MPX
TAG: MPX_BEFORE_MIDC_API_BREAK
commit b1bbdf464d2f8799fa3429c1c27ca998c5f3e94a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 20 17:58:30 2006 +1030
mi: added MPX to miSprite functions.
NOTE: This version will render multiple cursors but with an artefact each time
when devices alternate.
commit 7b4b619d4c268804199f9f4775eb56604f0b80e8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 20 13:10:07 2006 +1030
mi: moved core pointer information from miSpriteScreenRec into a
miCursorInfoRec.
bugfix in mipointer, semicolon after preprocessor statement
commit ca2874b273232d9f51881b1cd754ed6847bfaf47
Merge: c9a5f9d e2f6dac
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sat Nov 18 19:56:32 2006 +0000
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit c9a5f9d3911c2e6a8f81b0721c9eb914fb7719b5
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sat Nov 18 19:55:42 2006 +0000
Shutdown input devices if FatalError occurs during startup.
Fixes Xdmx problems when the input device has been initialized
and the keyboard map has been destroyed.
commit e2f6dacc736527790ed8e304698678afc17f71c6
Author: Dave Airlie <airlied@linux.ie>
Date: Sat Nov 18 11:26:55 2006 +1100
dri: setup libdrm hooks as early as possible.
This is due to radeon doing drm stuff before DRI extension gets initialised
commit 90bea69dfdd63f58ee326887359ad1b35a31cb5f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 17 18:03:43 2006 +1030
mi:
added miCursorInfoRec to contain info of the MPX cursors.
calling miUpdatePointerSprite() from event queue for MPX devices.
adding device-specific processing to miPointer*() functions.
dix: Call to SetCursorPosition in CheckMotion() temporarily disabled.
xfree86/common: call to miPointerUpdateSprite() disabled, is done from the EQ
NOTE: This build will not display cursor images.
BUG: The second mouse does to take correct x coordinates.
commit 94e106a898c44daeb228bcb031b85f996ddc96b0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 17 15:10:37 2006 +1030
dix: moved isMPdev field to end of _DeviceIntRec structure
mi:
added miMPPointers array to mipointer.c
added DeviceIntPtr to all miPointerSpriteFuncs. Coming from miPointer
we use inputInfo.pointer as standard value. ABI BREAK!
ramdac:
forcing failed HW Cursor initialisation. MPX needs software rendering.
changes to use new miPointerSpriteFunc (this required externing
inputInfo, should probably be fixed at a later point).
RAC: changes to use new miPointerSpriteFuncs.
commit ef47d9c3ba63e9a6243fe5c81ccc60c8246352b4
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 16 13:50:48 2006 -0800
Reduce calls to RRGetInfo.
RRGetInfo can be expensive. Don't invoke it when quering Xinerama
information or setting a new CRTC configuration.
(cherry picked from commit b5aa9eb8e6eda36856a075f4b008c33f6c706bad)
commit 07b26e690cd9a4fc626132feed0702515cbe5a88
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 16 09:48:33 2006 -0800
Remove RandR output options.
RandR output options are now expected to be handled by properties instead.
(cherry picked from commit 8b2a7e94a1dc2776ab2cfaaebb309be02502602a)
commit f17e3c34dfd1f1418440bdebf45764e4dbf550f0
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Nov 16 02:18:03 2006 +0200
Fix GL context destruction with AIGLX.
The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is
inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT().
commit ae3c9ad4abe66784d7ee474455003d2745699286
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu Nov 16 17:29:06 2006 +0100
Bug 9041: Check the return code in xf86MapDomainMemory().
commit 5388423eb05daefcc71067b6ab96b6e57c44ef5c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 16 20:43:27 2006 +1030
mieq: EQ processing handles MP devices
global: MPX define added to xorg-server.h.in
xfree86/common: small fix to avoid byte overflow
commit c957a16180810fbd58526e1a670d82384fb4a61d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 16 15:11:14 2006 +1030
dix: added isMPdev field to _DeviceIntRec, is used in GetPointerEvents()
mieq: avoid merging events from different devices in mieqEnqueue()
xfree86/common
isMPdev field used from xf86ActivateDevice(), xf86PostMotionEvent()
and xf86PostButtonEvent()
commit 7ce2dc57844872cc340b60387d4d1cb3d982633e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 16 12:51:08 2006 +1030
dix:
merge with code cleanup from master
GetPointerEvents treats events in the same way as XINPUT devices when flag
has POINTER_MULTIPOINTER set.
xfree86/common:
added XI86_MP_DEVICE flag and parsing in xf86ProcessCommonOptions
added POINTER_MULTIPOINTER define. Is used in xf86PostMotionEvent and
xf86PostButtonEvent for the flags that are passed into GetPointerEvents()
global:
added flags to configure.ac to enable/disable MPX define
added flags to dix-config.h.in to define MPX
commit 4d07b503727ba86315b90d6f45b06ed6185724b2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 16 10:55:15 2006 +1030
dix: cleaned up GetPointerEvents() to avoid code duplication.
commit 6ff7f2ad6a5e2e769244590578e6809974b5235d
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 7 13:13:53 2006 -0800
Fix build on FreeBSD after input-hotplug.
(cherry picked from commit 4e6e4baead6c565363abbcd9e06cc685be121596)
commit bffb1f9b67c8d3d264c0c3fd703cf7e57dcdf7b7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:53:13 2006 +1030
removed unused variables drag and local from xf86PostMotionEvent
commit f737cd925efe452787443b039ae65b8d85081bb3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit 2eab230d9bd3f73ffe1b5a42111f89e85904ee11
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Tue Nov 14 16:37:18 2006 -0600
For NetBSD, define PCVT_SUPPORT (System has PCVT console).
Noticed by Joerg Sonnenberger. This fixes problem with console
switching.
This was in original imake NetBSD.cf.
commit 26d2e45bdb0cf4d18ba7b0365425da49d60b3d5c
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Nov 14 15:33:07 2006 +0100
Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL.
commit a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf
Merge: 6facd95 f80a8ae
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Mon Nov 13 20:32:26 2006 -0600
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 6facd958c2e7098cb68eac2810a88b8cd40f19c0
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Mon Nov 13 20:23:06 2006 -0600
On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
TODO: use autoconf to handle this so the code is not platform
based but feature based.
commit f80a8ae6e6820378ea70ac0849cee8bf3055e0e8
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Nov 13 18:26:05 2006 -0500
Disable Xprt server build by default.
commit 5bfe7f4dfc6ab51b6790d74faf11574385234423
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Mon Nov 13 01:54:32 2006 +0200
DRI: call drmSetServerInfo() before drmOpen().
Also, remove some libdrm remnants.
commit acb5ff4c73ac4d52201d7c421f488e2ead5c8b9c
Author: Jurij Smakov <jurij@wooyd.org>
Date: Sat Nov 11 14:09:15 2006 +0200
ffs: handle 0 argument (bug #8968)
Handle an argument of 0 in ffs(), instead of looping indefinitely.
Add an ffs prototype to dix.h, and add includes to ffs.c.
(cherry picked from 34164e551e4c3909322d50b09835ca4ac1d49d68 commit)
commit ca094684196886a4a1c10273049fae0705a3edc2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 10 18:02:05 2006 -0800
Correct symlink-mesa.sh usage message
commit 28337cc1060bc08adef81c304dd9ed02d0a0e37b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 9 19:51:17 2006 -0800
Fix typo before the last commit.
commit e1720b1089328af80ca0cb85e5289ced05263f95
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 9 18:53:37 2006 -0800
Bug #8868: Remove drm from SUBDIRS now that the directory is gone.
commit 0dee48b8af3e054228aef0d15c1cb1c9e23790cc
Author: Keith Packard <keithp@mandolin.keithp.com>
Date: Wed Nov 8 23:17:55 2006 -0800
Add RRInit function to create resource types for RR objects.
To allow RandR objects to be created before the screen object exists,
the resource types must be registered with the resource database.
A driver wishing to create RandR objects must call RRInit before doing so.
Also, fix a segfault when setting Output data before it is associated with a
screen.
commit ec77a95a02329a2ee3a94d7de9d2a234aecb9ca0
Author: Keith Packard <keithp@mandolin.keithp.com>
Date: Wed Nov 8 21:36:35 2006 -0800
Allow RandR objects to be created before the associated ScreenRec.
xf86 drivers need to create RandR object in the PreInit stage,
before the ScreenRec is allocated. Changing the RandR DIX code
to permit this required the addition of functions that later associate the
objects with the related screen.
An additional change is that modes are now global, and no longer associated
with a specific screen. This change actually makes mode management cleaner
as there is no more per-screen list of modes to deal with.
This changes the RandR 1.2 ABI/API for drivers.
commit fd91630b73100e9d77ccb492c52807448bc772a5
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Nov 9 09:30:33 2006 +1100
make X server use system libdrm - this requires libdrm >= 2.3.0
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
commit 0409e1627a167db2efc1355f292d3c02a6989ffc
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Nov 8 16:17:20 2006 -0500
'make dist' fixes.
commit 7e0aeebb8f8a5dff3cb4d88756e535dd70edeec4
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Nov 8 12:03:37 2006 -0500
Bug #6786: Use separate defines for server's Fixes support level.
commit b5d09d4adb8088719ff494a4281a793717046576
Author: Rich Coe <Richard.Coe@med.ge.com>
Date: Wed Nov 8 18:10:14 2006 +0200
CheckConnections: don't close down the server client (bug #7876)
When an appgroup is shutting down, the list of clients can change, so make
sure we're not trying to shut the server down.
commit 0567a6337b84fa045b5732e98203f488274aa2a2
Author: Bram Verweij <amverweij@gmail.com>
Date: Wed Nov 8 18:00:52 2006 +0200
xfree86/linux acpi: fix tokenising
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
commit e7900d68c3ee657158813f0650886d680c0a9a3c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:36:47 2006 +0200
remove trailing whitespace
Whitespace police in full effect.
commit 2035f115b7db3c4b7deabeab0d814b3107d6ef30
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:28:10 2006 +0200
xfree86: remove xf86Keymap.h
commit 809e2841aaa54662a42498aacec558bc813bba1c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:27:58 2006 +0200
xfree86: add general handler, port ACPI to it (bug #5665)
Add 'general' handler registration, which will not trigger DPMS when an
event comes in.
Make ACPI use this.
commit b5438f7fb2879e0226b578f60b22a490e73c3a83
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:24:58 2006 +0200
Get*Events: massive reorganisation
Reorganise the code logically, and put more comments in.
Clip valuators in proximity calls.
commit b0a7443ca8bd224994f98c1c1e25de88f2573224
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:23:52 2006 +0200
configure.ac: axe redundant SDL test
commit 332f179db7c38310db1f752d45f51b6d8301fd30
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:23:35 2006 +0200
kdrive/sdl: fix compilation
commit 988757a44197c91027109076e2e33ff6510ed71d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 14:06:51 2006 +0200
config: error messages non-fatal, and before we free them
Move error messages before we free the error structure, and make them all
non-fatal.
commit e2b78df5800fb4e3f0ed01b38a1974ba3577949c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 7 11:13:56 2006 +0200
xkb: warning fix
commit b55007d8cc9d20baa23d5de67683e414c827d3e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 7 11:13:32 2006 +0200
SyntheticMotion: don't dereference sprite.screen when not using Xinerama
commit f93d10ce9bb4a6de83b561f44fb7b046def16234
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 6 18:33:45 2006 +0200
dix: remove staggeringly broken vendor workarounds
Dear SGI,
No.
Scant regards,
Daniel
commit 389275d240e4ba19d62fda0f138a45c7ecb245ff
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Nov 5 02:47:59 2006 +0200
XkbCopyKeymap: don't iterate broken types, or dereference null pointers
Don't iterate invalid destination types (>= num_types) when coping key
types.
Don't free key_aliases if it's NULL (theoretical, but sure).
Make sure dst's label_font gets allocated if it's NULL.
(Thanks, Chris Lee.)
commit d585b4189aff8d7952847f75b19b4f092ab3b88b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:47:55 2006 +0200
xkb: fix uninitialised warning
Fix uninitialised warning with memset(); we never actually use it
uninitialised, but gcc doesn't know that.
commit b6d7b537ed8975363ad0f7c4180a62822358e418
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:43:22 2006 +0200
os: fix sun extensions test
'else if' is not very valid, plus the logic is kind of broken, so just
move it outside the ifdef in the first place.
commit 8ba0c7b62c78dead722b0c8aa414f37bac4414b7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:41:03 2006 +0200
xace: avoid 'unused variable pScreen'
Initialise pScreen explicitly, as REGION_* macros ignore pScreen.
commit c3ea1f7db494365032526dc06a7283384bd0ecd1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:38:31 2006 +0200
dix/mi: still more warning fixes
Fix up prototypes for PrintChildren and PrintWindowTree in the dix.
Make miPrintRegion be unconditionally defined, and move the prototype into
regionstr.h.
Change a bunch of ScreenPtr pScreen = foo; to
ScreenPtr pScreen; pScreen = foo; in window.c, so we avoid unused variable
references (as inline REGION_* doesn't reference pScreen).
commit 3a9b96425851b495503bd2eb0fd0d01c08f6a097
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:33:09 2006 +0200
dix: add missing prototypes
Add missing prototype for ffs, and include headers from ffs.c.
Move PostSyntheticMotion prototype to input.h.
commit 6716488fa256798070017232405b107d5c985479
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:30:23 2006 +0200
dix: remove unused debug code
commit 51813d77bfb84609a58a98e678efe9b6c0bf5503
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:29:05 2006 +0200
dix: remove unused variable
commit 844090a5b557705dd0adce2b7ed98813b5104d85
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:21:29 2006 +0200
xfree86/xf86misc: warning fixes
commit 61b570d0c1eb448f0aa08b4598118f0d43bc7345
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:21:09 2006 +0200
xfree86/os-support: update prototype for OSRingBell
commit c51fadc07d938f6a3edfd5620170fcb7d6486a11
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:20:45 2006 +0200
mieq: annotate with some more comments
commit 578899139f133746634a7bf8845e25362b5dfca2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 20:35:55 2006 +0200
RemoveGeneralSocket: don't touch EnabledDevices
RemoveGeneralSocket. Harmless, but.
commit ae58d349c1cf5d63ad3616c485baa858350978d5
Author: Laurence Withers <l@lwithers.me.uk>
Date: Sat Nov 4 19:34:37 2006 +0200
CreateColormap: fix return value (bug #7083)
Return BadMatch when an unsupported visual type is given, not BadValue --
this is correct according to the spec.
commit 96f78e3886791b723ccd9ba40bea701603537b0c
Author: Erik Andren <erik.andren@gmail.com>
Date: Sat Nov 4 19:29:49 2006 +0200
remove XFree86 changelogs (bug #7262)
Without being able to tie these to specific commits, the text changelog is
useless, as well as being huge.
commit 5a40448f2d0ac2c86c617bebe3fb649174bf0d7f
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 7 15:48:05 2006 -0800
A couple more cases of error message before freeing strings.
commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58
Merge: 3e7e0e3 46af6d1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Nov 7 18:42:54 2006 -0500
Merge branch 'autoconfig-for-7.2'
commit 3e7e0e35094d09e0e764818ed125314be75be01a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 7 14:13:23 2006 -0800
Report the error before freeing the error strings.
commit 4e6e4baead6c565363abbcd9e06cc685be121596
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 7 13:13:53 2006 -0800
Fix build on FreeBSD after input-hotplug.
commit 20e9144c0746943624ff77a61791b8596f3f8458
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 7 12:49:28 2006 -0800
Add $(DIX_CFLAGS) to remaining Makefile.am files
commit 5e946dd853a4ebc2722ae023429ce5797de3d7a6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 7 13:50:19 2006 -0500
Bug #8937: Extension setup functions not called on server resets
commit 1dcda4f3c56214464c0b6123fea6daa69aae69fc
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 7 01:29:51 2006 -0800
Avoid dereferencing sprite.screen when Xinerama is not running. (#8925)
With Xinerama support built into the X server but not in use,
sprite.screen is NULL and yet the SyntheticMotion
macro would dereference it. Avoid that by just passing sprite.screen
to PostSyntheticMotion which can then dereference it when Xinerama is
enabled.
Also, define PostSyntheticMotion in dixevents.h and include dixevents.h in
getevents.c
commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8
Merge: 028bbdc 3d39c02
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 7 01:21:28 2006 -0800
Merge branch 'origin' into randr-1.2
commit 3d39c02fe6aaa602c52f1d4f0ea6cd3bd000cf9f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 6 21:25:52 2006 -0500
More work on Bug #8875: revert previous fix and try using client argument
instead of serverClient. Also don't use totalClientSize as it is not
initialized until after the first call to InitClient.
commit 75fe0670eb1f71144246f1c20759d58788bbee00
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 6 15:30:25 2006 -0500
whitespace adjust
commit 0539d9cf2423fc0bed6f5c413beba3080f8abd85
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 6 15:29:17 2006 -0500
Bug #8875: Security extension causes Xorg to core dump on server reset
commit aa0261a98e9d5b1349b33e2639bd83c556dd4000
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Mon Nov 6 02:29:49 2006 +0100
Improve vm86 error handling in Xvesa.
commit 6b2c65fdd169037c6ede250d4a8fec3d29a080ae
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Mon Nov 6 00:30:09 2006 +0100
Fix typo in Xvesa: incorrect reporting of DAC capabilities.
commit 028bbdc0417173803695808ba9f48498519273a3
Merge: 50504c6 8deaaa3
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:46:26 2006 -0800
Merge master back to randr-1.2
commit 50504c68e1d407232cf83465981b235e542ef31f
Merge: 8b87ce1 cde8806
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:43:19 2006 -0800
Merge branch 'randr-1.2-origin' into randr-1.2
commit 8b87ce19741753eafbd99e7093bc3dea8f26e838
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:41:25 2006 -0800
Allow X server to build against libdrm 2.1
commit 7ffbe9d232e3a4621a204448d67e434736465cbe
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:41:09 2006 -0800
Add DIX_CFLAGS to hw/vfb/Makefile.am
commit 2db62bce0725ba2d88cbe40fc440b6bda45046f3
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:40:34 2006 -0800
Define fbHasVisualTypes in fb.h as it is exported
commit 8deaaa312ad7f9b492a2ae8ad17d74650112c25c
Author: Bernhard Rosenkraenzer <bero@arklinux.org>
Date: Sat Nov 4 18:59:39 2006 +0200
automake: avoid use of reserved _SOURCES keyword (bug #8866)
Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead. Shuts automake 1.10 up.
commit f72927d26cd112d321f7bf187df3c740b3129d22
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Nov 4 19:00:57 2006 +0200
xfree86/hurd: remove OsMouseProc (bug #5613)
Remove OsMouseProc, let the mouse driver deal with it.
commit 0273610578485564c3c0be11b336b6554cc31b43
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Nov 4 19:02:04 2006 +0200
xfree86/hurd: add bell support, remove SERVER/LOADER defines (bug #5613)
Add no-op bell ringing support, and remove obsolete @SERVER_DEFINES@ and
@LOADER_DEFINES@ from CFLAGS.
commit ade4bf09076d13dbf3549c0a2d987a0afe76d5c1
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Nov 4 19:03:13 2006 +0200
mesa/indirect: include byteswap.h on GNU userland (bug #5613)
Include byteswap.h on all GNU-userland systems (including with the Hurd
and FreeBSD kernels), not just Linux.
commit 412e93349e1656c9650115328af4be0e59a66f74
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Nov 4 19:05:02 2006 +0200
kdrive: make building of Linux support conditional (bug #5613)
Only try to build Linux support on Linux. We should probably disable all
OS-dependent DDXes if we don't have a workable OS (and only build
Xephyr/Xfake), but that's future work.
commit cde8806c2930788ba8076e94651d391e45f3ccdb
Author: Eric Anholt <eric@anholt.net>
Date: Fri Nov 3 16:36:34 2006 -0800
Don't bump the refcnt if the new mode is NULL.
commit 97fd471a627be185bee8cda3f709cfccea3fa12d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Oct 27 12:36:56 2006 -0700
Fix standard VESA modes.
The built-in mode timings were off slightly for the 640x480@60, 640x480@72,
and 1024x768@75 modes.
commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4
Merge: 49a2668 bd0c829
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 3 12:54:56 2006 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 49a26681b2bdd95ed65c425f1fa1441d2f092a6e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 3 12:54:43 2006 -0800
Add DTrace probe points for X server <-> client communications
See http://people.freedesktop.org/~alanc/dtrace/ for more details
commit bd0c829654903ca45543dfa59cda967c4fafd8ac
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Fri Nov 3 18:54:06 2006 +0100
Do not map full 0-1MB legacy range
If we're mapping something in the "legacy range" (0-1Mb), we shouldn't
expand the requested range to the entire 0-1Mb range. Typically this
is for mapping the VGA frame buffer, and some platforms support mmap of
the frame buffer but not the entire 0-1Mb range.
For example, HP sx1000 and sx2000 ia64 platforms can have memory from
0-0x9ffff, VGA frame buffer from 0xa0000-0xbffff, and memory from
0xc0000-0xfffff. On these platforms, we can't map the entire 0-1Mb
range with the same attribute because the memory only supports WB,
while the frame buffer supports only UC. But an mmap of just the
frame buffer should work fine.
commit c1828a8ff51c8db326c47e6710f4f42fab94fb6d
Author: Egbert Eich <eich@freedesktop.org>
Date: Fri Nov 3 18:32:48 2006 +0100
Fixing mach64 driver bailing out on ia64
Mach64 driver bails out on ia64 because it cannot map device
memory. It turns out that some bogus and unneeded code attempts
to find the root bridge of the device and fails to do so proberly
as there this host-to-pci bridge is not existant. This code has
been around for years although it completely unclear what it had
been intended for. Fixing this by eliminating the bogus code.
commit d50fc413b39f52663b46084c28e81fc4933a7b49
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 18:53:41 2006 +0100
Fix device path in altixPCI.c to be domain aware.
commit 1d731fc54a2cf5d3f353d8ee1c7c4989df27f011
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 18:50:15 2006 +0100
Add domain support to linuxPciOpenFile().
Loosely based on patch from David S. Miller <davem@davemloft.net>
See also bug #2368.
commit caaa113acf4144fd47a1ac93ca440d78d1983e54
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 18:38:45 2006 +0100
Fixing domain support for ia64
ia64 specific functions + defines.
Still uses /proc interface for some scaning code.
Based on code from Egbert Eich <eich@freedesktop.org>.
commit 16c5043fc0c84b14323cd211c2645106455ac320
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 18:22:09 2006 +0100
Fix 2 warnings.
commit 072c022e731c3aadf34096f16364e29df47280d2
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 17:58:19 2006 +0100
Fix obviously wrong boundary checks + cleanup unused vars.
Also disable compilation of code that is no longer used anywhere in the whole
Xserver tree.
commit 5afc6c1a14fea2966017493b045fa7209faeb8eb
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 15:42:03 2006 +0100
Added linux 2.6 compatible domain aware device scanning code.
Additional scanning code uses the /sys interface of 2.6 kernels.
Cleaned up the use of tags and already split domain/bus/dev/fn.
commit 6319f7d713971f70f06166480f069eca3bcace36
Author: Egbert Eich <eich@freedesktop.org>
Date: Thu Nov 2 12:50:52 2006 +0100
Make int10 fully domain aware.
commit f4dd2665b0f9aa9c00a5152c73bc72cb7514eeb5
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 12:36:12 2006 +0100
Added missing domain stripping in already domain aware code.
commit 46901063e8edc82b67989f4e5eec39d17c67dc98
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 12:25:03 2006 +0100
Build with -D_PC on ix86 only.
commit 543b397277d1f03b8091e44812010abcd5d80102
Merge: 4056e6e 645d057
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 2 19:00:35 2006 -0800
Merge branch 'origin' into randr-1.2
commit 037f23e6f8fbe6e6fc8e71ed21958fc553df72d0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 2 18:30:58 2006 -0800
Convert Xprt DDX to new motion history api
commit 7dc54a40e900cbea1e509620623b091d54a3c2d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 2 16:38:47 2006 -0800
Remove references to xf86Info.kbd* from solaris code
commit e46f7f78b362e76f5a553184e3f5ec7e109aa39d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 2 16:38:12 2006 -0800
sun_bell.c needs to #include "xf86_OSlib.h"
commit 58bf9a142d1957f4d77038ee4ce7b1116b1f7955
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 2 14:43:02 2006 -0800
PostSyntheticMotion needs to be extern, not static, since it's in getevents.c
commit 1ecd45fb8e4250fb51daa2bdf1a960af0f8b53fb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:51:03 2006 +0200
Makefile.am: add config to DIST_SUBDIRS as well
commit 01afa533aa872d1a101a41153f95d800e68fea3e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:32:37 2006 +0200
xfree86/os-support: axe more unused files
commit 57c1409151cb1f6e0e528fb92ebda58f86f12c1a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:21:06 2006 +0200
xfree86/os-support: remove unused file from dist
commit de5a4c63747a417cdece919f4fb5a4004a3ee7bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:18:33 2006 +0200
xkb: note that we allow full xi interaction
We now allow maps to be set (etc) on different keyboards, so stop putting
XkbXI_KeyboardsMask in unsupported.
commit 1d65429a9e03871969552d0c31b022546cc46b12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:12:55 2006 +0200
xfree86: don't attempt to enable and disable non-DIX devices
Don't try to enable and disable devices with no entry in the DIX, such as
the evdev brain.
commit 64139c1950ea825c0a0124abc5f88499e91f797f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:22:09 2006 +0200
bump to 1.2.99.0
commit 18c246a13b887b865de6a17e6cd1c259b9bc383d
Merge: 794f2e7 4843d82
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:21:37 2006 +0200
Merge branch 'input-hotplug'
commit 4843d823f4d38d8bd468ce3a8feddbff229ed416
Merge: ba9f513 a7b944f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:18:13 2006 +0200
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit ba9f5138fc32a7a7b97bcf941bc92751b7c6c2c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:16:10 2006 +0200
xfree86: allow starting with no input devices
Add a server flag (AllowEmptyInput), which will inhibit adding the
standard keyboard and mouse drivers, if there are no input devices in the
config file.
commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9
Merge: a2d6242 6fdfd9d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:15:25 2006 +0200
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit a7b944f0d96c3e0e15e75378a04def1ac96089fb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 1 16:17:49 2006 -0800
If getpeerucred() is available, include pid & zoneid in audit messages too
commit fbfb35189ef6666707097704b43e052cb2f919ae
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 1 15:11:48 2006 -0800
Bug #1997: AUDIT messages should contain uid for local accesses
<https://bugs.freedesktop.org/show_bug.cgi?id=1997>
commit a2d6242106bb3a440faa9cad157e0120dbfa7b6e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 00:46:33 2006 +0200
kdrive:remove Change{Keyboard,Pointer}Device
This was removed in the DIX, so just axe it.
commit d9a5e3e964b6c91fbca88b50674fce9660b972a4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 00:45:23 2006 +0200
XkbCopyKeymap: be more careful with levels, allocate compat/geom
Take various extra precautions with copying levels across (thanks Chris
Lee for a gdb session), including allocating when we don't already have a
coherent map.
Only free type components if they're present.
Allocate geometry and compat components if we don't already have them in
the dest map.
commit 6fdfd9dad91d7b7aa292f8c4d268dd27c34de8d3
Author: Eric Anholt <eric@anholt.net>
Date: Wed Nov 1 14:29:59 2006 -0800
Fix several cases where optimized paths were hit when they shouldn't be.
This fixes a number of rendercheck cases.
commit 40f84793bca40dcc6883d51aefa1bda44bd1ac61
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 1 14:34:46 2006 -0800
Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server
commit d7d931abe01a8cf555b027f2bcfcccd5e9053e52
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 1 23:48:58 2006 +0200
configure.ac: remove check for rate/period
Keyboard stuff is now handled in the kbd driver.
commit 81728558a044fdde0e1d63da7b6314755f77296e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 1 23:10:26 2006 +0200
input: add non-keyboard bell ringing function
Add a generic 'ring the bell' function (console bell on Linux and BSD,
/dev/audio on Solaris), and add DDX functions for this. Make this the
core keyboard's bell.
Port Xvfb and Xnest to this.
Port XFree86 to this, with OS-specific hooks for Linux, BSD, and Solaris
taken from foo_io.c in the old layer.
commit 3df454719f9cbf6a046cb7458019ec621b3b42ee
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 1 23:02:57 2006 +0200
kdrive: add KdRingBell prototype
commit 4056e6e79a4e37101d298ae29139c83d3816368b
Author: Keith Packard <keithp@mandolin.keithp.com>
Date: Wed Nov 1 00:29:46 2006 -0800
Move physical size from mode to output.
Modes can be shared across different sized monitors this way.
Also caught some missing byteswapping and an incorrect return type.
commit c03311a1e78daa291477a67b1bb7206772108c5d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 31 16:05:48 2006 -0800
Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
commit a2434ec5f3c9dc79d1f05c2d704a82a766718ed4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 31 15:57:59 2006 -0800
Make _POSIX_C_SOURCE hack work with Solaris headers
Solaris headers are very literal - if you ask for POSIX_C_SOURCE 199309L,
they limit to only the functions in that standard and no more, unless you
also specify __EXTENSIONS__ to allow functions beyond the standard base.
commit 645d0576205532a3610ae351267d5b84d76236bd
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 29 18:19:56 2006 +0100
Handle building in a separate objdir
commit 59584c375f4e4b2670a92002ecb7a78a0bc50cce
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 29 17:49:46 2006 +0100
kill GNU-make'ism.
commit 0107320fac0913aae2cb169992e31c670b4bd2f7
Merge: 06b6b97 a34446f
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun Oct 29 15:23:35 2006 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 06b6b971d065226b983ba25da7ea8236ec37df04
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun Oct 29 15:22:37 2006 +0100
Make sure we have 64-bit file-offsets in libdrm.
commit 644ee2434a4e09f5baea00a486911f8c24b9a261
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:52:11 2006 +0300
kdrive: avoid null dereferences
Avoid jumping into NULL pointers for OS or card functions which do not
exist.
commit 738d2e88171bcce8782d670a1cda9a1d941d7977
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:48:02 2006 +0300
kdrive: move bell ringing into an OS function
Move the bell into an OS function, and use that if it's declared; else,
fall back to using the driver's function.
Remove the Linux keyboard bell function; just move it into the OS layer.
Use named initialisers when converting the old structures, and eliminate
unused functions.
commit 96e32805d12fc36f0fa0926dbfb0dd8a5cadb739
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:43:34 2006 +0300
Xi: disallow changing core keyboard and pointer
Just short-circuit the change core keyboard/pointer requests.
commit 68f595ca6c7883e030947b7f95c50e92aa733f2b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:41:34 2006 +0300
GetTimeInMillis: use correct units for clock_gettime
Make sure we're treating the nanoseconds as a long, not an int, so we
don't overflow.
commit 51a06b3c44509c72279b5cfcf2b52b9a35c461b0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:40:57 2006 +0300
WaitForSomething: only rewind when delta is more than 250ms
Only rewind time when we're more than (original delta + 250ms) away from
executing the timer.
When we're walking the timer list, use a goto to iterate all of them from
the start again, since timers may drop out of the list.
Don't bother trying to be smart in TimerSet, we'll pick it up in
WaitForSomething anyway.
commit a34446f5b3d90714969a90583c49cb1eae1c9651
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 27 13:43:43 2006 -0400
Add missing file to list in Makefile.am
commit 92d04e746bd9b8ad3ee217c165ace20468e079cf
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri Oct 27 18:26:30 2006 +0200
Import libdrm functions for the drm memory manager.
commit e3d3d29db5eef057b4e8294377c9c3147436bc2f
Merge: 92387e9 004d00e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 26 20:21:16 2006 -0400
Merge branch 'master' into my-XACE-SELINUX
commit 92387e99d085b0b081fcedb2f20304eb0ac536b1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 26 20:20:57 2006 -0400
Change symbol in libaudit library test.
commit 196c5836f463c28f633bbba847f59acd5935359d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 27 01:27:31 2006 +0300
CoreKeyboardProc: annotate with FIXME
Setting an empty keymap by default isn't wildly useful.
commit f9a1e456f8a4eaa1a9c71fd0fe5231140975c22d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 27 01:25:39 2006 +0300
CoreKeyboardProc: don't leak keymap and modmap
SetKeySymsMap does a copy here, so try not to leak them.
commit a5be65401769fabcb5001dc63035c69f9e4a2712
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 27 01:25:21 2006 +0300
mieqEnqueue: only compare DEVICE_BITS of deviceid
Only compare DEVICE_BITS of the two deviceids, so we don't decide that
a valuator event isn't for us, because (id | MORE_EVENTS) != id.
commit 85212eb504f860b054eb0f0a5029fed86cb8d1c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 27 01:23:58 2006 +0300
getValuatorEvents: make sure we put MORE_EVENTS in the right places
Make sure we put MORE_EVENTS in with the device id if there are, in fact,
more valuator events coming.
commit 794f2e7291ccb4e48f9fbfc8f08302e3aac0f79f
Author: Myron Stowe <myron.stowe@hp.com>
Date: Thu Oct 26 20:38:58 2006 +0300
xfree86: re-enable chipset-specific drivers for Linux/ia64
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e
Merge: cdc8a4b 004d00e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 26 15:21:22 2006 +0300
Merge branch 'master' into input-hotplug
commit 004d00e6689f452fc9fdf91f5ffc6d6aed697d54
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 26 01:10:08 2006 +0300
GetTimeInMillis: simplify monotonic test
We don't actually need to get the CPU clock ID, which means we don't need
the monotonic_usable test. Since there's now only one branch, the
compiler will treat that as likely, so we don't need xproto 7.0.9 anymore.
The fallthrough to gettimeofday() is preserved.
commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a
Merge: 3da918a d285833
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 26 00:28:30 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit d285833290316cb5dd1e7f1e52c96be3e9cf21cd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 23:57:00 2006 +0300
GetTimeInMillis: spuport monotonic clock
Add support for CLOCK_MONOTONIC from clock_gettime, and use that in
GetTimeInMillis() if available, falling back to the old gettimeofday()
implementation.
This is _slightly_ faster on some 64-bit architectures, and _slightly_
slower on others (though barely measurable).
commit d3e57faffee63df1424a209d0418d3a712f91ae6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 23:55:43 2006 +0300
WaitForSomething: allow time to rewind
If time rewinds dramatically, reset all the timers to fix their expiry.
commit e21604914dccece6bc64c69b55512d1f1a969235
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Oct 25 09:48:23 2006 -0700
Merge master back in and clean up some unfinished code (closes 8745)
commit becbda6d519a11c2c211afb8d46f9ea1a2676bc3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Oct 25 11:39:27 2006 +0200
Fix test for Option "IgnoreABI".
This option has plenty of potential for wasting the time of bug triagers
without pretending it's always on.
commit 59511974db843fa7e11133894cfc10c20fdaf60f
Merge: 054f8cd 598ac7a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Oct 24 17:26:20 2006 -0700
Merge branch 'master' into randr-1.2
commit 598ac7a83698327b607084abaebcbd22f8d25fbb
Merge: 828c34e 948a97b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Oct 24 17:23:12 2006 -0700
Merge branch 'origin'
commit 828c34e83ccdf3bcd2844d5af8b0cac4164b04ab
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Oct 24 17:23:02 2006 -0700
Byte swap RRSelectInput enable flags.
commit 3da918a16c8908fdfaf89f2a1bcaec19e01528a9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 02:22:07 2006 +0300
mipointer: remember to update pointer location
Update pointer location so it doesn't get quickly reset by the next
pointer update.
commit aabc087998e680c2fcf0ebc1c5022c1fe8f58f0c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 02:21:39 2006 +0300
GetPointerEvents: always ensure correct number of events
Ensure correct number of valuator events are returned, and that we always
increment events correctly.
commit 65cd5aa4d754624566c2263015f1a018d137fce1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:12:45 2006 +0300
kdrive/input: remove unnecessary #ifdef XINPUTs
Xi is now mandatory, so don't bother with the ifdefs.
commit 0514d53e10b3521bb708a9cbde4bab525248eadb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:10:44 2006 +0300
xfree86: remove motion history handling
Remove motion history handling, as we now deal with this in the DIX.
commit b1debebf8fe20ded20ba27e871fd1a6a9de029e3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:10:20 2006 +0300
mi: remove mi motion history
This is now unneeded as we do motion history in the DIX.
commit b9e180e632d04bf685ade9e32bd0b20882794486
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:09:19 2006 +0300
port all users to the new DIX motion history API
Port KDrive, Xvfb, and Xnest, as well as the virtual core devices, to the
new motion history API. Make GetPointerEvents also update the history.
commit 5b38eb69cdaa154791c7f74e35dbe4d3256b19bd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:08:29 2006 +0300
dix: add motion history support
Add motion history support (sort of based on the XFree86 DDX's
implementation) to the DIX.
commit 11fb58be77ac163844e494b2b0a260cf28a7ecd1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:07:36 2006 +0300
miscellaneous warning fixes
Use the correct type for time, and fix the mi prototype of EnqueueEvent.
commit 2a74b8a91da1a98669993078f7fe9081f2d743ce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:04:53 2006 +0300
xfree86: re-bump input abi to 1.0, yet again
commit 37d1fffe79c35ada056ce9a56292c000014fe48a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Oct 24 23:06:57 2006 +0300
inputstr: try to keep device structs the same size
Try to make sure DeviceIntRec and friends stay the same size,
regardless of whether or not XKB is enabled.
commit 9f9ac01a819ee96fb5be5d7d346c91f461bf3979
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Oct 24 23:01:05 2006 +0300
inputstr: fix indentation
commit 27d682fa030501611a5b52f41f29738134b45c0b
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Oct 24 09:04:14 2006 -0700
Fix from HEAD accidentally reverted during merge.
commit 8b909135664abb69ada522e8e39495d9eca717ac
Merge: 21291d6 948a97b
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Oct 24 08:57:59 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/scanpci/extrapci.ids
hw/xfree86/scanpci/pci.ids
hw/xfree86/scanpci/pciid2c.pl
hw/xfree86/scanpci/xf86PciStdIds.h
commit 0cd6a3d8efb5cc1ce4f85ab95bcdf4fb66c7245d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 06:56:07 2006 +0300
xfree86/input: add proximity support, free valuators
Re-add support for proximity events, and remember to both va_end our
varargs, and free our valuators.
commit cccf7ae0ff24d0c84b5144c457f3f86bbbc36e12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 06:55:21 2006 +0300
GetProximityEvents: add (untested) function
Add untested first guess at what GetProximityEvents should look like.
commit 35fa4ac12b3da33f81e2a12bc9661ed075f323ed
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 06:23:45 2006 +0300
GetPointerEvents: break into separate functions
Break out clipAxis, clipValuators, and getValuatorEvents, into
separate functions, to be used by the proximity event code.
commit a7c2d9a15dc2ff253bb69c3b0738ad993521b9c7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 06:08:27 2006 +0300
kdrive: numerous warning fixes
commit c8f76fb3a473a022d497bd0acd6c84f58fc6efbe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 05:12:15 2006 +0300
xfree86/input: disallow pointer device changes, fix drag event calculation
Don't allow users to change the core pointer.
Fix xf86SendDragEvents to check the device button state, not the core
pointer's.
Remove unused xf86CheckButton.
commit c5b5b046e86b159a9d32451308f38246cc4587f7
Merge: fab1d37 948a97b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:58:30 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit fab1d37ecbeee9777ad1485b0cc62b55042d5014
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:57:00 2006 +0300
xfree86/options: don't blindly dereference NULL pointers
Sure, conf_idev should be initialised, but if it's not, try to make the
best of a bad situation.
commit 523fe64ba16cf7a40f4095432d81300726d83e8d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:56:28 2006 +0300
kdrive/lots of DDXes: make stubs use KdOsAddInputDrivers()
In theory, removing LinuxPciScan should make these drivers OS-independent.
commit 57f98e2b72d5c7fea93a9f6da86228ffb4856bf3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:55:41 2006 +0300
kdrive/tslib: port to new absolute API, remove debugging
Port to new absolute device (not touchscreen) API, and remove some
leftover debugging.
commit a6dc629052f0ad509cfa30e98217043a63c09552
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:54:59 2006 +0300
kdrive/os: add KdOsAddInputDrivers
Add KdOsAddInputDrivers, which adds all relevant input drivers.
Could possibly be refactored to KdAddInputDrivers, which called through
OsFuncs to a new function, if it existed.
commit ac240b00ff6fc354c1aa641406ae8b49244c0b8b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:54:07 2006 +0300
kdrive/input: use Absolute instead of Touchscreen
Adjust to suit Zepheniah's new absolute device API.
commit b1ba4b3e8ad427af1fa8618b0bd839f741ec2ce3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:53:15 2006 +0300
kdrive/neomagic: include vesa.h, use DebugF
commit 29f28dd1a8a7ed07e945a67946e3510f4b32d12a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:52:52 2006 +0300
configure.ac: add XSERVER_LIBS to XNEST_LIBS
commit 2f33f4065d89ae2b6fdda43c7105d72f89920cae
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:52:35 2006 +0300
Xnest: port to new input API
Port Xnest to Get{Pointer,Keyboard}Events, plus the new mieq API.
commit 08928afb0500d46b0caa0a1d1244dee2ed80e6a0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:51:52 2006 +0300
Xnest: disable XKB, reshuffle code
Disable XKB, as we can't yet use it; move Composite disabling to
ddxInitGlobals, along with XKB.
commit cd3b16a57efaf89108054f18a94c91e2dd74fafa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:51:13 2006 +0300
Xvfb: port to new mieq API
commit bf4df9b73f0c1a84093aaf9a2e2cbc56fb341c60
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:50:53 2006 +0300
include: move POINTER_* flags from inputstr.h to input.h
Given they're just numeric constants, they should be included in
input.h, not inputstr.h.
commit 4dd91c45abea9fb561a5acb10290e29487df6722
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:50:03 2006 +0300
miinitext: Xi and XKB are not hardware-only extensions
Xi is now a required extension, and XKB can be used without hardware,
so include them both when NO_HW_ONLY_EXTS is defined.
commit 562096a012f4bb8f44d5ec6320a32f4010c189e4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:49:22 2006 +0300
XkbCopyKeymap: increment shapes and outlines when copying
Remember to increment the source and destination shapes when copying,
instead of just endlessly copying the first one.
commit eec182259112fba240751f974f7e5ca09fce8b9d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:48:30 2006 +0300
dix/getevents: move SyntheticMotion to getevents.c
Mostly, this is just a cheesy hack to ensure that getevents.o gets
included when linking. Sigh.
commit bc701a14292da5abfb601e3a040651a74f46df8f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 00:08:32 2006 +0300
dix/getevents: cosmetic cleanups, remove keymap copy from GKVE
Remove keymap copy from GetKeyboardValuatorEvents, as
SwitchCoreKeyboard now takes care of this for us.
Remove unused variable and function prototype.
Update comments to be as informative as possible.
commit b03e2f7029506640a8fe5cb88818b329c23503ff
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 19:56:49 2006 +0300
xi: fix NIDR return yet again
For a one-line function, it was pretty broken.
commit 90de7ce25a84cfe6c6790f9af2bc2399d25b9b9c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 19:54:36 2006 +0300
xi: fix return type for NIDR
commit f46dc272913ffb6b5b234a7ec6f4ba5cae44a831
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 19:51:35 2006 +0300
xi: add NewInputDeviceRequest to stubs
commit 31a6307b7ba5adaa96deb8101ddfcda0262f537d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 19:49:31 2006 +0300
xi: change DEVICE_TOUCHSCREEN to ABS_{AREA_CALIB} for stubs
commit eae6594d03a606ddf1f433b5897b5938aa940c1e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 16:39:44 2006 +0300
Xi: swap control in DevicePresenceNotify
commit be21630164e865eca72ff2a686a38ae4e30fd79c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 16:33:02 2006 +0300
dix, Xi: make use of deviceid in DevicePresenceNotify
Use the deviceid and control fields in DevicePresenceNotify since
the last push to inputproto to send a DPN whenever a control changes
on a device.
commit f08b6b2367705cb5b60e996e6328197430bf1919
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 12:30:02 2006 +0300
kdrive: change DEVICE_TOUCHSCREEN to DEVICE_ABS_{CALIB,AREA}
commit 77e724585f6c53feb55475b94d8cfcb6acf1159b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 20 00:44:46 2006 +0300
minor formatting fixes
commit 948a97b97e93cee05a23f1f1ae699c5e181bc8ce
Author: Drew Parsons <dparsons@debian.org>
Date: Sat Oct 21 23:09:22 2006 +1000
Minor typo fix to xorg.conf man page.
commit 04554a3adcddc32de5fdb0b3122da0bcdd4c24a9
Author: Drew Parsons <dparsons@debian.org>
Date: Sat Oct 21 22:06:43 2006 +1000
Minor typos in Xserver man page.
commit e26a494f417c3c700636ee68892c3015b2e0f27a
Merge: 736b0d5 aeba855
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sat Oct 21 04:26:14 2006 -0400
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 736b0d5078597abbda80444deef852879260af90
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sat Oct 21 04:24:49 2006 -0400
DEVICE_TOUCHSCREEN becomes DEVICE_ABS_CALIB.
Update the DEVICE_ABS_CALIB stuff to include the new elements.
New DEVICE_ABS_AREA support.
dev->touchscreen becomes dev->absolute, with _CALIB and _AREA stuff in it.
Update xfree86 to compile with this, kdrive needs an update too.
commit edd5f1745461f995670969cb736d1569ca94643f
Author: Carl Switzky <Carl.Switzky@Sun.COM>
Date: Thu Oct 19 17:30:54 2006 -0700
Add ast driver/device info to Xorg server & config utilities
commit aeba855b07832354f59678e20cc29a085e42bd99
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 20 00:30:28 2006 +0300
move keymap copy to event processing, from enqueuing
Move the keymap copying to event processing time (in
ProcessInputEvents), instead of being at event enqueuing time.
Break SetCore{Pointer,Keyboard} out into separate functions.
Change mieqEnqueue to take a device pointer, that asks for the
_original_ device associated with this event.
commit a8d3dad9d9f2b9053843e655abe463a68ba8dcb7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 20 00:28:40 2006 +0300
xi: add DEVICE_ENABLE control
Add DEVICE_ENABLE control, which allows runtime enabling and disabling
of specific devices.
commit b0780312d80ea4af0136227f90fdd7ada3db71c5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 19 13:51:53 2006 -0700
Pre-release message should tell users to check git, not CVS, for updates
commit c5dc997baf57ffa08025efadbbaf761296ce4bc4
Author: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Thu Oct 19 11:14:26 2006 -0700
Create xorg.conf.example (Gentoo bug #138623).
commit d029c8f1b72019446a5c873f55ffa43504b03dfb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 18 18:11:06 2006 -0700
Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris
commit a8a0abdbea0573c861a5af9d58f3ce66790455ca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 18 10:59:07 2006 +0300
config/dbus: always unref the connection, not close
commit 80642f37d40216035786eaf490952d16f6b5f597
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Oct 17 14:53:28 2006 -0400
Stop building xorgcfg by default.
commit 5e17cde27b064174584d478130b0f95dcef78deb
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 17 17:06:44 2006 +0200
StorePixels() macro could create invalid *x++=*x... code - fixed.
commit 205c6788d7a34704e36b23f1a93d89e9b986266a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 16 23:48:09 2006 +0300
config/dbus: properly initialise vtable
Properly initialise the vtable, so we don't end up with an unregister_function
pointing to god knows where.
commit 85ac2f16abe9f6e88b4e71609da334d336a9a600
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 16 12:39:05 2006 +0100
Small modification to blocking signals when switching modes.
commit 0901eec87ee9f3a2a067695bdbd569ff42149879
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 16:57:09 2006 +0200
Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
commit a232693c8c2a206aac47c07b133c071938204e0b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 16:48:59 2006 +0200
Add per-drawable Xv colour key helper function.
This allows overlay Xv adaptors to work slightly better with compositing
managers.
Bump the video driver ABI minor so drivers only need to check for this at build
time.
commit 5563861ab7e56ec891cfce6b34af43fec53ccee3
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 13 19:05:28 2006 -0700
Make sure xorgcfg files are included even when dist made with --disable-xorgcfg
commit e1dd1904c6c7ce33f347d822272831d54a6497c8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 19 13:51:53 2006 -0700
Pre-release message should tell users to check git, not CVS, for updates
commit 62d24097932708fbbb62a23614fe63b4b7acf3bd
Author: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Thu Oct 19 11:14:26 2006 -0700
Create xorg.conf.example (Gentoo bug #138623).
commit 357b37b3826fa6e9878c0bd895164259c2ed3c0d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 18 18:11:06 2006 -0700
Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris
commit 1b1698af41b9038d9f9dbf521737d0baab5a2237
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Wed Oct 18 04:57:22 2006 -0400
Pass SetDeviceValuators down to the driver.
NOTE: This changes the LocalDeviceRec struct, which breaks input drivers.
commit 5eca750fe2f3f243fb352271ad8da196af0cb16a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Oct 17 14:53:28 2006 -0400
Stop building xorgcfg by default.
commit df979b75c8cd8a7e0566aea58031bb9b8f5cd3d3
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 17 17:06:44 2006 +0200
StorePixels() macro could create invalid *x++=*x... code - fixed.
commit d430e76a161c963169067875c3654f5fd8f42b19
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 16 12:39:05 2006 +0100
Small modification to blocking signals when switching modes.
commit 6dd4fc4652f942724039dc2317c560ea7276ab59
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 16 00:22:00 2006 +0300
xkb: fix virtual modmap size computation
Compute virtual modmap size bounded by nVModMapKeys-1, rather than
nVModMapKeys.
This is sort of a best guess. The other way seems a little more
logical, but also leads to segfaults pretty quickly if you hammer
GetMap hard enough. So let's try this one.
commit a484ba15277e66e7ef9b21b238dcbf760695bc63
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 23:47:34 2006 +0300
XkbCopyKeymap: copy server vmods, and name atoms
Copy server->vmods, and all the atoms in names.
commit ad355fecee3965be576596aeed5da54d776edf1d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 21:59:06 2006 +0300
xkb: make sure we set the map on the right device, not necessarily core
Forgot that all XKB requests took a device spec: the comparison of
'if working on the core keyboard, does this device send core events; or,
is this device the core keyboard?' was broken. Instead, what we want is
'if working on the core keyboard, does this device send core events; or,
is this device the one we're working on?'.
commit 4ae7745a0dc86de6346409a69c1e396e0b954514
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 21:48:01 2006 +0300
xfree86 input: always open devices on NewInputDeviceRequest
commit acd8419948003032056a56d46adbef7c35e7739c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 20:42:31 2006 +0300
config: unref connection, don't close it
Just unref the connection instead of explicitly closing it (thanks, Rob
McQueen).
Add a commented-out unregister_object_path call: unfortunately, when we
call it, libdbus segfaults. But if we don't unregister the path, we
can't register it again. So regenerations are broken either way, but a
little less violently like this.
commit fc9b5f84b244ea08480b73bd15ac919b875800fb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 20:01:01 2006 +0300
dix/devices: add devices in proper forward order
Add devices in forward order with the normal linked list convention.
Previously, AddInputDevice would add all the devices in reverse order to
off_devices, before they were added again in reverse order to devices with
EnableDevice.
This just makes both work in forward order, which provides the ordering as
you'd expect when hotplugging devices (i.e. adds them to the head, not the
tail).
commit ec35e7198debf938f1115f584e675ce5995743e3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 19:44:49 2006 +0300
config: add replies and dbus api documentation
Add replies, which use standard X error values, to the two currently-supported
input configuration requests.
Document the D-BUS API we use.
Make sure we free everything when we encounter an error.
Add a _source option to all incoming requests, noting that it came from a
client.
Reject all requests to add a device where an option name contains an
underscore.
commit 7e4717683d6c08d1e490a60b7493a94bbc57bf8d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 18:12:28 2006 +0200
exaDrawableDirty: Fix initialization of BoxRec.
This will hopefully fix the partial window corruption experienced by some
people.
commit 3ad1642f1bbaa5f96558cdf3384b40f7122f8781
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 16:57:09 2006 +0200
Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
commit f9bfee50981006a2c58d3f73e2b0d123bb2a41b7
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 16:48:59 2006 +0200
Add per-drawable Xv colour key helper function.
This allows overlay Xv adaptors to work slightly better with compositing
managers.
Bump the video driver ABI minor so drivers only need to check for this at build
time.
commit a05044cfc14a8bc6cc31236dcecada60bec09924
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 14 22:14:56 2006 +0300
xkb: better support of XkbDfltXIId
XKB.h specifies that XkbDfltXIId should be used where the client doesn't
care about the device identifier. We take this to mean core devices,
where practical.
commit 4d8030076ed1a7680bdfcb7b89af1045bdc40304
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 14 22:14:07 2006 +0300
dix: move GetKeyboardEvents/GetPointerEvents to a new file, export symbols
Move GKE and GPE to a separate file, to help stem the events.c explosion.
Mark GKE/GKVE/GPE as _X_EXPORT.
commit 6afc7c284690b1e2bb7544b5bc4f31a3f6a05519
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 14 15:54:35 2006 +0300
dix/devices: remove XACE merge debris
commit 93302452e737bd91a893eb495592538d40d921e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 14 15:54:12 2006 +0300
XkbCopyKeymap: add geometry support
Add a first cut at geometry support, which seems to generally work.
commit b9108a13fc126d97c0393f911a1d9292563444ce
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 13 19:05:28 2006 -0700
Make sure xorgcfg files are included even when dist made with --disable-xorgcfg
commit 054f8cd2675a80b14bc1ce266377fcfee2335cee
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Oct 13 17:34:53 2006 -0700
Limit pointer to valid crtc areas. Add event swapping. Fix change tracking.
Add function to keep pointer within valid crtc areas.
Finish event delivery and swapping code.
Separate configuration from layout changes to send correct events.
commit 335b503c5e7041bb0c44611e496d1c46f554e630
Merge: bd3d93b cf948b7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 13 18:10:45 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit cf948b7b04dfeb61a294889027b9a54f6b9b478e
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 13 14:48:10 2006 +0100
Block IO on switchmode just as we do for VT switching
to avoid cursor movements signalling io.
commit 4b53a5e4b147ab748b28dffc1d330b7148d8efa6
Merge: 23f6f08 042d4a4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 11 20:50:31 2006 -0400
Merge branch 'master' into my-XACE-SELINUX
commit a6df780e4d3f90cc699b0b864bade03d6f15afd7
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Oct 11 15:41:22 2006 -0700
Fix bug #8608.
Regenerate files based on recent commits to Mesa (that fix Mesa bug
that return pixel data.
commit 042d4a407d0eca9131d0420b0b9189559aac326d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Oct 9 16:32:11 2006 -0700
Bug #8459: Don't forget to include AM_CFLAGS in libfb_la_CFLAGS on non-MMX platforms.
Reported by Edgar Toernig.
commit 1b94c117e0f294ef2f89bf24d45ba7a8e45efe35
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 10 19:37:22 2006 +0200
Fixing probably long-standing bug in domain support.
commit 6776c0f0e9677a65ec36ceef9618ff701b99596c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 9 17:24:37 2006 -0700
Use bash on Solaris to run symlink-mesa.sh
symlink-mesa.sh won't run with Solaris Bourne Shell (/bin/sh) so explicitly
run it with /usr/bin/bash instead
(cherry picked from cde68728860179dc84e615ccb378ce992513fd62 commit)
commit bd3d93be82d91e4cf35ae317dfd658d1706257ea
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 23:21:12 2006 +0300
xkb: remove random broken vendor workarounds
commit 33406da096b4ae21134484113b280e07d0c8f0d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 23:20:56 2006 +0300
GetKeyboardEvents: add first_valuator argument to GKVE
commit ef7e05e9de57b9c9c27ed3307eede6d8fc6c1af3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 21:42:15 2006 +0300
xfree86/xinput: pass first_valuator params, don't clip to first screen bound
Pass first_valuator to GetPointerEvents/GetKeyboardValuatorEvents.
Don't clip axis bounds to that of screen 0 when initialising axes.
commit 1546a398144619a14ff06aaf84ebc1bf293eac66
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 21:40:53 2006 +0300
GetKeyboardValuatorEvents: also take first_valuator param
Take a first_valuator parameter, which specifies the first valuator.
commit b05a11478edc7e6d1e38ef7f8d6788c7bd917493
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 21:23:12 2006 +0300
doc/extensions: rename to c-extensions
The old name could be somewhat confusing.
commit 41bb9fce47f6366cc3f7d45790f7883f74289b5a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 20:34:32 2006 +0300
mipointer: take device arguments, split miPointerAbsoluteCursor
Update mipointer API to take a device argument to (almost) all functions,
and split miPointerAbsoluteCursor into a couple of separate functions.
Remove miPointerAbsoluteCursor call from mieq, as we now deal with it in
GetPointerEvents.
Make miPointerSetPosition (successor of miPointerAbsoluteCursor) take
pointers to x and y, so it can return the clipped values.
Modify callers of miPointer*() functions to generally use the new
functions.
This should fix things with multi-head setups.
commit be8dfafd1d58b27bbfd953fc1216311523353db1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 20:32:16 2006 +0300
warning cleanups
Fix still more warnings.
commit ca474e0920dd29ebe7ccf346cddc526732ad01ba
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 20:30:49 2006 +0300
Xi: move SendEventToAllWindows and FindInterestedChildren to exevents
Move SendEventToAllWindows and FindInterestedChildren from chgptr to exevents,
so the DIX can more easily use it.
Clean up two warnings (type mismatch, unused variable) in exevents.c.
commit c2fab469b66f2796c541e911202faa411d116b04
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 18:26:26 2006 +0300
dix/devices: clean up debugging
commit 4493acb88c59721f7807093a3ed3c39396c2076d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:51:03 2006 +0300
xkb: add FIXMEs to procedures which need to act on all core devices
Add FIXME comments above request handlers which need to act on all core-sending
devices if called on the core keyboard.
commit ef68273f5bdb27a492ec0b69548ec4fbede46c08
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:44:37 2006 +0300
mi/mipointer: deprecate functions which don't take a device
Deprecate all mi pointer functions which don't take a device argument, and
replace them with versions which do, in preparation for MPX.
commit 6eab4c55890660089067da0e944256b1ed3a8c67
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:24:33 2006 +0300
doc/extensions: document C extension use in the X server
commit 80cdd26581508dd17c5d0a5739cd540113996bbb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:23:54 2006 +0300
mi/pointer: mark public pointer functions as deprecated
Deprecate miPointer functions which don't take a device pointer. Pointer
movement should be handled through GetPointerEvents, and functions which
take a device as an argument (e.g. miPointerPosition) will be added.
commit 97030b6c6b0fb6ff629ae31e483704d0a2207a53
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:07:05 2006 +0300
config: fix compilation
Accidentally built with --disable-config, didn't notice that the previous
commit to clean up the debugging broke things horribly.
commit 14b157bdb1f2cd5feba03ba0815d7c5b2dd6633f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:04:12 2006 +0300
include: actually declare DebugF
DebugF is ErrorF when DEBUG is defined, else a no-op.
commit 9e37de193f5d7412ffd8de76d5eed0158c0a3609
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 16:32:15 2006 +0300
configure.ac: reactivate warnings when building with gcc
We were inadvertently stomping XSERVER_CFLAGS after adding the warnings, so
move them after we do that.
commit b559cbb1601f93cb03ea3dcfb2c5ca94ee6b73bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 16:23:14 2006 +0300
dix/CoreProcessKeyboardEvent: remove debugging for every key event
Also change #ifdef DEBUG/ErrorF/#endif to DebugF in FixKeyState.
commit 3ae4d250185e71a0a218c062426f92b9b1adbf05
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 16:20:42 2006 +0300
xfree86 Xinput: remove still more excessive debugging
There isn't any more debugging left for input events in the XFree86 DDX.
commit 58314756aeecbb8fb04706c3e04d98e9ac531a02
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 16:18:05 2006 +0300
GetPointerEvents: add first_valuator parameter
Add a first_valuator parameter. Looks correct by inspection, but untested
with first_valuator != 0 as yet.
commit 84f5d2291c1fe92fd8358e999e909bf3aab86c98
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 15:30:24 2006 +0300
GetPointerEvents: fix relatively harmless typo
Change !(cp->button || !cp->valuator) to (!cp->button || !cp->valuator).
commit cfc3e9ede2dc83741bd38bf3df13f096ecb8adc0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 15:27:52 2006 +0300
config: remove excessive debugging
commit 8d8e7f8bae4099f9e90ef9aac687607dae1d32bf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 15:26:54 2006 +0300
kdrive/input: remove excessive debugging in NIDR
commit 22a836fafd39a8ef413826dc2c94bc5f96990e2d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 7 14:16:51 2006 +0300
xfree86/loader: bump input major ABI version
Bump input major ABI version to 1.0, since we removed the OS keyboard
layer.
commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db
Merge: 8382234 49a70c8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 6 18:01:13 2006 -0700
Merge branch 'XACE-modular'
commit 3686cd0fbf56d883f2f3b3fda11ffba1058b74e4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 17:20:42 2006 +0300
xkb: make XkbSetControls work on all core-sending devices
commit 7b4dc171b036107cfba87a1a16bf692b982005a5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 16:26:54 2006 +0300
xkb: remove unused #ifndef
commit ab56f0c5b516269bb99ae8b5f479e49e61a3af76
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 16:12:36 2006 +0300
xkb: simplify core device loop in GetKeyboardByName
commit 4b6e2f12f7296e17b2850f36b3adcf8156125cbe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 16:08:21 2006 +0300
xkb: make LatchLockGroup work on all core-sending devices
Apply the settings to all devices sending core events, if we're working on the
core keyboard.
commit ebf9b3bbbb04acb78cdf8a84e47a96755fbfe854
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 14:17:59 2006 +0300
xkb: update all core-sending keyboards on GetKeyboardByName
Update the keymaps of all keyboards which send core events on
GetKeyboardByName; still a few other procedures which need this treatment.
commit 1178796a4dff5ebf0bd9fb3cacb35be9709b41e5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Oct 5 22:31:35 2006 -0700
Add preferred modes for each output. Round vrefresh. Deliver crtc events.
commit 23f6f08b7b5c9a4297fd223d232a7e9f45376550
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 5 16:07:26 2006 -0400
Improve error handling, messages during initialization.
commit de63a469dcd0a8ae98554bca540ac0106cccf2a5
Merge: 9c7440b 8382234
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 5 20:29:19 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit b4659faf9b455b44ac8e691cc7a8fc00a967c80b
Merge: c4f30c6 8382234
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Oct 4 14:46:04 2006 -0700
Merge branch 'master' into randr-1.2
commit df351f1efbcc95f94c719fcf993c480155c511e9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 4 16:23:35 2006 -0400
Experimental window property holding security context.
commit c4f30c63538e1451f15ed1991439869127d9b148
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Oct 3 21:06:11 2006 -0700
Add mode origins and output options. Fix memmoves in resource free funcs.
Output options and mode origins both affected driver ABI. memmove mistakes
were causing 'Freeing resource which isn't there' messages.
Prune unused non-user defined modes from available list now.
commit 8382234a7f318057de66490299d63807cefb5201
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 3 17:49:48 2006 -0700
Update pci.ids to Tue 2006-10-03 daily snapshot
commit 96edf7b853c1045d12d957a2957a11879100a2de
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 3 17:48:50 2006 -0700
Don't insert RCS tag into generated pci id header files
commit 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343
Merge: 6926776 20c0cee
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 3 13:58:03 2006 -0400
Merge branch 'my-XACE-modular' into my-XACE-SELINUX
commit df800d87e04ce984a8a9ab4252ac6478ab1e4426
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 2 11:28:47 2006 -0700
Add (void) casts to clear compiler errors about ?: results having type mismatch
commit 9c7440bdf5a4ecd113e102004c804a2ba354c422
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 20:58:33 2006 +0300
xkb: remove the world's most staggeringly broken vendor workaround
Certain versions of LynxOS needed to sleep up to five seconds for closing a
pipe to actually, y'know, be useful.
commit d7c89c7c1c8c1e110345d9d8d300adbf5fe5804a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 02:15:36 2006 +0300
symlink-mesa.sh: expand *.{c,h}
commit d6ea96b13e2ea01c51998c41ae2a3677bdedf61c
Author: Ivan Pascal <pascal@info.tsu.ru>
Date: Mon Oct 2 02:17:14 2006 +0300
xkb: fix wrapping when switching between groups
Use XkbCharToInt as that's what we're doing.
commit 3c98cebb6e954855528794fec46830f456cbdec1
Merge: fa1ac94 2cf1098
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 02:18:17 2006 +0300
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit fa1ac94178cf976d4c8dae9a4dc8703303a62d4b
Author: Ivan Pascal <pascal@info.tsu.ru>
Date: Mon Oct 2 02:17:14 2006 +0300
xkb: fix wrapping when switching between groups
Use XkbCharToInt as that's what we're doing.
commit c31672e6aab168262bd7824a8082ecdf841fc3c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 02:15:36 2006 +0300
symlink-mesa.sh: expand *.{c,h}
commit 2cf1098436d6b4382d9ed3f6b88214d37bdd8ddb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Sep 30 17:05:46 2006 +0300
dix/events, mi/eq: remove utterly ridiculous debugging
Remove debugging which can cause long-lived Xorg logs to grow well above 1GB
if built with --enable-debug.
commit 20c0ceedfbce9ae5c70703900b52973917ac4cd0
Merge: 49a70c8 84eb2c0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 29 15:37:00 2006 -0400
Merge branch 'master' into my-XACE-modular
commit 518db35ca3f569e7cb95dbddeddb93f3691de498
Merge: 5d99e05 84eb2c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 29 00:35:21 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 5d99e05f05a42a82a9f02844df9bfebaa673759d
Merge: ad631af 5893375
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 29 00:35:07 2006 +0300
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit ad631afcf3fbc74024cddaaacd05d38addc047a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 29 00:34:23 2006 +0300
make core keyboard/pointer map functions act on all core-sending devices
Make Set{Keyboard,Modifier,Pointer}Mapping act on all devices which send core
events.
Change LegalModifier to accept a DeviceIntPtr.
commit 84eb2c0a06de60e88e14bb03fabe661d7cd8f1d3
Author: Brian <brian@yutani.localnet.net>
Date: Thu Sep 28 15:09:40 2006 -0600
Replace hard-coded filesnames with loops (all .c and .h files).
Should fix problems with Mesa adding/removing source files, for the most part.
Patch by Dan Nicholson.
commit 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145
Merge: cf6e968 f9542e7
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 28 13:27:13 2006 -0700
Merge branch 'wfb'
commit f9542e749544c7a3084fd72ecc6642ca3262f7c7
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 28 13:26:54 2006 -0700
Restore the global xx* symbols and add them to wfbrename.h.
I don't think they're ever used, but it's best to just leave them alone for ABI
compatibility.
commit cf6e9687ffcc52af0d64e9098186570719a575a2
Author: Jeff Smith <whydoubt@yahoo.com>
Date: Thu Sep 28 15:34:17 2006 -0400
Bug #8449: Yet another Mesa symlink script resync.
commit a5d639cd87f30f9b3d765352d27253940f33b2b7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Sep 27 16:15:27 2006 +0300
remove merge detritus
commit 2206a92a97901977910a6e39b4174ca805f9f4a7
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 30 19:15:55 2006 +0200
Push information about cliprects of DRI windows to the DRM.
commit 54d371e7a4ebab79a0f616669e2f601d8370cef3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 30 19:12:17 2006 +0200
Add wrapper for new ioctl to update drawable information in the DRM.
commit ad321fad4b9ab3a2c70cfff37ca6c8faaa5cce9c
Merge: 5e9d33f f7c1d94
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 24 17:56:43 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit f7c1d942416db8d0d4c5a21f5ece1ccacb926b69
Author: Brian <brian@yutani.localnet.net>
Date: Sat Sep 23 10:38:10 2006 -0600
Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
to prevent potential segfault.
commit 945b7c63946f5257d0f9b0dcf2f8f4882fb2c6f8
Author: Brian <brian@yutani.localnet.net>
Date: Sat Sep 23 10:35:25 2006 -0600
The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
Otherwise, Xdmx generates a slew of protocol errors.
commit 891e9c3e6cbd0869a57395b96c8e18ff522c2bb4
Author: Brian <brian@yutani.localnet.net>
Date: Sat Sep 23 10:28:24 2006 -0600
Replace broken DMXDBG3() with DMXDBG2()
commit a10039a100dfe5f87e29e9cc4fa656176e0890f9
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Sep 21 23:58:32 2006 -0400
Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev.
commit ce78b0cd2b1c35d60eb5683a1d00222aa4797c79
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 21 20:42:47 2006 -0400
Close with Pclose() that which we open with Popen().
commit c1655f0fd457f9bdf0857c5e0904639925bb01f1
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 21 14:45:17 2006 -0700
Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN.
commit b36fde9257263fa502147df37e8331184c323e14
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Sep 21 09:52:04 2006 -0700
When no mode is specified, don't validate mode-specific parameters.
commit 8b4ed47c5d39f219866e3c72fa973c6fc4c70f18
Author: Drew Parsons <dparsons@debian.org>
Date: Thu Sep 21 22:19:44 2006 +1000
* Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
* Removing outdated references to CDE and dt, rename script to
92xprint-xpserverlist.
commit 219546fd76750f358ffb6738f17b9237c58c15a6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 22:43:05 2006 -0700
Steal Xinerama code from SiS driver. Add missing files.
Provide a Xinerama implementation when DIX version isn't enabled. This
version exposes each crtc as a separate 'screen' and reports the size of
that patch. The extension also sends ConfigureNotify events to the root
window whenever crtcs change so that applications will re-fetch xinerama
information. This actually works for metacity.
commit bde0a4c12cb393a6d7f1552b067624da1b0502ae
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 19:42:34 2006 -0700
RRSetCrtcConfig status fix. RRGetScreenResources timestamp fix.
RRSetCrtcConfig was returning the wrong status values.
RRGetScreenResources was always returning currentTime.
commit d812f486a01a6276aed7b4ebd3cd8eb8ddfe10d3
Author: Donnie Berkholz <donnie@supernova.(none)>
Date: Wed Sep 20 15:39:39 2006 -0700
Really fix sparc on 64-bit kernel/32-bit userland.
Commit b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
commit 09f7499851bd2f2eba1e30460c61c7a82ed9e853
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 13:15:20 2006 -0700
typo
commit 9f870e0aa1ada238d6a0cd099996e8c47f6ba1d9
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 13:14:53 2006 -0700
When setting output state, leave output unchanged when setting to current.
commit d16e83413e7e06adebd629d04de57bbedd8c3765
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Sep 20 12:47:17 2006 -0700
Hide or rename more global symbols to avoid clashes with libfb.
Rename composeFunctions, xxSetup, and xxPrintVisuals. Hide the other xx*
symbols by making them static.
commit d08718d8fd31477e90f13b9e122504c515b46ee0
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 12:05:52 2006 -0700
Avoid calling xalloc(0). Change rrScreenSizeSet to rrScreenSetSize.
commit ef1f3248cb5fff0a02c0059f865c4d931eba23a6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Sep 19 22:48:54 2006 -0700
Split out 1.0-style info and new property routines to their own files.
commit 07112adb0802d28488de5a495aa61bb3cfc280b6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Sep 19 00:46:27 2006 -0700
RRGetScreenResources and RRGetOutputInfo are working now.
Removed separate id field in RRModeRec.
Pull screen subpixel order from Render extension.
Implement RGetScreenResources and RRGetOutputInfo
commit afe5e9483b352ed06075ed68a6ffa50799194e2d
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Sep 18 12:18:22 2006 -0700
RandR working with old clients and old API.
commit 2be1ac15aee592782d7693b8de2c3815478a094e
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Sep 18 12:11:18 2006 -0700
Remove smashing of CFLAGS from server build.
CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
commit bf07893947cfca945598e194ed416fda6162b11c
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Sep 17 23:03:23 2006 -0700
Split out RandR dispatch code from randr.c to rr*dispatch.c.
More disassembly to ease ongoing development.
commit 3e745745fecef1cb59e53bde52ded311b51e1dac
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Sep 16 23:21:37 2006 -0700
Split RandR implementation into separate files.
RandR is getting too big to live in one file; split into one file per object
type (crtc, mode, screen), leaving the rest of the code in randr.c.
Code is slowly approaching the point where it will drop-in as a replacement
for the old 1.0 implementation.
commit d17fb9672e238a089e463ac74cc4cd3325b67e1f
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Sep 16 21:44:42 2006 -0700
Start moving to new randr 1.2 definition
commit 8dec74321d916f204f8182f1b93a65defbe50e78
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Jul 17 14:43:07 2006 -0400
Successful legacy RandR API/Protocol emulation for query.
These changes clean up minor errors to make it possible to list the
available modes for a monitor using legacy APIs in both the X server DDX and
RandR protocol. Setting modes is untested, so it probably doesn't work.
commit cab3a0145f2483fe43b5db5f5dd2076db9757fe5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Jul 17 01:21:11 2006 -0400
RandR: New data structure, old API. At least it compiles now
commit d95c758630f4aacec339a7ec80d2c4a9d7de1e4a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 1 19:46:38 2006 -0700
Preliminary RandR 1.2 work
commit f057de4f73fa593fa3fc5f05f65b89e76273b158
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Sep 16 03:49:11 2006 -0400
Don't install librac.a.
Thanks, automake.
commit 6926776f0ecd1e8e81c5c40ccd3a97227bc44dcb
Merge: 6950267 49a70c8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 15 15:28:13 2006 -0400
Merge branch 'my-XACE-modular' into my-XACE-SELINUX
commit 49a70c8570b03aff8239324a2474918a6fbc52a0
Merge: d1110c5 05231e3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 15 15:26:57 2006 -0400
Merge branch 'master' into my-XACE-modular
commit 46af6d1e953f1eefb6edbba3d29fb9700e42c2bb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:28:44 2006 -0400
Always believe the monitor when it reports a reduced-blanking mode.
CVT reduced blanking modes are typically only seen on digital connections to
LCDs, but there are some monitors that report them as supported over the
VGA connector too, which is perfectly legitimate, electrically speaking.
commit 63acf18b7e4ce3a9f7deab3a9088a1c41cab0191
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:26:37 2006 -0400
In xf86MatchPciInstances, fail gracefully when there's no PCI device at all.
This allows the autoconfig logic to fall through sanely on non-PCI machines,
which importantly includes Xen virtual machines.
commit a8f9936f55c5364bb02e8c3187507eb1f70e2ef2
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:24:41 2006 -0400
Prefer driver-provided modes when matching name strings to modelines.
Well, kinda. Strictly we prefer M_T_BUILTIN strongest since those are modes
where the driver has said it absolutely can't do anything else (VBE). Then
we look for user-defined modes, ie, modelines from the config file. Then
we consider modes reported by the monitor via EDID. Finally if nothing has
matched yet we consider the default mode pool.
Within each of the above-mentioned classes, modes with the M_T_PREFERRED bit
take priority over other modes in the same class.
This logic ensures that the timings sent to the monitor exactly match the
timings it reported as supported, which occasionally don't match the numbers
you might get for that mode from CVT or GTF.
commit 81ef1b6d6063c20db4963abf7b7848e235aa4ebb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:18:58 2006 -0400
Mark EDID modes as driver modes. Infer virtual size from driver modes.
This allows the server to guess an appropriate initial virtual size and
resolution. The heuristic is to select the largest driver-reported mode
that matches the monitor's physical aspect ratio. We revalidate this
estimate after mode validation, since we may have filtered away all
modes that would fill that size.
Also, the EDID preferred timing is now marked as M_T_PREFERRED as well.
commit 43d9edd31e31b33b9da4a50d8ab05004881c8d5a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:09:02 2006 -0400
Attempt to add the 'mouse' driver in more situations.
Always add a mouse driver instance configured to send core events, unless
a core pointer already exists using either the mouse or void drivers. This
handles the laptop case where the config file only specifies, say,
synaptics, which causes the touchpad to work but not the pointing stick.
We don't double-instantiate the mouse driver to avoid the mouse moving twice
as fast, and we skip this logic when the user asked for a void core pointer
since that probably means they want to run with no pointer at all.
commit 739224d05eb4f356c9cab9dcb8a44a8d78287765
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:03:32 2006 -0400
Load the default module set when no Module section is given in the config.
Also, synchronize that list with the list for the pseudoconfig file used
when starting with no config file. These really need to be better unified.
commit beac2bf1e48e6b77dbf7d95f086abc5abcd90cf0
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:01:13 2006 -0400
Expand the default sync ranges to be large enough for 800x600@60.
commit 71a15a7d5721073eccb3a275f353b3aa584c0d68
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:00:10 2006 -0400
Publish the raw EDID block as a property on the root window.
This was removed in the patch for bug #5386, but is still useful.
commit 7939c8dfb7c7bed4febcdc12922fb2e17619ea36
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:57:57 2006 -0400
Bump the default pixel depth to 24, and default bpp to 32.
commit 72af975f9c8de0ff6796f1ce4b76dcf841d21e99
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:56:34 2006 -0400
Fix up EDID blocks where the max pixclock exceeds the preferred mode clock.
Base EDID only lets you specify the maximum dotclock in tens of MHz, which
is too fuzzy for some monitors. 1600x1200@60 is just over 160MHz, but if
the monitor really can't handle any mode at 170MHz, then 160 is more
correct. Fix up the EDID block before the driver can see it in this case,
so we don't spuriously reject modes.
commit d05e0a97bb704a4986cf638487205da759c4ce17
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:49:12 2006 -0400
Enable DPMS by default.
commit 334f7db9f653113d5d46236911d7de2ec4173f28
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:46:10 2006 -0400
Allow hsync and vsync ranges to be overridden independently again.
commit ced46e17777b635df9371c4cfaec3f8968b4dbcf
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:41:59 2006 -0400
Record all standard timings from EDID as modes, instead of just the first five.
commit d89fee68d0e49211871cd9eb3893ed55c1d478a6
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:41:15 2006 -0400
Record the maximum dot clock of the monitor, and filter by it.
commit fa8ef7166839a7435e0017683f3e3c7f7904b285
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:33:00 2006 -0400
Don't translate monitor gamma to X gamma.
The X gamma is used to set the output ramp of the card. Setting a 2.2 output
gamma going into a 2.2 monitor gives an effective gamma of 4.84, which is
very much not what you want.
commit 511c60bc7399b07c267d686a969880e5ec92408a
Author: Luc Verhaegen <libv@skynet.be>
Date: Thu Sep 14 18:30:36 2006 -0400
Bug #5386: Synthesize modelines from EDID data.
commit 05231e336db8f959c15dda518641976f061df1a6
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Sep 14 14:13:39 2006 -0700
Use correct opcodes for GLX_EXT_texture_from_pixmap.
Regenerate from glX_API.xml 1.3 from Mesa. The glproto package and libGL
(from Mesa) must also be updated.
commit 0a62840e2ce25e5c2554e7e5ab4c9c5b96899e2d
Author: Bill Nottingham <notting@redhat.com>
Date: Wed Sep 13 15:40:23 2006 -0700
Bug 7641: fix comment written to Xorg.conf (s/VertSync/VertRefresh/)
X.Org Bugzilla #7641 <https://bugs.freedesktop.org/show_bug.cgi?id=7641>
Patch #6349 <https://bugs.freedesktop.org/attachment.cgi?id=6349>
commit 182e5e0f4ba4c98a34bc52bdf4032ba315fe80ad
Author: Drew Parsons <dparsons@debian.org>
Date: Tue Sep 12 14:30:46 2006 +1000
Xprint: revert installation of /etc/X11/Xsession.d/cde_xsessiond_xprint.sh
pending resolution of #8232.
commit 594d4019c613b0f4bf8f48cc074ecc3c8366f1d7
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue Sep 12 01:15:40 2006 +0200
transformIsIdentity() now doesn't accept a zero matrix as the identity.
Added a non-zero test for one of the diagonal values.
commit fc30370d14125f86ee1192890a184881fa139546
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 11 19:43:09 2006 +0200
Bug #8226: Fixed SetPictureTransform()'s handling of the argument matrix.
It now recognizes scaled variants of the identity matrix, too.
commit 2b357e9a2f9038cf9cd07da908e3103a3d0965c9
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date: Sun Sep 10 22:17:20 2006 -0700
If we're installing libxf86config, install headers needed to build against it.
commit 58933757862c458e2da39bd464e50d9c0e41b313
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 15:50:51 2006 -0400
Warning fix, and a syntax fix in a #if 0 section of code.
commit 0a3740a0000191e3039fe183ae51b938d0548340
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 15:49:25 2006 -0400
Typo correction, 'i' is not a '1', so no longer crash on some Xi requests.
commit 8d709f0280b458515b32c2b87938749428e5c149
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 15:48:35 2006 -0400
Remove a merge artifact so that we can compile.
commit b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba
Author: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Sun Sep 10 11:13:18 2006 -0700
the new PCI mapping routines are broken on sparc64 (in fact they look
broken for any 32 bit X server running on a 64 bit kernel) so #ifdef
them out for now. the PCI rework tree will make all this crap go away,
so I think we can tolerate the extra #ifdef for the next release.
commit 60db190ecfce52cbfa888c0af3210634f9186bed
Merge: 5e9d33f 6525610
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 03:49:17 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 65256109bb8f5a26704ed960e1dd113981df5787
Author: Drew Parsons <dparsons@debian.org>
Date: Sun Sep 10 17:40:37 2006 +1000
* Define XPSERVERLIST with `/etc/init.d/xprint get_xpserverlist`
instead of `/bin/sh /etc/init.d/xprint get_xpserverlist`
- allows the initscript to set its own different shell under #!
- allows disabling of XPSERVERLIST by making the script non-executable
* Allow files to be installed by using dist_*_DATA instead of EXTRA_DIST.
Also, use dist_*_SCRIPTS to install scripts.
* Fix minor typos in man pages.
commit 6950267dd690ef8e29b1c32a157dd64c9b79c06d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:31:18 2006 -0400
Add SELinux extension configure-time support.
commit fb34c02861ab3629c1c85c156e73b158518db7c7
Merge: 9c503f0 d1110c5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:30:12 2006 -0400
Merge branch 'my-XACE-modular' into my-XACE-SELINUX
commit d1110c5c83a7f439158f369ab2f3ae614fa9d2a5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:28:48 2006 -0400
Generalize the handling of configuration files that ship with extensions.
commit 9deb579dc9366590203afe0576bf88643ab36c89
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:25:17 2006 -0400
Zero out newly created ExtensionEntry structures, but only after the
devPrivates have been initialized.
commit cec392656cda1c938d5462e1949e6eef489f9168
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:24:23 2006 -0400
Zero out newly allocated ClientRec structures.
This is required to initialize the devPrivates to a known state.
commit 0fba09cdfcc78161f5c92bef6cca53e5309656bd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:23:06 2006 -0400
Include dix-config.h.
commit c93877100eb98647c5b6b8556730d54677f730b6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:21:57 2006 -0400
Don't need to allocate memory now that devPrivates are being used.
commit 9c503f09ce78d952d0ece77c424e42b6df3fa9ad
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:17:01 2006 -0400
Add SELinux extension to the module/extension loader.
commit 9aa44e3e4c321f42d8e64f83c7f0932470593c26
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:15:19 2006 -0400
Add SELinux extension configure-time support.
commit 150eabc4c8a08c81c48493583f922a1240b7e91c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:11:04 2006 -0400
Add SELinux extension source files.
commit 86450998da616e3d00d4d6293acc35eccc2061e7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Sep 7 15:35:16 2006 -0400
Fix AIGLX VT switching.
See https://bugs.freedesktop.org/show_bug.cgi?id=7916
There may be a simpler, less intrusive fix that involves just rearranging
DRI locking between 2D and 3D drivers around VT switch.
commit 5e9d33fe87f9d24e55c468d4b2bb761c9efdb26a
Merge: 629798c 64479ff
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Sep 7 15:43:31 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 629798c73ad76a77fa6a55bc6403fd9b95ade2bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Sep 7 15:17:04 2006 +0300
XkbCopyKeymap/SrvXkbCopyKeymap: free geom harder, add cheery comments
Unconditionally free geometry when copying the keymap (so we have none on
core, oh well), add a couple of heartening comments.
commit 64479fffa22581cc7d753065c33eda5520b7db9a
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Sep 6 16:13:21 2006 -0700
Remove prototypes and externs for non-existant functions and variables.
commit a0179281a6522ec59830e8f2549633741bc56e10
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Sep 6 15:45:48 2006 -0700
Remove prototypes for non-existant functions.
commit 8356be492c6b46abdffa08b13836571ed872e16f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Sep 6 15:20:55 2006 +0200
Make sure _XSERVER64 is defined when it should be and gets tested.
commit f6ce0839ba5b73247097826d28f7388fe248ec0c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Sep 6 13:18:02 2006 +0200
Fix #include paths for fontcacheproto headers.
commit f39fd4242902eaa862321d39337f429dd14ebacf
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Sep 5 15:23:54 2006 -0700
(unsigned long)(1 << 31) = bad news on x86_64.
(cherry picked from 410e5b1d738ba47b36778e6cbed44023a27ce259 commit)
commit 410e5b1d738ba47b36778e6cbed44023a27ce259
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Sep 5 15:23:54 2006 -0700
(unsigned long)(1 << 31) = bad news on x86_64.
commit 0b81fccd2ee4e054e5cffb739de07460ff2c13f7
Merge: 20c4ac6 c281351
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 5 18:03:25 2006 -0400
Merge branch 'master' into my-XACE-modular
Conflicts:
configure.ac
commit c2813514cf7b1a36caa848cbc2ceef99cf2eb769
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 31 15:36:13 2006 -0700
Add missing file from previous commit.
commit 0f9cfb2f752a9010ff07f4b2bd891db0cc30b8e6
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 31 13:54:10 2006 -0700
Implement GLX_SGI_swap_control.
Regenerate from glX_API.xml 1.2. Add infrastructure to support
GLX_SGI_swap_control for AIGLX when the DRI driver enables it. Tested
with R300.
commit a9ef5862919313582f72fc0cfb5ab0af4df6507e
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 31 13:47:50 2006 -0700
Fix problems with vertex program protocol
There were two sets of bugs in the vertex program (ARB and NV)
protocol. First, several of the ARB functions were missing the
'doubles_in_order="true"' annotation. Second, after the ARB decided
that glVertexAttrib*ARB functions must not alias fixed-function state
for GLSL, Nvidia re-assigned GLX protocol opcodes for
glVertexAttrib*NV (circa Septeber 2004). For some reason gl_API.xml
was never updated to reflect this, and the updated version of the
GL_NV_vertex_program spec never made into the registry.
This is just a server-side regeneration from gl_API.xml version 1.68.
commit 69d5becce4ca2cfc8f8de53672ed54a47de62164
Author: Matthew Allum <mallum@openedhand.com>
Date: Thu Aug 31 17:30:24 2006 +0100
Fix previous commit breaking other kdrives pulling in fbdev.a
commit fd609956f27d76ee76ac8623787f0fc8633a5546
Author: Matthew Allum <mallum@openedhand.com>
Date: Thu Aug 31 17:18:57 2006 +0100
Add framebuffer device command line switch for Xfbdev
commit 2fb7b8795a9a36cce61f6449f6ca26ffd1b071f0
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 16:35:32 2006 -0700
Minor extension tweaks.
GLX_EXT_texture_from_pixmap should always be enabled.
GLX_SGI_video_sync is only for direct rendering and should never
appear in the server's string.
commit 1c8851ad491dd02d1c79e620b46384956838ed42
Merge: d59b52f 5ddbf4b
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 16:34:04 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit d59b52fc08f2d80b38993e383e61c3eeb0bb0763
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 14:40:13 2006 -0700
Make sure unsupported extensions are disabled.
GLX protocol isn't supported for GLX_SGI_swap_control or
GLX_SGI_video_sync. Remove them from the list of available extensions
until they are supported.
commit db6d04d4b87fd9b6409a3ddf0479a88440c2eda1
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 14:35:08 2006 -0700
Add support for AIGLX drivers to enable GLX extensions that they support.
commit 5ddbf4bcd46fe0d3d682668c2748c712fea410ae
Author: Matthew Allum <mallum@openedhand.com>
Date: Tue Aug 29 22:07:15 2006 +0100
Re-add support for tslib (1.0 release) and Xcalibrate extension.
commit 4524a2bf6f22c871ed109b027a065f0262137dc5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 23:49:26 2006 +0300
configure.ac: move tslib from KDRIVE_PURE_LIBS to KDRIVE_LIBS
Yeah. That was dumb.
commit 942b4369990a255257f66835caf8671432c405a3
Merge: 77d315b 393dc0a
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 13:30:37 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 77d315bd2fd2f9014c831d313efbe5821189177c
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 13:30:20 2006 -0700
Remove __glXNoSuchRenderOpcode because it is no longer used.
commit 260c3f32b69c98f8fc5360f860f69d32c19f04a7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 23:18:12 2006 +0300
configure.ac: fix XSDL test
commit 393dc0a3388d56186181b2bd9bcc1d267747e709
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 22:53:54 2006 +0300
kdrive: remove @KDRIVE_LIBS@ from Xfoo_DEPENDENCIES
commit cff23616fe45e10c6786a303c8dcfc0a80463a53
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 22:44:09 2006 +0300
configure.ac: allow disabling of XSDL
commit 89d272bb183e85715d8e6047929fb2d912033d82
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Tue Aug 29 15:05:31 2006 +0300
[PATCH] kdrive/linux keyboard: remove more debugging spew
commit bd6f539ff9409aa7d9056fabe120b457b0a15997
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Tue Aug 29 13:21:58 2006 +0300
[PATCH] kdrive/linux keyboard: silence excessive debugging noise
commit 5436fce09003e20744a388fa4ae49007c9cf8ede
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Tue Aug 29 13:21:40 2006 +0300
[PATCH] GetKeyboardValutorEvents: be even more careful
Don't accept devices without a keyboard feedback class.
commit 0eb7299f445455a7bcacf2410e83227b23259675
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Tue Aug 29 13:19:12 2006 +0300
[PATCH] XkbCopyKeymap: still more range fixes
Make sure we don't stomp preserve if it doesn't already exist, and fix a
couple of range-related thinkos in level name copying.
commit 7fa3383e3c8eea7d1eb0e556393f2431cf8e6ed2
Merge: 8d77d44 ebbdc13
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 15:16:01 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit ebbdc1342a243b301723390696f742dc91f59764
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Aug 28 18:17:32 2006 -0400
Remove calls to LoaderCheckUnresolved(), since it's now a stub.
commit 8d77d44fda3aacbae62864a3620e09095b79e92d
Merge: d6f36bd 2fde560
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 27 23:08:49 2006 +0300
Merge branch 'origin' into input-hotplug
commit 20c4ac6e038607ebbf6c04639670514c016d8597
Merge: 13c6713 8d4f21a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 25 18:49:46 2006 -0400
Merge branch 'my-XACE-SELINUX' into my-XACE-modular
commit 13c6713c82763a85c725c998b37ad02156d803ba
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 25 18:17:01 2006 -0400
Add four new XACE hooks: auditing, key event notification, window init
commit 2fde560bbb9c1148f26fd969dc30c4e736672b7c
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Aug 25 13:01:51 2006 -0700
Enable GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Re-generate from gl_API.xml 1.65. This provides the missing bits for
GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Enable those extensions.
commit e2d529963ed40b5f113cf82c17809d241cd4aac1
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Aug 25 12:05:16 2006 -0700
Enable vertex and fragment programs.
Implement glGetProgramStringARB and glGetProgramStringNV. With these
functions implemented, GL_ARB_{vertex,fragment}_program,
GL_NV_{vertex,fragment}_program, and related extensions can be enabled.
commit 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9
Merge: 1a5561c cd2da4e
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Aug 25 09:34:21 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit d6f36bd28009881ef7f7a20cdadb3808d808ed97
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 25 12:43:17 2006 +0300
xfree86/parser: use 'kbd' driver when 'keyboard' specified
Now that we've completely ditched the old driver, we should probably make a
best-effort attempt to keep configs working.
commit 7c4167f0d6b33c9c602b04fcfd246fd3aeddd709
Merge: 393f834 cd2da4e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 25 11:15:33 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 393f8347edcccfc24d8902a86ea9def7ada2537b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 25 10:46:32 2006 +0300
xorgconf.cpp: kbd, not keyboard
commit c33e39c86be2010b169ffbd8adbe53b93222dc5f
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 20:33:57 2006 -0700
Finish support for GL_ARB_texture_compression.
Fill in __glXDisp_GetCompressedTexImageARB and
__glXDispSwap_GetCompressedTexImageARB to finish support for
GL_ARB_texture_compression. With this extension (and the related
compression extensions), the server-side GLX supports all of the
protocol for GL 1.4. w00t!
The bad news is that this has received only minimal testing, and Mesa
does not contain any good tests for GL_ARB_texture_compression.
commit cd2da4e41eae233b50f8830d9a8f5d1d916a5a1b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 18:00:16 2006 -0700
Remove GL/glx/g_disptab.c, GL/glx/g_disptab_EXT.c, and
GL/glx/g_disptab_EXT.h. Unfortunately GL/glx/g_disptab.h has to be
kept around a bit longer.
commit a29e6dd2d2d45c18c52737bb3b7945aafcea5032
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 17:58:52 2006 -0700
Add some missing bits of GL_SGI_color_table.
commit ae608b2071d882966e9c7ede71f846b1ecec0b23
Merge: 2c86527 b879356
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 14:56:33 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 2c865277fe1d056981d1020e1af001d2319252c0
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 14:54:49 2006 -0700
Regenerate from gl_API.xml 1.63. Enable extensions.
gl_API.xml 1.63 corrects some problems with GLX protocol for
GL_EXT_paletted_texture and GL_SGI_color_table. Regenerate from that
file, and enable those extensions and GL_EXT_shared_texture_palette.
commit 7d5de5c6657304246473d7ddd5c29bb0c7a3bc34
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 14:49:46 2006 -0700
Regenerate from gl_API.xml 1.62. Functions move, no real changes.
commit 3a36b0a24aa9e9e238faa7f00100f59800f5142b
Merge: db1ab1b b879356
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:35:28 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit db1ab1bdb2f79eca593fe247056309a16ebd29c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:33:59 2006 +0300
XkbCopyKeymap: fix various range issues
Fix a bunch of range issues caused by incorrect assumptions (e.g. that the
design was at least halfway sensible), and copy types by hand, instead of
just blindly memcpy()ing the lot, since it itself cleverly contains a ton
of allocated pointers.
commit 5fb8d947bb88d715b9b236342885c445cb5a9387
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:16:43 2006 +0300
configure.ac: more thinkos
Fix auto tests for vidmode and xf86dga. I win at life.
commit 4e37c07ba6e5d299d4f8922dc6cf054c814f7baf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:16:17 2006 +0300
config: clean up debugging messages, make failure to acquire name fatal
Bomb with FatalError when we can't acquire the bus and name.
Clean up a bunch of debugging ErrorFs to be hidden behind #ifdef DEBUG.
commit b879356ce96929d02bcb75b9aa24b17ac7e28125
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 24 15:50:15 2006 -0400
More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER.
commit 4ed311cf1c29090c53e474a3001c5702ff8409df
Merge: 73e58ad b29b236
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Aug 24 20:17:10 2006 +0200
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit b29b236d88789fd45d823a55dbedb393bb134c5b
Author: Lukáš Turek <8an@centrum.cz>
Date: Thu Aug 24 15:57:09 2006 +0200
Adapt to Mesa header name change.
commit ce4a0a4ddafd3833d7025f83ed3729915c8aba70
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Aug 24 13:56:22 2006 +0100
Apply patch in bug #7919, blit improvements in
multiwindow mode for Xming/CygwinX
commit 866ca1f929c95689bac9f0a0b3478f7b4d77214b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 15:46:44 2006 +0300
configure.ac: fix XF86VidMode test
commit 2b06c69c8feaf3bdc065635ee711efa45b3033b3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 14:51:26 2006 +0300
GKVE: pass correct arguments to XkbCopyKeymap
Fix horrendous thinko. Indicators now work perfectly.
commit 4adf9af313c9f63b6ad734e174efe1d36ddb5813
Merge: 33af05d 67bd672
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 10:59:33 2006 +0300
Merge branch 'master' into input-hotplug
commit 67bd672c880869ef625ae0c0163c3ec1eba46abf
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Aug 24 08:47:06 2006 +0100
Fix typo
commit 733c4beb16c2c4ad9e9a4ea9a85b09fc5062a775
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Aug 23 22:39:42 2006 +0000
Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI
commit b983773d446cef6a0948ca264ed48126e404ae9a
Merge: 0623d36 d9a8656
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 17:16:50 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 0623d3643fc28ebc514b2ca872c985d0cf0c753a
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 17:16:02 2006 -0700
Fix the sorting of the extension string. Add a few extensions that
are supported by the new code. A few of these were actually supported
before but weren't advertised.
commit 5d2caacff570dd68bb3fb05e776e02515b2a9da0
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 16:47:00 2006 -0700
Refector __glXDisp_Render and __glXDispSwap_Render to DoRender.
Refector __glXDisp_RenderLarge and __glXDispSwap_RenderLarge to
DoRenderLarge.
commit 866bb3f34046045c9fa0744db1d76e035b3da9c7
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 16:41:53 2006 -0700
Memo to myself: Whenever a Makefile.am changes, autogen.sh must be
re-run. This is especially true if the change is to remove a source
file.
Fix RenderLarge to actually use the new protocol decode tables.
commit d9a86566c21afd7985673f3ed851b055d9dac46f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 23 16:15:19 2006 -0700
Add LOCALCONN to dix-config.h template for xtrans
commit f6fd7d8f8393f93705e76b2b2777a0d9bcafa991
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 16:05:37 2006 -0700
Convert protocol decode tabels for Render and RenderLarge to use nice,
compact N-way search trees generated by scripts in Mesa.
commit 7ae82b5fc8721be78b43a322bbf2c46aac08b8cf
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 16:00:48 2006 -0700
Fix __glXDispatchInfo::dispatch_functions and
__glXDispatchInfo::size_table. dispatch_functions had the const in
the wrong place, and size_table was declared as an array of two
pointers to int_fast16_t instead of a pointer to an array of 2
int_fast16_t. cdecl to the rescue!
commit 39a620d17809dc71fb5ad61a955fe3c442f90a05
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 14:24:34 2006 -0700
Rename __glXDrawArraysSize to __glXDrawArraysReqSize. This makes its
name match the pattern of all the other functions in
__glXRenderSizeTable.
commit 86406455f0e5fc977431948611e9bb5fda1e1d46
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 13:30:59 2006 -0700
Re-generated files after a fix to glX_API.xml (in Mesa).
commit d7a7f12361d31001bbd9394a57de029ef0b934b8
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 13:30:13 2006 -0700
Convert protocol decode tables for Single, VendorPrivate, and
VendorPrivateWithReply message to use nice, compact N-way search trees
generated by scripts in Mesa.
The Render protocol decode tables are next...
commit bdec9680fa74dd23cf319d09af1940f8cf71a5b1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Aug 23 14:43:23 2006 -0400
Make sure Composite is never enabled for Xnest.
commit 9f2a108051aad9b024ab737b45fc12290a113e37
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Aug 23 14:38:34 2006 -0400
Make 'Xvfb -render' also disable Composite, lest we segfault on startup.
commit 33af05d58f1f4f021036e9ce4b60fd76dbaebe73
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 23 19:05:50 2006 +0300
XkbCopyKeymap: use correct range for MapNotify
We haven't copied {min,max}_key_code by the time the notifies run, so use
src instead of dst to determine number of keys, et al.
commit 6323a11d0db4d3cf0317af83f0362730142f5325
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 23 18:53:04 2006 +0300
XkbCopyKeymap: optionally send NewKeyboardNotify/MapNotify events
Optionally send a NewKeyboardNotify or MapNotify event when copying the
keymap; modify GetKeyboardValuatorEvents to make use of this.
commit 728fbadd16a748b45c80bc2c65c46f82cf803578
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 23 14:33:59 2006 +0300
gitignore: ignore vi swap files
commit 8f8487ff997670a4af0293fed77ff920cfc39fb1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 23 14:33:41 2006 +0300
xkb/gkve: copy XKB map, not pointer-assign
Write a new function to copy an XKB map (does everything but geometry at
the moment), and use that instead of nasty pointer assignments.
commit 52ba722e4c89c052609b4fc62e965d92778aa2dd
Merge: 9138d5a 0554125
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 21 18:49:31 2006 -0400
Merge branch 'XACE-modular' into my-XACE-modular
commit 05541259bdb0dfaab015a01caa3722b7a1b782e2
Merge: c2535f6 a1ac044
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 21 13:07:41 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
commit a56b98bb047003a05e26ca9365c212a2da7ac200
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Fri Aug 18 18:03:41 2006 +0300
dix: enable null root cursor
Enable a blank root cursor, selectable with --enable-null-root-cursor at
configure time.
commit 0704bb298cc826cd117815898c6bc015a693c2c9
Merge: c140369 a1ac044
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:30:14 2006 +0300
Merge branch 'master' into input-hotplug
commit a1ac0440bba690368aa4226468ce571be1a09d95
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:30:00 2006 +0300
dix: fix whiteroot thinko
Note to self: run git update-index _after_ testing, not just before.
commit c14036977fef7b8787c0b68f5262fa0b6a2834f5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:24:34 2006 +0300
input.h: add InitCoreDevices prototype
commit 1c2cb30cd88ba4453f9da339025f8ff39f7f5412
Merge: 633b6a6 70ddd0f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:05:50 2006 +0300
Merge branch 'origin' into input-hotplug
commit 19f673b7788d32c220e7e06734f1074b0e4a999c
Merge: cb0a565 70ddd0f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:05:41 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit cb0a565d2b2cf8823abbd77b4426cc2237731dc1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:04:48 2006 +0300
dix: add whiteroot flag
Add a -wr option to use a white root window, and use a BackPixel rather
than BackPixmap for both white and black root windows.
commit 70ddd0f39d5118db72a1a4e473cbfb502f1ed9ec
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 14:43:10 2006 +0100
Fix bug #5735, Serious flaw in CygwinX clipboard
integration prevents paste from X to Windows apps
(Brett Stahlman & Colin Harrison)
commit 708b225689b5a4ba9ffe3372b584b715ef9eacdc
Merge: e1f4565 ee5e2cb
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:13:52 2006 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit e1f4565be5ce80be4655e81f77f4073fa3fbf8d0
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:11:48 2006 +0100
Fix bug #7302, make Xn.hosts work from the
Microsoft Windows install directory on Xming.
(Colin Harrison)
commit 1880defe4eaba02f9585b154d0883235eabc6d11
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:09:53 2006 +0100
Fix bug #7281, clipboard viewer should not
call SetClipboard viewer when bogus in Xming/CygwinX
(Colin Harrison)
commit a1a8e4f7f5917f537eb3dd51d3d6fa3e129236ce
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:08:12 2006 +0100
Fix bug #7280, round title corner background
should be transparent not black in Xming/CygwinX
(Colin Harrison)
commit ee5e2cbd2bee610a95facc6b486c4a5070973099
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 17 17:29:32 2006 -0400
Un-cut-and-paste the mode rejection message.
commit 43e42eef1f5a22703eb64fc9cffecde036ea38e0
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 17 16:22:07 2006 -0400
Fix default mouse device on Linux, again.
It would be really nice if we only did this in one place instead of 40.
commit 633b6a69f560c0a77dcff78fdef5fcf0041e2e04
Merge: 95dbfcf 7da5144
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:25:14 2006 +0300
Merge branch 'master' into input-hotplug
commit 7da51447eaab34292e14077fb5a48e6b2e587781
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:24:07 2006 +0300
events.c: fix tiny XEvIE thinko
Make sure xeviehot gets updated after the ConfineToShape() call.
commit 5d082f05632906c29296a44ef5c3a4962c0cbe62
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:18:18 2006 +0300
events.c: make XEvIE a little less verbose
Change a lot of:
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = ...
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = ...
to one single
#ifdef XEVIE
xeviehot.x = sprite.hot.x;
xeviehot.y = sprite.hot.y;
#endif
at the end of the functions.
commit 95dbfcf8828c041c218145afc87d21a6c9c7bc02
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:18:18 2006 +0300
events.c: make XEvIE a little less verbose
Change a lot of:
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = ...
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = ...
to one single
#ifdef XEVIE
xeviehot.x = sprite.hot.x;
xeviehot.y = sprite.hot.y;
#endif
at the end of the functions.
commit c6c39afde3e5f43b623ca6b52162b83c98a28d45
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:13:09 2006 +0300
dix/events.c: add YAFIXME
Add another FIXME to the cacaphony of XXX and FIXMEs in this file.
commit f9624e0109cf12b6af43fb4235aaa0b54340a4bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 16:09:51 2006 +0300
kdrive/input: verify SIGIO with --enable-debug
commit 73e58adda96c1d1b5176d819107faa7697c3eb94
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Aug 16 18:17:58 2006 +0200
Fixed segfault w/ broken Xinerama configs.
commit cd3f744b1f983f71476db99c050045d981c5f5b2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 15 15:54:13 2006 +0300
fix missing brace, trim unused variables
commit 5d073697adb3864133fa3221b82ab8d2f4a59758
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 15 15:37:10 2006 +0300
kdrive/input: minor warning cleanups
And also a compiler error fix when VERIFY_SIGIO is defined.
commit 47c1c948e69cfba950ad37a3133fa2db0bd0ff2c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 15 15:25:16 2006 +0300
kdrive/input: only run special key behaviours on non-XKB
Only attempt to manually deal with special key behaviours (e.g. terminating
the server) when not using XKB, and leave locking behaviour up to GKVE.
commit 34228d8b280ef105a0c60b8de5dacf70a5ce24b5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 15 15:23:53 2006 +0300
GPE: fix absolute button events / GKVE: (non-XKB) don't repeat lock keys
Fix absolute button events in GPE, where we would previously send valuator
events without bumping numEvents accordingly, causing the core event to
go missing.
In the non-XKB path in GKVE, implement proper lock behaviour (one press to
enable, one press to disable, discard releases).
Fix debug_events prototype.
commit d003bada3352ec7d734498c4c732904876a9d1e2
Merge: d6433be a815b9b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 22:48:55 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit a815b9b990e068f02d9cbba2b17f2cc3a30a9310
Merge: 37943e2 984babe
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Aug 12 21:58:33 2006 +0300
Merge branch 'master' of git+ssh://gsap7@git.freedesktop.org/git/xorg/xserver
commit d6433be3cca807dd78fbb1f45d9ba0212283083d
Merge: 2bf9e3d 984babe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 21:50:52 2006 +0300
Merge branch 'master' into input-hotplug
commit 2bf9e3dc1ec5fd7bf84a4a96899e5663a721d4a4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 21:50:39 2006 +0300
make DIX more tolerant of devices without a CtrlProc (Debian #269860)
Return BadDevice on client requests for devices without a CtrlProc, instead
of tanking horribly.
commit 984babe86bf82002b4d6589b2750c7b5a5489bd5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 21:43:38 2006 +0300
remove obsolete vendor defines
Remove random behaviour changes for SGI and MetroLink.
commit 37943e2f1abc6709ff739000372b0394d5cd18c5
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Aug 12 20:54:33 2006 +0300
Call exaTryComponentAlphaHelper() for solid src also.
Also, rename to exaTryMagicTwoPassCompositeHelper() as it is now called for
non-component-alpha masks also, and add function description from
http://anholt.livejournal.com/32058.html.
commit f7919c287936f55569c2301ebb1b5f52358e70fa
Author: Bastian Blank <waldi@debian.org>
Date: Sat Aug 12 20:43:25 2006 +0300
xfree86: don't do legacy IO on ARM or S/390 (Debian #362641)
Don't attempt to poke legacy IO ranges on ARM or S/390.
commit 59dcc62906d8ee597cd43aa307f414cb47995cea
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 20:39:08 2006 +0300
xfree86: remove Xqueue support completely
commit e641000b98e7c2e92e3c801eaa42aa15d5c16ad0
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Aug 12 19:41:59 2006 +0300
xfree86: add Hurd support (#5613)
Add support for GNU/Hurd.
commit 5a3488ccac8e5dabd9fc98bc41ef178ead1b2faf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 19:25:06 2006 +0300
configure.ac: fix execinfo.h test (Debian #363218)
Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h.
commit 26c3cd1c9e3f52548389817a6d89a377e20c4269
Merge: 008aa7e c4951e0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 18:58:18 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 008aa7eb6ed090384e6c44f861410e317c78a1cd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 18:56:05 2006 +0300
completely remove OS keyboard layer
Completely axe the keyboard layer from os-support.
commit c4951e0a6b6cf3eeee710cc5cda1d9bc929ee3d7
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 10 20:49:06 2006 -0400
Fix a mode sanity check to not break reduced-blanking setups (LCDs).
commit e1921f014b102e3eecf3b41972f8672cf23264d6
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 10 20:43:15 2006 -0400
Rename some mode tokens to better reflect their use.
Per #5386, M_T_EDID -> M_T_DRIVER, since it's really for any driver-detected
mode. Also add M_T_PREFERRED bit, to select a 'best' mode out of a set.
commit c2535f67923bde0bfb0e72363467110806e2f40f
Merge: c0cb8d1 db82e12
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Aug 10 10:37:59 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
commit 9525c2709ea3245c6518d4c3b5a0a4afff37181d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 20:29:57 2006 +0300
configure.ac: fix xephyr conditionals
Fix Xephyr build conditions, allowing it to actually be disabled.
commit 6d8d4abaaacf08140b673472d985117d448a62e7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 20:28:06 2006 +0300
configure.ac: allow conditional building of XF86{DGA,Misc,VidMode}
Allow conditional building of the above three extensions, defaulting to
auto.
commit 1a5561c4ecccaf32b03c41373adf376100d457aa
Merge: 190f229 db82e12
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 10 10:20:37 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit cec284f2b3e948deb9e56a1a8519fddf693ab952
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 18:03:58 2006 +0300
kdrive: properly ifdef composite enabling
commit 45bce556e8665412b9f6e89f88ed5bedb41de1ba
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 18:02:47 2006 +0300
GetMaximumEventsNum: be more conservative
Be slightly more conservative in our maximum event count if we're using
XKB (and thus don't need to count the extra repeat events).
commit 172d45b9b75f95c997d1e9358040eead496e2a06
Merge: 3832a3d db82e12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:14:54 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 3832a3d7db0f3b5d7167e3b3b5ea6d6b3d96351a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:13:51 2006 +0300
GKVE: don't repeat modifiers when using XKB
Make sure we don't ever repeat modifiers (previously was repeating when
using XKB); only do explicit KP/KR repeats in the non-XKB case. XKB will
take care of repeating when we're using it.
commit 9f188416bb6b4837d4c3f8773053d5eee0ff0ee1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:00:34 2006 +0300
core devices: clear devicePrivates on close
commit 539d1f33475484d35fb5a377efc76dba2d868e3f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:00:14 2006 +0300
GKVE/GPE: have DDX allocate events
Don't allocate events on every GKE/GKVE/GPE call, just have the DDX manage
it instead. Introduce GetMaximumEventsNum(), which is the maximum number
of events these functions will ever produce.
commit db82e12fac5eaa16a39fc1bd0bc31ad95089dc95
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Aug 9 14:55:17 2006 -0400
Remove TargetRefresh option from the autoconfig logic.
The default target of 75Hz is almost always wrong for LCDs.
commit fcd4167e8913f77bdf9e17a6955d0f2a9f4eeb10
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Aug 9 14:48:51 2006 -0400
Remove the bc flag from the -help text, since it's gone.
commit 767f372dd02232469f9fd804b811a17eaf762e1e
Merge: c4f5de6 462bb61
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Aug 9 20:23:30 2006 +0200
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit c4f5de6cc3b935025829af971b0b8010c1ecfedb
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Aug 9 20:21:52 2006 +0200
Sanitized glxdri's Block/Wakeuphandler calling.
__glXDRIleaveServer() and _enterServer() used to call DRIDoBlockHandler
(resp DRIDoWakeupHandler) directly. They are now calling DRIBlockHandler
(resp DRIWakeupHandler) to account for driver specific block/wakeup
hooks.
commit 5506b4ad200745236f997c121e8200179c47b749
Merge: 4be9abb 462bb61
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 9 07:21:01 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 4be9abb8504b3761b5f3a01851e4eb3da86c76e2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 9 07:20:16 2006 +0300
kdrive: remove ddx_DEPENDENCIES
Remove foo_DEPENDENCIES as they weren't guaranteed to just be libs,
and loader arguments (-lfoo, -Lfoo) might've crept in.
commit 462bb61b0fe968fae1b99cf98ec6f7de09105dcd
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Aug 8 18:07:22 2006 -0700
Add CompositeRegisterAlternateVisuals.
This provides drivers the ability to add their own alternate visuals and then
register them with Composite for implicit redirection.
commit 190f229ed77d87797e0f2f6762c86b3ad3a3dcbe
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Aug 8 16:47:32 2006 -0700
Make xf86PciVideoInfo static since it is only used within this file.
Dummy out all of the PCI bus and device access control functions. We
need a better way to do this, and that will probably be in
libpciaccess and / or the kernel.
Refactor xf86GetPciInfoForEntity to use pci_device_find_by_slot.
Refector xf86CheckPciSlot to use xf86GetPciEntity.
Eliminate disablePciBios and the one place that calls it.
commit 5508f7646f9754b054e961a1025b7a52913b563b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Aug 8 16:43:31 2006 -0700
Remove prototypes from some functions that were previously removed.
commit 9df53d903ed68073bf7d2c2a275b6f6556a85c0f
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Aug 8 16:42:23 2006 -0700
Rename xf86ReadDomainMemory to xf86ReadLegacyVideoBIOS, since that's
what it is actually used for. Modify a few routines in linuxPci.c to
take pci_device structures as parameters in stead of PCITAGs.
commit fe351a711ef55c3ae1e784d4551147c080eda109
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 8 14:54:10 2006 +0300
GKVE: send XkbMapNotify, not XkbNewKeyboardNotify
Sending MapNotify is more correct in this case than NKN, so do that.
commit 31089816317f27c668b12a15c74fdd226a8df9f7
Merge: ab3ebfe 12dbd8a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 8 12:01:12 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit ab3ebfefdb7d21aba72a5030f6f93bf4fafed709
Author: Tiago Vignatti <tv02@c3sl.ufpr.br>
Date: Tue Aug 8 12:00:34 2006 +0300
xorgcfg: fix compilation error
Add missing parentheses to IS_KBDDRIV macros.
commit 12dbd8a02f797ad57a1be683a02a1fcb1ca35438
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:43:40 2006 +0300
remove optional R3 backwards compatibility
Remove the permitOldBugs flag, which enabled backwards compatbility with
broken R2/R3 era clients.
commit 7721ee308fbbb6fc9c969f15fe04b3346c04f843
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:03:02 2006 +0300
config client: fix minor race with event queue
Fix a small race whereby you could remove a device while events from it
were still in the queue, by calling ProcessInputEvents immediately before
RemoveDevice, to (hopefully) flush the event queue.
commit 458c63a84110f64c7fce397a531a3a779c2239a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:02:17 2006 +0300
enable adding devices after removal of a middle device
Allow new devices to be added after a device that _wasn't_ the last on the
list was removed, by ensuring inputInfo.numDevices always increases, and
never decreases.
commit a31d11a7a8485cdc799f76c4d407d3b7f7c9b350
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:01:23 2006 +0300
GKVE: get rid of bogus double-release check
Get rid of a bogus double-release check which broke non-XKB servers.
commit bedc4ecf23c7150e3156e0d24602ed3bc3977225
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:00:45 2006 +0300
xephyr: aid input debugging
Add the 'ephyr' mouse and keyboard drivers to the driver list so we can
re-add devices.
Set the names properly in Ephyr{Keyboard,Mouse}Init, not in InitInput.
commit baf93b3abe1e88d82ee6a3d6939f50f96ded271a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:12:45 2006 +0300
kdrive: move map initialisation to KdNewPointer
Do a linear n -> n initialisation on the map up until KD_MAX_BUTTON in
KdNewPointer, moving it out of both KdParsePointer, and KdPointerProc.
Also remove dead pointer acceleration code.
commit ccb53340b66a778abf10182fd88a7d699207fb84
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:12:00 2006 +0300
ephyr: cleanup
Remove extraneous KdAddPointerDriver call.
commit d1c18af27e0aed73104743afb4bf4b8d3d1186cf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:11:38 2006 +0300
GPE: use button map for DBP/DBR, not just BP/BR
Make sure we use the button map for extended events, not just core.
commit 9b7ecbd1dd8d092221897e29c85f3306c7367716
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:09:32 2006 +0300
kdrive: prevent overrun in map
We actually need n + 1 elements for the mouse button map, not n.
commit eb6e8d4042252b13328dbb122e0e6186796a80ac
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:05:37 2006 +0300
kdrive: increase maximum number of buttons
Increase KD_MAX_BUTTONS to 32.
commit 1c72290cdf4d9b214e1b9c0526cb7cb8641051f3
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Aug 7 09:57:58 2006 -0700
Use DrawablePtrs instead of PixmapPtrs for Prepare/Finish access.
Also, define some wfb functions even if FB_ACCESS_WRAPPER is not defined. This allows a client to use libfb and libwfb at the same time.
commit afcad4ad99bbfc8bdcd0f4fdd70e072108410d30
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 18:11:05 2006 +0300
xfree86 ddx: always free GKE/GPE events
free() events we get passed back from GKE and GPE so we don't just, er,
leak them all. *cough*.
commit 98fdf874eeadd5b37413922d8afba8415d0c56bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 16:51:39 2006 +0300
move all autorepeat logic to DIX
Move core autorepeat logic for keyboards down to the DIX, remove it from
KDrive.
commit 5c7001fef8ffc6e3d8585a37d3f79a9495be8ed0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 16:51:09 2006 +0300
memcpy() events in
memcpy events into our event structure instead of doing pointer assignment.
commit c85e64cba1d2d88f676ca7cf23b52a6f8219e90e
Merge: a406f6b f54b71b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 15:54:55 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit f54b71b772a1f587394ae3968782b611e52f0e2d
Author: David Nusinow <david@nee.(none)>
Date: Sun Aug 6 18:11:00 2006 +0000
Document enable/disable flag for AIGLX in xorg.conf manpage.
commit a406f6bfeaa46e3236f7ab46813fe6c30b936a35
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 4 12:40:19 2006 +0300
mieq: don't leak events
free all events posted through mieqEnqueue.
commit 997ba45b192f21810099ed888792a45f1677a9ce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 4 11:18:16 2006 +0300
fix incorrect button test
Test for n (1..nButtons) being under nButtons, not button (1..(1<<nButtons)).
commit 9138d5a51e411f598bc0e75a3e73d2c16187a518
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 3 18:24:04 2006 -0400
Make SecurityLookupIDBy* part of the base functionality.
commit 45c229f526bf1dafb5e81b50d700449ba4e1613d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 3 14:26:06 2006 -0400
Remove LBX code.
commit 96e45626c43b7674b66e0258b0b1730d5ce71357
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 2 20:29:59 2006 -0400
Rebase Security extension to use devPrivates for storing security state.
commit 83ebf61ec03ff31005375900bee1e55e0e694c4b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 13:33:33 2006 -0700
Eliminate the last few places outside xf86pciBus.c that use
xf86PciVideoInfo. In all cases this means converting the code to use
the pci_device_iterator interfaces.
commit 5bfb2ee9652e5ef6d076ef8b6df54baaa43b8e0c
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 13:29:21 2006 -0700
Remove the last remants of the pci{Read,Write}{Long,Word,Byte}
functionality. This also allows the removal of PCI_CPU, PCI_CPU16,
and a few other dangling bits of cruft.
commit a0f2e1cae46f189ed97e2d92b485d315b3d2627a
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 10:54:41 2006 -0700
Move xf86FindPciDeviceVendor and xf86FindPciClass from xf86pciBus.c to
xf86int10.c. Refactor common code from those functions to do_find.
commit de8234606f87ce79d016f7ddeabdf57c4ad212f3
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 10:44:11 2006 -0700
Modify xf86FindPciDeviceVendor and xf86FindPciClass to use the
pci_interator interface instead of the xf86PciVideoInfo array.
commit 3c23dec5962b8b81ae838fe0ee2c7b0a789f5386
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 2 13:39:49 2006 -0400
Call ClientStateCallback on serverClient devPrivates initialization.
commit 23f44df9009023e77508f03ac4a7595c7e3d40cb
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 09:55:32 2006 -0700
Remove pciConfigPtr and all of the associated cruft.
commit 966ebd3d2d84b440e89504d055a0e937303ed11d
Merge: a941766 39169fd
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 08:14:58 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit ee02e647882a4be29e1130bd79904ee79ed6b802
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Aug 1 13:45:43 2006 -0700
Wrap libwfb memory access.
Use the READ and WRITE macros to wrap memory accesses that could be in video
memory. Add MEMCPY_WRAPPED and MEMSET_WRAPPED macros to wrap memcpy and
memset, respectively.
commit 39169fd373b97f34923f6494d697d9429d0b8aa3
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Tue Aug 1 13:39:22 2006 +0100
Back out 'mystery' spurious host window hints.
commit f737cc38baea6af8bf284c9e207e60a7d90eebe1
Author: Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
Date: Mon Jul 31 19:58:42 2006 -0400
Adding devPrivates support to the ExtensionEntry structure.
commit b04d64854712678701d5243aacf5cc93444cfadc
Author: Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
Date: Mon Jul 31 19:35:08 2006 -0400
Added devPrivates support to the ExtensionEntry structure.
commit a94176627cdd6122ffadb618995f9bcec872609a
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 14:33:58 2006 -0700
Eliminate all uses of the businfo field of pciDevice / pciConfigPtr.
commit a69335dc299be6de8b82ed34de1cb30f1255feb4
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jul 31 14:15:55 2006 -0700
Make ReadMemoryProcPtr take a const pointer.
Fixes some warnings when using READ with a const pointer.
commit 26c9587f90806cce1c0d2a98e656e9c311a34ee5
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 13:54:36 2006 -0700
Build fixes for last pull from HEAD.
commit 65dc25d8f86b962f2adc765a9ff327419f98092b
Merge: 69533fc b74c845
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 12:30:30 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit b74c845a1233f78b841ff8840272c50873300c20
Merge: 3112a6c 02daa6b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 10:26:06 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3112a6c4f26d5e9258b8def7ce4109b4bd408c67
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 10:25:31 2006 -0700
Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a
is actually used.
commit 02daa6bb103e53e5a33db2bb6acbe57d0bf2c30e
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Mon Jul 31 17:32:05 2006 +0100
Improve XRes to;
- Better estimate general pixmap memory usage.
- Account for pixmaps shared between clients.
- Account for window background and border pixmaps,
and GC stripple and tile pixmaps.
commit 69533fc04f38c67fd424776c5191a4ba57ba8c8f
Merge: ef1aeca 24051ef
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 09:26:04 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86AutoConfig.c
commit 24051ef97406f28c102cf46a78223400b61fdae2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 12:15:33 2006 +0300
remove filename that's too long for tar
commit ecb7d43a76d507d04891ab7f189b23be5eccda51
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:52:41 2006 +0300
add sym.h to sources
commit bf2d7499c84c94f228d03b21448f5688b3cda1a8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:17:02 2006 +0300
add securitysrv.h
commit e87e68634d8eb66ab783e2802e2d5d12ff1031be
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:11:59 2006 +0300
remove .cvsignores from EXTRA_DIST
commit ed0c807de9f07468385fcbd2e8a9c0737759a461
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:08:54 2006 +0300
bump to 1.1.99.3
commit a68dc013a33d867e65a7e76b3eec5947b862a5b4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:08:47 2006 +0300
remove README (which doesn't exist) from EXTRA_DIST
commit 87fe85f38b6f781bf0e2eb555526e3d77779f9fa
Merge: 3518e2d 654619d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 10:51:34 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 654619d76c779606f2315782fc01d1410399fa3b
Author: Kevin E Martin <kem@freedesktop.org>
Date: Fri Jul 28 17:16:32 2006 -0400
Revert xkb changes that broke XkbGetKeyboard()
commit 79016d4036786b091a9b9d1133a6cdfedd6c277d
Author: Luc Verhaegen <libv@skynet.be>
Date: Fri Jul 28 16:02:02 2006 -0400
Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and
export it from the X server to modules.
commit e6ae1612be519ee6224d354244d076d85d44a750
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 27 18:24:59 2006 -0700
Add fbHasVisualTypes and fbSetVisualTypesAndMasks to wfbrename.h and include -DXFree86Server.
commit 2a4ceb09ed5a09dc5763754ab865ec23df91ac9f
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jul 26 19:39:17 2006 -0400
Remove dead function prototypes.
commit 990a4009057e068f41d20b95aa0c59357185650d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jul 26 19:03:39 2006 -0400
Remove getconfig horrorshow. Replace with a static built-in rule list for now.
commit 377a581ddf5e428a368efb1b59fcb317666fecdd
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jul 25 15:27:31 2006 -0700
Switch to using void* pointers.
Pass the size of the data pointed to by src or dst as an argument to
wfb{Read,Write}Memory. This allows one set of macros to be used with any size
pointer. Assumes that sizeof(FbBits) >= sizeof(FbStip).
commit a4005c15fbb48231cb958c32b2c791a2d23a135a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jul 10 18:58:09 2006 -0700
Add framebuffer access wrapper infrastructure.
Create fbPrepareAccess macros to call into the driver to set up the
wfbReadMemory and wfbWriteWemory pointers. Call these from fbGetDrawable and
fbGetStipDrawable.
Add the READ and WRITE macros, which expand to simple memory accesses for fb,
and calls through the function pointers for wfb.
Add fbFinishAccess macro to give the driver an opportunity to clean up. Add
calls to this in the appropriate places.
commit 319efac445cebda5a2ac1db67efebe54bc47ba9d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 7 18:45:30 2006 -0700
Prefix all of the exported symbols in libwfb.so with "wfb".
For now, just #define all of the exported symbols in wfbrename.h. Later,
we should add FBPREFIX() around the exported symbols and use -fvisiblity=hidden
to hide the rest.
commit 7608a63ff7409f399c9a26962a304b84196a1868
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 6 17:05:21 2006 -0700
Build infrastructure for libwfb.so.
Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la. Define a macro,
FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la. Use the
macro on [w]fbModuleData so the new module loads.
commit 39158e98acb29e97a2682d4a37385f9141b484c4
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jul 26 18:39:28 2006 -0400
Remove another latent PowerMAX hunk.
All your favorite running jokes of 2005, today!
commit ef1aecaaf6cd7e9e4f9d0c6373664e774500bc13
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jul 26 13:25:13 2006 -0700
Pass correct pointer to xf86MapLegacyIO.
commit 3518e2d0debc97e2bacdefe604b280e7fdfdd216
Merge: eb7733a 3821f6a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 26 11:29:21 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit eb7733a48a92405660d5d2ab60913b62c30daaed
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 26 11:28:45 2006 +0300
kdrive: drop excessive NewInputDeviceRequest debugging
commit 3821f6aeaa714582ee0a631de96c6e7cfd96303e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jul 26 01:56:02 2006 -0400
Unlibc-wrap DMX glxscreens.c and fix tag-removal typo.
commit 28ba8d56912ae56d7b9835188f621b0a491add30
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jul 25 15:38:09 2006 -0700
Gut anything having to do with the PciBusPtr (or PciBusRec) type.
Bump required version of libpciaccess to 0.5.0 so that
pci_device_get_bridge_buses can be used.
commit 380b51d605a82c98082a2cebd70a0d1d0735eaa7
Merge: 82f6b7e 8977b07
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jul 25 11:30:04 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86Init.c
hw/xfree86/int10/pci.c
hw/xfree86/scanpci/xf86PciData.h
hw/xfree86/scanpci/xf86PciStdIds.h
hw/xfree86/scanpci/xf86PciStr.h
hw/xfree86/scanpci/xf86ScanPci.h
hw/xfree86/utils/pcitweak/pcitweak.c
hw/xfree86/utils/scanpci/scanpci.c
Re-removed most of the conflicting files.
commit 4ea475924c557ad0819b796f5369e5e669465709
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 25 20:00:48 2006 +0300
re-add OpenedHand copyright
Ae-add OpenedHand copyright, accidentally dropped in KDrive new world
order patch. Sorry guys.
commit 82f6b7e75e04e3fb951ab71ad3c553c8b34ea995
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 13:52:58 2006 -0700
Don't re-look-up pointers that are already stored in structures.
commit 2fd6b995ff927c8ca7267c201f535564b82e691f
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 13:33:34 2006 -0700
Global s/xf86MapDomainIO/xf86MapLegacyIO/. Let's call a duck a duck,
okay? Since xf86MapLegacyIO is called from only one place, cut the
parameter list down to the one parameter that actually conveys some
information: the one that gives a PCI device. Change from using a
PCITAG to a pci_device.
commit aed6fe0bb12c68b94e564252bc03594728ed8c5b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 13:13:05 2006 -0700
Refactor linuxGetSizesStruct to take a pci_device pointer instead of a
PCITAG. Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to call
linuxGetSizesStruct directly with a pci_device pointer. Remove
linuxGetSizes.
commit e48762799248eb7e16ea2c0df1561ae1430f2112
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 12:23:23 2006 -0700
Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to use the
libpciaccess interfaces.
commit 4b474cbc1a0fe17da2438a15291f04ee67ea28f8
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 12:17:27 2006 -0700
The functions xf86PciBusAccWindowsFromOS and xf86BusAccWindowsFromOS
are identical. Just have one call the other.
commit 7dff8d98a9ed11f92806cb8c4b3f10e01c5d063f
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 11:56:37 2006 -0700
Remove source files that have been dead since day-1 of this branch.
commit eb95128f615e2f3fab17dcafd4fc260c6d4d0644
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 11:53:37 2006 -0700
Changes that were missed on the previous commit. Perhaps oddness
caused by doing git-update-index at the wrong time.
commit 05f8b772aec2b05d92078bb60a07bd8413386363
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 11:23:03 2006 -0700
ScanPciDisplayPCICardInfo now uses pci_device interface for PCI
scanning. Log messages simplified to make the code shorter and less
convoluted. ScanPciDisplayPCICardInfo is now void since it was only
called from one place with a constant parameter.
commit ca3f4fc1b0c21a0620ab1eb35c199cd55d795095
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 23 19:02:12 2006 -0400
add fallback ChangeDeviceControl, allow XOpenDevice on closed device
Add a fallback ChangeDeviceControl, which allows the attributes we know about
so far.
Allow XOpenDevice on closed devices.
commit e73e5e2a4d8f22889d840a7719479f9af686cb9c
Merge: a73cef1 8977b07
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 22 13:56:30 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 8977b07434d75ca396d236dc1324f0c862b633c7
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Jul 23 03:36:47 2006 +1000
glx: fix typo from tag removal
commit a73cef1f005ca66db18e952e676ee5a21b829700
Merge: 672ca15 70869fc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 22 12:07:22 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 70869fc6777f87cd05794446caa739e3d9a91ffe
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 23:39:37 2006 -0400
Yet more dead code.
commit 7c1b2ee7a8238c267bc97e78bbff204dc7723dd3
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 23:35:13 2006 -0400
static markup, more dead code.
commit 1c4f90b1d05d4c49279f3224a6dd94850a6bd8d0
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 23:03:21 2006 -0400
Open-coded path checks make baby Jesus cry.
commit 114264584ca43091a5e07282566a30a6378a1502
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 22:55:41 2006 -0400
Remove a useless open() of the module we're about to load.
commit 985611d5cd079f97da700c7b8e898d33da004be0
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 22:37:59 2006 -0400
Delete some long-unused testing code.
commit 525257eb98b46209c69c8576daa6bd7afc1f48a9
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 19:16:38 2006 -0700
Fix stupid typos.
commit 672ca156bfb11440e6e234650bfba9d38e1edb52
Merge: d14d91f 6cf844a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:58:42 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 6cf844ab69926b6d23619a12c97734af3881ba67
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:57:28 2006 -0400
loader: walk directory paths with readdir(), don't stat() everything
Walk the directories with readdir, and don't stat everything we can
find. Thanks to davej for the public humiliation reminding me to go back
and re-fix this one.
commit d14d91f094c3897c889f6aafb66d738820dae0aa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:57:28 2006 -0400
loader: walk directory paths with readdir(), don't stat() everything
Walk the directories with readdir, and don't stat everything we can
find. Thanks to davej for the public humiliation reminding me to go back
and re-fix this one.
commit e18d34f4238e13e226b0407fa2f5f77d2038de39
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 16:47:45 2006 -0700
Make the various implementations of xf86ExtendedInitInt10 use the
libpciaccess interfaces. This eliminates all calls to mapPciRom,
which in turn allows the elimination of hw/xfree86/int10/pci.c.
commit 87a6346bf7f086b5f98b2b2ecd52f27efe864e56
Merge: b73fb2a 0486d39
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:36:25 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 0486d3966d2888ef86d36c19f31bdbc2a3e8c652
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:35:04 2006 -0400
fix kbproto dependency
Depend on kbproto >= 1.0.3, for unconditional definition of
XkbSA_XFree86Private.
commit b73fb2ae35a82e0bdd48f01132e971fb84946ff1
Merge: e7ac27a aff404f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:30:26 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit e7ac27ad81efbea6128b3cec443ca98e228d14ad
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:29:28 2006 -0400
revert accidental deletion of lnx_io.c; re-delete lnx_kbd.c
Thinko'd which file to remove after merging from master.
commit 81913a12910e39d7ea6af8657c1c66cc6791cd65
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:10:26 2006 -0400
remove undead files from master
Remove dead files which worked their way back in when merging from master.
Ugh.
commit 7465010d59ec435bd00b738f0cef766b352dc7eb
Merge: 1d31ed7 0aaac95
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:05:41 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 1d31ed778284082e1060bff63317c94581d9eb9b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:02:52 2006 -0400
xephyr: load keysyms at init, not enable
Load keysyms at init time, not enable, so we don't get the wrong map width.
commit 63dfaa1d5ba556e09314ec914936e5471aab94b0
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 18:47:18 2006 -0400
Delete internal usage of the symbol ref/req lists.
commit bca9364f3f4a2376edbcf57a34f704ce28be21ba
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 18:41:46 2006 -0400
Remove the loader's required and referenced symbol lists, dead code.
commit 07ad92d2c4cb07db8487d76efc822fd7b88137cb
Merge: 18624a9 22db3fd
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 15:25:35 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
commit aff404f293ed86a44a093a51a9f11e79e6c3f4f6
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 18:24:37 2006 -0400
Detach xf4bpp from cfb.
commit 0aaac95b0d12089b256c97f6ff955c8c229ae095
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 17:56:00 2006 -0400
Remove RCS tags. Fix Xprint makefile braindamage.
commit eeaad0e956640aac653d194a992df7792e4abcbb
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 20 18:19:07 2006 -0700
Fix the RandR failure path for rotated screens.
commit 22db3fdb54d2f7f6b72638b46c186af6db04e214
Merge: 2f98841 93cd538
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 13:55:37 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3eeb62e8f587732e6b433c2b9c6879eb26a3f1b4
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Jul 21 16:33:28 2006 -0400
bug #890: completely remove deprecated keyboard driver
Remove all remnants of the old built-in keyboard driver.
commit 60ea7b51fe2b8a19a08b63db48504971a7a50ee6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 15:23:37 2006 -0400
xorg ddx: move to new input API, remove old keyboard driver
Remove most of the rest of the old keyboard driver.
Move to the new Get{Keyboard,Pointer}Events API, which is mostly
complete at this stage: just missing the proximity events.
commit d32dc8bf19e1071fc30af2f0bc6a6699b351f39e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 20 18:40:47 2006 -0400
be more careful in IVAS
Don't walk off the end of a NULL pointer in InitValuatorAxisStruct.
commit 7711c56d2e2aeae4dcd6d9297bc144c1cb3cfab1
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 18:38:57 2006 -0400
xephyr: fix keymap, pointer; dix: fix multiple axes
Initialise our axes properly in the DIX, and make sure we don't
unnecessarily clip maxval when it's not set.
Fix keymap copying in Xephyr (to some degree: it's still broken),
and set nAxes and nButtons properly.
commit f18c3122a57df9770087e5fc70ac488552222233
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 16:49:17 2006 -0400
sanitise debug output
Don't spit out huge chunks of pointless ephemera, especially without
--enable-debug.
commit 463e0fe35bec3c91b19be9aacf34babb146a88c9
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 16:45:15 2006 -0400
update KDrive to new input API
Update KDrive to fit the new API (mieqInit and InitPointerDeviceStruct), and
include InitTouchscreenDeviceStruct in the DIX.
commit 1987af8c498a1bf394a8951ca6d5b0b7f7a35188
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 16:39:54 2006 -0400
add virtual core devices to DIX
Add virtual core devices, with proper keymaps etc, to the DIX.
commit 737e6e4836a6af26fedc22cda8e7d366b52c8fa7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jul 19 20:10:48 2006 -0400
define SDevicePresenceNotifyEvent prototype
commit 7f36cc533e7f6ae44e973c5f00f9bfec7c6b7b50
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 19 20:09:13 2006 -0400
distribute config.h
commit e896195eab726a2b307200958308eda8c93dd3cd
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 20:05:33 2006 -0400
remove extraneous font debugging code
Some of it didn't compile, and some of it was just unnecessary.
commit 99c57674c002c5e88c6db34488a27b05004c9197
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 19:59:11 2006 -0400
avoid using font servers with built-in fonts
commit ecfad74c48f633916305bcc25baaaad74aa52b78
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 19:55:13 2006 -0400
add support for built-in fonts
Use --enable-builtin-fonts to only use built-in fonts, and avoid loading
fonts.
commit 0a2068d123520d35818c38a555ae3ba06d8ca7fb
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 17:29:23 2006 -0400
Xi: add XExtension{Keyboard,Pointer} types
Report XExtensionKeyboard for non-core keyboards, and XExtensionPointer for
non-core pointers/mice.
commit c7577f9b88aac84d59404f29d994ee7af583d33b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jul 19 17:27:58 2006 -0400
Xi: add DevicePresenceNotify
Add support for DevicePresenceNotify events.
commit 3a23e499017d5823157806029263edac53c663fd
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 17:00:23 2006 -0400
make XInput mandatory
Always build Xi, since GetPointerEvents/GetKeyboardEvents relies on it.
commit 02d09105113fb9b560a770fe15f7bb041165831c
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 16:51:04 2006 -0400
new KDrive input world order
Convert KDrive to GPE/GKE interface.
Add first-class drivers and enumerate every device separately through
Xi, instead of lamely attempting to aggregate them.
Add XKB support to the Linux keyboard driver.
Add 'thumb button' support to the tslib driver.
Rejig InitInput, so each DDX has to add a list of drivers it supports.
Support NewInputDeviceRequest, et al.
commit a274e7296b1bdd6f6c921f28b087610cec9548e0
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 13:56:23 2006 -0400
add GetPointerEvents/GetKeyboardEvents framework
Add GetPointerEvents (with XFree86 pointer acceleration) and GetKeyboardEvents
to the DIX. Extend the ValuatorClass structure to account for same.
commit b308dbf273f8c26361b0fee7aca64aec3245f60b
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 12:15:18 2006 -0400
add DEVICE_TOUCHSCREEN and DEVICE_CORE Xi controls (DeviceIntRec ABI break)
Add DEVICE_TOUCHSCREEN and DEVICE_CORE controls to the Xi code, and the
TouchscreenClassRec and a coreEvents flag, to toggle propagation of core
events.
commit c9a3d9baa81ceb940032ffe529d9eadf2d202ab2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 19 11:41:16 2006 -0400
xorg DDX: implement NewInputDeviceRequest
Implement NewInputDeviceRequest for Xorg, mainly written by Kristian Høgsberg.
Move MatchInput to xf86Helper.c, as xf86LookupInputDriver.
commit 02a95311568e24e1055ea52c7df8cb7aa3f38ad0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 19 10:05:12 2006 -0400
add basic D-BUS configuration mechanism
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
commit 93cd53860c3aca182a0a02543c41b5d71d65926b
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 16:52:31 2006 -0400
kdrive: allow debugging
commit cd0874dda1c30ef91a7d2b3cd455676422599ccf
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 20:13:02 2006 -0400
never define MEMBUG
Definining MEMBUG causes allocations to randomly fail.
commit 093943d4d02f1dbc8935b8cf835866a6e3885193
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 20:09:55 2006 -0400
define DEBUG in DIX
Which makes #ifdef DEBUG actually useful. Incredible.
commit 68b0678254240a984db9adefefb0cf68e9bfd4e4
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 20:08:32 2006 -0400
exa: only disable cw when COMPOSITE is built
commit 27df2eda795681c9f05e2907d74e2c102d3441e4
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 16:18:28 2006 -0400
fix KdXvCopyPackedData to actually work
Remove extraneous bit shift in KdXvCopyPackedData, so it's actually
useful.
commit 00b24f119f03da86fa98ffea545c5b041810ce53
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 19 17:01:20 2006 -0400
fix minor typo
commit f8a7a1e40c14a85ebde11c5854c07a8d529d38b9
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 17:06:00 2006 -0400
fix XEvIE build without XKB
Don't unconditionally play with XKB stuff in XEvIE.
commit 2f98841fde6bad807967ed15e954291240714198
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 20 16:08:27 2006 -0700
Remove unused variable.
commit 985c34bf06af70a7296db8307899a17347a25558
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Thu Jul 20 17:33:13 2006 -0400
Remove the DDXTIME conditional, for being unused.
commit c69c00d6523a35232a32e54a533811fc2b37815a
Merge: 4636935 84683f1
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 20 12:08:38 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 84683f19b4d1c712281036bcabf8dc623e64b26a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 18 18:16:12 2006 -0400
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
commit 881953813c7307f2aac4057b48d233e5f4a574cd
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Mon Jul 17 13:50:38 2006 -0400
Fix the Linux ACPI reopen code to use a repeating timer, rather than a
one-shot sleep-and-reopen attempt.
commit f029e9a32dcaa95b84e08ec173a0cc78fd92bdbf
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sat Jul 15 22:05:38 2006 -0400
Un-glx-libcwrap DMX GLX proxy so it works without GL/include.
commit 46369350d40819ecc2a9f37ed4aaa95866b80997
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 15:51:55 2006 -0700
Add some const qualifiers to serveral function parameters.
commit 490fb304599b1f24b36439e5c1397781e7d2f612
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 15:26:56 2006 -0700
Rearrange code in xf86int10ParseBiosLocation to use strncasecmp. This
eliminates the need for the first use of xstrdup in this function.
The second use of xstrdup was *never* necessary and has also been
eliminated.
commit d3ee49bcbafe4b4e6b308686020847e978473779
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 15:13:35 2006 -0700
Refactor common code from the generic.c and linux.c version of
xf86ExtendedInitInt10 to xf86int10GetBiosLocationType and
xf86int10GetBiosSegment.
These changes were tested on MGA hardware on x86-64 with various
combinations of InitPrimary and BiosLocation.
commit 8793c7fd4ba7d1b3e2eff3f2c18d042ee9bb3f62
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 09:11:39 2006 -0700
Refactor identical xf86InitInt10 function from generic.c and linux.c
to helper_exec.c.
commit 1450fd596433f7adfe3d0798dc2ddceb9d0a9034
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 09:10:32 2006 -0700
Trivial refactor of libint10_la_SOURCES.
commit 18624a9b7cf88e769c53cc3a876b3647c5d5057c
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 13 21:10:48 2006 -0700
Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr.
commit 12595a77d6c2f037f48dfe751bdc10505b3317df
Merge: 37838de 4c225a3
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 13 12:48:03 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 4c225a3a8b2e7e5e5510347d8473f1318bbac769
Author: James Steven Supancic III <arrummzen@arrummzen.net>
Date: Thu Jul 13 10:03:57 2006 -0400
Bug #7482: Fix Xdmx's Render code to match reality; fixes BadLength client
crashes.
commit bb3aa94845a74d7718ba9539bb76203ec82957fc
Author: Drew Parsons <dparsons@debian.org>
Date: Tue Jul 11 18:26:55 2006 -0700
Bug #7346: Disable Composite extension in Xprt
Xorg Bug #7346 <https://bugs.freedesktop.org/show_bug.cgi?id=7346>
Patch #6184 <https://bugs.freedesktop.org/attachment.cgi?id=6184>
commit 10f3e32726d5b4981abd1a3a022e5b4f219fb41e
Author: Gustavo Pichorim Boiko <boiko@mandriva.com>
Date: Mon Jul 10 16:37:53 2006 -0700
Fix the configure check for the --{enable,disable}-dpms option
commit 2194d99d9ca3c607e0f5ddd911ee3df536d77564
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jul 9 16:16:08 2006 +0200
Replace GNU make-ism.
commit 90a9b82272446fdaebe71c966325fd7e670f75c6
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Sat Jul 8 21:57:07 2006 +0100
Fix crash in Xephyr when running on host X with keymap width < 4 ( i.e xvnc )
commit 21e3e3ca298dce22e5fad6ef38aa6fe9736a1d3b
Merge: e805621 39b2f7b
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Sat Jul 8 21:13:52 2006 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit e8056218944e873135c93039d1e9646d51364467
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Sat Jul 8 21:10:58 2006 +0100
Add support to Xephyr for simulating 8bit grayscale.
commit 39b2f7b2182aedb1ab45415efb4c263012ace512
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Jul 8 19:55:53 2006 +0200
Bug #3042: Use autoconf to get the correct name of a struct member.
This allows us to remove the kernel version ifdefs from the code, which
are ugly and broken.
commit 63f13e01ee6e7df1753f2113f4cff9538596be0a
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Jul 8 11:33:44 2006 +0200
Bug #7097: do case-insensitive comparison for some hotkeys.
xkb's strcasecmp implementation has been moved to the dix so it's now
safe to just use strcasecmp().
commit 5416f90e9c939027005fc01fa3ce3df56919ae0d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 6 21:22:34 2006 -0400
Implement GLX_MESA_copy_sub_buffer.
commit b84374b2917a91a7732e780ffab6a29c807a3ecc
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 6 02:28:55 2006 -0400
Add GLX_MESA_copy_sub_buffer marshalling support.
commit 2152e2d364bdd179cf218cde446c763d8c8bb833
Author: Ed Catmur <ed@catmur.co.uk>
Date: Thu Jul 6 17:45:36 2006 -0700
Remove hardcoded 'lib' in XPRINTDIR.
commit 233c004641483a75985e09fea5416ab2c7a97fc4
Author: Ed Catmur <ed@catmur.co.uk>
Date: Thu Jul 6 17:41:53 2006 -0700
Generate xprint.pre from xprint.cpp.
commit b3e4d1d1f4bcf900146d7b8cd19e008209294663
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 6 18:51:29 2006 -0400
PPC64 build fix.
commit f847f3c0a956c0aec8ade8e32f770daae147f40b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Jul 6 15:33:31 2006 -0700
xorgcfg now needs libxkbui version 1.0.2 or better.
Old versions of libxkbui use XkbStrCaseCmp which doesn't exist any longer;
the server fails to link with that version of the libkbui library, so
require the current version (1.0.2).
commit 27ffd7e03c05dd2083a10e5acebd2b385d729eeb
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Jul 6 14:43:10 2006 -0700
GL proto version 1.4.7 needed for texture-from-pixmap defines.
GLX_TEXTURE_TARGET_EXT and GLX_TEXTURE_RECTANGLE_EXT are defined as a part
of the new texture from pixmap GL extension in gl proto version 1.4.7 and
are now used by the X server code.
commit d7a96dd6f18e54c26fc5881772d033ac078db3a1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 6 17:39:14 2006 -0400
Switch the default mouse device on Linux to /dev/input/mice.
commit 37838de62edc474f44c0a48bd56470a6c23f8956
Merge: fd49a0d 8d07ee0
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 6 13:01:57 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/linuxPci.c
commit 8d07ee070ecf0d403d9d27c80764d343b80af6f0
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 6 12:48:51 2006 -0700
Refactor linuxGetIOSize and linuxGetSizes. Eliminate the unnecessary
optimization in the search loop.
commit 704e645207d88a2d0a372cf69f6abd778ed4c30b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 6 14:22:33 2006 -0400
Remind dlloader that it needs to search the global scope as well as the
loaded modules. Fixes LoaderSymbol() on symbols provided by the server.
Spotted by Aaron Plattner.
commit fd49a0dcc13280cf195bd6c7ee0f23d0840cb665
Merge: e66e7b4 28b95fd
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 6 09:52:15 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 28b95fd9d1c2f078aaaac75c310a27b17c74a6fc
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 6 03:25:38 2006 -0400
Drop unused GL/include subtree.
Woo, less Makefile's to generate.
commit fc1a55671dceae0e2a701e044ff8203fae5eb1ba
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jun 29 04:35:45 2006 -0400
Implement glXCreateWindow and glXDestroyWindow.
commit ee012588d28b468bd41da8d216210f8cb2bf8cb5
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jun 29 04:25:54 2006 -0400
Move __GLXdrawable lookup and creation into GetDrawableOrPixmap.
Also refactors __glXSwapBuffers to use GetDrawableOrPixmap for
getting the __GLXdrawable. This patch paves the way for GLXWindows
with XIDs different from the X Windows they are created for, a
prerequisite for glXCreateWindow().
commit 8b5bc6a9ab487fdea754266b120c686d75d9e100
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jun 29 00:05:01 2006 -0400
Drop global GLX error integer variables and use __glXError() instead.
Also drop glxerror.h (__glXError is now declared in glxserver.h)
and global.c (last remaining globals are in glxext.c now).
With this change we now support all GLX 1.3 error codes.
commit 7cf3ec7b59223f15314a0629f122ecb796678421
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jun 28 17:00:23 2006 -0400
Move createDrawable from __GLXcontext to __GLXscreen.
commit eea8efe4516750b2505b52ebc9f769f5e8a6f94c
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jun 28 15:59:01 2006 -0400
Add marshalling for GLX 1.3 requests.
Also, hook up glXGetDrawableAttributes and glXQueryContext to existing
DoGetDrawableAttributes and __glXQueryContextInfoEXT.
commit e66e7b48e15543f3753951a19376f0446759963a
Merge: a9d4842 eb35f81
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jul 5 15:21:36 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit eb35f812a5b65adcc5f6cbb91b31b69cae5d7f3d
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 13:27:26 2006 -0700
add another file to .gitignore
commit 863f5cc31b747bc9f2fcd6a9e20c613a11733bf4
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 13:26:34 2006 -0700
fix compiler warning in hw/xfree86/common/xf86Config.c
commit f059b61ab3af25b03c704669eddb838d3ce4366c
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 11:47:25 2006 -0700
fix compiler warning about xnestRecolorCursor() not being defined
commit cc3e99f747586f9d32622e5a682de39891b1fcba
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 10:13:19 2006 -0700
fix some more compiler warnings due to defines being declared differently
commit 59836c0f2abee3339e1aa30dacadb82e477943d6
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 09:30:48 2006 -0700
fix wrong function pointer type in hw/dmx/dmxcmap.c
commit 12563db59dd613ecc926e3bed9534152ebc0a2fb
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jul 3 12:52:27 2006 -0700
Revert "Optimize out computing a gradient pixel if the mask value is 0."
This reverts cf46242e337481cd3b9b39d77dd621d2a63b11f9 commit. It wasn't meant
to be pushed to master yet, and doesn't work.
commit 002e28c12c74aa63777f65cbfb382c2bfd0d6850
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jul 3 12:48:12 2006 -0700
Correct AGP memory deallocation argument on *BSD.
This fixes leaks and eventual crashes with RandR resizing on Intel.
commit cf46242e337481cd3b9b39d77dd621d2a63b11f9
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Wed Jun 28 18:35:59 2006 +0200
Optimize out computing a gradient pixel if the mask value is 0.
Obtained from: kdrive CVS (DavidR XGL fb/ megapatch)
commit a838fb70c52a829872680f6a2a2e7dd6d2dc9247
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jul 3 19:22:36 2006 +0200
Bump server version to 7.1.99.2 for gradient and repeat fixes.
commit 25d871d98462f0481ee419295ddc94b8c79dc881
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jul 3 19:22:26 2006 +0200
Fix source picture filter check for multiple screens.
Now, we only check for filter commonality if we're operating on a source
picture, and we compare the id (screen-independent index of the filter name)
rather than the pointer to the filter (per-screen state).
commit 7106a77df37c06d2b5568eceeb9297096bff3137
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Sun Jul 2 12:41:35 2006 +0200
Fix bugs in support for new repeatTypes in XAA and EXA.
EXA now won't pass pictures with new repeatTypes to drivers. We can add a flag
for them to support it at a later time.
commit f5e92542a14f51029347b6476e4e4af69144930b
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 30 12:03:47 2006 +0200
Bug #7366: Fix crashes when setting filters on source pictures.
Now, filters may only be set on source pictures when the filter is common to
all screens. Also, like SetPictureTransform, ChangePictureFilter is now not
called on source pictures.
commit 6ef457913955d4289081c7d07d528963ccf5272c
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 30 03:01:14 2006 +0200
Bug #7366: Fix two crashes in operations on source pictures.
A screen's ChangePictureTransform now isn't called when changing the transform,
as source pictures aren't associated with screens. Also, attempting to set
an AlphaMap to a source picture will fail with BadMatch just like a Window
would, preventing another crash.
commit 50a3e1ad18c815a5adafee22beccdf970bae62d6
Author: Rudo Thomas <rudo@matfyz.cz>
Date: Sat Jul 1 12:34:36 2006 -0700
Missing close parenthesis in one of the setuid() fixes.
commit 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea
Merge: d3d6c5f 179737d
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 1 11:12:50 2006 -0700
Merge branch 'origin'
commit d3d6c5f4d05e0ca5b566e19657e0fe2b3898482a
Author: Paul Mackerras <paulus@samba.org>
Date: Sat Jul 1 11:10:18 2006 -0700
Bug #7381: Coordinates get wrapped in accelerated line drawing on pixmap
XAAPolylinesWideSolid was adding the drawable origin onto each element in the
pPts array. Since the values got stored back into the pPts array, they got
truncated to 16 bits, causing the overflow I saw. This patch avoids storing
the coords back into the pPts array (and actually reduces the size of the
code too :). Now the 32-bit sum of coords + origin doesn't get truncated to
16 bits, and the problem is solved.
commit 179737d4a07ed10a734fe017b5680f8e78ffda96
Author: Jens Granseuer <jensgr@gmx.net>
Date: Wed Jun 7 01:46:00 2006 -0700
Bug 7145: fix build with gcc 2.95 & other c89 compilers
Move variable declarations to start of blocks as required by c89
commit a9d4842893b65232d61fe4c63f074d30e81021d2
Merge: 66cac9b 6bd4c25
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jun 30 11:49:29 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 6bd4c254396cb0f4e8ae21ff455ebb15cd9f4f10
Author: Martin Bochnig <mb1x@gmx.com>
Date: Mon Jun 26 01:52:24 2006 +0200
Updated Solaris aperture driver to build on sun4v & amd64 kernels
Updated for Solaris 10 changes to DDI
commit 66cac9b17498497d939bfb7a4075bcee5a485e5f
Merge: 7c4e540 54d9acd
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 28 14:11:49 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 54d9acd5113318274e291abab4554b8e678227df
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Jun 27 19:44:52 2006 -0400
Add damage tracking to GLX_EXT_tfp implementation.
- Only update when pixmap content actually change;
- Only update the regions that acutally changed.
This is a worthwhile optimization, but it doesn't completely remove
the bottleneck, as mesa still uploads then entire texture whenever
it changes.
commit adfe8e7437ff739f54d1d074008e8cc0e3bcb4d3
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Tue Jun 27 21:49:00 2006 +0200
Bump server release to 7.1.99.1.
This will be important for a couple of cairo workaround tests.
commit 63c169e3b1f7d6a7375a414fcd50cce32358a525
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Tue Jun 27 04:11:47 2006 +0200
Fix MMX Saturate implementation.
The code was expanding the source blend factor from the wrong channel. Fixes
cairo's clip-operator test.
commit 7c4e54025345455f420cd2abaa7a40679689d3cb
Merge: 9d0a15d ff6b59a
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jun 26 14:39:44 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit ff6b59a0dbadbe61a53e48c23965d3073d95791b
Merge: b3c8693 48c8715
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jun 26 13:02:33 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit b3c869304cd85af034aa9debaa874e29d14fcbe6
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Mon Jun 26 10:48:44 2006 -0700
Free small, one-time memory leak in xdmcp -from handling
Part of Patch #6046 <https://bugs.freedesktop.org/attachment.cgi?id=6046>
commit 48c871564d493203d434d5da015903399287f619
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 26 15:57:32 2006 +0200
Move EXA_PM_IS_SOLID() to the public API, since drivers will want it frequently.
commit afb84c2fca56887b3bfe7aa93f337c49b087acdc
Author: George Fufutos <fufutos610@hotmail.com>
Date: Sat Jun 24 15:23:14 2006 +0200
Bug #6911: Check return value of exaGetPixelFromRGBA().
commit 930b9a069a425818d4e9965f53be7df1f4d7d422
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 15:21:17 2006 +0200
Bug #6818: Avoid infinite loop in exaLog2() with negative arguments.
commit 36756fdb2ddc154b406f664a6af0f38d26e6973d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 15:09:24 2006 +0200
Make sure <execinfo.h> is actually included when needed.
configure only defines HAVE_BACKTRACE, not HAVE_EXECINFO_H.
This could cause problems on platforms where the size of a pointer is greater
than that of an integer, see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=363218 .
commit 4426215a6e99f84550aaac23ac9c2018668bfbc1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 15:02:56 2006 +0200
Bug #7213: Fix the XFree86-DRI extension for byte-swapped clients.
These clients are by definition non-local and thus not direct rendering
capable, but they still need the QueryVersion and QueryDirectRenderingCapable
requests to find out cleanly.
commit a195a3debca02572d9f7d7a9976b5bf67acc5d08
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 14:54:52 2006 +0200
Fix byte swapping in some GLX requests.
commit bc6cfde19887eff7a07dc739ffa29609fb55b83d
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 23 20:07:34 2006 -0700
Use correct OSNAME setting so we can find os-specific modules like libdrm.
commit c7ac485a59709572307b9a4a9abacc52c7021b65
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Wed Jun 21 09:34:55 2006 -0700
Remove the default case from fbcompose.c switches which should cover all cases.
Instead, stick the NULL return default case afterwards, so that the compiler can
warn us when we've got unimplemented cases. Removes some unimplemented and
unused 8bpp, depth 4 picture format names.
commit 2cf1f39ca974c81a2f52d2f7509aa3d098a87176
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Wed Jun 21 09:30:59 2006 -0700
Add a manpage for EXA.
commit 9d0a15dca56b14821cad474f9db9c332acb3b1e6
Merge: 6c514ca d67fd10
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jun 22 16:21:10 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
hw/xfree86/loader/xf86sym.c
commit 6c514ca14c2326c2cf82b73196429789d11e4a01
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jun 22 15:51:16 2006 -0700
Use XSERVER_LIBS instead of XORG_LIBS for -lpciaccess. The former is
only for libraries that are built as part of the xserver build.
commit d67fd106968e371d8be3966ed5ecdd3c69f36e3a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 22 12:47:51 2006 -0400
Add kdrive servers to .gitignore
commit bf17c6dede1c0cf1edee10f2cc7e1e619b944d3a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 22 12:24:09 2006 -0400
Drop libz from the server's link line, it was only needed for LBX.
commit c0cb8d1fb80540e093da54da3ee2f55bdf139274
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 18:12:41 2006 -0700
Use XACE, not XCSECURITY to decide if SecurityLookup* are exported
commit 3177dc498a955cd58cd6054a7c7e69724db4a59b
Merge: 3f19803 91dcac5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 18:06:06 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3f19803e0b1adc66e695f63f915b8dc85eb84215
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 18:05:51 2006 -0700
APPGROUP requires both X-ACE & XC-SECURITY now
commit 91dcac5295486cc55a34ad91704bfa483bd31eeb
Merge: d8135eb 77c947b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 21 20:49:30 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit d8135eb9e414bf6957f64c5102ee0ef7c2404c6f
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 21 20:49:21 2006 -0400
Unbreak unbreaking the loader. Re-add the symbol reference lists so that the
linker will include everything it's supposed to. This is a terrible solution,
but ld semantics don't let you do anything better.
commit f83cee0338eca095ad601374a87775be823a2565
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:07:37 2004 +0000
Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
commit 15c9002d68a7eeb02a6db1f231af7a18a3cf7512
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:24:20 2006 -0700
Correct ifdef - should be XACE, not XSECURITY
commit 90af38fa0c46c2081d2becac262a614c26ba6ef1
Merge: 3e098ef 77c947b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:23:31 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
Xext/appgroup.c
commit 3e098efa35ba70ad4d5699af3130a3b02e1cb06e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:21:03 2006 -0700
Correct ifdef - should be XACE, not XCSECURITY
commit 77c947b900faf34f425eef1549d8210c475e093b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:18:41 2006 -0700
Move Xserver internal API for appgroup from Xagsrv.h to appgroup.h
(Since all use is inside the xserver module, might as well keep the header
in the Xserver module instead of in proto/XExt to allow easier synchronization
of updates.)
commit aa131c51e06e735d7b54cadf51205f703a3de4ef
Merge: 1708b0c 77aa701
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 21 14:39:52 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 1708b0c7d962b80073500eb1c483447bbf965bc9
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 21 14:39:39 2006 -0700
Eliminate "ugly" spaces around parenthesis. Add const qualifier.
General code clean-ups.
commit a3c26d01a16e4ae20a5d1acf9d888e95760c3da1
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 21 14:38:07 2006 -0700
Move declaration of "j" inside #ifdef block where it is used to
eliminate compiler warning.
commit 40aafaf154ba8a2cba857689d1481be2d4a610c2
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 21 14:36:09 2006 -0700
fix a number of compiler warnings in os/*
commit 77aa701e898c6525322cc4029d95167dd9f6e618
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 21 14:16:48 2006 -0700
add some function prototypes to hw/xprint/DiPrint.h as they are exported
commit 865884d050e1778180f7677e15f9ee1625ea4bb2
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 21 14:16:28 2006 -0700
fix compiler warning in dix/xpstubs.c when XPRINT is not defined
commit ed18d776f02e2ab235954501ef64936af9f9d909
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jun 21 16:22:14 2006 -0400
Fix #2488 for fb too: sample pixel center when transforming.
commit ea5e0eabd1303a55d8fc10f44d21a3d371ce8919
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Jun 21 17:08:51 2006 +0200
Bug 4320: Fastpath corner case improvement for Composite.
commit 9af315a9be19b48faa1249e0575cbe3d1e31dec5
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:07:37 2004 +0000
Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
commit f68ecfa482b2c2037f929710310c7b9ce6fe9291
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 19:01:34 2006 -0700
Add X-ACE to build system
- Added --disable-xace to configure.ac and issue configure error if trying
to build XC-Security without X-ACE
- Added XACE #define to dix-config.h
- Added X-ACE sources to Xext/Makefile.am
commit a46c06dab8392cf8012c7cc0b916de9a9e569671
Merge: 49b368c d44b2a0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 18:40:18 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
Xext/appgroup.c
Xext/security.c
dix/devices.c
dix/dispatch.c
dix/dixutils.c
dix/events.c
dix/extension.c
dix/property.c
dix/window.c
os/access.c
commit d44b2a0a57fb89741173c31676af0ccc822387dc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 18:22:51 2006 -0700
Move Xserver API for security extension to securitysrv.h
commit a54435946544a039fc333bb5e3438501d0d1ffc6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 18:14:27 2006 -0700
Move Xserver API for security extension to securitysrv.h
commit 49b368c0bb04816c4a3579071c596b2398cae3ec
Merge: 63f6e6b 481d401
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:22:39 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 481d4012e74d9b0e98911f0ae02700ecf4cfc5ac
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:16:19 2006 -0700
Don't add -ldl to XORG_LIBS if it's not needed for dlopen
commit 63f6e6bbfd0d3677e29621af982c9392ead98dd7
Merge: 88ede2c 6df52fb
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:03:34 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 6df52fb7745c185c0168060f69cc6b4f5315914e
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:02:55 2006 -0700
Delete code that's been inside #if 0 since X11R6.7.
commit 75398cff82b56c0a8fc301e84e2087f59a61a360
Merge: 1f91b57 2b58685
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jun 20 15:49:47 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
hw/xfree86/loader/Makefile.am
hw/xfree86/loader/xf86sym.c
commit 88ede2cec79281a43cecb43ee6dec65770f82530
Merge: 227a319 2b58685
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 15:29:55 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 227a3193405147fbbee2971cc15bac92cc13285a
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Tue Jun 1 21:09:25 2004 +0000
Add XACE extension source files.
(Copied from XACE-SELINUX branch in Xorg monolith CVS since these were never
imported to modular cvs or git trees.)
commit 1f91b5726c721778de0627c0139100744db06934
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jun 20 15:03:13 2006 -0700
Fix a compiler warning about varibles being used without being set.
Add some const qualifiers.
Remove some "ugly" space around parenthesis.
commit 2b58685402e70f123e131fd8146e6083ff5214a4
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue Jun 20 21:07:53 2006 +0200
Check setuid() return value. Bugzilla #7116.
commit 4365d16c8629e824973ee0c357efdfbfd28b672c
Author: Kristan Høgsberg <krh@redhat.com>
Date: Mon Jun 19 22:13:22 2006 -0400
Pull over convolution filter fixes from xgl-0-0-1 branch.
Cherry-picking patches:
8a5ea68800b9d7dca90ff4e573ad8533852f1ea3 and
4d755fe14274a7293748ce9aa666ab85df6297c5
commit f818e0ab60da3779ab2602c6e6d3ff261b50917e
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:07:37 2004 +0000
Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
(cherry picked from 0106715000196c7b349a0b4494b61545f0f5e138 commit)
commit 0707eb33d6826e1300a905edea28c12134600b12
Merge: 37f0ae0 98d17bb
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Mon Jun 19 17:09:51 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 37f0ae02457bd22b27f8f30a373e5cb19f2fbaea
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:04:52 2004 +0000
Replace XC-SECURITY code with XACE security hooks
(cherry picked from 8526cd6395490b03b279f1962df777fb0e4a9878 commit)
commit 98d17bba716619e3402bd74c7c3e1c01d055ef6e
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Mon Jun 19 17:07:59 2006 -0700
Tell git to ignore emacs *~ droppings and git .msg files
commit 569c808a2375be71f835ee8693605487484bd22e
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 16:42:09 2006 -0700
Fix crash when using PICT_x4a4 by supplying an appropriate fbFetchPixel_x4a4.
commit 8d9ccc90a54c786ca4ba5620ab0a965e3f3bc8ea
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:15:41 2004 +0000
Add XACE extension
(partially cherry picked from 8d4f21ab53c44ca48501d6211ea6db0c0b8af916 commit)
commit 55426650417df4ec22ea0e2a67f6074f0ac1d54e
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 15:04:46 2006 -0700
Clean up gcc warnings from picture format CARD32 -> enum change.
commit 520c80f4b807ae6419e70fe2b524532465b509ac
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 14:40:27 2006 -0700
Don't forget to step the rows when verifying the equivalence of fb/sys areas.
This is only used by fakexa, but we would have missed some errors without this
fix.
commit e793f0eeee3e9c83b6a7b50d451fb6db12839087
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 14:06:02 2006 -0700
Correct component ordering when fetching [ax]4b4g4r4 pixels.
Noticed by: rendercheck
commit e1672a12eb70836a2ceec803d505294897ae8cd2
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 13:20:56 2006 -0700
Convert PICT_* names from #defines to an enum to aid in debugging.
commit 9742d55c820a260a42a4537502295931d4529deb
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 14:40:14 2006 -0700
update .gitignore to handle Xprint move
commit d97a21acb878bc4e5e6542912fbd820503bba312
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 14:36:54 2006 -0700
fix compiler warnings in hw/xfree86/i2c/fi1236.c
commit 29c78321e86956c4ce0c1c899d82557f927e04da
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 14:36:41 2006 -0700
fix compiler warning in hw/xfree86/i2c/tda9850.c
commit 9f2793551f335e5fb08990fc8bb9e05e0ffb68d5
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 11:50:47 2006 -0700
fix compiler warning in hw/vfb/InitOutput.c
commit b20ae5ddb7682bafcee6f8bf0c8208a3f70b882b
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 11:38:52 2006 -0700
fix compiler warnings in hw/xfree86/xf4bpp/ppcGC.c
commit 4d258f31967141e3c4a6e4abbef89ffa717e85aa
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 11:27:47 2006 -0700
fix compiler warnings in XTrap/xtrapdi.c
commit 870cecb72c2cba44dc64cb202917453603c8f287
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 11:22:42 2006 -0700
fix compiler warnings in XTrap/xtrapdiswp.c
commit a28652f9c35fbc009245382a5cc2a022f42366fc
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Mon Jun 19 00:57:18 2006 -0400
Another round of loader sense-beating. Remove the (unused) server export
lists, a really bad hash table, the last vestiges of the other backends,
and some miscellaneous cleanups. Good for dropping 300k from the size of
the built server on x86.
commit 98a602fab1f307a07a96868d7dae12b6f8d7f405
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Sun Jun 18 23:54:04 2006 -0400
Don't bother building RAC as a module, that's just absurd.
commit 76aaf7eae7409162c5ed2963f2e27d019cb30263
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Sun Jun 18 19:47:29 2006 -0700
Add a couple of (doxygen) comments I wrote while looking at modesetting.
commit 6aaf0e5b581b06fc73e56f863a26cd9d684eb9c0
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Sun Jun 18 19:12:15 2006 -0700
Add options to disable EXA acceleration for Composite/UTS/DFS, and always print
out how much memory EXA is managing for offscreen pixmaps.
commit 21ef7e17ef6dca177461c9438b9df707a4d664a2
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Sun Jun 18 18:57:55 2006 -0700
Add some missing .gitignore stuff for Mesa symlinks and other generated files.
commit 71fbda8049f64c7fefae8ab817fb5f37ee2ee134
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Sun Jun 18 21:07:28 2006 -0400
Xprint/ -> hw/xprint
XpConfig -> hw/xprint/config
commit 868e2cab706e317618646e064b0559d4e68c7b32
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 16 10:17:51 2006 -0700
Add explicit dependencies (Xorg_DEPENDENCIES = ) on the internal libraries
(such as libcw.la) that we link into the server, causing it to be rebuild
automatically when they're updated. Some system libraries are included, but
don't appear to cause any harm. You would think this would be automatic...
commit 53f74b6aa95fe57fda45fd8a051595e772f00402
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 16 10:14:30 2006 -0700
Bugzilla #5120, #7246: In CW's GC ops, validate the backing GC against the
backing drawable if the serial numbers differ. Fixes crash in XAA which
occurred when the DDX bumped the serial number on the backing drawable and
expected it to get re-validated, and we didn't because the wrapped drawable
hadn't been bumped.
commit 72ac20c0e878ad48ff61f7e846cbf1005a4eb435
Merge: fc3e814 b900883
Author: Ian Romanick <idr@localhost.localdomain>
Date: Tue Jun 13 21:13:02 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit b90088321e6ef84970aa97d7c851af93f49bf4b7
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 15:22:31 2006 -0700
Add arrayobj.c to the Makefile as well.
commit f9f33b72e34eaeccea2a20f4a3dd68c2dbefc90e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 12 20:19:11 2006 +0200
Track per-drawable damage to minimize UTS and DFS transfers.
Based on work by Eric Anholt.
commit 6060b612de6b41f872d034c6130770c1d189d0a3
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 12 20:12:31 2006 +0200
Provide option to report damage after operation is complete.
commit fc3e81473a98d3b932faa73c0c01c21366a48a9e
Merge: 4bedaad 041ef23
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 09:41:06 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 041ef23192b193b87f6cfc3e74e2e77f9f47cd4b
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 09:39:18 2006 -0700
Add new Mesa files arrayobj.c and arrayobj.h.
commit 4bedaad17dc75dfbada91f47e1007a8c090300a9
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 09:29:05 2006 -0700
Add new Mesa files arrayobj.c and arrayobj.h.
commit 4e3c9ab8c90d474a2224dbfa0807bc01fc012f7c
Author: Ian Romanick <idr@localhost.localdomain>
Date: Fri Jun 9 16:56:54 2006 -0700
Remove some static declarations for things that were removed in
previous commits.
commit 8b6596b1e1864dd79a3c53ee3ceb7a8e9bdb6ec7
Author: Ian Romanick <idr@localhost.localdomain>
Date: Fri Jun 9 16:08:06 2006 -0700
Move probe_devices_from_device_sections,
add_matching_devices_to_configure_list, and check_for_matching_devices
from xf86Helper.c to xf86Init.c. These functions are only called from
a single place in xf86Init.c, so it makes sense for them to live
there. They were originally in xf86Helper.c because they evolved out
another function that was already in that file.
commit 7810d87cd6ae9316d88f6a2e7696deb8837cec27
Merge: dcfaa9f caad8b7
Author: Ian Romanick <idr@localhost.localdomain>
Date: Fri Jun 9 15:16:50 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit caad8b724b97074e41de447fe77dda189f287a26
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 11:24:57 2006 -0700
fix compiler warnings in record/set.c
(note this only fixed up the function definitions for the static functions
which can not cause any abi incompatibility)
commit 51489bb5ed86cb6aa07e26a13618765c29f913e4
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:59:47 2006 -0700
more .gitignore updates
commit c4d251bd3e88cf8dfd6872537dbe30c07344b196
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:46:18 2006 -0700
updated .gitignore with more pre-generated files
commit 9f31ef83be61a900c701fcbc9a43ffae40ca7005
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:44:46 2006 -0700
fix compiler warning in hw/xfree86/loader/loaderProcs.h
commit 490ffc205a7714145cac0c63efeb6374ea28141f
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:44:25 2006 -0700
fix compiler warning in hw/xfree86/loader/loadmod.c
commit 6119845d1ff832ea2b7c9cbe7ed6c6637cdcf305
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:14:08 2006 -0700
fix compiler warnings in hw/xnest/Keyboard.c
commit 1a7335ff932baa59a3283c50dd6007d81989b7e3
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:02:08 2006 -0700
remove unneeded externs from Xprint/ps/psout.c
commit 9583859d538394e98ac1f38b8e6f0997e321621d
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 09:59:22 2006 -0700
remove unneeded "extern" in Xprint/ddxInit.c
commit cb9e29c184474edd75645e3b52e22a097a242e40
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 09:54:50 2006 -0700
removed unneeded extern in Xprint/ps/PsWindow.c
commit 96c19a3ec1b7e43782d373b8015fa0ca24cb4f5b
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 09:51:28 2006 -0700
put function prototype for ShapeExtensionInit() in proper place
based on FIXME in mi/miinitext.c
commit dcfaa9f4f8fb10b75be50c9a49ccd88caf6d0f6a
Merge: af9afe4 576e6fb
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 15:03:00 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 576e6fb1124a47493371210adf99d6f2076e72c5
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 8 17:49:02 2006 -0400
Bug #7120: Multimonitor (non-Xinerama) support for xwin servers.
(Tom Whittock)
commit d42cf4a2a4980fdd29fb15c4fd8fddda67b36256
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 8 17:46:53 2006 -0400
Bug #7121: fix clipboard handling in Xming (Colin Harrison)
commit af9afe4cc50df973bea2293a803f7dfdefaa6411
Merge: caffac3 3930da3
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 11:37:09 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3930da3f6209312dd0f10aba0b16ef45996a07fe
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:27:29 2006 -0700
fix compiler warnings in Xprint/ps/psout.c
commit c496a3b9c981dc079fcc6c0ac4db3aa912b3dcf1
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:23:53 2006 -0700
fix compiler warning in Xprint/ps/PsImageUtil.c
commit ea24b5a25c2544f3b3de6480da125edb23a6b3a9
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:22:01 2006 -0700
add proper function prototypes for Xprint/ps/PsCache.c to Xprint/ps/Ps.h
commit ee2bb4d1929e20436cf0e830ece02fe07db2d524
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:15:34 2006 -0700
fix compiler warnings in Xprint/ps/PsArea.c
commit 92303d534a91cb0ea30e4cd0f639efd70b9739b4
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:12:16 2006 -0700
fix compiler warning in Xprint/ps/PsGC.c
commit cf6169f9e99e6e8ab264f284cfa13cb379b36207
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:09:56 2006 -0700
fix compiler warnings in Xprint/ps/PsFonts.c
commit 1abc7f96edf37a1e2c766b9cdba7fc9b2cb06d19
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:06:51 2006 -0700
fix compiler warnings in Xprint/ps/PsInit.c
commit 2dc291384c550badf55542ae645240e166676848
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:04:40 2006 -0700
fixed compiler warnings in Xprint/ps/PsPixmap.c
commit aef092e0290143c2b8b1cb98fdf55c9630032aaf
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:53:17 2006 -0700
fix compiler warnings in Xprint/ps/PsPolygon.c
commit 511b231ded61159ebd70cab020ca1ca003fd0784
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:41:34 2006 -0700
fix compiler warnings in Xprint/ps/PsPrint.c
commit 35fccb0068e8d73d1e6a16aefdc771506e620f83
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:40:24 2006 -0700
remove some compiler warnings in Xprint/ps/PsText.c
Note that one of the existing warnings is pointing out a
real bug (uninitialized use for fontPage in PsPolyText16())
if anyone really cares about this code.
commit caffac38432009e8dc01e7d3e72a7fa6fba2f078
Merge: c5b3aa1 9fa7372
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 10:38:43 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 1ac30947f4a222ba78558eddf8e5f03cec31f613
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:35:18 2006 -0700
fix compiler warnings in Xprint/ps/PsWindow.c
commit 9fa73721f0c3df73e508da909a5665f47a54cb57
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:27:28 2006 -0700
fix up EnableDisableExtension() and EnableDisableExtensionError() prototypes
commit c405659626477f2009603d8c0e381b8b62277bb6
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:19:24 2006 -0700
comment out QualifyName in Xprint/Init.c which is not used anymore
If someone else wants to delete this function, that's fine with me too.
commit a940b851faba569e36983f7885aefa72f7bf2ade
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:17:53 2006 -0700
fix function pointer warning in Xprint/Init.c
commit 9e0c82386ae389bcc296a5ad44e996790b033ad3
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:16:37 2006 -0700
fix already-defined warning in Xprint/Init.c
commit 40fb7eecaf14a76f35ac2dc350ad2fffdaf6e0d0
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:11:17 2006 -0700
fix noDamageExtension warning in Xprint/Init.c
Also took out duplicate definition of this variable in mi/miinitext.c
commit 494895e0fbbf0a71bc535c0a2358c9db54c95c5a
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:43:44 2006 -0700
Properly define dispatchExceptionAtReset to fix compiler warnings
commit d90eecf40ea768b2bf6340f15bb0af9dab2f3cf3
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:11:41 2006 -0700
add some missing function prototypes to Xprint/AttrValid.h to fix compiler warnings
commit bccde1609153dee93f6fe5a138fc0c0f2fe08212
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:01:59 2006 -0700
fix incompatible pointer warning in Xprint/ddxInit.c
commit 60bd8893d50ed1da9b94f4b96a07ea432e23f467
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:01:21 2006 -0700
Properly #ifdef out ddxBeforeReset() to fix compiler warning
commit ac21e6a594eac69101aa8920d70a9d60412b57f6
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:00:42 2006 -0700
remove unused variable warning in Xprint/ddxInit.c
commit 71dd44b0ad617dd36ce4ed328f9e1e8c5ef713a5
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 19:17:26 2006 -0700
Fixed up most "warning: function declaration isn't a prototype" warnings from Xprint/
commit 839305bac98856a2bb1d96691e4dcf49db229f90
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 19:12:23 2006 -0700
Remove unused variables from Xprint/attributes.c
commit c5b3aa120bf96ee169d07c33a2698499944a1624
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:46:23 2006 -0700
Added a comment about some suspicious code.
commit 50112dfcc82dd476727fa453b9e3d1852e06d678
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:46:05 2006 -0700
Fixed severly broken calls to pci_device_find_by_slot. I mis-read the
tag bits when I originally coded it. I mistakenly thought that the
original code masked off the PCI function bits, so I just always
passed 0 as the function. That was a mistake.
commit f9e7128d948a0b62e6f03295305e0080d9233fd8
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:44:06 2006 -0700
Added missing include of Pci.h. This caused the server to terminate
when the symbol PCI_DOM_FROM_TAG couldn't be resolved at run-time.
commit 23182315f34e3a0065739b43b15d4560e75b41a1
Merge: bc05158 757f40f
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:03:48 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 7a40ac2585028860730ffcd333eb3fe9de63680c
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 16:23:45 2006 -0700
remove a bunch of unused variables in Xprint/Init.c (fixing the compiler warnings)
commit 163980138cc0bfc9124456781b3dc45a49e2a129
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 16:11:20 2006 -0700
remove some unused local variables in Xprint/Oid.c
commit 8e41640db884a4633b598d0a52b269e6547c8bf0
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 15:56:43 2006 -0700
add bison generated files to .gitignore
commit 78f4ab6b89fca3086b9c9471b40c11c23fbb6142
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 14:12:40 2006 -0700
Fix compiler warning about undefined ReinitializeRootWindow function
commit 757f40fca50a99377e437949ee77b983c8cd6087
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 14:09:13 2006 -0700
updated the .gitignore file with more auto-generated files
commit bc05158a5ab00c548e4b04b5638afe07bc702260
Merge: 46f55f5 cc46580
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 14:09:12 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 46f55f5dead5d70cdff30531d80a72f6be042315
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 14:09:02 2006 -0700
Initial batch of changes for PCI rework. All future changes will be
tracked individually.
commit cc465800ddca5fb6c9ec09fdfa8f1f05359cf396
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 14:03:35 2006 -0700
Fix compiler warnings about SetVendorRelease and SetVendorString
commit 785c9789704ed142fe98cd17b5995e4a95b7141f
Merge: 21ebcfd 36d786e
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 13:20:21 2006 -0700
Merge ../xserver
commit 36d786e9f051c5c95c1cc8c098c84e118ed3cc85
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:47:50 2006 -0700
add more files to .gitignore
commit 8f5aa38abf1158a789b5528df9d98826342e30cf
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:33:44 2006 -0700
fix compiler warning about XKB_IN_SERVER redefinition
commit 101ae616962c355388722e05ab8413eb5f5c3402
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:06:22 2006 -0700
Add PanoramiXExtensionDisabledHack to globals.h as it was missing.
commit e5b72bd9c6fb06640a5de4031be0dc9b04b4b215
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:05:39 2006 -0700
Remove 3 compiler warnings in the Xext/xevie.c file
commit e3c11f66516521959127b9ab8fd88cc4c954f5bb
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:05:01 2006 -0700
Added first cut at a .gitignore file to make using git easier.
commit 21ebcfd7027b2a6182d4065e56a2ef814f5181ae
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 7 14:17:31 2006 -0400
Demolish now-unused loader functions.
commit f90761b06eaa5fa44fe85289e54eed5f47eff3b9
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 7 13:58:24 2006 -0400
Add a token for EDID-supplied modes.
commit d00aa6b8559d3e5f70c6558ce0abd12f7d758491
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 7 11:44:36 2006 -0400
Delete a (now misleading) message from the crash handler.
commit f8535edec736cf19740bd41ed2adfe531f2c26ac
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jun 6 10:29:34 2006 -0700
Remove ChangeLog file.
commit 8444bb77c91cf8a23d32b3cc9749e2a3d3f9f9eb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jun 5 20:22:06 2006 +0000
When we can, bound the maximum number of PCI devices to attempt to scan, by
the number found on the system. Only implemented for Linux right now.
commit 11cf4d2fde9219e8d6ca427acae89a0c9f5d71b1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 5 07:15:23 2006 +0000
Update AC_DEFINE_DIR to version compatible with CVS autoconf which requires
double eval to avoid leaving ${prefix} in output
commit 52fc7c8dc70226cc7f03454e9be86a627672295f
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jun 5 03:00:24 2006 +0000
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
XFree86LOADER ifdefs, non-loadable hasn't been supported for a while
now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO
ifdefs surrounding a call to a function added in XFree86 4.1 (!).
Miscellaneous static markings.
commit d22582dc5a070f72d4653e24d1e4ebe4a112276e
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jun 4 16:13:26 2006 +0000
Remove a stray LBX reference.
commit ddc6b99505e227f99585b8c2392da524022a73e6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 11:24:33 2006 +0000
Bump to 1.1.99.2.
commit 4fd668940f2155c4b06d24b6da8bcccd01f66f4c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:58:37 2006 +0000
Bug #6619: Fix disappearing hardware cursor. (Colin Harrison)
commit ee71cb61f8da29bcf36ea4b199d629e34f89b119
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:54:38 2006 +0000
Bug #6956: Fix crash when removing session leader before its children.
(Rich Coe)
commit cd384af3058fe15077c57eccdffed3b61e261e7f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:50:23 2006 +0000
Completely remove relocation pointer table.
commit 8e8c6faecddbe014d8760822e1f705b43a00fa33
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:48:37 2006 +0000
Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno)
commit 5b703f847d166176920077c1e6ba1d9559fc8481
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jun 2 12:05:32 2006 +0000
Fix type confusion.
commit 56f21bda1ce95741c88c423b60bd709eef26eb12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 22:30:52 2006 +0000
Bug #6583: Only open /proc/bus/pci/devices once. (Bill Nottingham)
commit a9ed5a87902a839a5a135af03db78f113b18bd86
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 22:06:41 2006 +0000
Kill LBX, too.
commit df6da66525836d515f408a82f1a13ca5251ff0f7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 20:56:39 2006 +0000
Simplify the unsupported XI function list.
commit 97203f1cf6e5b7c6389f69cbb1b75ac675d09531
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 20:41:21 2006 +0000
Clean up a warning, and remove excess multiple-suffix code.
commit 6d594ebc667afd404556ec3e108c810946b20ac5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 20:22:39 2006 +0000
Ditch more alternate-loader braindamage.
commit c9468177486833d521ec62c7b0266b4be8200de7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 20:18:30 2006 +0000
Kill a.out, COFF and ELF loaders with FIRE.
commit a3a4221495dfe4cc0a3874a08dd5364ef45a7f2e
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 1 19:53:06 2006 +0000
Add bitmap to the ignored module list.
commit ee689c104287140db38bbd26959ab1b4847c168e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 19:49:55 2006 +0000
Ignore requests to load GLcore and speedo.
commit 07c731a2bc21e6b98f28a2c0ebc42f01b67b824b
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 1 19:37:53 2006 +0000
Bug #5089: Die, libbitmap, die!
commit 32be08ba7242da74de5defd6a4dcb536a273f57a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 19:22:38 2006 +0000
Remove horrendously ugly DDX backward-compatibility.
commit d81edb9e00680e3c0001f343fa1d0c310b86cb93
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 19:22:01 2006 +0000
Forgot to remove this one too.
commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 18:47:47 2006 +0000
Die XTESTEXT1, die!
commit fc5ca97284ef237a91f6adb433148ff57a673c08
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue May 30 22:56:36 2006 +0000
Powerpc machines also need ioperm_noop.c
commit 07b168c8d8b2d79a4e7cf8dc5124eafc0f2bbcd0
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue May 30 16:10:59 2006 +0000
Properly document the DPMS, SyncOnGreen, and TargetRefresh options.
commit 107defd920d9b1eb52b15e8ca8665bc48bb933d6
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon May 29 19:53:18 2006 +0000
Remove superfluous definition of tfp tokens.
commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 29 11:14:03 2006 +0000
Remove -xkbmap argument.
commit db0680cf70b8367e1f8a7fff9c0f6ec414db0542
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 29 09:26:32 2006 +0000
Minor #include cleanups.
commit c38aab293a06f43c04f14223f94f822d91d73396
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat May 27 23:15:05 2006 +0000
check buffersize before reading next char, fixes the "mouse stuck at left"
bug (bugzilla #3113) for BSD systems using wscons. (Dale Rahn).
commit 2102fdd0a58e18aeaa842b2ec73b6071970fafb7
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri May 26 00:12:18 2006 +0000
RGB color database and XErrorDB install to "share" not "lib" by default (by
app/rgb and libX11).
TODO: They are customizable, so maybe cpprules.in should be extended.
commit 354086d7e8e13fc7acbcc6603ca2a03c8cc806ee
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Thu May 25 23:32:33 2006 +0000
Don't do fixup_video_driver_list if no drivers. (I had signal 11 and core
dump when drivers not installed yet.)
TODO: fix fixup_video_driver_list to handle NULL argument.
commit c6b1cff43238deded11dc58945778aec3d844598
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu May 25 13:27:42 2006 +0000
update to build against Mesa CVS HEAD (Carlos Eduardo Rodrigues Diogenes).
commit 99724c16c9c58eb3e20ba91c79464747b8ee3fcf
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu May 25 10:14:39 2006 +0000
typo
commit 5c7aef148de23f39027fda647bbb53bb5b992683
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu May 25 09:57:47 2006 +0000
Don't destroy a pixmap twice on server exit (bugzilla #4247).
commit 693079442377daa2dc48bf318a0d7dd256cb2738
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Wed May 24 22:58:03 2006 +0000
NetBSD also has curses.h instead of ncurses.h. (TODO: Maybe instead of
checking for SCO, UnixWare, Sun SVR4 and NetBSD, the curses.h versus
ncurses.h should be tested in configure.)
commit 9477e5e0be04f4f6fa311de8b3693fbc8a082fbf
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Wed May 24 22:43:13 2006 +0000
On NetBSD, add -li386 for i386 and -lx86_64 for x86_64 to SYS_LIBS. (x86_64
on NetBSD not tested.)
commit b3031532ca96b22e81863202efb8bbcb9d701fac
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Wed May 24 20:11:38 2006 +0000
Remove tolower() which was missed in the _XkbStrCaseCmp/strcmp changes.
commit eb696f72a0819edef550bce9ff55730c02f70452
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 23 16:17:09 2006 +0000
Add AC_SUBST([SOLARIS_ASM_CFLAGS]) that I forgot when splitting them out of
the XORG_CFLAGS.
commit bc0c56c407117d1545e20d21f7d30eb3472d618b
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 22 15:47:56 2006 +0000
Bug #6924: Restore the ABI for DrawableRec and ColormapRec to the state
they were in prior to the fix for #6438. Based on a patch from Andy
Ritger.
commit cc3b882bd141218052cdde0144fc2a707ceee83d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat May 20 00:55:44 2006 +0000
Update to 2006-05-19 snapshot
Remove entries now present in pci.ids
Regenerate from updated pci.ids & extrapci.ids
commit 0b2c2b6bba5b578d5f0ac2d709d5d2ce7cb32bef
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri May 19 20:29:47 2006 +0000
Remove dead DPMS timer functions from the installed headers. (Fredrik
Höglund)
commit deebf6bd51117c01a3217f134bd952481b9e41ab
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 23:52:51 2006 +0000
Bug #4139: Fix a BAR remapping bug that could lead to IERR and system hang.
(Egbert Eich)
commit 91239d83f4e27835cf871348b5ff6c892bd4f4f4
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 23:52:41 2006 +0000
file getemptypci.c was initially added on branch server-1_1-branch.
commit c11cfcfaffc79be5686c666f881c4c08f69e1b86
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 23:48:57 2006 +0000
Bug #6377: Ignore disabled BARs, and allow matching BARs aligned to less
than 16 bytes. (Felix Kühling, ATI)
commit fa9a49a92db52de968d7147c71c6b9a8fd480f1e
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 18:18:41 2006 +0000
Bug #5877: Avoid burning CPU when acpid dies. Require acpid to be running
for ACPI support on Linux. Minor errno handling fixes. (Valery
Inozemtsev, Adam Jackson)
commit 7893dadb2f6df218a4f4ea30a41c1aa9838da1f0
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 14:39:59 2006 +0000
Bug #6827: Fix texel fetch in fbFetchTransformed to avoid crashes. Still
not 100% correct, but better than 7.0. (Radek Doulik, Matthias Hopf)
commit 2892dd6d2e34957650ef1630a94d471dfa71f888
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 17 16:20:03 2006 +0000
Make Xv symbols conditional. (Enrico Wiegelt)
commit a317bf482257f0e1b612dec7961fdfa564f0b9f2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 17 15:00:18 2006 +0000
Make DBE support conditional. (Enrico Wiegelt)
commit 321dbed5f5a857a23525167ab85d4d7699429132
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 15 18:27:18 2006 +0000
Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev)
commit dd38d3bd673cf830c2cd591fe1245909aa729892
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun May 14 16:22:24 2006 +0000
Don't use AM_CONDITIONAL inside shell conditionals. Bugzilla #6916.
commit 6558ba4e62dba99f2a4d830f1c16f8d1c255b316
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri May 12 21:53:28 2006 +0000
Fri May 12 17:51:26 2006 Søren Sandmann <sandmann@redhat.com>
Keep track of the previous item and update its next pointer when deleting
from the linked list.
commit 9e239a0df7ededb50de091e5271cbfddd2b683c3
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu May 11 11:23:43 2006 +0000
Bug #5796: Wrong fastpath selection for repeating sources.
commit 9db5d2dfc33e384ea4db1b7cbc377e0b05cfb3ff
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu May 11 10:18:08 2006 +0000
Bug #4320: Improved XAA Composite fastpath.
commit 9a2a63ca3ff30d15e82a29e75a3720ba5b446978
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed May 10 15:44:27 2006 +0000
Bug #3561: Crash fix in the Record extension. (Paul Anderson)
commit ab1a0249ba5e3174f18a1db212bc511fd7d74cb0
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue May 9 22:36:01 2006 +0000
Bug #6867: Yet another Render crash fix. (Michel Dänzer)
commit 24310f827b71009c7510a674d2f92ced89847e37
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue May 9 18:12:50 2006 +0000
Revert accidental commit
commit 86ffb46358965509aa3ee536f15cb5a4e5e04426
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue May 9 18:04:29 2006 +0000
Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer)
commit b46d6a44fa97a3e66de828385026b7f84d9e59b8
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed May 3 23:45:16 2006 +0000
Make Xephyr build on Solaris:
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since
they're not needed for Xephyr-only builds
Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
commit fc91ca069dd55490b99b096f029e0864b049120c
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed May 3 17:50:10 2006 +0000
Redact a few mentions of speedo font support.
commit b9a9cf618566bdd796556b8a1f31949f66184352
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue May 2 14:09:30 2006 +0000
Typo in ALLLOCATE_LOCAL() arguments, causing mis-computation of the buffer.
Bugzilla #6642.
commit 1e8a594957d84a37e66183e9c0cb9d42b62bdb24
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 2 01:37:25 2006 +0000
Fix Solaris build with Sun compilers to work when exa is built before
hw/xfree86/os-support/solaris (as it is by default now).
commit 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 2 01:30:37 2006 +0000
Use min() [defined in include/misc.h] instead of MIN() [not defined in any
Xorg header].
commit ad124742ae2a265a54a4a7ac91709ec6fd6ced34
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 30 20:33:27 2006 +0000
Remove stray mfb/cfb references.
commit 291e89d4f2a4bb3177b2dfe6421680e23f120b8e
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 30 19:16:14 2006 +0000
Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.
commit fdcacc5a4bc1d6cb7347fc66041a9c686c5c74d1
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Apr 28 03:27:12 2006 +0000
Add Polylines and PolyPoint acceleration as well. This is primarily to
clean up fallback debugging output, so I can focus on more imporant
cases. Performance is comparable but without hardware stalls, and
passes Xlib9.
commit 005529a1c9c9e78f06565dff081f03b74988081e
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Apr 28 03:26:30 2006 +0000
Correct some bugs causing performance issues in the "Smart" scheme.
commit 8738bc295bba229e36d064713e0c28aa8720c494
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Apr 27 20:27:27 2006 +0000
Improve EXA fallback debugging output to include the locations of pixmaps.
This is being used in tracking down recent compositing performance
regressions.
commit 83b061776a57025076fc26d6d01fe2e049c2243b
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Apr 27 19:17:34 2006 +0000
Add trivial PolySegment acceleration for 0-width horizontal/vertical lines,
which still happen somewhat frequently and were cluttering up my
fallback debugging output. x11perf says it's a major performance win in
those cases (though probably irrelevant), and it passes Xlib9.
commit 69164ec00c749787dd59d5913ec6b3d159ad74d7
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Apr 27 02:15:19 2006 +0000
In drawing glyphs, shortcut our way to exaComposite instead of going
through the whole CompositePicture stack and doing things like
computing damage over again. This is a sizeable win for text drawing
with a compmgr. Also avoid calling down into the server for dealing
with the scratch pixmap when we are able to do UploadToScreen
successfully and never need it.
commit 3d4ca57b69c40d27fe191170d0819013f8cc4947
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Apr 26 18:27:40 2006 +0000
Add a helper for the Component Alpha Over case, which breaks the operation
down into an OutReverse and an Add. Turn off the fallback to software
glyphs when component alpha, now that we expect all (new) drivers to be
able to support it. Also, make Xephyr fall back in the CA Over case to
exercise this code. This speeds up my rgb24text and ls -lR in
gnome-terminal by a factor of 5.
commit 26fa45b64258894201496f921eccb0cb7028c28c
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Apr 26 11:40:58 2006 +0000
Bug #6751: Use the Linux PCI ROM interface on Linux properly. The old
domain code, still modified BARs not a good idea, Just talk to sysfs,
if 0 read, fallback to old methods.
commit c339b221d3f59130a39e63d4cec3de7e3de95bf3
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Apr 26 11:31:07 2006 +0000
Bug #6750: This patch detects Intel bridges that are transparent but aren't
reported as such. From the Linux kernel fixups. This patch also removes
the reserved BIOS area from the area to allocate resources in.
commit 6d156c044085881c6ecbd8a13521c0a26df71c30
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Apr 26 01:33:15 2006 +0000
Improve the migration debugging output.
commit eaed7545a25a08b3223bf620c2ab6f80fe7cfdf6
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Apr 26 01:32:55 2006 +0000
Fix a bug in the intersection computation that could concievably cause
incorrect results to be returned (but would probably usually be
over-conservative).
commit 5d00859c6e7d4b7ebce56f438ec4993334de2328
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 25 23:56:17 2006 +0000
Bug #4668: Check if the lists of glyphs don't have any intersecting glyphs,
and if they all have a maskFormat matching the format of the actual
glyphs If so, we can avoid the temporary pixmap for accumulating
glyphs, which reduces the number of operations done, and makes it
easier on the migration system. This fixes some significant performance
issues, particularly with subpixel antialiasing. Note that it does
increase the amount of damage computation which is done, so is not
always a win with a compositing manager running.
commit 074dc9a023b3967ce00aa42c26a7c988423afe8a
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 25 16:47:23 2006 +0000
Add an option to verify at the point of migration that pixmaps which aren't
marked dirty are in fact not dirty. This will hopefully help catch
issues like the previous commit. Leave it on in fakexa.
commit 702d9226d57ec1584de2e8a85c268795650b1094
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 25 15:46:04 2006 +0000
Don't forget to mark the drawable as dirty in exaPutImage(). Fixes
corruption with drivers that have UTS. (Michel Dänzer)
commit 39ca0867c7dd6f3bdecc52aec8df435946682098
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Apr 24 05:44:06 2006 +0000
Remove another reference to cfb16.
commit 81f3c2937df6230542f3223c201da8c41ff59945
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Apr 24 05:39:47 2006 +0000
strlcpy() doesn't exist on Linux, so use the implementation in os/.
commit a715634d23fb3124261dbbd8d7d4e6522551bb9b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Apr 23 13:14:50 2006 +0000
Don't access free memory after unloading a module. Bugzilla #4168.
commit 79dc6892610c9f8385cde4f0d601cc7481225c16
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sat Apr 22 03:22:17 2006 +0000
When reading the kernel keyboard mapping (readKernelMapping in
os-support/linux/lnx_KbdMap.c) we overrun the usefully-named global
array 'map', scribbling on other random static variables elsewhere.
This is fixed by changing the size of at2lnx. (David Woodhouse). Bug
#5169
commit b37c515320dc8df2b1d160cc3f37d6bfac109b91
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 19 21:56:13 2006 +0000
Add support for x4a4 format (depth 4 at 8bpp). Bug #6325.
commit c947d796aad0b81d661a10b787deed967376da79
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 18 19:18:43 2006 +0000
Missed in previous commit: Add a new migration scheme, called "Smart" for
lack of a better name. This one behaves somewhat between Greedy and
Always. It moves in if we can accelerate, unless the destination is
clean and shouldn't be kept in framebuffer according to the score, in
which case we migrate out (and force-migrate anything where migration
is free). This should help fix lack of acceleration for drivers without
UTS since removing exaAsyncPixmapGCOps, and has removed one performance
trap with Radeon I'd noticed. It is the new default.
commit b17a4de83e7ab18bef29ae898195889638f1cc6a
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 18 19:14:07 2006 +0000
Add a new migration scheme, called "Smart" for lack of a better name. This
one behaves somewhat between Greedy and Always. It moves in if we can
accelerate, unless the destination is clean and shouldn't be kept in
framebuffer according to the score, in which case we migrate out (and
force-migrate anything where migration is free). This should help fix
lack of acceleration for drivers without UTS since removing
exaAsyncPixmapGCOps, and has removed one performance trap with Radeon
I'd noticed. It is the new default.
commit 771b366abe0bc060592b548612ec413291e14bf0
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 18 18:50:35 2006 +0000
Fix exaGetPixmapFirstPixel to migrate as unaccelerated. Also adds a bit of
fallback debugging info to PolyGlyphBlt.
commit 782d61a03176264e0a9eb222ae97be3d175cf0ab
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Tue Apr 18 17:28:44 2006 +0000
Update all prefixes in config tools, so they mostly work again. Also, make
RgbPath commented out when using xorgconfig. Start using
/dev/input/mice as the default mouse location on Linux.
commit 0f065059dcaf9c452f1cdec115f619f697fd71cc
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Apr 17 07:27:43 2006 +0000
Wrap a couple more SDK headers in if XORG, as per Dave Airlie's commit on
2006-01-18.
commit ba632f697a782cd47870705b6cecaac2c60d30ff
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Apr 17 07:10:31 2006 +0000
Fix kdrive build by linking in libexa before KDRIVE_LIBS.
commit 0e62d92d5b809bc3a6503e9bc386cf961fc22557
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:43:32 2006 +0000
Coverity #804: Another leak on OOM path.
commit d61219aaadf9e4aa83644a69627d3a1d3282c95f
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:38:11 2006 +0000
Coverity #806: Another memory leak on OOM path.
commit 1b04e313920447e4c1f42bdd5a61f188d463210c
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:32:22 2006 +0000
Coverity #847, #848, #849: Three more memory leaks.
commit 6545051902f2ce00c98bd1373f97ebc942667e9c
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:10:59 2006 +0000
Coverity #1003, #1004: Two more useless null checks.
commit ab1d420022fb09d36a0d6ad948c38147c65b9adf
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:09:38 2006 +0000
Coverity #1005: Avoid a null deref.
commit d01e0956a8903fb41e8a34c78973b9b2860b6446
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:08:10 2006 +0000
Coverity #1007: Fix a silly null check.
commit 6d29f659318364afe046dc242d6f506ce40a944a
Author: Luc Verhaegen <libv@skynet.be>
Date: Fri Apr 14 23:01:35 2006 +0000
CVT means Coordinated Video Timing instead of Common.
commit 82b6ea1a4b414426072bf001daeb3e9de0e93589
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 22:51:19 2006 +0000
Bug #6580: Don't install xf86drm.h, that's libdrm's job.
commit aefa347bded9a3179ab139d0ccddce314040e9b9
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Apr 13 21:08:25 2006 +0000
Fix build for added file to Mesa CVS. This is always fun. :(
commit 6aadd454e70d83921685b58bf57ec30d95920734
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Apr 10 10:11:19 2006 +0000
Fix stupid thinko.
commit c9f6e60d42dec82d06995c05a2a011c338cadd87
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Apr 10 08:50:33 2006 +0000
Coverity #826: Fix potential memory leak.
commit 1357af2474be9a3bce7ee2350fd4252eee89a3b1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 9 17:39:10 2006 +0000
Coverity #340: Fix potential NULL dereference. Clean up proliferation of
'register int n' in loops of ProcXkbGetNames.
commit f324be00c547effc698ae6679d12ffe90bd90e43
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 9 17:28:42 2006 +0000
Coverity #324: Fix potential NULL dereference. (Alan Coopersmith)
commit 7637aa17f21e26d979fbb210a638d6751c98b1eb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 9 17:26:17 2006 +0000
Coverity #169: Fix potential fgets() into NULL (?!?).
commit d5bc41b88272b4a3a1841cc1189720b0549db215
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 9 17:15:51 2006 +0000
Coverity #323, #445, #446, #447: Fix potential NULL dereferences.
commit 2387bfa5ff5ed82f3f732fb9152c1ea95850a914
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Apr 7 18:56:04 2006 +0000
Bump the ABI versions. Due to Glyph privates and the XV update below, the
video driver ABI needs to be bumped to 1.0. The rest of the ABI minor
versions were bumped to include the LoaderGetABIVersion function.
Add a DrawblePtr argument to the XV hooks. This allows drivers to determine
that the target window is redirected and draw to the appropriate place.
commit dc43909219fe2a4d03139638814b89032b2921b9
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Apr 7 17:49:32 2006 +0000
Fri Apr 7 13:46:45 2006 Søren Sandmann <sandmann@redhat.com>
Use FreeResource instead of deleteCompOverlayClient()
commit 94e7213d594dbbb53a6bb05d1dab7514c4ff5350
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 16:08:50 2006 +0000
Remove libc wrapper types from Xisb interfaces.
commit 47bdc9528c2dd4ea9d59a0944c023173ea7a7a66
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 7 16:07:50 2006 +0000
Coverity #844, #845, #846: Fix memory leaks.
commit 2c90c3bfef8563f739a72bb645dd52b35b6ff6d5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 7 15:57:17 2006 +0000
Coverity #987: Avoid potential NULL dereference.
commit 843146cfbaef234e13df9a62b6f0232a5efdf7f0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 7 15:53:21 2006 +0000
Coverity #1216: Fix double-close of file on error.
commit 5dacc822327689c0f096093756473c96fba67d76
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 7 02:20:11 2006 +0000
Coverity #333, #334 - eliminate unncessary test for always true condition
in fbEvenStipple.
commit 75a9afdbf42e4196471774102e1758f18866bec6
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:53:43 2006 +0000
Coverity #488: Avoid smashing an array on malformed config files.
commit 20c1ef2cc30abe45eeaf5b0833cbc0095ed05c02
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:50:07 2006 +0000
Coverity #769: Fix a potential memory leak for systems that allocate on
malloc(0)
commit 5ef711032b821be82fd7281fe64872bcbaff0327
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:41:00 2006 +0000
Coverity #838: Plug two more memory leaks.
commit 69477ea4b6e666940c5dd4422bedfa6432dead04
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:37:11 2006 +0000
Coverity #837: Fix another another memory leak.
commit b472ce7307dd88a21c7713a2b127e34f5c2bc817
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:35:43 2006 +0000
Coverity #836: Fix another memory leak.
commit 9c84ed5f8d9eded1a8b509c9cad1ca0ebcf2166a
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:34:29 2006 +0000
Coverity #835: Plug memory leak in extension section parsing.
commit 12924d0da36ad2266bb040caac58534c07e85261
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:29:39 2006 +0000
Coverity #812: Fix parser memory leak.
commit 49abff79957799e9229d5c0226ee1b0d7505003d
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:26:33 2006 +0000
Coverity #818: Avoid memory leak on error path.
commit bda292120fc97f890c1f58a31177c0f7c0bfa048
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:23:50 2006 +0000
Coverity #985: Avoid segfault on malloc failure.
commit 536628bb4bcb0a0d749e0c01412a5eb5d6d24063
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:18:01 2006 +0000
Coverity #1037: Sanity check idx before use.
commit 53e97ce4ddd993248561c245143b61915ea254b5
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 6 22:04:12 2006 +0000
missed a line while removing cfb16
commit 4ae12636694af05cee4287b119bde08e9ceaa8aa
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 6 18:59:11 2006 +0000
Remove cfb16, no longer used.
commit e1fc15a85fb367ee9afd63c920c3327c3f45158d
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Apr 5 21:08:45 2006 +0000
Put the screensaver extension back in the Xext module.
Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
commit 383c2e1e9ec54ab9de356993ad552c1aa6ec094f
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Apr 5 19:52:12 2006 +0000
Include fbmmx.h in fb/fbwindow.c when USE_MMX is defined. Fixes build
problem on x86-64 resulting from fbHaveMMX being a macro instead of a
function on that platform.
commit 4697da177d545a2f8bb6fd0d6588a1c40532c339
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Apr 4 18:30:28 2006 +0000
Initial checkin
commit 83ea57bcc82f478a7ecdcd6ed73ca4be01cd9c26
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Apr 4 14:39:06 2006 +0000
Bug #5729: Convert xf8_16bpp to fb. chips(4) users please test.
commit 4c7da861185080d15b3ff4301af4af0e85a71f93
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Apr 4 14:17:04 2006 +0000
Bug #5300: Fix missing spaces in the Build OS line in the log. (Egmont
Koblinger)
commit fb6f61b50f1c701041680e49f6a406a6603f1577
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Apr 4 12:36:16 2006 +0000
Bug #4806: Dump the raw EDID contents in hex to the log file for better
debugging. (Philip Prindeville)
commit 14af50371c7f23855781924cdf6afa6ab7566a87
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 22:00:06 2006 +0000
Bug #2142: Make font path logging more readable. (Eduard Fuchs)
commit 373f9f92566290d979730c09c9c5c5d50e23390c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 21:45:54 2006 +0000
Bug #4766: Convert all Xprint drivers to fb.
commit d9b8bfbfafe8758ceb629606607e37546d51ca52
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 21:16:30 2006 +0000
Bug #5478: More use of fbSOlidFillmmx. (Jim Huang)
commit b0e67782653033c6518944adfbf23e466bd8bc39
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 19:50:15 2006 +0000
Bug #6346: Build fix when using gcc -mno-sse. (Jonathan Adamczewski)
commit 66500819b1ca730a7b1df400a8368a08cbe49335
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Apr 3 11:37:30 2006 +0000
Bug #1358: Make ISO_Prev_Group cycle/wrap as ISO_Next_Group does.
commit 2a6c11aa3b06f13dad94f3441c7184e6720a2bf4
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Apr 3 09:12:28 2006 +0000
Fix a server crash due to memsetting beyond allocated memory when running
GL applications.
commit f6ca2b3ea92b7fe98408c51a17a590435e808b1d
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 02:15:55 2006 +0000
Coverity #38: Dead branch elimination.
commit 9b9dd747d8f4697c6d5c947c160d5991c7c8fde5
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 02:13:47 2006 +0000
Coverity #75: Dead variable elimination.
commit 3f87aeefb4be3ac23ae636d3756ffdc446eaa62d
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 02:12:11 2006 +0000
Coverity #82: Dead variable elimination.
commit 61926dbe592468076f8c9a666f0098d067d2213e
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 02:09:05 2006 +0000
Coverity #271: Fix an unbelievably boneheaded NULL chase.
commit 7ef95da8a3e22e710882590fc47d56893159cb5d
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:51:54 2006 +0000
Coverity #616: Fix a rare memory leak.
commit 01ebd633017249c496f378df511586c973d49708
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:43:33 2006 +0000
Coverity #833: Fix a rather nasty memory leak.
commit a01f17d6dec02f80144e108f748783cb4e429ebb
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:35:05 2006 +0000
Coverity #983: Move some risky debugging code inside #ifdef DEBUG.
commit c03cfca3806f45948627715b25b46839a07be979
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:31:59 2006 +0000
Coverity #986: Prevent a NULL chase.
commit 07ecf49521973bbb205b199c39e1171f1163df2b
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:28:11 2006 +0000
Coverity #992: Prevent a NULL chase.
commit c6b3b3354c2d9139b19b132051d434e97dd19715
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 2 22:51:42 2006 +0000
Bump to 1.1.99.1.
commit 7e085f52b6f07c076bd3bcfdce27c17d14d7822e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Apr 2 22:31:13 2006 +0000
Use xf86LoaderCheckSymbol to check for DRI symbols instead of dlsym,
avoiding RTLD_DEFAULT. (__glXDRIscreenProbe): Change GLX-DRI to AIGLX
in LogMessage for consitency.
commit b2097b99a2e6cc045ee9b6d80946bc06c4d9302c
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 2 21:45:03 2006 +0000
../stub
commit 4e3a4cfdd1d7153eb88aab05ed02ddb32601ae93
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Apr 2 06:22:05 2006 +0000
Use RTLD_DEFAULT, rather than relying on NULL happening to map to it as it
does on Linux.
commit 323fec20292fc5ad90bfee9015ecccdc13c968ad
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 2 00:46:20 2006 +0000
Reorder link order for Xdmx to fix new screensaver variable reference
properly; remove previous awful hack.
commit a605b9ffd3c2e7d227e35b911761f720bf07b7e6
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 2 00:09:43 2006 +0000
Fix some includes to point into X11/fonts/ properly.
commit e5b1d38e142807b59ce4ec89764c949f707ec541
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 1 23:53:33 2006 +0000
Disable Xprint freetype support momentarily. Needs ttf2pt1.c, which exists
in the monolith but has an advertising clause in the license.
commit ccca76b8083b83825fa16483b44e8926a35412bb
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Apr 1 23:41:23 2006 +0000
Clean up warnings and a debug printf.
commit 6afa814ab16f351b2eb787e5bf481a1f9738b391
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Apr 1 23:28:17 2006 +0000
Pull out fb's tile handling during fbValidateGC so we can do the necessary
exaPrepare/FinishAccess()es. Revealed by xtest with fakexa.
commit 277f612d4eeb89adb8ccda4e8fd3d211d8d1705e
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 1 23:19:08 2006 +0000
Hack around the new screensaver variable for DMX, which is otherwise
blissfully ignorant of it.
commit 5f95146fcfcae60cc29265799ba3b851647105d6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Apr 1 22:35:16 2006 +0000
Export exaPrepare/FinishGC to the rest of EXA, and use it in the ImageGlyph
implementation to avoid unprepared access to the tile. Also, relocate
the fbGetDrawable to avoid using a stale dest pointer after
exaSolidBoxClipped() may have migrated it. Revealed by xtest.
commit c720ffe875e4b2038746ff9b4767f8b90db0a307
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Apr 1 22:17:44 2006 +0000
Use fb's depth-to-planemask computation, which doesn't suffer from getting
a 1 planemask at depth 32. Fixes Get/PutImage xtest tests.
commit 5c0a2088e229d05c38e5df7daea45af0d7db7daf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 1 21:49:44 2006 +0000
Bug #6428: Fix off-by-one error when walking off the end of the vmodmap
list.
commit 1e764feab595b781dab22d6e41c26f118c9d41b5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 1 21:20:31 2006 +0000
Bug #5801: Check for MTRR support under Linux. Minor refactoring of MTRR
checks for other OSes.
commit 978c7b14a18caffde5600480824d04492fc32aef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 1 21:02:40 2006 +0000
Make Xprint AC_ARG_ENABLEs and AC_ARG_WITHs unconditional also.
commit 71a6f2ef6c1138c5c6918a54dfb856183f4f242c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 1 20:58:42 2006 +0000
Unconditionally run XP_USE_FREETYPE AM_CONDITIONAL, not only in the Xprint
path.
commit d1e90113fc32b6ddc4dbe1a074763c31bc133e75
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 31 23:22:29 2006 +0000
Don't attempt to Prepare/FinishAccess NULL pDrawables. Exposed by new
gradient testing in rendercheck.
commit 2e38fedd29e7e55d01e3edce6a73b8ceaac17911
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 31 19:41:28 2006 +0000
Add an option to EXA for the DDX to request that EXA hide the pixmap's
devPrivate.ptr when pointing at offscreen memory, outside of
exaPrepare/FinishAccess(). This was used with fakexa to find (by NULL
dereference) many instances of un-Prepared CPU access to the
framebuffer:
- GC tiles used in several ops when fillStyle == FillTiled were never
Prepared.
- Migration could lead to un-Prepared access to mask data in render's
Trapezoids and Triangles
- PutImage's UploadToScreen failure fallback failed to Prepare.
commit f480dc797b51f080f912efc7867d6d8e50be074c
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 31 19:25:42 2006 +0000
Revert mistaken commit to exa_unaccel.c. Should have been to
exa_offscreen.c: Correct a typo in debug-only offscreen validation
code. (Wang Zhenyu)
commit 1a8167c1baa767fc056d1e17d96d0ea98a5f3b17
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 31 19:16:51 2006 +0000
Correct a typo in debug-only offscreen validation code. (Wang Zhenyu)
commit 7ea30b507f4ce5ce20fbfaca80f7d5b53a99eb1d
Author: Fredrik Höglund <fredrik@kde.org>
Date: Fri Mar 31 18:49:38 2006 +0000
Move the screensaver extension from module to builtins.
Add the server side implementation of the ScreenSaverSuspend request.
Require scrnsaverproto >= 1.1, and change the linking order of the Xorg
static libs.
commit acca49b1a5a6c034f3b9d51d9016b8a7d43da809
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Mar 31 17:39:35 2006 +0000
Fri Mar 31 12:37:16 2006 Søren Sandmann <sandmann@redhat.com>
Fix copyright statement
commit b074ce22470ba0a51eda2af7100d09a260a1e8bb
Author: Egbert Eich <eich@suse.de>
Date: Fri Mar 31 15:11:51 2006 +0000
fixed typo.
commit 710bb2e6c8b2874406e48fa8ad24539290c98d41
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 31 14:52:57 2006 +0000
Reindent with -cbi0.
commit 7c44bb8c49656133eae675377edea55322d254ca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 31 07:33:34 2006 +0000
Simplify XkbWriteXKBKeymapForNames a bit, and remove debug spew.
commit 4c317bbc1259fa555dc5d5278226b21c42845c0c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 31 07:21:41 2006 +0000
Add full FreeType support for Xprint. (Drew Parsons)
commit 759033703ce17b20d57756206f48a7ae410a50d1
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 21:44:36 2006 +0000
Remove the exaAsyncPixmapGCOps mostly-unaccelerated ops vector, and always
plug in the accelerated one, even if the destination pixmap is
currently offscreen. This was a leftover from when kaa originally got
accelerated offscreen pixmap support, and its only concievable use was
to avoid a little overhead on ops to in-system pixmaps that weren't
going to get migrated. At this point, we probably care more about just
getting everything accelerated that we easily can, which should happen
with the new migration support.
commit b9203dc068ccd4c0d22d49a94b910783432b96a8
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 21:25:43 2006 +0000
Don't do an extra fallback path for CopyWindow while swappedOut, since
exaCopyNtoN takes care of the fallback anyway, and we don't care about
the performance of this path.
commit 5c04610f8aeceed9ec7cd0ca8c5eb314cacc3c25
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 21:21:59 2006 +0000
Add a dependency on EXA, so it rebuilds when the library does. The manual
indicated I shouldn't do this, but experience indicates I should.
commit 8ec42a10ff04e51e8d0b4cffb15064d901bc398d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Mar 30 20:08:44 2006 +0000
Mark the ARGB FBConfig as nonconforming to prevent drivers and apps from
falling over.
Add @GLX_DEFINES@ so GLcore gets compiled with TLS support if configured.
Only destroy the mesa buffer if it got initialized.
commit 08e319091fae7a60ae9fa757659cfde2966af9e9
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 30 18:53:41 2006 +0000
Added notice to last ChangeLog entry
Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x.
Provided by Hong Bo Peng of IBM (slightly modified). Patches try to
resolve some of the careless mixtures of ulong and uint (which are
different size on
64bit). > This patch will break the driver ABI! < Bugzilla #6438.
commit 9da1d2257d02155cc8b4541cf5fcb4e64d756945
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 30 18:48:11 2006 +0000
Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x.
Provided by Hong Bo Peng of IBM (slightly modified). Patches try to
resolve some of the careless mixtures of ulong and uint (which are
different size on
64bit). Bugzilla #6438.
commit 6d7ad353bafe914f0b50887daaeaae89ada6ebd3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Mar 30 18:29:53 2006 +0000
Regenerate these files using updated scripts to avoid unused variable
warnings.
commit 2153fa97482bae5737def3ecd4fe1cdc03834991
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 05:24:27 2006 +0000
Bug #2986: Add PutImage acceleration for the ZPixmap, planeMask ~=
FB_ALLONES, bitsPerPixel >= 8, GXcopy cases. With the radeon driver on
my machine, this gives about 10% speedup in PutImage
10x10 and 500x500, and 40% speedup for 10x10 ShmPutImage, up to 65%
improvement in 500x500 ShmPutImage. Also fixes a crasher in GetImage
that slipped in at the last minute.
commit 3cf46cc1e32efc0e4be1d88be111ba0438e0f021
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 05:15:58 2006 +0000
Add an UploadToScreen implementation, for testing PutImage support, and
make the DownloadFromScreen more robust.
commit e799dd68e2bd0fa8ac3c344111fb12e1f32d4c10
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 29 22:25:17 2006 +0000
Bug #2986: Add acceleration of GetImage using DownloadFromScreen for the
ZPixmap, planeMask ~= FB_ALLONES, bitsPerPixel >= 8 case. I'm pretty
convinced that this is the only case that we care about at all. Tested
with xwd -root and xwd on a gnome-terminal, in a composited environment
or not.
commit 4bb5ab0b4453208573b91b334940f190a8f7210a
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 29 22:03:18 2006 +0000
Add a DownloadFromScreen implementation, used for testing GetImage
acceleration, and set the migration scheme to Always on init (since
this is all for testing, and Always should make migration happen more
frequently than Greedy).
commit e31e8ace1043eab340d6b60a6e98b23ebf102786
Author: Deron Johnson <deron.johnson@sun.com>
Date: Wed Mar 29 17:51:54 2006 +0000
Fix composite overlay window bug 6411
commit ff6f88348c7498e83b0b143ef3737fd6eb0995e4
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 29 01:05:09 2006 +0000
More warning cleanup.
commit 52d9ce7f4fc599d30dec2e61fc1720597043d91c
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 28 21:45:14 2006 +0000
Fix another typo.
commit 7df64898eac46a487e8eab2af7213d133b9ca419
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 28 07:46:04 2006 +0000
Fix a couple of typos.
commit bd283c2464e2c0e1fd0aca1dedff0f39c2564c34
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Mar 28 07:21:50 2006 +0000
Add a new export, LoaderGetABIVersion. This function allows modules to
query the versions directly instead of having to guess. Bug #6416: Add
LoaderGetABIVersion.
commit a06342eccc76035ff859fee4d283b288c90ee923
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 28 02:57:07 2006 +0000
Add --enable-glx-tls ./configure option to enable use of TLS for storing
current GL context. Use this option to let AIGLX load DRI drivers
compiled for TLS.
commit 77531dfb9f9f3ca0e38ad0555ee3735d6f28cf19
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Mar 28 01:22:01 2006 +0000
Silence some editorializing in the configure help text.
commit 7deaaa797cf8e7ca71e9b34fa6f413d1ed2b3dab
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Mar 28 01:21:00 2006 +0000
Big old pile of warning fixes.
commit 7342dbe4b2108827eaf30993ceeecbd828da2290
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Mar 28 00:18:31 2006 +0000
Remove long-dead screen region code.
commit 0e88cefbfecbff0c7dd606ce0caca840f45cbc0d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Mar 27 23:03:47 2006 +0000
Prune XKB code to only what we need to run the server. Remove dead
!XKB_IN_SERVER codepaths. Remove HAVE_CONFIG_H codepaths.
commit 5be8a66d324f3d5840b134ad29069eace64e6f12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Mar 27 22:28:32 2006 +0000
Fix remnants of previous busted _XkbStrCaseCmp commit.
commit 9e202dfe40e2bdd66f461a6ba531e927f82096ae
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Mar 27 22:25:56 2006 +0000
Remove remnants of XkbCF code.
commit 7257590651328f89d23e80da1ec6241542a660cd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Mar 27 21:15:06 2006 +0000
Move XFree86 DDX XKB actions into dixmods.
commit d7b9e2b0e9d6889ea6b05e63892e612f4e5f19f5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 23:09:50 2006 +0000
Bug #3819: Remove open-coding of strcasecmp.
commit b3570dd94aa72f94e537a17680150e91e7712f5a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 22:37:58 2006 +0000
Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype
to xkb.h. Explicitly initialise nTypes in xkb.c.
commit 1ef60ce8ebb681b3cfb5e515be5c187c0442dcda
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 22:35:48 2006 +0000
Really remove all DDX pre-config code.
commit ec10f70b2114e5369a5b2f34b084dcf55634dcb4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 21:52:49 2006 +0000
Remove XkbCF DDX configuration code.
commit aae4238360b842ac34dc8ee16e165a1821f9a801
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 20:17:58 2006 +0000
Fix two glaring unconditional-NULL-dereferences.
commit a68c11bb1d7c5419004a1714e49dffac57304e78
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Mar 25 19:52:05 2006 +0000
Mark everything in xf86sym.c as _X_EXPORT.
commit ae935832facfa81a9689882406ecca74b0346790
Author: Fredrik Höglund <fredrik@kde.org>
Date: Fri Mar 24 20:50:13 2006 +0000
Refactored the screensaver and DPMS timer code to use the screensaver timer
for both screensaver and DPMS. Removed the SetDPMSTimers() and
FreeDPMSTimers() functions.
commit d1746ec0f0c8a0b750f390e7a7faf21b67683f4a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 24 17:58:39 2006 +0000
Make sure DRI module is loaded before calling DRI functions.
commit f1616508c95d12dfaad2cfd61b40228b3dba6f60
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Mar 23 23:54:08 2006 +0000
Add ast driver/pci id (Carl Switzky, Sun Microsystems)
commit 6d2896b384e17512e8f12036daabcd575d21f804
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Mar 22 22:49:52 2006 +0000
Improve error logging.
commit 5449634e3c9428005aba5b3322ced7e86c62f185
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Mar 22 21:37:49 2006 +0000
Wed Mar 22 16:28:46 2006 Søren Sandmann <sandmann@redhat.com>
Use inline assembly for copy area, since gcc doesn't generate movq
instructions.
commit 5b3084c64f7bd1232603ffb3e985600b8d045453
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Mar 22 21:13:08 2006 +0000
Wed Mar 22 16:05:09 2006 Søren Sandmann <sandmann@redhat.com>
Use inline assembly for solid fills, since gcc doesn't use the movq
instructions.
commit a08e5e0c68baaf85b0fc3ecde74a6bcf80bcd4bf
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Mar 22 18:44:26 2006 +0000
Wed Mar 22 13:42:44 2006 Søren Sandmann <sandmann@redhat.com>
Patch by Keith Packard to make sure redirected windows don't get considered
"FullyObscured".
commit 966d93ef6d1f2ed02f3b81b5bf5a1ebbdd48c93d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 21 22:54:38 2006 +0000
Make the server distcheck and tag 1.0.99.1 snapshot.
Bump CVS version to 1.0.99.1.
Distcheck fixes.
commit 8e3ad87d01c102591c7dc25614f6ac10e444a1b1
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 21 22:32:13 2006 +0000
#include indirect_dispatch to get prototypes for FBO functions.
Fix a couple of warnings.
commit dcc43d57cbe9d2b65384fe9ba2e4e4fbb43cb0a1
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Mar 20 20:10:29 2006 +0000
Finish glx_ansic.h wrapper changes to make Xvfb and Xnest link again.
commit 9509c6799e31e96677b6d07bdf24ea91ddd30020
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Mar 20 19:32:18 2006 +0000
dead file removal
commit 61a020265c5915e3d671d5b2047b81a5d15594c3
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Mar 20 18:43:18 2006 +0000
Bug #5549: Fix build for sparc64. (Matthieu Herrb)
commit 6eb4e2303aaab8d64e3f6cbc0bbee55689bdcb82
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Mar 20 14:01:05 2006 +0000
Bug #6213: Check geteuid's return value, not its address, otherwise
unprivileged users can set the modulepath and run arbitrary code. Patch
from Matthieu Herrb. (CVE-2006-0745, Coverity #4)
commit 8c1bb37d0649b269b78c457b8b41ff59a41d89af
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 17 08:55:07 2006 +0000
Typo fix, reindent.
commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 17 01:47:25 2006 +0000
Check for glproto when building GLX and make sure we have at least 1.4.6.
Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
directly.
commit 2c11cde3367fcd22740b577a4364b1e41cf3e1d2
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 17 00:35:18 2006 +0000
More patches from David Reveman:
Add GL_ARB_texture_non_power_of_two, GL_EXT_framebuffer_object and
GL_NV_texture_env_combine4 extensions.
Add __GLXcontext destructor and flush context cache there and on
loseCurrent.
Chain back to new __GLXcontext destructor. (__glXMesaContextForceCurrent):
Set render table on forceCurrent. (init_screen_visuals): Index pVis
array correctly. (GlxGetMesaProvider): Add this.
Hook up FBO marshalling.
commit 14aafc258cd774cf937f9798a888c2d3c97ccacf
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 16 18:43:55 2006 +0000
Change EXA so that exaMoveOutPixmap() retains the framebuffer copy of the
pixmap, and damage is tracked so that a later exaMoveInPixmap won't
result in an upload if no upload is necessary. This will likely improve
the performance of the "Always" migration scheme significantly, and is
a step in the path to more exact damage tracking between framebuffer
and system memory.
commit d0d336efd58896718f31a400651bacd9b769fb5a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 16 16:29:17 2006 +0000
Add support for ZX2 PCI-E local bus adaptors. (Alex Williamson, HP)
Use soft timeout register to avoid MCAs when probing for non-existent local
bus adaptors on ZX2. (Alex Williamson, HP)
commit 175980580e572745a9a381b4432e3ba0457d3ba3
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 23:05:53 2006 +0000
Bump to requiring fixesproto >= 4.0 and compositeproto >= 0.3.
commit 6fe377af5a82deb6f8b0f3b75414335e7845caac
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Wed Mar 15 21:25:38 2006 +0000
- OpenBSD needs -Wl,-export-dynamic to export symbols from main executable
to modules.
- Probe for OpenBSD aperture driver and define HAS_APERTURE_DRV
accordingly.
commit 21f7f2fb113ee4f9cd011c3cc2d45d43bbdd35fa
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Wed Mar 15 18:43:32 2006 +0000
Enable correct handling of the BTS instruction (opcode 0f ab) The code was
there but #ifdefed out. Insead of BTS, BT was executed. This patch
enables the BTS function and hooks it up the the correct opcode. (ATI
Technologies Inc.)
commit b726aa502a871c700bc42b5325abf2c6820ff756
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Wed Mar 15 18:37:44 2006 +0000
Update to build against Mesa CVS HEAD.
commit c74464d92cd673ff0669375757caab798cc57e95
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 15 16:59:45 2006 +0000
Don't let pinned pixmaps get migrated in when using the "Always" migration
scheme. This notably keeps the visible screen from getting migrated in
to a new location in framebuffer.
Reported by: Michel Dänzer.
commit b9c43cde1e368903786977b06368d5e36db9ffe8
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:56:10 2006 +0000
Coverity #1042, 1043: Nuke some dead variables.
commit 5e106a71b9f8077216d41619402952b0005dd8a4
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:49:04 2006 +0000
Coverity #807: Fix a memory leak in XFixesExpandRegion.
commit a3ef63696cac950b2520e7c85564befc0a830fde
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:36:31 2006 +0000
Coverity #490: Fix a range check in xf86vidmode extension.
commit 152090ce442e94de1ae920208a92931af6493c8c
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:33:12 2006 +0000
Coverity #487: Check version number correctly.
commit 72cc6307257fcbb800267464487bf918ee674328
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:32:05 2006 +0000
Coverity #491: Check version number correctly.
commit 460f2ea4a594a53536f34c4ad27795fceec50bcc
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:21:04 2006 +0000
Coverity #794: Fix a highly unlikely memory leak.
commit 116d158e85ec43577ff69aeb3271ab1f888500c9
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:16:24 2006 +0000
Coverity #269: Compare the requested ABI class against the ABI class of the
module, not the module class.
commit d8221a9b70a11606a0f7e1f69afee6049d7f182f
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:11:34 2006 +0000
Coverity #484: Fix an off-by-one in module refcounting.
commit 6bb2dc02a7cffd6ed7dd28e88d584920a4150749
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:01:47 2006 +0000
Coverity #337: Remove useless NULL check.
commit 1e5c0842af99027cc6c30a16f967d8b60c9a894d
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 15:34:57 2006 +0000
Coverity #1053: Nuke a dead variable.
commit 7314d16cde4c3f99d9d9f1d539f0c5ff4942e653
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Mar 15 03:18:42 2006 +0000
Fix DRIExtensionInit() to not register callbacks when it hasn't been
initialized for the current server generation. Fixes a problem where it
would use stale private index and blow up in colorful ways if no driver
called DRIScreenInit() on the second generation (which happens due to a
bug in radeon that i'll fix separately). Note: clearing the index in
DRIReset() wouldn't work as DRIReset() is called before the
CloseScreen() chain
commit 02d80a0de93f7592e69065b0fbe5820dcdebdb44
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Mar 15 03:12:32 2006 +0000
Make xf86 linear allocator smarter when dealing with alignment constraints
when falling back to X/Y allocations. Fixes various problems of Xv
allocation failures, notably with "nv" driver.
commit c1601717d536419693b3ef6e8a3d69b9f2fdc2b3
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 15 01:20:08 2006 +0000
Add a new migration scheme, "always", which will move pixmaps to their
desired location always (unless they don't fit in FB, in which case
they all get moved out for software rendering). The default remains as
before, but can be controlled by the MigrationHeuristic xorg.conf
option (which is intentionally not documented, as it may be
short-lived). This is part of the exa-damagetrack work, which appears
stable in testing with fakexa, unlike the work as a whole.
commit a90cff266cc81993ed804fb320c1dbfe5e0d4787
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 15 00:13:52 2006 +0000
Add more doxygen documentation, including notes on WaitMarker() and
MarkSync() that I noticed were needed while reading the VIA driver.
commit 693e42114f1127528448126d78a5209dd1198d8d
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 14 21:30:12 2006 +0000
Move migration logic to a new function, exaDoMigration(). This is largely a
manual conversion to allow for different migration schemes to be
implemented reasonably, but does include some minor improvements such
as accounting for pinned pixmaps not being acceleratable, and for our
current GetImage and GetSpans not being accelerated.
commit d30905478078036383977ae9d4a3685c2e2c642f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 14 20:38:06 2006 +0000
Pull code for getting the (0,0) pixel from a pixmap out to a separate
function, since it gets repeated (with bad error handling, in one
case).
commit 01aa209f2056ef04e3f2735756a0f8b4a67a3d87
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 14 19:32:27 2006 +0000
Bail out early if screen doesn't support DRI.
commit 0cc34266d6e84bb491fcf9aa74e34615b2fca4fc
Author: Deron Johnson <deron.johnson@sun.com>
Date: Mon Mar 13 22:43:42 2006 +0000
Updated ChangeLog for my latest composite and xfixes changes.
commit 450018f48b2796345a4eaccbb94c1971ebd30114
Author: Deron Johnson <deron.johnson@sun.com>
Date: Mon Mar 13 21:59:55 2006 +0000
Part 3 of 3 (Other parts are in proto and lib) Composite Version 0.3:
CompositeGetOverlayWindow, CompositeReleaseOverlayWindow Xfixes Version
4.0: XFixesHideCursor, XFixesShowCursor
commit e5956f49b217b0ee9c9f35b6a58f339a8d22b1d7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Mar 13 01:54:59 2006 +0000
First batch of AIGLX fixes from David Reveman.
Add getter for Mesa provider.
Export this for Xgl.
Move resource tracking out of drawable constructor to allow wrapping.
Use corrent reply size #define.
Add this function. (DoGetDrawableAttributes): Fix array length.
commit eb63e50d95da4e1e08fc6fcec46ac63d5e3b7bf4
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 12 17:14:03 2006 +0000
Fix build when AIGLX is false.
commit 9ed3463450469c3108e0be7e4baabc0a403a78b2
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Mar 12 03:04:52 2006 +0000
Improve doxygen formatting, and attempt to clarify the 1:1 ratio of
successful PrepareCopy()s to DoneCopy()s.
commit 9a7fba5fd07c8831d0acab8d901605de537ae273
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Mar 12 03:02:26 2006 +0000
Make exaCopyNtoNTwoDir() call DoneCopy() at the end of each string of
consecutive Copy() calls (rather than exactly once at the end of the
function).
Reviewed by: jbarnes
commit c3342c8000f6d2bfb61e2cf95e028d11b59698fa
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Mar 12 00:11:34 2006 +0000
Merge accel_indirect branch to HEAD.
commit b1b731c28630965d9e2defe62d1108270dc8264c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Mar 11 02:43:51 2006 +0000
Fix buffer size checks to prevent 2-byte buffer overflows. (Coverity #480,
#481, #482, #483)
commit fc0772de36315f19f5b57220db69f48a3b1fdc9a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Mar 11 02:10:14 2006 +0000
Add HAS_MMAP for Xvfb
Fix Xvfb option parsing to exit on bad arguments, not just issue error
messages and continue on. (Coverity #492)
commit f2ecbb30187000547a98ca7cbaee433ea4ba8fe3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Mar 11 01:58:32 2006 +0000
Pass sizeof the correct buffer to XmuSnprintf. (Coverity #489)
commit d6955798489813ef77cca13cf5f5c67d49e6dece
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 21:36:24 2006 +0000
If fakexa is enabled, create a larger buffer in the Ximage, but keep the
same width/height for front-buffer drawing. The fakexa code then uses
this extra space for offscreen pixmaps. Note that this tones down the
absurdity of fakexa's offscreen pixmap alignment requirements (odd
alignment is too weird, so stick with "24", which is still strange but
exists out there). It also fixes a couple of bugs in the fakexa
implementation revealed by using offscreen pixmaps.
commit 5b1a7b478f072f56e836f2d4c0fbc1985842e2bb
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 21:32:34 2006 +0000
Move the exaDrawableDirty in exaPrepareAccess to exaFinishAccess, which is
after the drawing is done. Previously, a failed PrepareAccess could
have migrated and cleared the dirty flag before the damage was ever
done.
commit ffdbb547becc71f1cfdd035d0d6c71539f185fb1
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 08:06:42 2006 +0000
Coverity #1011: Remove a useless NULL check on a pVbe that had been
dereferenced many times before.
commit 1bc72dce5f8bc40e369e69b684816fdaaa07da43
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 08:03:24 2006 +0000
Coverity #857: Fix resource leak in error path by freeing earlier.
commit 55f677d600370b19d62ef821025481f2be6f5edb
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 07:58:27 2006 +0000
Coverity #813, #814, #815, #816: Fix resource leaks in error paths of
config parsing code.
commit 2bd41105496b729395fbcf97f09581eb0efb3510
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 07:45:25 2006 +0000
Document the restriction on PrepareAccess() failure, from discussion with
benh.
commit 21dcd0304879f38ea8ea01ba88e7cc7783771adf
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri Mar 10 01:34:45 2006 +0000
Just like FreeBSD, let DragonFly's default mouse Device be /dev/sysmouse
(since /dev/mouse don't even exist by default).
commit 9a99afdfb292f303f914039952fdd772eed9e03a
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri Mar 10 01:22:26 2006 +0000
Add DragonFly support. (It is like FreeBSD.)
This patch is from DragonFly developer Joerg Sonnenberger and the pkgsrc
collection.
I tested using /dev/sysmouse with moused using my serial /dev/cuaa0.
commit 7a0f7f739804bc7d9c5562701abee8d134878977
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 9 23:29:44 2006 +0000
Coverity #349: Fall back to software early if pSrc->pDrawable is NULL, or
pMask is non-NULL but pMask->pDrawable is NULL. This prevents NULL
dereferences on gradients and other Pictures which have no pDrawable.
commit 8a3ff42abb726d1604af39b4653ede5f760b7e69
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 9 23:25:35 2006 +0000
Commit changes missed in last commit (mis-typed path and didn't notice): Do
a first pass of doxygen documentation of EXA. This removes the
corresponding pieces of exa-driver.txt, which were becoming stale.
Hopefully the documentation will stay much more up-to-date this way.
Many thanks to jbarnes for writing exa-driver.txt which was used a lot
in writing this documentation.
commit ab35c3fbc135bafdfc5057ef5d6227ca3534ed26
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 9 23:18:15 2006 +0000
Do a first pass of doxygen documentation of EXA. This removes the
corresponding pieces of exa-driver.txt, which were becoming stale.
Hopefully the documentation will stay much more up-to-date this way.
Many thanks to jbarnes for writing exa-driver.txt which was used a lot
in writing this documentation.
commit d8f8bfeccef0750d79f852b9ae7152e841227d5a
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Mar 9 14:23:57 2006 +0000
Do Xorg configure checks for Xgl only as well
commit 2822cbc1fb2271844e7ae10c3629aaa940ae4042
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 9 06:04:07 2006 +0000
Rearrange EXA driver structures so that there's a hope of maintaining ABI
when extending the driver interface. The card and accel structures are
merged into the ExaDriverRec, which is to be allocated using
exaDriverAlloc(). The driver structure also grows exa_major and
exa_minor, which drivers fill in and have checked by EXA
(double-checking that the driver really did check that the EXA version
was correct). Removes exaInitCard(), which is replaced by the driver
filling in the rec by hand, and the exaGetVersion() and related
EXA_*VERSION which are replaced by always using the XFree86 loadable
module versioning.
commit 65aa33f9173b1554924437685698f7c5f645a3c4
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Mar 8 06:19:37 2006 +0000
render/picture.c Initialize the format of a source picture to
PICT_a8r8g8b8. Fixes a failure in the gradients test of rendercheck. In
the long term we could do better by setting the format to something
without alpha whenever the gradient doesn't contain colors with alpha.
This triggers a reduction of the over operation to a pure source
operation.
commit cb5090e8d60f4e9780c859faeea5c24587f6bee7
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 8 03:32:07 2006 +0000
Bug #6150: Do the obvious fix of an insane sanity check in
xf86InitFBManager. (Julio M. Merino Vidal)
commit 2e6f801fe1a749f6a4db2cfd8a43abec5caceae0
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Mar 7 23:58:22 2006 +0000
Numerous amounts refactoring and comment adding (see ChangeLog for file by
file details). The primary intention for these changes is to pave the
way for the new device probing and PCI configuration code that I'm
working on.
commit b7d2dfc1e5e07051732303731ff3e4e76852dd94
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 7 20:06:15 2006 +0000
Add appropriate MIT license. Oops.
commit 9d8c0e4bcbb111e860b7c3c33c224c22589006b1
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 7 19:57:46 2006 +0000
Add a new flag to ephyr, "-fakexa", which turns on an EXA acceleration
implementation that calls fb to get its work done. The purpose is to
have a trusted EXA driver for use with testing changes to the core of
EXA. However, fakexa has not received much testing yet, lacks offscreen
pixmaps support, and doesn't reliably provide garbage when EXA doesn't
get its syncing right. All of these should be fixed soon.
commit 0a3d6c739968bf5af81fc0e8ea7211c20d52080b
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 7 19:49:31 2006 +0000
Remove stale EXA files, which failed to get removed during the move to
top-level, somehow.
commit 68a8963f726cb92624665669813b6d952d53556e
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Mar 7 16:00:57 2006 +0000
Fix cvt -r check again. CH7011 TV encoder had 800x600 PAL hit the check.
commit 0693083335185ce05ee64546151f3fc43ce98575
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Mar 6 21:00:09 2006 +0000
render/picture.c Correctly initialize devPrivates variable in source only
pictures to 0
miext/cw/cw.h Don't try to access devPrivates of source only pictures
commit 448997ebcd2bab02be1059b07b91b63b0d05d268
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:43:10 2006 +0000
Only output SetClientVersion message if verbosity > 1, like other
extensions do
commit d921173833cc207380eb08b6675393f5e8139d5f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:35:08 2006 +0000
define SYS_LIBS to hold system dependant libraries that may needed. and add
it to libraries list where needed. Update ChangeLog for previous
changes too
commit 82cbd2ee0d20225b9edbb5246c8ed116b4614e1a
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:33:17 2006 +0000
Don't hard-code -DUSE_DEV_IO here. configure generates the proper OS
specific values here.
commit b56a1513d27f84dcd55f3dc6053f183aa6f7855b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:32:40 2006 +0000
Definitions for bswapxx() macros on OpenBSD.
commit 4335868476af7c821c64def52b102b93ae91f8b0
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:13:21 2006 +0000
Fix build with non GNU make.
commit b2f8f410c0bb8bc24039b2a593f8a2a483659914
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Mar 3 09:54:54 2006 +0000
https://bugs.freedesktop.org/show_bug.cgi?id=4341 Make Xming error messages
more meaningful.
commit 29237c1977e454511e0d0244c68d34d572b68458
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Mar 3 09:50:55 2006 +0000
https://bugs.freedesktop.org/show_bug.cgi?id=4538 Fix mouse button release
on multiwindows scrolling.
commit 06f01623fde61f1a11c2c1ecfae6a4c346473b05
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Mar 3 09:43:42 2006 +0000
https://bugs.freedesktop.org/show_bug.cgi?id=5138 Check for NULL pointer
commit 054c291b274b238893e408e070aef13a7933400b
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Thu Mar 2 18:35:08 2006 +0000
Fix build against Mesa CVS HEAD: added s_blit.c to symlink-mesa.sh.
commit c1a82b9554028640dc4e08f042f1a8faf3372627
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu Mar 2 03:43:26 2006 +0000
added s_blit.c file
commit 5f4d11c8d926cf396e0a8e203e14a8e1e123e011
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Mar 1 16:31:53 2006 +0000
fix spelling error, document EXA_TWO_BITBLT_DIRECTIONS device flag
commit 044a3abb382a4850722c391f04d09d3160790814
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Mar 1 16:28:34 2006 +0000
Add accelerated two directional blt support to EXA
commit 96ca329382141fd50dccb1cc35a71a333d80bce4
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Feb 28 23:07:09 2006 +0000
Remove redundant definition of struct Inst. Safeguard xf86AddDriver against
future additions to DriverRec.
commit 1cfa9f647e0241f4b9e56556b128d7bfd987eaca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 28 16:55:26 2006 +0000
Bug #5216: Allow options to appear with other components.
commit e3b6b95f29cb2ea00b4290d694c5e202b8d180ad
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Feb 28 16:26:16 2006 +0000
Bug #5627: Fix Xprint font symlinking. (TIlman Sauerbeck)
commit e7f0b84fa7bd0c40cb456ec4e447103442c8dae3
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Feb 28 05:20:20 2006 +0000
fix exaInitCard by making it a real function
commit 088e5768faa90fe16de41b135b1111b5d25c64ad
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Mon Feb 27 18:12:24 2006 +0000
Fixing the Mesa build again, sigh. Add slang_execute_x86.c. Add
-I../shader/slang to swrast INCLUDES.
commit 345d99c972cac67f2cdc38750e4ba2dea1cdb360
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Feb 27 16:19:39 2006 +0000
Typo fixes (Nicholas Joly, XFree86 bugzilla #1658)
commit 6b08a5013b4e9e350ba461c9a59d30bb41feef8f
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Sat Feb 25 20:26:49 2006 +0000
EXA driver doc cleanups and additions.
commit f41ec003f39c575299429897d4287233184583ad
Author: Roland Scheidegger <rscheidegger_lists@hispeed.ch>
Date: Sat Feb 25 01:17:10 2006 +0000
Add two radeon pci ids (one is used for a radeon mobility X700 XL in a
medion notebook, the other is for a AIW X800 VE)
commit 01a0bf881ada03ca3c27bdef7423c760c3bc2f9c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Feb 24 17:01:57 2006 +0000
OpenBSD supports PCVT and WSCONS. PCCONS is long gone.
commit d3e1587c20c155b7873b6646ddf0b96f806f8a7f
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Feb 24 16:50:42 2006 +0000
file glxdri.c was initially added on branch accel_indirect_branch.
commit 5d9a620726d2b0ad89625574478d2fd4536485b0
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Feb 23 19:25:57 2006 +0000
Remove redundant composite op reduction, done in Render now.
commit 028d6903f674fa77617f333b25356710d1682b05
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 22 16:29:07 2006 +0000
Bug #5978: Added missing swap of input variables. Added missing cases for
GL_SECONDARY_COLOR_ARRAY and GL_FOG_COORD_ARRAY (Colin McDonald)
commit 43324132afcbb6b231efcc24ec72ee44678d5771
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 22 16:08:56 2006 +0000
Added Mesa include directory
commit 43fbcc28c960ce5abe1d3223441c3dc5a10cde27
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Wed Feb 22 02:47:00 2006 +0000
Update to build against Mesa HEAD. (Thank you Felix for feedback on xorg
list.)
commit cfdacab33a62b47f22bb54683e3ca20ec9824864
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Feb 21 00:02:08 2006 +0000
Eliminate unused PCI BIOS reading functionality. The old code used several
function pointers to implement a level of flexability that was never
used. The code also had unused support for extracting a single image
type from a larger expansion ROM.
Fix the spelling of PCI_BIOS_OPEN_FIRMWARE.
Fix a couple errors in #ifdef debug code.
These changes have been tested on x86 and x86-64 Linux.
commit 5fd0f94006775e2271107c960dfa3314dddd9a5f
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Feb 20 23:45:50 2006 +0000
Eliminate all the code for querying the PCI class from the PCI ID database.
Class information is not, and never has been, stored there. Therefore,
this is just a bunch of elaborate code to read 0x00000000.
This has received testing on x86 and x86-64 Linux.
commit 6d7083bd69724586338d79784655328f1fcd2ae5
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 20 22:16:49 2006 +0000
indent fixes (OMG SO UGLY), and nuke old RCS keywords.
commit 5480c537cee79b324736eac3e438a4713dfa1036
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 20 21:50:49 2006 +0000
ANSIfy Xi/. Mostly automated via protoize(1).
commit cc42e153c2437fe9c94b0c20e1b56277474d94d0
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Mon Feb 20 03:00:09 2006 +0000
Update to build against Mesa HEAD.
commit ed3ea887a6b1c9fdc83895c40da34076121f05e9
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 21:49:51 2006 +0000
Fix the encoding of DES's name.
commit ea0b3f65f77a78df1671b09739c00762a8875607
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 21:45:12 2006 +0000
Fix build of Xorg by putting xf86bigfont back into builtin instead of
module sources list.
commit d97f29be22e22e6f5bc23229ffa5ef087f992c8c
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 21:35:32 2006 +0000
Bug #5453: Don't forget to still do AM_CONDITIONAL for XVMC even if XV is
disabled, and also force XVMC disabled if XV is disabled. (Dag-Erling
Sm�rgrav)
commit d33c2e0d1079f93f4ba8b28d19950d384a9e7c32
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 16 19:36:39 2006 +0000
Add oscolor.h
commit 60d4839a2d373cc6d8c0d5004284494d3a994a63
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 16 19:03:07 2006 +0000
Forgot to include this file in previous patch
commit 8987b2c1efc9a4667e278e6ba411772ba2a4a4e6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 16 07:17:31 2006 +0000
Make more extensions optional in build (for kdrive). Fix kdrive build for
actual hardware. Fix kdrive pointer signed/unsigned types. Add
kdrive-required YX rotation functions. Replace rgb text file loading
with static rgb color table.
commit c8acb342695936db062c966029019a458d45459e
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Feb 16 06:52:12 2006 +0000
Fix an occasional crash on VT switches: the server would save a pointer to
the current cursor when disabling FB access and would try to restore
that cursor when re-enabling. However, that cursor might have been
destroyed in between. This fixes it by updating the saved cursor
pointer when a cursor is set and vtSema is FALSE.
commit c845e152f52b3e8cef579797c5c8834ad2fd2cd5
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 05:46:08 2006 +0000
Bug #5871: Drop special build infrastructure left over from libcwrapper
times. (George Fufutos)
commit c2f685e64464ccf86ed47ae37f74bf46877e0739
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Feb 16 05:18:20 2006 +0000
Fix XSERVER64 should be _XSERVER64
commit 1bbd5e49b1dcc2e3f9785bd2bb58f946b9998099
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 04:59:45 2006 +0000
Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be
useful any more. (George Fufutos)
commit c03b06bdf04fa8500d0f85314c7268848b4d50be
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 04:39:00 2006 +0000
Bug #5888: Remove orphaned laymodule.c from miext/layer removal. (George
Fufutos)
commit 3b32e902c7a12aa2320da27d984029cde28fd8c3
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 01:49:23 2006 +0000
Add entry missed in my last commit.
commit c4767794ef5b014ae25fe8541e72348ecfb1ee49
Author: Zephaniah E. Hull <warp@aehallh.com>
Date: Thu Feb 16 01:03:09 2006 +0000
Export xf86ActivateDevice, used by the evdev driver.
commit dc0354104cb4057dfcc7b2ccb8e2ae8474d70b15
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 00:14:11 2006 +0000
Move EXA implementation up to the top level and remove its XFree86
dependencies. It was nearly abstract enough already to be used by
multiple DDXes. This will be useful for EXA development through
providing a fake acceleration implementation within Xephyr, so that
testing can be done on new EXA code without worrying about buggy
drivers.
commit c170aa830d0ce3dbff6b30081e04c3f91bf921be
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Feb 15 23:27:40 2006 +0000
Forced commit to note repocopy from hw/xfree86/exa/
commit 6770f1bdb145e7a6c431d0523f10d12155f58273
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Feb 15 21:09:14 2006 +0000
Define NO_LIBCWRAPPER in dix-config.h, and rely on Mesa including
dix-config.h if DIX_HAVE_CONFIG_H is defined to get it and _XSERVER64,
instead of defining things like this per directory.
commit 7d7fc927cd90146788780477b8e3379d91c3b910
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 15 20:47:44 2006 +0000
Remove a few #ifdef vms; whatever problem that was solving should assuredly
be solved some other way.
commit f105b8da11fcf337512b3c39da3368f98da07a33
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 15 20:44:13 2006 +0000
Mark everything in dixsym.c as _X_EXPORT.
commit 010d6effa6fa210251b12459882e88aeee82c2c0
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 15 19:15:32 2006 +0000
Mark everything in {ext,font}sym.c as _X_EXPORT.
commit 3fe482c77e7b3e46739d011d8bbdee527d7a42fc
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 15 19:05:55 2006 +0000
Mark everything in misym.c as _X_EXPORT.
commit 6ad4325b87889e1aada9333d750b7bb586c38b52
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Feb 15 18:26:45 2006 +0000
Update to build against mesa head.
commit 50e2ff9a2500078ebbd833fddab0d93f3a50b6a6
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Feb 15 03:20:55 2006 +0000
Remove the waitSync from KdDisableScreen and push it off to drivers'
disableAccel hook, which is more correct anyway. This makes kdrive.c
not have any knowledge of kaa, opening the way for using exa from
kdrive.
commit 0446aafa9467f43515fb578d50f45e2c3153c8cf
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Feb 15 03:07:23 2006 +0000
Avoid some more libcwrapper damage that prevented kdrive linking.
commit 5c9b6f0fb01252d704de1bbdf3015dee7f956593
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue Feb 14 08:14:42 2006 +0000
DRIGetSecs() would call getsecs() when XFree86LOADER is defined, relying on
the wrappers to provide it. Wrapper gone, and getsecs doesn't exist on
linux so it now blows up. Fixes it by just calling gettimeofday() in
all cases instead.
commit 049dca0f43eb2179d2c61033a17ff1a89f8fb689
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue Feb 14 08:11:41 2006 +0000
Remove useless line of code that contained a bug and triggered a gcc
warning. This variable will be overriden before being used anyway.
(Bugzilla #5595)
commit 1132d0e6102d4564f70f0e8c98854e3acf25b109
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Feb 14 06:27:59 2006 +0000
update to latest Mesa CVS HEAD
commit bb8c36690ab411c11aa8dd3d4520d513eb8f9091
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Feb 14 04:20:37 2006 +0000
Bump shadow module version number to 1.1.0 from 1.0.0
commit cc9dfab0b31c7956f99d1f1b9c195065b5e18c29
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 13 18:57:38 2006 +0000
(Reverted)
commit 83dd6241c8cd81e8d897bd17588ada92a945e647
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 13 18:55:44 2006 +0000
Reverted, did nothing anyway, I'm not smart today.
commit 4a7f6f53cad541e8c5042a6472e3b3886fc9b7e6
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 13 18:09:51 2006 +0000
Further op reduction when both src and dst alpha are absent.
commit 28ced9f3e0dd4bd81067f590a1d64ba0844edb06
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Feb 13 05:29:00 2006 +0000
Add missing ChangeLog text for r1.2 of GL/glx/indirect_reqsize.h
commit 4839e91fcab4c344e672154a447d8c7035fce1f4
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Feb 13 05:03:13 2006 +0000
HAS_MKSTEMP vs. HAVE_MKSTEMP (From Fredrik Höglund)
commit 1a4f20541a9f4f41f444d826d743899ea2dee2db
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Feb 13 04:56:27 2006 +0000
Fix linux build without libc wrappers (From Fredrik Höglund)
commit 2dc7b5e0d96a187bfbb355caa788f0fdcd88eaad
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Feb 13 04:43:40 2006 +0000
Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and remove
stubs in other DDX.
commit 34d0b9228f46c2f87be74dddc9c7d97aab091d03
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Feb 12 20:53:35 2006 +0000
Simplify ops that would use the alpha channel when an alpha channel is
always 1.0, and short circuit PictOpDst for good measure.
commit 5f45776ef3b9256bea44842d1c50f269422531a1
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Feb 12 10:30:47 2006 +0000
Add missing HAVE_DIX_CONFIG_H which caused issues with mismatched screen
structure interpretations, and remove a bunch of unused junk from
kdrive-config.h. Xephyr almost works on my amd64.
commit 5249416d091d59c248c8dda44529b8aa4910b1a0
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Feb 11 22:40:50 2006 +0000
Add stub xf86WrapperInits so that the servers will build even if os/ was
built with XFree86LOADER set.
commit a2a5254675a6b7ef0f7da9caa76c028b7c526502
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Feb 11 19:16:51 2006 +0000
Add <string.h>, <stdlib.h>, and <stdio.h> to clear undefined function
warnings after the removal of libcwrapper headers.
commit d6337c83241f0fa4bb03039a9767b58d8a1a7c91
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Feb 11 17:42:31 2006 +0000
<sys/limits.h> -> <limits.h> so we can compile on non-BSD OS'es
commit 4fafba61d5402d4e4d2c21ba1be3ed8969b99334
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Feb 11 03:03:45 2006 +0000
Remove libcwrapper damage from GLX (requires fresh Mesa HEAD), and get it
compiling in kdrive.
commit c3d14036729fd186d4ec7ca1de603e1f2d174e2f
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Feb 10 22:00:30 2006 +0000
Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
commit a8cec1b656f57746758613213de1d6e5acb79451
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Feb 10 09:00:02 2006 +0000
Merge from kdrive: use RECT_PRIM to avoid tearing in xvideo.
commit efc3fab7f4b29f56fffd21304c64c03a48aa5b4b
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Feb 10 07:52:05 2006 +0000
Make kdrive (i.e. Xephyr only) buildable on FreeBSD and probably other OSes
without linux VT switching, fbdev, and vm86 support.
commit fa3a65e33d8c893c7867ea507afc7caa1361aa9c
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Feb 10 07:47:21 2006 +0000
Remove the include of X11/misc.h, which fails to compile and isn't
necessary.
commit d875bdb2756b082ce93bd86016c369ea85c04d17
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri Feb 3 02:44:19 2006 +0000
hw/xfree86/os-support/xf86_OSlib.h Fix sysmouse handling on DragonFly,
mostly garbage arrived. From Joerg Sonnenberger.
commit 0946bb9427695a4314e5c43de573b3a75a18e466
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri Feb 3 02:37:52 2006 +0000
Fix sysmouse handling on DragonFly, mostly garbage arrived. From Joerg
Sonnenberger.
commit 5e2a7af23bd0f46fbddca34098cb297be58b7a55
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 2 21:07:06 2006 +0000
Move the frequently-repeated code to get the pixmap that backs a drawable
to a new function, exaGetDrawablePixmap().
commit ee3c7ccb175752dbeaed6b0113d0819b3fcd2398
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 2 20:51:54 2006 +0000
Remove more debugging leftovers.
commit 3366b6836572461209bb2f8aa28d9e662067dc54
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 2 20:09:14 2006 +0000
Rearrange and rename EXA code to be a bit more logically organized. Also
removes a little bit of debugging leftovers. Summary:
exa.c -> exa.c (miscellaneous code) exa_accel.c (all acceleration code)
exa_migration.c (migration logic) exaasync.c -> exa_unaccel.c (software
fallbacks) exapict.c -> exa_render.c (render extension stuff)
exaoffscreen.c -> exa_offscreen.c exaPriv.h -> exa_priv.h
commit 25d4ff870d49533d82a77f144722ff7934d52e0b
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 2 20:04:15 2006 +0000
Forced commit to note repocopies: exa.c -> exa_accel.c exa_migration.c
exaasync.c -> exa_unaccel.c exapict.c -> exa_render.c exaoffscreen.c ->
exa_offscreen.c exaPriv.h -> exa_priv.h
commit 2ab487d4d20e4e34e73cc6d87f41bf0836c7a8af
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Feb 1 22:20:05 2006 +0000
Add a new function RRGetRotation() which does exactly the same thing as
xf86GetRotation(), but allows for drivers to provide their own RandR
implementation. xf86GetRotation could be obsoleted by this change.
commit f4898b409376803c9a9dd8475bdd5576ff1cc59d
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Jan 31 14:49:43 2006 +0000
Further bug #5386 fixes: Fix some problems with the EDID code: Some
bitoffsets were wrong. Unknown Detailed Sections weren't handled
properly and defaulted to Detailed Timing.
commit 437b385ce4cc3ff00e14d3d39f4a2f6c8f0c67a0
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Jan 31 13:55:01 2006 +0000
Bring the cvt utility up to date with bug #5386 changes. Fix 2 issues with
the generator routine: the allocated modeline wasn't nulled and
mode->name's \0 wasn't copied over. PrintModeLine was rewritten and
HDisplay gets rounded up to character width instead of refused.
commit 8f3c69dcf17691f71bca7b0a2cd34f7788a97b8c
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Jan 31 13:04:02 2006 +0000
Accept modes with less than 25% horizontal blanking again (you can push old
gtf timing to below 25%), only stop cvt reduced blanking. Users should
be free to blow up their monitors if they so choose.
commit 701b63cf1dcd3e49602114fb1dde45a74b4e1122
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Jan 30 20:04:56 2006 +0000
Update to build against Mesa trunk.
commit dd50015b05b901fe0c60717512c854389610aea2
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 28 02:20:37 2006 +0000
Add libc_wrapper support for random(), which will be used in upcoming EXA
memory manager work.
commit 3d1667278ff309d7f8e61a6d330f712bae5bcd41
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 28 00:37:52 2006 +0000
Remove leftover variables for cfb24 build, and finish commenting out Xglx
standalone stuff, which some versions of automake get whiny about.
commit ab01eb247f9e5d7c9995bf2d6432358cd64bf11d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Jan 27 12:27:34 2006 +0000
update pci ids
commit 261aa4403c77203f8f02b399ddd382c731dda324
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Jan 26 09:04:22 2006 +0000
remove that, and will put it in a i810 driver specific Changelog
commit 94e678fd014c61d12591d7398b6591f24c3d71f1
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Jan 26 08:49:19 2006 +0000
add changelog for i810 updates
commit c5e93182905332383ca3ef5db3f334cec69c8dda
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Thu Jan 26 04:32:45 2006 +0000
Really allow linking against Mesa trunk to work.
commit 0dc0f17f27f99da79c99031b41b0c0e95ef035f5
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jan 26 04:10:43 2006 +0000
Speed up checkout and autogen by removing disused iplan2p4 and ilbm.
commit 023d2b4e3c392eed1f149dc5b13a83429cd052a3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 26 00:23:44 2006 +0000
Add forgotten HAVE_BACKTRACE define.
commit 14fdd81614cdd6ef7e01976a43da8b6a3bf8386e
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jan 25 23:05:26 2006 +0000
Remove xf8_32wid, it's dead code with no maintainer interest. Also remove
cfb24, since xf8_32wid was the only user.
commit 2e28f4104ddf94a8f9a70fe6b2a2a6859ffedc8f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Jan 24 22:05:33 2006 +0000
Allow current trunk to build against Mesa trunk
commit 0d9ed2624fe8fb95c57930da523351556ba11351
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 22:01:34 2006 +0000
Commit #4633 - Initial mouse pointer incorrect with EXA which also fixes
the repaint of the cursor image with randr events.
commit 9148d8700b7c5afc2644e5820c57c509378f93ce
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 13:59:14 2006 +0000
Commit slight variation of bug #5460 which is the merge of the new shadow
code from kdrive.
commit cfd3988ed906ab48ca4362256f8dbb8852d7ca0a
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 13:58:19 2006 +0000
wrap with if XORG / endif
commit f51ecc66e9ad6d2c3541b1dafa7659da5a0a3a86
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 13:54:59 2006 +0000
#include "gcstruct.h"
commit 80f45fa4dfa011c2ae7bcb34f87aafb91763f1fe
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 13:54:34 2006 +0000
add damage.h & damagestr.h to SDK headers
commit af5b3ea4b3df9e9c6dd6993c5e7238a366a3f508
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Jan 19 14:51:09 2006 +0000
add randrstr.h to sdk_HEADERS
commit 03ebd37baba2f5af3ab502ff02ec14c15859dc3f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 19 12:25:01 2006 +0000
Make error() bomb with exit code 1, not 0.
commit adce1f16e0d815e5c762407da3544a7d2eff9303
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 19 00:06:57 2006 +0000
Only try to use byteswap.h on linux. Assume that everyone else (thinking of
BSDs here) has sys/endian.h, and use macros as appropriate for the
names. This should probably be in a gloabl header.
commit 1c3f8727b2349c9b988eaa744f11366322d42538
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jan 18 19:42:56 2006 +0000
More kdrive merge, fast path fbBlt to use memcpy() when possible. Good for
-5% to 60% speedup on XGetImage, and 0% to 10% speedup on copies within
host memory. Based on work by Jaymz Julian.
commit e70b64b93024d05519014fb1b76fe26bd9f3a496
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Jan 18 07:15:55 2006 +0000
Updated xgl code drop from Novell + xserver tree changes
commit b5356e0afaf2b660c8905f63d5fdcb03402b81c5
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Jan 18 07:00:50 2006 +0000
typo in last change
commit 506eca5f57b960a6650c3387047a6ae8a22181e9
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Jan 18 06:56:52 2006 +0000
Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers
breaks.
commit 8ccf4f2b8fdb5e57d2ec5f2d54731fbf83fb9d8c
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Jan 18 06:49:17 2006 +0000
This is a fix from David Reveman from the xserver tree, Make fbPadPixmap
work with negative stride
commit a1f9262c6acd195c0fcf5f602d5ca0c252993521
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Jan 17 21:27:49 2006 +0000
file glxvisuals.c was initially added on branch accel_indirect_glx.
commit c2dedf4d17f8a5b1a8037fd2b4e29122ef78945a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jan 12 22:14:56 2006 +0000
Thu Jan 12 17:09:18 2006 Søren Sandmann <sandmann@redhat.com>
Add new functions to enable and disable events on Map and Unmap.
Use them here to make sure Composite redirect doesn't cause Map/UnmapNotify
events that would confuse window managers.
commit 847d83ec3c90c5b298eaf19ba55251b4a30f4155
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 12 00:21:59 2006 +0000
Bug #2996: libglx / libGLcore should use a dispatch table
Port all changes from the (monolithic) accelerated_indirect-0-0-1 branch to
the modular trunk. This will break the Darwin and cygwin builds. Other
than the changes to symlink-mesa.sh and the various Makefile.am files,
to code is identical to what's in the branch.
Reviewed by: airlied, krh
commit c56e9a8849ce8dd5c09732ae1860e409e7886690
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 10 03:24:53 2006 +0000
Bomb when symlink-mesa.sh continues, instead of silently failing.
commit 2949c705f11f8710301555c039bcecbe748cabd9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 10 03:23:05 2006 +0000
Add all subdirs used to DIST_SUBDIRS, and files to EXTRA_DIST.
Attempt to build xeglmodule.c, not xglxmodule.c.
Add xf86Sbus.h to EXTRA_DIST, as _HEADERS doesn't appear to get the same
treatment as _SOURCES in terms of automatically DISTing.
commit 4fc9eb592a446ad5711bdaa82c60e9fe010fd76a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 10 02:32:20 2006 +0000
Bomb out if symlink-mesa.sh failed.
commit 890ec849479db2510a9b4bc5e5e2f7978ca37b83
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 10 02:30:56 2006 +0000
Add xgl to DIST_SUBDIRS.
commit 53dbd00a75313ec5301ca95b2e91d5d02bdaf820
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jan 8 23:43:54 2006 +0000
Remove remaining #ifdef DPSEXT stanzas.
commit 7fc9bc44e099f8f046bf707cb87ef7d736933f80
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jan 7 01:29:05 2006 +0000
Compile fix, again, stupid non-clean builds
commit 9d62d1e6903ccc095f784279a699b3f40a8f0cf8
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jan 7 00:45:17 2006 +0000
Bug #5218: Don't crash on unconfigured interfaces. (Andrei Barbu)
commit 3c58072956c28ebc3ca2eb50c1ff09823e1219d7
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jan 7 00:33:41 2006 +0000
One more build fix.
commit 07303c1b42afd1ada98cbc11d1ba616d366017fb
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jan 7 00:05:46 2006 +0000
This version will actually compile
commit 7f46aba35ee482e9b28ecc81d1a99d423fc88a70
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 23:52:23 2006 +0000
Compile fix
commit 25babf2791ad42101a86ba2a0f14564328256ee2
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 23:36:53 2006 +0000
Missed file.
commit 13c9e0c094c4e34cd1e43a7cc08b2dca39a32412
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 23:06:15 2006 +0000
Bug #5525: Build a working Xprt. (Drew Parsons)
commit fe0c838b5d8bc8d9cf5a686bb7d3e90682d2d19a
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 18:06:02 2006 +0000
Move drawable lock acquisition into DRIClipNotify from DRIValidateTree, so
we only take it when clipping a DRI drawable instead of on every tree
update. Note drawable lock acquisition per- screen instead of globally,
and drop it in BlockHandler if necessary.
commit 39ce5f1544029412f4060f3e89ce1d87222ef42b
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 17:05:26 2006 +0000
Remove unused X11R4 DDX compatibility function miClipNotify.
commit 07ecb969d7eb8d4ab0bb0b8a55a5f40f3c8ec5e3
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jan 4 03:29:15 2006 +0000
Forced commit to note that glyph privates commit was:
Obtained from: xserver tree (David Reveman)
commit b6b88d2f62d8c596171f487dd25fbdbc85d0c5a8
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jan 4 00:05:16 2006 +0000
Correct rounding in divide-by-255 code. Obtained from xserver.
commit b9c0ae867e1b52186c26841a77745f7f5a0a76dd
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 3 22:36:46 2006 +0000
Remove the manual AddFilter for convolution, which I'm pretty sure
shouldn't be necessary due to it already happening from
PictureSetDefaultFilters.
commit 601ab861b46a62b0742ffd3e937c4fab129664f0
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 3 22:06:23 2006 +0000
Add glyph privates for Xgl, which uses them to implement a glyph cache. EXA
would probably also like to do this. This breaks module ABI for EXA and
XAA, and likely breaks proprietary drivers as well.
commit 1729fc882ceec392331566c95efd5968fe9e97fd
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Dec 31 08:06:00 2005 +0000
Change REGION_INIT(pScreen, &foo, NullBox, 0) to REGION_NULL(pScreen,
&foo). While it is no longer (or rather, once again not) required as of
regionstr.h r1.4, it matches the style of the rest of the xorg code.
commit c25536a7937b11a5347bfb8796d5cb6eb0445b51
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Dec 31 08:01:31 2005 +0000
Initialize the fourcc value in stack-allocated glitz_pixel_format_t
structures. Greatly reduces the number of uninitialized-value accesses
during Xgl startup according to valgrind. Allocating and filling these
in by hand on the stack seems very shady to me.
commit e6dab3d7c429a2d30d31f188c4554e870011e051
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Dec 30 12:05:47 2005 +0000
Fix the AC_TRY_RUN for sys/linker.h which had no hope due to lacking a
main() to instead use a nice AC_CHECK_HEADERS that works. Also, fix the
nearby SYSV IPC check which was lacking an argument and giving bogus
results (it's "AC_TRY_LINK(includes, main, yes, no)").
commit eef16c36ad6e90fd8eaad4d8bdbc1205bc28a66f
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Dec 30 05:44:14 2005 +0000
Add #undef BSD44SOCKETS, without which the listener socket on FreeBSD would
be created without the port number due to xtrans's define not being
used when xtrans was compiled in the X Server.
commit 7aa0ea23bc9b8df582fe06f2bc39dcfe34583c7e
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Dec 30 04:11:42 2005 +0000
Add an empty all-local target for FreeBSD make's sake, which doesn't deal
with .PHONY.
commit 49a9249239b0dd105b83a101db6e32549978f0d5
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 21:11:41 2005 +0000
Make kdInputMachine static const, shrinks .data a bit.
commit 6d7ee4167d9daeef9b793789a70aa724c4fe6bf4
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 20:54:08 2005 +0000
Style fix, make SCREEN_EPILOGUE two arguments instead of three.
commit b1efb3810cfea8116d76bae3ff3acfee521f4793
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 20:42:54 2005 +0000
Missed one
commit 858b4bc14a7adc7314ce5043c7ff8ca1891dd0c9
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 20:38:29 2005 +0000
missed changelog entry:
Enough build fixes to get {sdl,ephyr,fake} to link.
commit 54922aeadb29df0a1819afd3f616131aa56e140a
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 20:29:26 2005 +0000
Disable building LBX by default.
commit fc69a2e729532ee062af6676fb187a89f7fffe8a
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Dec 29 08:42:49 2005 +0000
Remove PowerMAX_OS define it never worked , it'll never work again,
finishes running joke of OLS2005
commit 25d3852b833bc0b61ce8313ce116251a2602b827
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Dec 29 00:44:20 2005 +0000
Undo spamming of libv's ChangeLog entry.
commit d6646307f063b938c44d6193a2e8872e178aa90f
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Dec 29 00:19:33 2005 +0000
Add necessary *CONFIG_H declarations and a force-off of XF86* extensions in
miinitext in the XGL case. Prevents mismatched structure sizes on my
_XSERVER64 machine. At this point, with the uncommitted render/ diffs,
Xglx starts up but displays badly.
commit 3664c3ebf348d07ae3fe301fb8720adf32cf6d64
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Dec 28 15:22:21 2005 +0000
Bug #5153: standalone CVT modeline generator.
- add hw/xfree86/utils/cvt/, cvt.c, cvt.man.pre and Makefile.am.
- Adjust configure.ac and hw/xfree86/utils/Makefile.am for cvt.
- Add MonPtr->reducedblanking and Option "ReducedBlanking" to the Monitor
section.
- Check for reduced blanking in xf86CheckModeForMonitor and disallow modes
with less than 25% blanking otherwise.
- Fix some warnings in hw/xfree86/common/xf86Config.c.
commit 08708f7d616a7c0a596fb71dd7acd76d45257fec
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 11:48:14 2005 +0000
Merge from xserver: Make the existing ChangePictureFilter and
ChangePictureTransform screen hooks get called at appropriate times.
commit 31d0fdde19598ce9375cc9638ad4e2c8b5af8d9a
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Dec 28 10:46:56 2005 +0000
Remove a debugging printf
commit 64ac7401ad5022462279dff4dcfb12844c9857ae
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 10:43:02 2005 +0000
Fix a copy'n'paste-o that would result in mis-rounding of the results of
several composite operators in A and G channels.
commit 9ceffb6b92e55f0d74d71489900d43940f14dfd9
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 10:37:17 2005 +0000
Merge from xserver a header for shm's server internal functions, which are
called by DDXes. Desired by XGL, and should be used in other locations,
probably.
commit b1b40ed6a87f72d07825624730cca193d5a89baf
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 10:31:46 2005 +0000
Initial commit of XGL build infrastructure and XGL code changes for
building within the xorg server tree. Requires additional, uncommitted
dix changes to successfully build, and successful running is still yet
to happen.
commit 36061c75ae42aa733cde9b3fd05e0c8280b31655
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 10:10:59 2005 +0000
Forced commit to note repocopy from xserver CVS as of a few minutes ago.
commit 05c139d4cdfd11d39c0168d0c80ac1dbdd069b4c
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Dec 28 10:02:54 2005 +0000
Enough build fixes to get {sdl,ephyr,fake} to link.
commit aeb770f645e2d591b255ec4ab06addcb1beafa5f
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Dec 28 02:43:50 2005 +0000
recommit previous changes to evdev.c
commit ce7c0c89375ec74f89ae5727998fd75fb768d280
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Dec 28 01:57:11 2005 +0000
some updates for default colormap install
commit 022aa1127c7dcd133ce73dbc12a10bfba8b1ed6e
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Dec 28 01:01:06 2005 +0000
Get Xsdl closer to linking.
commit 27d79ab2bcebb634d0b69c851c72283a7514eb0c
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 23:03:15 2005 +0000
s/XSERVER/KDRIVE/
commit 72817714a0787536ce8e8ad0d5473dea0f1c1abe
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 23:01:27 2005 +0000
Remove Imakefiles.
commit 9dd0af6cb4e2c8976ada57a4f4ed16faae090a9d
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 08:31:37 2005 +0000
Skeletal kdrive build system. Totall non-functional atm.
commit 7fd73d2953cf9449c15462cf4bf67639db64f997
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 08:29:50 2005 +0000
Build fixes: XSERVER_LIBS -> KDRIVE_LIBS, config.h -> kdrive-config.h
commit 2f3ac6e5fcbd0e954a094fb6b975d7c8816c44b7
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 08:26:03 2005 +0000
Start importing kdrive.
commit 6798fd0170f4225ce4e69148978533fcee9bdc34
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 26 19:13:52 2005 +0000
Bug #4190: Add a rule for 'make relink' since automake sucks.
commit 8fc4ea8620913776a903ee2b4f22c306d5778623
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 26 18:55:09 2005 +0000
Nuke unsupported NDBM routines. Shrink the hash table a bit, over
25% of the buckets were going empty.
commit ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Dec 26 04:23:58 2005 +0000
Remove unused -xkbdb and -noloadxkb options. Rename -ar1 and -ar2 to
-ardelay and -arinterval, respectively. Remove XKB banner from help text.
commit 7e3cb9a09ac422179be89773f7fb14a462d25434
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Dec 25 22:25:15 2005 +0000
Remove unused layer module.
commit 9b083369ded2258cbc8ac2058e06ec8a3b171178
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Dec 23 20:11:12 2005 +0000
Change list of X server man pages in "See Also" section to list the ones
actually included and remove the ones that are no longer.
commit 5fd978b1e7bce9169f87712a4a7c2c36a68ac00a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 23 07:40:44 2005 +0000
Make LBX configuration default to auto.
commit 5230e86b1cc841bfb35806618052aa835b7eb7e7
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 04:13:37 2005 +0000
fix up xglglx.c
commit feb735c5bb0cd391136f1c73476703dff82dc9b0
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 02:07:58 2005 +0000
Well there were a couple of snapshots later than CVS available outside of
Novell, so I've done a crazy merge to try and get them into a workable
CVS, I suspect I may have failed.. there is a pre-xgldrop-merge tag if
I did.
commit ade104ce5a016623c1ce97b0d52b531185b35baf
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 01:51:40 2005 +0000
check drawable is available
commit 7fb521e80d6e2c05e9475e74fbf80bfbe74cda95
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 01:50:04 2005 +0000
from davidr's tree update some fixes
commit c88a3145d057ab72466a3ea8b789bf419e4efc33
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 01:49:21 2005 +0000
from davidr's tree if source picture defined return
commit c59508566f11982aa3f4be383597d0e6178718c2
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 01:13:28 2005 +0000
fix glx up for newest glitz interface
commit d822bc159672e7327054e572b659ae7dde040e83
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 00:08:35 2005 +0000
make xgl code at least build against latest glitz.
commit 6e2086395d99081d8d682b90cec650a06e41fc2c
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Dec 22 23:32:49 2005 +0000
fixups for newer glitz API
commit f3ae42c0fd910b7f9feb9be91ccb056bce0cd999
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Dec 22 23:31:15 2005 +0000
small fix towards new glitz interface
commit 2af7e94eab6847159a3439301ecc93c62a12b1a0
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Dec 22 13:54:08 2005 +0000
Adjust the rules for auto-generating some source files, so that they work
on both GNU make and FreeBSD's make.
commit 0d7ec5c7d9b451066a079fe56bcc9722341a91ff
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:30:08 2005 +0000
Update package version for X11R7 release.
commit b37e738d5f4e1769bdee98acca788aeeb1556bcc
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 20 21:40:19 2005 +0000
Fix an fb regression on A8 pictures. (Fredrik Höglund)
commit 03d37eb03864cfc1a2f8d239d5a4c8341bf274f7
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 20 21:34:21 2005 +0000
Bug #5359: Fix a segfault (Mark Kettenis)
commit 7b89b643c12fa0f7a662b3ff76e05ece53101312
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:44:21 2005 +0000
Bug #5116: Refer DRI section details to dri.fd.o.
commit 3ef3add90351e3cb7b54dbcedc234bc5d3d65f1c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:34:07 2005 +0000
Stub COPYING files
commit 3566307c8d44f89622ea51169f67c79092cb56d1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Dec 19 09:18:29 2005 +0000
Fix typos.
commit 137447c5f3c6f1914ac869297f823ae93ce428ac
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Dec 15 01:54:45 2005 +0000
Update to 2005-12-14 snapshot from pciids.sf.net
commit 2cf86fce41e3fd2ac48c5088da11e19077e42e65
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:20:27 2005 +0000
Update package version number for final X11R7 release candidate. Update
release string to 6.99.99.904.
commit f1ba3b4f33a928a3a59538799b3863de5c87e70e
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Dec 14 20:11:16 2005 +0000
Bug #4718: Command line flag to disable ACPI.
commit cf605eb91619a8c0589a08674ffc3e018471b3fc
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 13 17:35:26 2005 +0000
Build libglx correctly when not building the Xorg DDX.
commit b076dd787ff71c4b385ab4e2e4eb367f3de378f6
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 13 17:34:06 2005 +0000
Spell it XINERAMA_SRCS, not PANORAMIX_SRCS.
commit 3666dbb5f3e06fa6a72def64556d64cf73141777
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Dec 12 23:33:55 2005 +0000
Remove unnecessary include of dgaproc.h that broke Solaris builds.
commit 438a5549f08ab03443d45dd46323579a2f2e4ba2
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Dec 12 03:06:18 2005 +0000
Bugzilla #4715 <https://bugs.freedesktop.org/show_bug.cgi?id=4715> Files in
xserver/xorg/Xext not included in tarball after make dist
commit 62f3ef930adc7edd49b27dd1f7b0f51bc8bc0afa
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 18:35:21 2005 +0000
Bug #5258: Restore binary compatibility with 6.8.2's PictureRec. (Aaron
Plattner)
commit b99dea9dcf99f907a3536c0db1c39cc67931a5b1
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 18:32:46 2005 +0000
Bug #4935: Fix includes. (Eric Anholt)
commit f4957ee94810b471110deebf03d7413399b45db3
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 18:30:51 2005 +0000
Bug #4809: Re-fix that doesn't break distcheck. (Alan Coopersmith)
commit de22d0c2264bd6dbacbbb4160d09c7e84ad37e70
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 15:30:05 2005 +0000
Fix a thinko so the code matches the comment
commit 6fcb049cd0d2291da5943176716d1f7bbb85fdc2
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 06:49:39 2005 +0000
Bug #1288: Additional refactor of the driver probe logic to keep ati loaded
before atimisc.
commit 17ac5e9fec1e07bd18ae1407043c300cb4695ede
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 05:36:41 2005 +0000
Push the fallback drivers to the end of the list so driver probe order
stays useful.
commit 80ea67e37980d07438749f1aa4dfdd7ee1086799
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 03:59:41 2005 +0000
Bug #4361: Change driver probe logic to read the driver list from disk
instead of using a compile-time array.
commit 7fa2d11d85d43f42aa9c02f8d772c91d1b04df43
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 03:57:41 2005 +0000
Bug #4361: Define XF86CONFIGFILE properly so config file generation works
commit 26b41ff43959a07a778bc3d6e4db8da036f09de3
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 9 03:02:21 2005 +0000
Fix sgml docs build.
commit d6f98cbdb8fb74c504a92939d3741420eeed7110
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 8 19:33:09 2005 +0000
Bug #3944: Fix 24bpp packed pixel. (Søren Sandmann Pedersen)
commit f9ccebe8c5cd674c08fe8ed860d1c456e42c937e
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 8 19:27:13 2005 +0000
Bug #4928: Fix compilation for Alpha. (Stefaan DeRoeck)
commit 3a6bdf0715b994d6ecaa5b6e448695a8a8ec7d72
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 8 19:21:12 2005 +0000
Add configure option to set the top level font dir.
commit 008c2dd5e4614e6a21123ee3a2ac9c5d3bafa97a
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 8 17:55:19 2005 +0000
Add configure options to allow hard-coded paths to be changed.
commit 39189c2b86a4c2ab5f3f161d423eb072356668e5
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 8 17:54:40 2005 +0000
Allow hard-coded paths to be configurable.
commit 20c0ebe7b3feb85abf9bf140b7799aafc6f59513
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 7 16:18:02 2005 +0000
Change to use the app-defaults default dir configured in libXt.
commit 4a39354e14c3c360046b04ea0d4825832b05df05
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:51 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 84faf8dc9747bc4f1db5ebc2f23e17cf1460e2e9
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 6 16:22:47 2005 +0000
Bug #5230: Fix whitespace bugs.
commit 9439297b7bc07dcb90f0d01da09eea1bac3d42ff
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Dec 6 15:50:35 2005 +0000
Bugzilla #5219 <https://bugs.freedesktop.org/show_bug.cgi?id=5219> Make
sure all optional sources are included in EXTRA_DIST, even if they
aren't used on the platform the distballs are made on.
commit f259fd680caccb59546d7788704e46e51a9c6146
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Dec 3 22:47:47 2005 +0000
Disable the xf8_32wid logic for now, breaks distcheck
commit 26f9c4305660c2b3dc7fe8d214bcdd3c24e1b198
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Dec 3 17:04:45 2005 +0000
Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809> Patch
#3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908> xf8_32wid
and cfb24 only need to be built on sparc
commit 98231c6b38c98976f4ac2b9417ecfbc37a8cbe9a
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:47:25 2005 +0000
Update package version number for X11R7 RC3 release. Update release string
to 6.99.99.903 (i.e., 7.0 RC3).
commit 7c00afd0ec94e491f1a9ef32d6543ed51ea3319d
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 06:02:45 2005 +0000
Define XFree86Server only where it is required.
commit 924518605b613eb66aa569877fa9f131e6f2a2fd
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 1 23:39:00 2005 +0000
Fix GL build when srcdir != builddir (Donnie Berkholz).
commit 14b9315379fe8c783013906616d868f93fd51c83
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 1 22:06:49 2005 +0000
Add missing XvExtension and XvMCExtension defines.
commit df8fa21d3189e20260328b88cc8a86224a9b1ebf
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 1 16:20:09 2005 +0000
Fix typo: xorg_bus_linuxbsdpci ==> xorg_bus_linuxpci
commit ccfaf82367c9d057fd8314ce36b47f0a8eb696b6
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Dec 1 05:04:07 2005 +0000
Bug #5160: Fix the modular build to try to use the same logic for choosing
the architecture/os-specific bus support as monolithic.
commit 9c0bd9687fe7d20f2f0793332ae0db06f035eb23
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Nov 30 22:59:22 2005 +0000
Import libdrm 2.0
commit 4ec0b623b6ab5f8a1e5af2cc3d839251acf81ce2
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Nov 30 02:36:25 2005 +0000
Bug #5093: Fix fb for non-SSE machines. (Xavier Bachelot)
commit ed826d563cba82c516fd41f6a29ee50aa1fe6c6a
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:34:30 2005 +0000
Only build dlloader modules by default.
commit da5d66f2ff27b21fe5c39a4abb4f627edd707f1d
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 29 16:39:33 2005 +0000
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
commit 51a721a6dbb42702347aad3115147e4922fc1a25
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:05:09 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 381931b15b15d0a2ec384b0c22864412c44f9c6e
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 23 07:14:46 2005 +0000
Add configure option to install libxf86config.a (disabled by default).
commit 594ca0966e8fd5992ebf95170cc42e19c698fec6
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Nov 22 02:11:00 2005 +0000
Bug #5118: Use "rm -f" instead of "$(RM)", which isn't always defined.
commit 1c8c1179c0789e3e134d31a62dbb88bfdb594b26
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Mon Nov 21 04:24:07 2005 +0000
Fix Xprt library dependencies in the case that Xprint is auto-detected by
configure.
commit a1f110bda80bb3b8e4f602385ca5ccd96cf3f786
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 20 23:01:02 2005 +0000
Make sure XKM_OUTPUT_DIR (used in code) ends in / (so paths don't get hosed
when appending file names) but XKB_COMPILED_DIR (used in Makefiles)
does not so install-sh -d doesn't get confused when the directory
already exists.
commit 385730d23944c24dd9af45b27f62c1161abc48b2
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 20 04:15:15 2005 +0000
Add xext to list of modules xorgcfg depends on.
commit 63aa96c08a8390621b017ea498c88cf88152024b
Author: Kevin E Martin <kem@kem.org>
Date: Sat Nov 19 07:15:50 2005 +0000
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
commit d3b6653a2892e8c929c79fe3ace19ac9d8366fc4
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Nov 19 03:53:04 2005 +0000
Bug #4824: Build XTrap support by default, matching monolith.
commit 627ac1fe1dbcbc070575da7bee9e686a7dce5262
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Nov 18 23:34:04 2005 +0000
Bug #5060: Fix non-Linux DRI on 64 bit post Linux 32/64 changes.
commit e3ec048ff2fe0ee0862472e9b147b7ce488ea898
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Nov 18 22:43:50 2005 +0000
Bug #4928: Unbreak Makefile.am for Alpha chips. (Stefan DeRoeck)
commit de95d8ee197a0bb738037195997d754a20e10254
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Nov 18 18:02:24 2005 +0000
Bug #4859: Don't segfault on bad DDC read. (Tony Houghton)
commit 21f7d03dbc347f6bf97a40671275ac75df15bd10
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Nov 16 07:28:19 2005 +0000
Fix builds when not building the Xorg DDX.
commit fb2d9df869af0c96f1488ef7cf364e01a9d28f3f
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 15 00:29:23 2005 +0000
Make fb build on darwin/ppc without addition #define hacks
commit 16b315affa30e34b9bab81778978484137a5d9bb
Author: Kevin E Martin <kem@kem.org>
Date: Mon Nov 14 21:04:12 2005 +0000
Use glcontextmodes.[ch] from Mesa.
commit 0c110c80e7afbef50bb354cf1df30123ed048250
Author: Kevin E Martin <kem@kem.org>
Date: Mon Nov 14 20:18:03 2005 +0000
Add GL_CFLAGS so that GLX can find its proto headers when using separate
build dirs.
commit fc81c13e4dafb0eb818879454ee7ae3fa3dae6d0
Author: Kean Johnson <kean@armory.com>
Date: Mon Nov 14 18:49:30 2005 +0000
Dont prevent SCO platforms for using the default ZAxisMapping now that the
OS layer correctly sends z-axis events when the wheel button is used.
commit bd9fb533b31c2427d854199fa59dccd357cf874b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 14 00:01:34 2005 +0000
Default xkb-output directory needs trailing slash.
commit 267cbffa41fffff69c692911d128462f5bab2a69
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 13 20:53:24 2005 +0000
Bug #5019 <https://bugs.freedesktop.org/show_bug.cgi?id=5019> xserver
installs manpages into 'man1' instead of 'man1x'
commit 3179d29b8212c197634d81fbeb8dd2e8df995735
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Nov 12 18:03:34 2005 +0000
use RGB_DB not RGB_PATH as that's what configure defines (Jürg Billeter
<j@bitron.ch>)
commit 0e7e4c7064df64c29b1a0ccd84fba1be7c748f18
Author: Kevin E Martin <kem@kem.org>
Date: Thu Nov 10 04:59:21 2005 +0000
Fix typo to enable DGA support.
EXTMODULE is required to build DGA support into extmod.
commit e4554db8f87c6a39a3087186395972000bd2085c
Author: Kean Johnson <kean@armory.com>
Date: Thu Nov 10 02:41:20 2005 +0000
Dont pass wheel mouse buttons as real buttons, map them as Z-Axis movement
on SCO and USL. Re-instate the ZAxisMapping default for the mouse
driver.
commit 1b26fe6d2092c202141a0371f47ef1cd7c66ec00
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:28:54 2005 +0000
Update package version number for X11R7 RC2 release. Update release string
to 6.99.99.902 (i.e., 7.0 RC2).
commit f886e632b8dab1bfa0de42b9759a8284ecd9b94f
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Nov 9 17:05:41 2005 +0000
Bug #4915: ButtonMapping option which allows to define arbitrary button
mappings (including left-handed mouse etc.). Fixed incorrect usage of
non-reversed, but ZAxisMapped buttons for state detection. Nuked unused
part of reverseMap.
commit a25871ae52dd5ce094ba8c1b2021dd027d3e71bd
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 01:00:46 2005 +0000
DRM 1.0.5 import
commit c9709c0a38af46368726857f7261cbeb84e53911
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 8 22:47:57 2005 +0000
Add newly checked in files to Xorg server build.
Fix release date. Enable DGA extension by default.
commit f8430a1b8651f4b52d9d3b54694a60d929b48925
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Nov 8 19:04:56 2005 +0000
Bug #2880, add functions for byte and word level access to pci config
space.
Fix broken utf8 again.
commit 5390c7ab05d23f64e6d9afaa558be246a6d6e1b4
Author: Kean Johnson <kean@armory.com>
Date: Tue Nov 8 06:33:30 2005 +0000
See ChangeLog entry 2005-11-07 for details.
commit f5814bf3fff5352ed6edef4c58aadf2d4593f094
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Nov 8 03:12:43 2005 +0000
Don't reference noXkbExtension when building without XKB. (Bob Terek - Sun
Microsystems)
commit e73cdba865f36ebf78c2dc4ff674b4d9bfe85013
Author: Kevin E Martin <kem@kem.org>
Date: Mon Nov 7 21:03:49 2005 +0000
Fix Xvfb to work properly in depth 15 mode. Fixes XTS5 XCloseDisplay-3
server crash.
commit 890ed0e082e048fa8daf48229b40558381bd131d
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Sun Nov 6 16:40:59 2005 +0000
Fix a bug where a system memory pixmap got a wrong address if memcpy()
fallback was used for downloading from screen.
commit 70aedcf32a0c924fd073f5b36d20813e8323026b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Nov 5 18:56:50 2005 +0000
Bug #4948: <https://bugs.freedesktop.org/show_bug.cgi?id=4948> Incorrect
URL in log file for Xorg CVS. Also fixed wording of statement to not
refer to monolithic CVS since modular uses the same code, so it was
appearing in modular builds too.
commit 89c661d61f1b9c70a08237476fa1f7f42c1783ab
Author: Kevin E Martin <kem@kem.org>
Date: Fri Nov 4 21:37:32 2005 +0000
Only use fbCopyAreammx if planemask is FB_ALLONES (fixes XTS5 XCopyArea
tests 22 and 23).
commit 0b150a05e6fadca7ee8240697d6cbeadea0c53b3
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Nov 3 17:12:53 2005 +0000
Whitespace change just to make sure I created the branch correctly.
commit 90cf8e339b71c2f8f2d7a362e6e1ca8078d7f4fd
Author: Kevin E Martin <kem@kem.org>
Date: Thu Nov 3 17:08:06 2005 +0000
Fix vendor string and release version reported by the servers. Enable
security, lbx and xevie extensions to give us parity with monolithic
tree.
commit f23defeef285b4a5bb58405589294bd557c9bb01
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Nov 3 16:57:01 2005 +0000
Use APP_MAN_SUFFIX for Xserver man page instead of hardcoding section 1
commit f5daec674aeb4fe6ccbc95ead8a319bbeb368d9f
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 2 15:56:40 2005 +0000
Add support for enabling/disabling DBE (part of generic enable/disable
extension support in the server).
commit a311bfa73afa1af76f81958d23bc8e0c631d6828
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 2 15:53:57 2005 +0000
Fix support for enabling/disabling extensions loaded from modules.
commit 462a2407d540eac831c9be4dcee8a16aa1cea6ac
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:01:51 2005 +0000
Add xorg-server.m4 for driver dependency checking.
Update pkgcheck depedencies to work with separate build roots.
commit 56101c9d6ec3585a0a8550da4b83dd399e3bcce6
Author: Kevin E Martin <kem@kem.org>
Date: Mon Oct 31 05:45:40 2005 +0000
Fix fd leak by closing them in the ACPI code instead of just using
shutdown.
commit 7993486e80711bd6f6f5b6c2b1f2ac32bfba735b
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Sun Oct 30 17:38:49 2005 +0000
RandR: Add a driver func to let the driver determine the physical size of a
screen size (display mode). Useful for faked widescreen modes, modes
which are scaled by the driver, etc. This really helps fixing RandR's
sometimes dumb DPI assumptions.
commit c818d3a1a5439c54fc687927a99d69712602ed5e
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Sun Oct 30 09:27:06 2005 +0000
Add xf86RandRSetNewVirtualAndDimensions to loader symlist
commit fdbb3ea60949a12eb2f4805d16e8acc2348e39c7
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Sat Oct 29 21:31:23 2005 +0000
Add function for drivers to change RandR's idea of the virtual screen size.
(This allows drivers to reserve a larger virtual size at start and
change it later)
commit e921eec1c6d6ce32630977bd876c529a7c694459
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 29 00:12:33 2005 +0000
Make X -> Xorg symlink at install time.
commit f842c229d4c4dbd5c01364f9e99709bedfd32be6
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 28 16:01:17 2005 +0000
build fix on alpha
commit 7416fd61a17a70a2c27c4b1d19796955c296dc7a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 27 21:03:27 2005 +0000
Improved stack trace dump code for Solaris - try fork & exec of pstack
first so we can see the names of non-exported symbols that aren't
visible to walkcontext/dladdr1 code.
commit b588bdfe2ac3758d7188706078d79fa276a303e3
Author: Dave Airlie <airlied@linux.ie>
Date: Sat Oct 22 04:38:50 2005 +0000
programs/Xserver/GL/mesa/X/xf86glx.c: Missing initializer in xf86glx.c
spotted while debugging something else.
commit 59279da49806b032027bb54410bc2513d21e3d9e
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Oct 21 19:06:13 2005 +0000
Bug #1429: Report input device type correctly. (Stéphane VOLTZ)
commit 4a8072011895e6f472e429af7503fc07e0561144
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Oct 21 18:50:09 2005 +0000
Bug #4730: Byte-swap the pixmap ID correctly. (Neil Campbell)
commit 81e913d3106066de73792f59f3e50e2b5458c567
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Oct 21 18:23:33 2005 +0000
Bug #4840: Typo, x$xRES -> x$RES. (George Fufutos)
commit f5a58178347878e0409b592330a07867bea02bef
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Oct 20 23:24:47 2005 +0000
Make sure that the __gl*_size prototypes are seen in all the places that
they need to be seen.
commit 279cf9f79da5778b6e14ecc437379d73e3bec5b0
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Thu Oct 20 22:41:28 2005 +0000
Bug #4817 <https://bugs.freedesktop.org/show_bug.cgi?id=4817> Restore '='
to '==' in test for mmx_capable.
commit 1f43d218cc24358a0379535ed517c23011633c31
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Thu Oct 20 21:45:40 2005 +0000
EXA: The "optimization" for using a fill operation instead of 1x1 copies
checked the destination drawable's dimensions (!) instead of the
tile's. Really....
commit 15f56b203dbc14ea59885d40fd4bed3da9e8e190
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Oct 20 18:52:51 2005 +0000
Move xf86XTrapModule.c to dixmods, guess at a build system.
commit da43c778f4a831061ad2c8b8a312b7a54c9cd79e
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 19 22:45:54 2005 +0000
Bug #3224: Degrade XKB fallback message to X_WARNING.
commit 4ebd26f04b32f1b09e0759f1a83437d0b1c4d646
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 19 22:36:22 2005 +0000
Bug #3196: Fix Load foo.so syntax.
commit af211a9bc1bcab0aa631558e5d6ce013095f9802
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 19 22:30:09 2005 +0000
Fix PCI bus scan on ia64 E8870 chipsets.
commit 5744308e2957781449bfe6fee9b465617a88384d
Author: Kevin E Martin <kem@kem.org>
Date: Tue Oct 18 22:06:54 2005 +0000
Update package version number for RC1 release. Update release string to
6.99.99.901 (i.e., 7.0 RC1).
commit 2769c3e72c470b472dae013e256a7ee73c3e53f2
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Oct 18 19:43:48 2005 +0000
Fix distcheck by forcing Xorg to be installed before chmod/chown.
commit dd0d010e9c34278f968be486a6c5c91e021b6609
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Oct 18 19:14:08 2005 +0000
Fix parallel builds my ensuring libdmxconfig builds first.
commit 79e6ac79f983b6cbd88a868dfd2235d9cbe75e8b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 07:18:21 2005 +0000
Don't use $< in explicit rules since neither BSD nor Solaris make allow
that.
commit fb282ef43a1936dcdefa57f16a8363b2adaf983b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 18 04:03:01 2005 +0000
Add miext/damage so misym.c can export DamageDamageRegion.
commit 959db6028d232dc76396cb658aa48d3b4e605aed
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 18 04:02:31 2005 +0000
Export DamageDamageRegion. Not bumping the ABI version since we did that
already for this release.
commit b61c828b0455ec1d4a7ffb54b5ac9b65764a458b
Author: Kevin E Martin <kem@kem.org>
Date: Tue Oct 18 02:23:58 2005 +0000
DRM 20051017 import
commit d6a40bcd4a745b5d6d1070deb696b21d128ca0fe
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:32:55 2005 +0000
Change default install dir for app-default files from
$(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
the monolith & allow localization
commit e7007f7d51c9e1d39118865fefb1716c579a70bd
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:42:03 2005 +0000
More automake 1.7 braindamage: use mkdir -p, not .
commit 151ba8b67fd88a721f9f72d3019212b22f5cd3e2
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:25:58 2005 +0000
Work around automake-1.7 braindamage by providing an explicit rule for
XOrgCfg.
commit eec3df1503e561aff6656e15c73b25a0bba1b06b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Oct 17 17:11:12 2005 +0000
Fix whitespace in AS_HELP_STRING uses, convert all help strings to use
AS_HELP_STRING.
commit 1859c62607d567aa05334df1662f7249c983f793
Author: Kevin E Martin <kem@kem.org>
Date: Mon Oct 17 07:18:59 2005 +0000
include/dix-config.h.in Add support for more extensions
Add missing files to EXTRA_DIST
commit ccfe9e7e9b49cbbf7c50fbf1a5c33178f27f79eb
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 16 21:57:34 2005 +0000
Link Xprint config directories in $(C_LOCALE) list to C locale dir, not
en_US
commit a7d6a4fb321415b8aaad72760ff8a1ca3fd077f9
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Sun Oct 16 03:02:53 2005 +0000
Change '==' to portable '='.
commit c2e461c7e970830ea430de3e5f352d144e9f0239
Author: Kevin E Martin <kem@kem.org>
Date: Sat Oct 15 20:44:44 2005 +0000
Fix typo and add new Makefiles to AC_OUTPUT
Fix typos
Add xorg.conf.man to CLEANFILES
Add missing files to EXTRA_DIST
commit 34b7b57b3c80507f63a542c6adb4b5c8ed80b642
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sat Oct 15 19:34:28 2005 +0000
Doh, remember to add this file.
commit 744aa34ca5228ea176cc56a7bdd48bbf5f29b0b5
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Oct 15 02:19:09 2005 +0000
Add an additional meaning to the "dirty" flag. Now, if !dirty && !area, the
pixmaps's contents are undefined, so we won't need to upload the
undefined contents in MoveIn. Use the ExaCheck* for async ops as well,
so that dirty is always tracked. While the performance impact for my ls
-lR test was not significant (though the avoiding-upload path was being
hit), it's likely to be important for the upcoming Get/PutImage
acceleration from ajax.
commit 21e7339c1eead1148eea462bc99cf8faf02c8d39
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 14 22:44:56 2005 +0000
Hook up lbx.
commit d62943c040fd3d45079c9918c57f74f993b585d4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 22:19:51 2005 +0000
Set default font path to match the default in the monolith so fonts are
actually found.
commit 0ee70f53ef9b05052ee079560df107d05a9c5407
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 22:01:46 2005 +0000
Install Xorg & xorg.conf man pages even when not building docs
commit 0676a2874a62a3661a718cdf21e75ffc77197ad9
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 14 20:01:36 2005 +0000
Add sysv and sco os-support subdirs and add simple EXTRA_DIST Makefile.am
in those dirs. Remove unsupported os-support subdirs (bsdi, dgux, hurd,
nto, os2, pmax, qnx4) that have no maintainer and we don't dist.
Add Options.
commit 57abb5b171b2fe88252aeb788463e533106d66b9
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 14 08:29:16 2005 +0000
remove reference to non-existent agpgart.h
commit 7e3e9ed97ba25bb84286f97fe6882a37c9aa7e25
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Fri Oct 14 06:10:06 2005 +0000
Add XTRAP_LIB to XPRINT_EXTENSIONS to fix xprint build when xtrap is
enabled.
commit 821584fcd3bf83f3aaacd35e54323f71d976db44
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Fri Oct 14 05:36:39 2005 +0000
Require glproto >= 1.4.1 if building DRI with GLX. This fixes a build
failure on a number of hyperpipe functions.
commit 8df7628a2ad93edf8271f13e0b43c0fa8f766668
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:41:51 2005 +0000
Remove reference to XF86config-4. Add xorgcfg(1) to See Also list.
commit b54c8154ca19edce00b9c6379d5daf94268bade1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:34:49 2005 +0000
Set substitutions needed in xorgconfig man page.
commit 1df705e465a103c94ffbb9fe97bdbe6b0aefc746
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 13 20:30:38 2005 +0000
AC_SUBST VENDOR_STRING & VENDOR_RELEASE for xorgcfg's app-defaults file
commit b349b20d783252d5126451142419aae554f9b776
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 13 18:08:24 2005 +0000
Dist NOTES.
Dist helper shell scripts.
Dist XAA.HOWTO and a few more unused C files.
Dist xorgconf.cpp.
Fix DIST_EXTRA typo.
Clean yacc and lex generated files only during make maintainer-clean as we
don't expect users to have those tools installed.
commit 35a767590e481b15ae66dccc2dd91098992b2751
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Oct 13 01:13:58 2005 +0000
Fix stupid mistake in yesterday's allocator commit, would cause exa to
consider a random available memory size
commit a16dabd05ee7ec97877f07bd40ed83c01e72fc22
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Oct 12 11:15:44 2005 +0000
Remove an RM line that appears unnecessary and was breaking the build at
xf86DefModeSet.c with FreeBSD make, where RM was undefined. While here,
make the build of xf86DefModeSet.c depend on its sources, so it'll
rebuild properly, and make it a normal CLEANFILE rather than a
DISTCLEANFILE, since the intention seems to be to build it at the
user's build time.
commit b819c8378fbf29f185332e8435a80eb35991cd1f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Oct 12 08:22:31 2005 +0000
remove unneeded line of code
commit e573b272bf2b06fb62d0306ddc966f3230ead967
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Oct 12 07:46:36 2005 +0000
Use proper access size when reading pixel based on bpp of the source pixmap
commit 55efb41f6cc064763cbfd3ee2a1239dc46cb109a
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Oct 12 07:35:20 2005 +0000
If a window background is a 1x1 pixmap, read the value out and go to
exaFillRegionSolid rather than sending piles and piles of Copies to the
hardware.
commit fce11fdf03acc1f3f1dafb79fc8fff0251cf5473
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 12 02:11:06 2005 +0000
Fix typo (DIST_EXTRA -> EXTRA_DIST)
commit 12994b9afbc18bfb7209f677abf673415c9ddf15
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue Oct 11 23:11:37 2005 +0000
Fix a couple of bugs in the offscreen allocator. One mostly harmless was
causing our search loop for evictable blocks to possibly skip a good
candiate, and another was the allocator would occasionally use
area->offset as if it was the base of the pixmap, while for a pixmap
that is not in available state, it is not. This caused some funny
miscalculation leading to overlapping pixmaps and accesses beyond the
end of the framebuffer. To make things cleared, I renamed save_offset
to base_offset, made sure it's the one used everywhere in the
allocator, and only align "offset" for the client at the end of
exaOffscreenAlloc().
commit 8444a1f3918b0433f89cae31673ab63628b4543d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Oct 11 21:01:04 2005 +0000
missed commit
commit 3b683b63eed603ae58a8cddab48eb81f7ba0dbdf
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 11 20:12:24 2005 +0000
missed ChangeLog entry for previous commit
commit b4450f3242ab408e80bc3d6d5d1cf6765f3e5339
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Tue Oct 11 19:03:02 2005 +0000
Add DGAReInitModes, Part 2
commit d91d18e1d6d663244288748ab86a35a6c151a535
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Tue Oct 11 19:02:18 2005 +0000
Add DGAReInitModes in order to allow the driver to change the list of
supported DGA modes. (Part 1)
commit c1a2abadfbb862cbaac3e23d0c1317ce5473ebdd
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Oct 11 14:50:47 2005 +0000
fix a typo
commit 697f64a22ac5a7742a0022605a1074351296d4f8
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Oct 11 14:50:03 2005 +0000
check randrp has been initialized
commit 2828d92c6ca400b603b6a20a221d9c858732292f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Oct 11 14:45:01 2005 +0000
programs/Xserver/hw/xfree86/common/xf86RandR.c
programs/Xserver/hw/xfree86/loader/xf86sym.c Add a new function
xf86GetRotation to allow third party modules to obtain the current
rotation.
commit cad18ec979e38ef80a606f0e4abf2142b9d0d2b1
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 10 10:07:47 2005 +0000
don't move x or y depending on the screen size change
commit 7f72f94aa4f0655b8aab6c67eef2a5f5ac4b418f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 10 09:31:49 2005 +0000
rework that again
commit 7c1d9a31a36552467d194e7d009c17dc526256c2
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 10 09:24:28 2005 +0000
a furthur tweak to the randr cursor position fix
commit 13f958fbe8420e406f24c01d320f29002ee860b7
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Oct 10 05:58:41 2005 +0000
Add missing {Prepare,Finish}Access() wrappers for the tile pixmap in the
fallback case
commit d82aeb55ca3b6abe4cafa7b9c39777a5f67308e5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 9 23:47:52 2005 +0000
Bug #3254 <https://bugs.freedesktop.org/show_bug.cgi?id=3254> Make sure
screensaver & DPMS timeouts don't overflow when multiplied by
MILLI_PER_MIN. (Reported by Zachary J. Slater)
commit 29b5f846d261976f466d2c7181d6a75de670066b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 9 17:47:34 2005 +0000
Bug #4715 <https://bugs.freedesktop.org/show_bug.cgi?id=4715> Add
SecurityPolicy to EXTRA_DIST (Bill Crawford)
commit 046234b3ebdfe221de9e87d70d287f69a6f59d6e
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Oct 9 02:03:22 2005 +0000
Don't try the accelerated glyphs path for component-alpha text (which I
don't expect drivers to be able to accelerate without exa assistance).
Instead, drop back to plain old miGlyphs for a 62.5% +/- 1.5% reduction
in runtime of my ls -lR test (n=5) with component alpha. While a
reasonable approach would seem to be making a better test to see
whether the entire path would be accelerated and force migration
appropriately, my attempt at this made the situation much worse.
commit 526d1502df8db6799c9d1155b86ce79cef90872b
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 7 21:29:39 2005 +0000
another update to the RandR fix (thanks Aaron)
commit 5a71a5667eb5b01e0f65f9310f4af1f6c5711ab7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 7 19:01:10 2005 +0000
Add Xprint init scrips to EXTRA_DIST.
commit 470213753b158225b44a39a872599344acbc7101
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 7 18:15:08 2005 +0000
update the last RandR fix
commit 348242f35aeb2869ef390241035b5f3266fc0288
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 7 15:39:52 2005 +0000
programs/Xserver/hw/xfree86/common/xf86RandR.c Use PointerMoved instead of
SetCursorPosition, as PointerMoved will call AdjustFrame to reposition
the window if necessary and avoid the cursor ending up offscreen.
commit 578e18d11b3d61449c1dd7eba04e1748f19c68f3
Author: Kevin E Martin <kem@kem.org>
Date: Fri Oct 7 14:27:47 2005 +0000
Add darwin to dist
Include missing docs in EXTRA_DIST
Include headers and other files in dist
commit 148df64a05d69adaac4b0f3684b846eb1da60219
Author: Kevin E Martin <kem@kem.org>
Date: Fri Oct 7 04:11:02 2005 +0000
Add README.compiled to dist tarball
commit ff258ac2783203ed2a7698894d951391d1aecebc
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Oct 6 23:45:29 2005 +0000
Clients tend to set picture->repeat when not necessary. Most HW cannot
accelerate repeat NPOT thus triggering software fallback (this is the
case with gnome desktop for example). This adds a simple optimisation
to exa that removes "repeat" when it's obviously useless, that is, the
single picture instance covers the entire rectangle beeing used
commit e4ed43c3a6c248ba2b82b8bbf29da537a68407e6
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Oct 6 22:25:35 2005 +0000
symlink.sh:
New files linked:
xorgconf.cpp Options
usb.3 usb_hid_usages
lynx_ppc.S
BUSmemcpy.S IODelay.S PortIO.S SlowBcopy.S
sun_inout.s
xaaTEGlyphBlt.S
xkbcomp/compiled/README
New files excluded:
All of lib/GL/apple
xlibi18n/*/*.mapfile
xxserver/xorg/configure.ac, xkb/Makefile.am:
Install README.compiled in the xkb output dir
commit 1614a31a9dad9482ae4526c194c2bae1c4993f8f
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Oct 6 21:55:41 2005 +0000
Bug #4699: Correct some memory leaks in EXA and damage related to region
handling.
commit cd9ff6aec81e04bbfe14364407ccb28df05fc063
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 6 20:16:13 2005 +0000
cpp processing for Xvfb man page
commit 370b8c8f1cb1a3531d52ea3b430852a0d76b2a4c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 6 20:14:43 2005 +0000
App-defaults file not supposed to have .ad suffix when installed Fix cpp
rules to set needed flags for app-defaults file
commit 2770233069d3845c681bea8eccff22e92254487e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 6 19:59:26 2005 +0000
Don't build "ev" example on systems without <linux/input.h>
commit 460145a5d52b5325fa5e920cee3699fcf7dd9afe
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 6 19:37:39 2005 +0000
Add cpconfig.c to EXTRA_DIST.
Add CURSOR.NOTES to EXTRA_DIST.
Add extrapci.ids to EXTRA_DIST and fix xf86PciIds.h rule.
commit e63f76caa1b1342422567fdcb9f8af24792c8ca1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 6 17:55:54 2005 +0000
Sun bug #6326551: xkbSetDetectableAutoRepeat broken when using XEvIE
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6326551>
(Derek Wang, Sun Microsystems)
commit 5f30a7b10286b4f55821acd4eb5580a8f5a3c56a
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Oct 6 08:08:04 2005 +0000
Bug #4689: Treat DirectColor as TrueColor in Render. It fixes some crashes
with xcompmgr when using apps that use a DirectColor visual for their
windows
commit 9000c0321baf1e25e1796e6a333aad0e5a22cbe2
Author: Kevin E Martin <kem@kem.org>
Date: Thu Oct 6 04:05:30 2005 +0000
Install correct man page and add to dist
commit 9b894df44b575f768a2400d044d8c1eb6ef2ec97
Author: Kevin E Martin <kem@kem.org>
Date: Thu Oct 6 02:40:41 2005 +0000
Include dmx-config.h for modular build
Use <X11/extensions/dmxext.h> intead of "dmxext.h"
commit 30c1369bf5816ffd7bd52d9a9dbcb72500684e2f
Author: Kevin E Martin <kem@kem.org>
Date: Thu Oct 6 02:35:22 2005 +0000
Add support for building DMX config and examples programs Add missing files
to EXTRA_DIST Install Xdmx man page
commit 1f9b6dc1ccd999c90ba825cf5fbdfa29770224a6
Author: Kevin E Martin <kem@kem.org>
Date: Thu Oct 6 00:34:29 2005 +0000
Clean up generated files to pass distcheck
Clean up generated files to pass distcheck Distribute getconfig.man.pre,
not getconfig.man
commit 61cd478b545de0313271cf6852e2df770e8f5914
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 5 22:39:41 2005 +0000
Bug #3652: Server-side GLX support for GLX_SGIX_swap_barrier and
GLX_SGIX_hyperpipe extensions. (Eric Kunze, SGI)
commit e891d9c078bd31447ae3e1fc7f8c15953b0bb916
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 22:19:09 2005 +0000
Update to 2005-10-05 snapshot from pciids.sf.net (includes a couple new
Radeon id's).
commit dc6ac8e46f80157960a24a1be1fb83f22dff45a0
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Oct 5 21:38:40 2005 +0000
Add DGA configure option and add various files that we should be dist'ing.
Simplify xf86DefModeSet.c rule a bit.
commit 8391eaa4aa1ae3744ad8c45f5d148ba362d2c9dd
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 5 21:13:49 2005 +0000
Preprocess and install XOrgCfg.ad as in the monolith.
commit a9df169f108b15d312421e498675cd2e48206660
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 17:27:58 2005 +0000
Add missing $(DESTDIR) to custom install target
commit a6cbe0776fcc8fb19a2bf2ecef41559eed6e5cef
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 16:39:09 2005 +0000
Fix the rest of the XFree86 DDX options that require an argument to say so
instead of reporting "unrecognized option" when the argument is
missing. Also give correct error instead of "unrecognized option" for
options only available to root.
commit 8c524f9966d2a167ea71dd81e235140e0db31471
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 15:33:40 2005 +0000
Xdmx & Xprint also need xau & xdmcp module dependencies
commit 9f3ad65251832631630f7e587b409b750a144bd3
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 5 07:27:52 2005 +0000
Fix lnx_pci.c's xf86GetOSOffsetFromPCI return value. Clears up the resource
ranges awkwardness and the "INVALID MEM ALLOCATION" warning.
commit da989e988cc96c0ec4f07fceb4c36b30c2e37f4a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 02:18:10 2005 +0000
Xnest depends on xdmcp & xau modules too
commit 9e8b5f3d478ca18a9ff9c26745de77c91a5d36d9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 01:38:50 2005 +0000
Make Xorg -config stop lying to people and claiming it doesn't exist when
you fail to specify a file name. Also, include it in the list of
available options for non-root users when listing all available flags.
commit 34a8411ede185553f1387ee0bf534cf77b0fc004
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 5 00:55:08 2005 +0000
Bug #4038: Unbreak the SYSVIPC check for cross builds. (Detlef Vollman)
commit f47f00ab747563678c8625de5e5b2a588660064e
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Oct 4 11:24:09 2005 +0000
Mark the temporary pixmap dirty if UploadToScreen succeeds. Failure to do
so resulted in a solid black glyph if the font rendering actually
resulted in a fallback (subpixel AA, for example) and the temporary got
migrated after 10 or so glyphs.
commit 89a1a91b88b94b341075bc208941337ce11465b7
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 4 07:42:21 2005 +0000
Add miext/cw to the module loader include path so that misym.c can export
miDisableCompositeWrapper.
commit 43625a47063c246e7bf9d687caded0b7e2ea0dc6
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 4 07:31:53 2005 +0000
Bump the video driver module ABI minor version to 8 so modules statically
linked against miDisableCompositeWrapper won't load on older servers.
#include "cw.h" instead of #include "cw/cw.h"
commit ca57db6fc1e6100c47ad935d626fdd490ed6116e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 4 04:30:33 2005 +0000
Export miDisableCompositeWrapper.
commit b2e451b93c20efc49a6cc565239432b2c705fe37
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Oct 4 03:44:14 2005 +0000
Correct the test for whether projective transform is necessary. Also, use
"affine" to describe the variable (universally) on suggestion from
vektor. Corrects a rendercheck failure.
commit cdded97a0ad717f4f9120b37d2687fa661696c9b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 4 00:45:42 2005 +0000
Add #include <xorg-config.h> for modular build
commit 4ae4fc7d51aeb0f27bed52f7e6a346745f3ea453
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 4 00:43:16 2005 +0000
Add gtf to xserver/xorg/hw/xfree86/utils
commit d51962378ef6371456e034d6d7f6780e05bc1207
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 3 19:31:50 2005 +0000
Bug #3781: Only use fbCopyAreammx when alu == GXcopy. Originally Gentoo bug
#96053, patch by bartron@gmx.net.
commit 6d4b350dee9495e54e6e5492815885f1d8455ac9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 3 16:46:14 2005 +0000
Bug #3815 <https://bugs.freedesktop.org/show_bug.cgi?id=3815> Patch #3463
<https://bugs.freedesktop.org/attachment.cgi?id=3463> GNU/kFreeBSD
Xserver support (Robert Millan)
commit 22b4200b01310e7b4743ef0b3541c3053a2d8279
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 3 15:41:10 2005 +0000
Whoops, need to be in DIST_SUBDIRS too.
commit 14a2bd33307fd937804a9fbb03787ec30858a05c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 3 15:37:57 2005 +0000
Add missing ] (Dawid Gajownik)
Add getconfig (Dawid Gajownik)
commit 84141fc299b03b5552be093f9b698a85bc670d65
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Oct 3 11:43:55 2005 +0000
Merge r1.36 of fbcompose.c from xserver CVS: Special case projective
transforms so we can avoid doing the expensive
64-bit math. Unroll the bilinear interpolation loops for an extra boost. I
tested this with the up/downscaling cairo-benchmarks with Xvfb and saw
a 12% +/- 4% decrease in time taken to run them.
commit c024262eae4e00567ccb66a59b4d572621233cbc
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Oct 3 10:20:29 2005 +0000
Merge r1.2 of fbedge.c from xserver CVS: Optimize spans where the same
value is being added to multiple pixels. This improves the speed of
rendering wide trapezoids. I tested this with a small set of xlibs
cairo-benchmarks with Xvfb and saw a 4% decrease in time taken to run
them.
commit a7e3c6fa8ceb6a3a423377aa32ab0da5a6ab9286
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 3 06:31:48 2005 +0000
Real configure check for execinfo.h (Yuri Vasilevski)
commit e3d2a7d57bc57453d66aa63ca7fe4d910b64737c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 3 06:29:14 2005 +0000
Bug #4393: uClibc lies and defines __GLIBC__ even though it's not source
compatible with glibc, so the backtrace support check fails. Work
around this by wrapping the code in a configure check for execinfo.h,
and emulate detection for the monolith. (Yuri Vasilevski)
commit 5037d3441d65f1fb6493c3b55137ef1b5eddd6b0
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 2 22:17:38 2005 +0000
Bug #1465 <https://bugs.freedesktop.org/show_bug.cgi?id=1465>
/etc/init.d/Xprint should use PROJECTROOT from build (Grzegorz
D�?browski)
commit b05e78dd40e1fe915096362f32c3af8aee0ed36a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 2 19:30:57 2005 +0000
Fix typo in MAN_SRCS (Dawid Gajownik)
commit 8814896da83b19be01beedd0b2b3380298778328
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Oct 2 08:53:18 2005 +0000
Fix include path for commit of bug #4616.
commit ecaa46380ed0a920186407b9294c5c60f75f1a13
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Oct 2 08:28:27 2005 +0000
Bugzilla #4616:
- Merge various fb/ bits of COMPOSITE support from xserver, which weren't
necessary before due to cw hiding the issues. Fixes offset calculations
for a number of operations, and may pull some fixes that cairo has
wanted for XAA as well.
- Add a new call, miDisableCompositeWrapper(), which a DDX can call to keep
cw from getting initialized from the damage code. While it would be
cleaner to have each DDX initialize it if it needs it, we don't have
control over all of them (e.g. nvidia).
- Use the miDisableCompositeWrapper() to keep cw from getting set up for
screens using EXA, because EXA is already aware of composite. Avoiding
cw improved performance 0-35% on operations tested by ajax in x11perf.
commit 2c82429f8957ed0268c0e4e4fe5aed9093f33960
Author: Ian Romanick <idr@us.ibm.com>
Date: Sat Oct 1 22:25:13 2005 +0000
Refactors __glXImageSize and __glXImage3DSize into a single function. It
replaces all calls to the old functions with calls to __glXImageSize
with the new parameter list.
I have also added 'target' as a parameter. This is a stepping stone to the
code in patch #2410. Basically, if the texture target is one of
GL_PROXY_*, the image size is always zero. This gathers all the checks
for that into a single place. I have *not* modified the existing
callers to take this into account. They still do their own checks for
GL_PROXY_*. However, when the generated versions of those functions are
added to the tree, they *will* rely on that.
The code growth is mainly due to the new 40 line comment before
__glXImageSize.
I have tested this with a few of the texture using demos and tests from
Mesa, including tunnel, texdown, and drawpix.
Reviewed by: Adam Jackson, Eric Anholt, and Brian Paul.
commit e27b3e4ea1ddf9b2e9c2d63a0e60400b523a8a94
Author: Ian Romanick <idr@us.ibm.com>
Date: Sat Oct 1 22:19:04 2005 +0000
Remove some more incorrect prototypes for the __gl*_size functions.
commit e270e6394b623b48d416feeef0c3856f2e303c8d
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Oct 1 17:53:38 2005 +0000
Bug #3822: out of bound reads in fbbltone and fbblt (Mark Kettenis, Thierry
Deval).
commit 54b2a14f0fa4397f3e9ae75dd63d5cacfdd778eb
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Oct 1 17:30:58 2005 +0000
Bug #3411: fix handling of keyboard Autorepeat rate in xorg.conf.
commit a07dd03748c8fa2633e294ee4d9ab38265970e5e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 1 07:17:55 2005 +0000
Add hw/xfree86/getconfig
commit abc6aa50fb52fa4fa9b9436dbc3a70f86e62dc27
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 1 06:27:12 2005 +0000
Oops - fix build/install of fbdevhw.man
commit 13e0db19d8c0b1df636f218bcbfbb2c54fa7576f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 1 06:19:02 2005 +0000
Adding more doc files & fbdevhw man page
commit b5ce065a5e91e2ad3213ea8c711cfe7ed9060c16
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Fri Sep 30 08:54:44 2005 +0000
RandR: Fix failure handling (Closes #4635; Thomas Winischhofer)
commit 4608a2b654be84b2e345bcada63422d18c74a06e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Sep 30 02:37:57 2005 +0000
Man page processing/installation and other doc file updates
commit aa74468aa59b95424cd0000179b8985b267d639b
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Sep 30 02:03:45 2005 +0000
sparse cleanups. s/0/NULL/ and mark a few things static.
commit c65fde5343719d3e9ebc76cc371c6f5f7948de8c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Sep 28 20:38:42 2005 +0000
Make the server distcheck:
- Fix up the XpConfig directory to remove the stuff it installs
- Add a few files to CLEANFILES here and there
commit 58abce3f90504dd48838a2f7ae7bb5db6a6cff70
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 28 20:01:37 2005 +0000
- Use the dirty flag (which should be set correctly all the time,
particularly thanks to Prepare/FinishAccess) to avoid DFS/memcpy on
pixmap move-out if it's unnecessary. This was disabled in KAA because
cache misuse on ATI made me guess that this code was wrong.
- Unwrap Glyphs on closescreen.
commit f53404bdbba23fd46420564565ab815f7c20b101
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Sep 28 16:55:25 2005 +0000
Add kbd_mode build system
commit 940158a6f2e98069a47293d713df674e16ad8a11
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Sep 28 03:37:22 2005 +0000
Replace all uses of __glEvalComputeK (and the doubly redundant
EvalComputeK) with calls to one of __glMap[12][df]_size. This was
tested with progs/samples/eval (from Mesa).
commit 806d74bc0640f4f3dcc034b36a36aea289b01685
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Sep 28 01:57:47 2005 +0000
Add __SVR4 #ifdefs to work in non-Imake builds.
commit 88957862b812b3e1e19d5e11365a22dc249cf4d2
Author: Kevin E Martin <kem@kem.org>
Date: Tue Sep 27 23:28:46 2005 +0000
Fix distcheck build and install errors.
commit 003655c02ad3a031031bb4ac859966a513f63e10
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 27 18:36:14 2005 +0000
Make XpConfig build system call mkfont{scale,dir}
commit 156b2cf3f76ae53cc37b6f5910b446c776ccc9ba
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 27 17:49:35 2005 +0000
Add forgotten Makefile.am
commit f3d0cb4a5722e0512bbdcd179215532795cba38f
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 27 16:15:55 2005 +0000
Get XpConfig build system in pretty much working state
commit 1c2e8b1ecc8b7b8c8562461eed7892ff22d17e71
Author: Kevin E Martin <kem@kem.org>
Date: Tue Sep 27 15:11:56 2005 +0000
Fix make dist to include only sgml files.
commit ca64aab609c3585234410cd8d908f8e1efe5c788
Author: Kevin E Martin <kem@kem.org>
Date: Tue Sep 27 14:09:31 2005 +0000
Add build system for building docs and fix setuid issues.
Add build system for sgml docs.
commit 1a4e30d508e62ab304722c3525748ff0e3c2899d
Author: Kevin E Martin <kem@kem.org>
Date: Tue Sep 27 13:47:26 2005 +0000
Include xorg-config.h so the generated file will also include it.
commit 30ff9e26196bdba8435e0dcdb96864e81c8cb136
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Sep 27 00:04:40 2005 +0000
Fix some problems that caused incorrectly annotated prototypes for
__gl*_size functions to be used. The result was that, on x86, the code
would be compiled with FASTCALL semantics, but the callers would not.
This should fix GLX protocol errors that people are seeing. There
doesn't appear to be a bugzilla associated with this problem.
commit 6c5c54b9a2872f1bb7de36a8d2d4efcef70b14c6
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Sep 26 23:07:44 2005 +0000
Various small fixups to get XpConfig to 'build'
commit 604f7c64efb57a48ec667c2ed62d3b4bad0c302b
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Sep 26 22:45:43 2005 +0000
Check in skeleton Makefile.am's for the rest of XpConfig
commit 8907195d784ff2c72a00b64edab6a8ac3b31dec5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 26 20:58:26 2005 +0000
Take care of more files from monolith's Xserver/hw/xfree86/etc dir:
hw/xfree86/utils/ioport/Makefile.am
Add ioport and pcitweak utils from monolith hw/xfree86/etc dir.
Generate xf86DefModeSet.c from vesamodes & extramodes
Add apSolaris.shar to EXTRA_DIST
commit 9abccb5e65628c938c6f01b685ab8fbffae7bc3b
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Sep 26 19:33:06 2005 +0000
Add initial build system for XpConfig
commit 0531c4be2f1a30082cfec5e411ab34d17978d66e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 26 02:41:38 2005 +0000
alanc@alf:/export/alanc/X.org/head/cvs-rw/xc [7:40pm - 628] head -14
ChangeLog
include xorg-config.h for modular build
Adjust XF86CONFIG defines for modular build
Fixes for modular build:
- include modular server config headers
- change default XCONFIGFILE to xorg.conf
- define XKB_RULES_DIR if not defined by Imake
commit 256fa24945bcaa6e5a68a48c1b757f8084e88a38
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Sep 25 17:48:09 2005 +0000
Add SecurityPolicy file for XCSECURITY extension.
Add README to EXTRA_DIST
commit 54639964cc344f1086196729fde37515f11e7972
Author: Bogdan Diaconescu <b_diaconescu@yahoo.com>
Date: Sat Sep 24 21:56:00 2005 +0000
Changed the license to a X/MIT one
commit 3192f400c72b3b606fcc1798d577737502897b43
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Sep 24 18:45:45 2005 +0000
Disable the {Open,Close}FullScreen DRI protocol. Remove empty FullScreen
stubs from drivers, comment the non-empty ones.
commit a5477ae7ac9a56c1a586950db1dee6661bff149d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Sep 24 02:40:51 2005 +0000
Add scanpci, xorgcfg, & xorgconfig utilities.
commit 2ba865b3f57340fd1d75f7614c17f615cc127b89
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Sep 23 23:04:04 2005 +0000
Fri Sep 23 19:00:06 2005 Søren Sandmann <sandmann@redhat.com>
Apply patch from Ronald Wahl to make sure that the stack pointer is not
modified at points where we access external variables. (Bug 4269).
commit 7554e1bf29e5aef8e76f88bac2994ea45a924f2b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Sep 23 00:27:07 2005 +0000
Sun bug #6321613
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6321613>
xorgcfg dumps core when it reads a configuration file that has a
Monitor Section, but does not have a "VendorName" entry inside it.
(Henry Zhao, Sun Microsystems)
commit 99793543c0fcfd4d699549fcc2bf0ed12aed6a19
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Sep 22 12:40:41 2005 +0000
put back some agp related allocation messages
commit 02566dff4abbda6888f719727c169b966617a83d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Sep 22 12:33:36 2005 +0000
fix typo
commit 56e7766c775385b0c6e09e6a65a1c8e10dba786e
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 21 22:26:07 2005 +0000
Bug #4541: Fix text drawing in the case where a list contains no
non-zero-sized glyphs. Several variables weren't updated, resulting in
rendering simply stopping when this case was hit. (Anders Kaseorg)
commit 32497ff479d0c34c05eb5acfcd5f7e186bac3227
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Sep 21 18:14:32 2005 +0000
Accept --with-xkb-output argument to specify output dir for compiled xkb
keymaps. Define XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY.
Add XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY.
Add XKB_CFLAGS.
commit 361a9eb953aaa38f8ebc057185de29e50f9eef26
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 21 10:27:53 2005 +0000
- Change migration-in rule slightly: previously, if your score was less
than the max, it was bumped, and then if you were above the threshhold
you got moved in. Instead, do the above-threshhold check separate from
score starting out less than max. While this will likely make thrashing
cases worse, I hope it will fix some issues with long term performance
(think of an xcompmgr with a backbuffer it's doing only accelerated
operations to. If some new pixmap comes in and bumps it out, even once,
it will never get a chance to re-migrate because its score will be
maxed). Change migration-out to be the same way for symmetry, though it
shouldn't ever affect anything.
- Fix a lot of debugging output, both in terms of printing quality, and
completeness. The fallback debugging covers a lot more now, pointing
out new areas for improvement. Debugging toggles are now centralized in
exaPriv.h.
commit 6a29c4cec156a135d1d9cdb65995f7a84de7cb56
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 21 07:43:01 2005 +0000
Add support for hardware accelerating tiled background painting. One
example of this is the root weave, which paints slightly slower on SiS
now in my testing. However, according to keithp some apps use this
feature for a sort of cheap backing store, which this could help with
significantly. While I haven't done much performance testing with it,
it will at least rule out one possible source of terrible performance.
commit 1115ff4c008dea6d6cafcb39e4ce6d0b3ed4fcc0
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Sep 21 00:38:05 2005 +0000
Bug #4487: Add the bsd subdir to DIST_SUBDIRS. (Joshua Baergen)
commit 00bd8968b264c1f69487dd99c212e0ce889b11db
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Sep 21 00:24:10 2005 +0000
Bug #4257: Move cfbcmap.c to cfb_common_sources.
commit b7e723ed6f23cc8d85f1f1eced9d8ccbc2a6b38c
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Sep 20 23:32:21 2005 +0000
Missing backslash
commit 15b2f94de5e2cc7e4df8d897d562dffeda31c82c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Sep 20 18:26:24 2005 +0000
Update CVS project tag & notice about pci.ids license in output .h.
Update to match recent changes to pci.ids, extrapci.ids, & pciid2c.pl for
people building on systems without perl.
commit 7d0f47c43c5c177cae0f375ceaeef892e4c9663a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Sep 20 15:50:31 2005 +0000
Add --disable-install-setuid option so you can build as non-root and
chown/chmod later. Also disable by default on platforms that don't need
setuid root X servers (Darwin & SPARC's, according to
InstallXserverSetUID settings in the old Imake config files).
commit b623c60745ca486667657fa39ad517d1f7a72794
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 19 22:44:49 2005 +0000
Linux/Alpha support (Stefaan De Roeck)
commit bd906c6bb803b286c39eca80e437a21c14e808a3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 19 18:54:05 2005 +0000
Update to latest version from pciids.sf.net
Sync with updates to pci.ids & PCI id list in nv driver
commit 535cd292c809314efe4730a27b0271adfa842775
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 19 18:38:26 2005 +0000
#include "xf86Axp.h" -> "shared/xf86Axp.h" for modular build. (Stefaan De
Roeck)
commit a1bcf25a1f819768672ac837cb0a3d0c66937656
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 18 02:32:23 2005 +0000
Break EXA ABI while we still can. Add coordinates to the UploadToScreen
hook so we can upload a subset of a pixmap, and convert the current
drivers to respect that. Use this support to directly UploadToScreen in
exaGlyphs, providing a 47.4% +/-2.4% decrease in wall time for ls -lR
programs/Xserver in an antialiased gnome-terminal on an M6 (n=3, caches
hot). I would have bumped major version, only I can't tell what the
EXA_VERSION_* is supposed to be doing as opposed to the module version.
commit 074913c8a9c1f66c8752387db2c81ad669e91878
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Sep 17 20:02:02 2005 +0000
- Don't try to upload 0 byte-per-pixel (PICT_a1) data using
RADEONHostDataBlit.
- Disable the shortcut for switching from 3d to 3d in radeon_exa.c. It
appears that we do need the cache flush here, thought it's not clear
why. Disable the 2d to 2d shortcut while here, since I'm unsure of what
we're doing. Exposed by the following bit:
- Bug #4485: Add a new routine, exaGlyphs, to handle font drawing. Glyphs
were being accumulated in from non-migratable scratch pixmaps, causing
the destination pixmap to move towards screen but the migration
necessary for source never to happen, leading to abysmal performance.
Instead, copy the scratch glyph data into a real pixmap first, then
composite from that into the destination, allowing for migration. time
ls -lR from programs/Xserver showed 26.9% (+/- 6.3%) decrease in wall
time (n=3).
- Create exaDrawableUse* wrapping exaPixmapUse*, but which are aware of
windows needing backing store. Makes migration code prettier, and
ensures that composited windows will be migrated as normal when we turn
off cw for EXA. (issue brought up by keithp)
commit be2bdab4339e493bb0ac3d0e36508b7aa1cd6e92
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 15 06:46:05 2005 +0000
Bug #3990: Require glproto in the cases that it's necessary (DRI or DMX
with GLX). (spyderous)
commit ef7eef0f68af6bfbb4ee56115ac2f3c1b7425755
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 15 05:55:21 2005 +0000
Bug #4046: Install the X.Org server setuid root. (David Schleef)
commit 88d7eb1f7ed6afc85c07797838714f2601356018
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 15 05:06:54 2005 +0000
Bug #3889: Create the log dir on install, and allow configuring
specifically that directory. Failure to have the directory keeps the
xorg server from starting.
commit 25a0ecdc1868f4b53225b92e8ccd222814e2da2a
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 15 04:07:19 2005 +0000
Don't put a version number on the module filename.
commit 0888ad3874414e32535fecdb717ee7ab86f9d4cc
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 14 07:49:22 2005 +0000
Build xf8_32bpp, which is wanted by the mga driver, and export elf.h, which
is wanted by the rendition driver.
commit dfb5da93bc16b2fd2b00e939dbe101a04bdeab4f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Sep 13 20:59:05 2005 +0000
Turn on DRI by default on Linux, NetBSD, FreeBSD, and fix the build of the
module for FreeBSD by setting some missing defines (XFree86Module,
IN_MODULE) in the dri directory. Note that those missing defines should
be somewhere generic, since there are other consumers of them, but I
haven't figured out where.
commit 12fbcfefe672ec226bdbc7597bf2fd2cb0ee1e19
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Sep 13 18:37:35 2005 +0000
Add some initial BSD support for the xorg server. Incomplete on NetBSD,
OpenBSD, and non-i386/amd64 FreeBSD for sure. Plus I haven't actually
run it yet.
commit 51eb6c83a3b2721703ca50758853bbf9f99fc4d2
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 13 15:28:29 2005 +0000
Tue Sep 13 11:27:05 2005 S%Gï¿¿%@ren Sandmann <sandmann@redhat.com>
* programs/Xserver/miext/shadow/shadow.c (shadowDamageBox): Add
missing REGION_UNINIT.
commit 133edff1b499b2c794fcc9a1860c1b5526b58869
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Sep 13 05:44:47 2005 +0000
Don't define POSIX_SOURCE on any BSDs, since it breaks things.
Define NO_SYS_HEADERS, as the monolithic build does. Helps FreeBSD.
Don't include validate.c in the library, since it seems to be a userland
test program.
commit c3d6799cee7ff8411b3a05a7ab7e2a9e80c95059
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Sep 13 01:33:19 2005 +0000
Bug #594: CAN-2005-2495: Fix exploitable integer overflow in pixmap
creation, where we could create a far smaller pixmap than we thought,
allowing changes to arbitrary chunks of memory. (Søren Sandmann
Pedersen)
commit b290884719e18646326f0c2412c2494a07fe3cfd
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Sep 13 00:44:52 2005 +0000
Bug #3284: Make the DRI lock reference count per-screen.
commit 846f797f37c1ae57a8dad981113b1139359d8c94
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 12 08:24:48 2005 +0000
Add missing fontsproto and fontenc to REQUIRED_MODULES.
commit 5b218617fa8ba52bf65aef35da39e06c662495e6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 12 07:53:16 2005 +0000
Add missing resourceproto to REQUIRED_MODULES.
commit ade158d238475ce923fbc5c49275c78cf3864223
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 12 07:07:59 2005 +0000
Define WITH_VGAHW, since we always build it; add to Xorg headers.
commit 34dc481a16c0c1cbd69a9ec7172331b59b85e9a7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 12 07:02:46 2005 +0000
Put DMX AC_CONDITIONALS at the top level, since they must always be called.
commit b0f6fe1f38b448b5f1a280e86b01353865866c70
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 11 21:38:41 2005 +0000
Add some optional (disabled) fallback debugging code to the async code, for
better tracking of when we're hitting software.
commit 1c003ccf5d68baaae6fafdc75eff964f2a62fc35
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 11 19:08:10 2005 +0000
Add a pair of hooks, PrepareAccess() and FinishAccess(), which get called
around CPU access to the framebuffer. This allows the hardware to set
up swappers to deal with endianness, or to tell EXA to move the pixmap
out to framebuffer if insufficient swappers are available (note: must
not fail on front buffer!).
Submitted by: benh
commit ca210830bd361e3d91b6bc741c495b61c424d1d2
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Sep 11 18:43:55 2005 +0000
Simplify life for EXA drivers by reducing some {Con,Dis}joint ops.
commit 04f81cacb9fd0944879b2c23a99fa3a1ae979b12
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Sep 11 18:33:31 2005 +0000
OpenBSD also doesn't like defining POSIX_SOURCE: it limits available
functionnality in headers beyond what's used by Xorg.
commit 089b4272cf32fc9429c1a0e666c2ffb34fda0b93
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 11 01:16:14 2005 +0000
use RGB_DB not RGB_PATH as that's what it's looking for
define HAVE_XKB_CONFIG_H so setting xkb-path works (Jürg Billeter)
commit 2f9d01c9681d80235a70263e2e087dc6c181cdc8
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 8 01:15:47 2005 +0000
Remove some references to mfb/cfb support that is no longer there.
commit b5d42012f9be87f3b45a089c596ce6dba8845794
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Sep 7 01:30:23 2005 +0000
Fix typo resulting in failure to swap between RGB/BGR properly. (Stephen P.
Becker)
commit c8de8c23fbccb3296747f429a02c0c0682b74bf5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 5 07:43:51 2005 +0000
Fix tests for maximum number of colours when creating a colourmap, so a
32-bit visual (e.g. ARGB) doesn't overflow an int when attempting to do
1 << 32. (Benjamin Herrenschmidt)
commit 5c5c51fa6da03f19831632a092761a1e4bcf653b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 5 07:40:50 2005 +0000
Initialise private arrays with calloc, rather than standard malloc.
(Benjamin Herrenschmidt)
commit 691669c0121494df90c8523f7d17e01ba0b14a57
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Sep 3 07:08:58 2005 +0000
xorg-server.h -> dix-config.h (thinko).
commit 4b2f5ba1b5d59fd6bd7f82da5730f72e8df04858
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Sep 3 03:27:55 2005 +0000
Use macros from xtrans.m4, issue error if not found.
commit 733a6d7a268945d149bcea159253408bedc69b12
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Sat Sep 3 02:21:36 2005 +0000
Add EXA driver writer documentation for the benefit of future generations
of X hackers.
commit 854010d71dc0f1e9b73cdc764c9d2cf36f1da625
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 2 03:22:01 2005 +0000
Add -include dix-config.h to GL/mesa/X to catch _XSERVER64, et al.
commit 287336f3c9e5023acbfba6508b05a68ccca9ddf0
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Sep 1 19:56:14 2005 +0000
Teach xkb how to optionally run xkbcomp from $bindir instead of
$datadir/xkb.
commit 94fbdb5c6d2cdc7b70ecdabe22a9de8b9aabeced
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Sep 1 14:56:35 2005 +0000
Make RGB_PATH configurable.
Move I2C modules back to $(moduledir)/multimedia.
commit a65c5796133d126b1810749b5206607e7c42d787
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Aug 31 14:58:09 2005 +0000
Include xkb-config.h if we have it so we pick up the paths defined there.
commit 9d3b5e89d691b79ea3361e6dc82938c22d70d0e3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 30 22:34:14 2005 +0000
Save keyboard LED state on startup and restore on exit so text console mode
LEDs match text console mode state. Move push of streams module earlier
so it's loaded before we start using kbd ioctls provided by the streams
module.
commit fa6fbd018da939fda7cc2b9a9aa2717b9675a178
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Aug 30 22:31:52 2005 +0000
Use the $(moduledir) makefile variable instead of @moduledir@ so it can be
overridden at make install time.
Remove driverdir and inputdir from pkg-config file. The directory layout of
moduledir is fixed and well known by drivers.
commit b4f4bf028a88ee709f4536373de2d40b6445006e
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Aug 30 19:51:59 2005 +0000
programs/Xserver/hw/xwin/winmultiwindowshape.c Fix off by one error (Colin
Harrison)
commit 0e50af8b7f459aafd1d1d52414629e926167a751
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 30 19:35:06 2005 +0000
typo fix
commit 0c74799af4f924ba64ebd6052802b73547f55c72
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 30 04:41:04 2005 +0000
Remove existing broken maxX/maxY code for composite (results in infinite
loops, doesn't deal with failure, doesn't present the interface to
drivers that I expected) and instead replace it with a simple fallback
to software when coordinate limits could be violated. Act similarly in
other acceleration cases as well.
The solution I want to see (and intend to do soon) is to (when necessary)
create temporary pictures/pixmaps pointing towards the real ones' bits,
with the offsets adjusted, then render from/to those using adjusted
coordinates.
commit f20e845b04dee5fc0780811f565180e322b60b73
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 30 03:42:07 2005 +0000
More 0 -> NULL for pointers missed in previous commit to this file.
commit 7777d325a3d049cc233c004cba288ed5d10539c2
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 30 03:05:21 2005 +0000
Apply an xserver patch from cworth: Avoid buffer ovverrun when a
trapezoid's right edge is on a pixel boundary.
commit e321f9e7ff7de9aa702e33a22743b55c8bb66953
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 30 03:01:38 2005 +0000
Apply the xserver patch from vektor for bug #4208: Use NULL for pointers
instead of 0.
commit 20813d3af065f9b719b39d2e7a3382b8fa278a48
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Aug 28 19:47:39 2005 +0000
Bug #3974: Fix unaligned memory access on LP64. (Matthieu Herrb)
commit 0926cf79c030f29dce32a9dc944734960ec93d19
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Aug 26 20:21:57 2005 +0000
Add diagnostic messages for exaDriverInit failure cases.
commit 5ffff7cb868a768307ff6faf164210020e6b94a2
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Aug 26 20:08:09 2005 +0000
Bug #4160: Fix Altix kernel version check.
commit 6b0cdc5dd9e451021c562ac4b6b2101d50187a30
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 16:46:41 2005 +0000
Change use of dix-config.h to xorg-config.h.
commit 9d1b349b3765fb587b353c78cca9aa083f5d0eee
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 16:34:55 2005 +0000
Back out previous change until I figure out something smarter.
commit 3075df24e7931901c6f0526e10a89631fd73c4d0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 07:35:55 2005 +0000
Subvert SIGUSR2 to reload all input devices. (Ubuntu #020)
commit 89c84575ea905c7598d6b6029c9209abe1cfb074
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 07:24:21 2005 +0000
Undo rate/period change after function body, so the damage doesn't leak
into other functions. (Debian #050)
commit bb5e934df7f23fb365ed673a12d283ff52af79c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 07:15:04 2005 +0000
Only open /proc/bus/pci/devices once. (Ubuntu #029)
commit c937faadd0a0a5f2598b84286ac1ed8996a512e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 06:48:24 2005 +0000
Better error message on failure to set iopl. (Debian #021)
commit 6d34a2ac8a33bd6c9083106b38fab6062e033e39
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 06:35:00 2005 +0000
Add Xv symbol from Xext.
commit b8f0d4c3ebee363279f9dc7318de3e3c854ca5ef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 06:29:15 2005 +0000
Spit out an error when there is no valid FB device, instead of just failing
silently. (Debian #070)
commit b48a24e7969d99a0116bc780c70d3e1c18b34769
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 06:23:41 2005 +0000
Don't assume that all sun4m CPUs support muldiv; the Cypress CPU, which
implements the 4m MMU but only v7 instructions, does not. (Debian
#100).
commit fd158d3d5215b0a013f5305a76097b0b8fa14cf6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 05:49:44 2005 +0000
Get prototype for ntohl from SuSv3-compliant location, fixing it for
systems which define ntohl as a macro only, not both macro and
function. (Debian #076)
commit 53e489c0e39b89f41213a726fe1b611d7d9a18db
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 05:47:36 2005 +0000
Work around ATI expansion ROM problem on IA64 caused by prototype HP
McKinley systems. (Bdale Garbee)
commit 40374d1149d6dcf0b4521faae8bdfecc8a3af077
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 05:00:07 2005 +0000
Accept 'Enabled' and 'Disabled' for Extensions section (Ubuntu #990)
commit ea80b5db257f4c22cf5a152084aef5fe05079db0
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 25 22:11:04 2005 +0000
Fix a use-after-free of cursor data by refcounting for the sprite.current
reference. The particular path seen was XFixes' ReplaceCursor()
resulting in the sprite.current being freed, but then it getting
accessed during the ChangeToCursor() that happens as a result of
WindowHasNewCursor().
commit 54cc45b09bc6c860b3de2012b57c4b35ca18ffd2
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 25 21:22:41 2005 +0000
Thu Aug 25 17:15:01 2005 Søren Sandmann <sandmann@redhat.com>
Add all the drivers to the module_LTLIBRARIES instead of having separate
variables for them. Pointed out by Kristian Høgsberg.
commit ff22adc09763b2bd860e7f780a5d0855cab0ab30
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Aug 25 14:19:43 2005 +0000
Remove sun_inout.s so make dist works (discussed with Alan Coopersmith).
commit 344a24b6229f477c892dd855546391bc1e091bd7
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 25 04:09:45 2005 +0000
Use system curses library on Solaris for xorgcfg text mode.
commit 0711502f1847ed461672b9842218b9afa9d349ed
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 24 23:48:11 2005 +0000
Bugzilla #4226: Change the pixmap migration strategy for the CopyNtoN case.
Now, if either source or dest were in framebuffer, try to get both
there, but prefer system memory for both otherwise. Required making
exaasync.c go through the try-acceleration path. This significantly
improves window resizing under composite, because previously the
pattern of creating a new pixmap and copying default contents from the
screen caused a fallback every time due to the new destination pixmap
being in system memory.
commit 2261710fe0dffd60433e3362ac12adf4db570fe5
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 24 23:38:25 2005 +0000
Fix a bug where NULL could be dereferenced during the pixmap kick-out
process by referencing the correct offscreen area. Also drive-by the
comments related to these for clarity.
commit 55c5c6953a3a661758a42b147f9542950a62fc4d
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 24 22:43:27 2005 +0000
Bugzilla #4090: Introduce getters for pixmap pitch and offset, to
simplify/clarify it for driver writers who probably don't want to know
what pPixmap->devPrivate.ptr or pPixmap->devKind mean. Converts the sis
driver to use them, and bumps the EXA module minor version.
commit 079ad773e09ed0c5baf01de3d4f02a5568da5634
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 24 22:37:15 2005 +0000
Fill in xf86DeallocateGARTMemory stub based on lnx_agp.c version. Add
include of xorg-config.h for modular builds
commit 8fd250e5e4c2016614b82e2d653b7fbf8a3a5b99
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 24 21:51:28 2005 +0000
Bugzilla #4089: Fix crashes in !EXA_OFFSCREEN_PIXMAPS case by not trying to
do migration when the EXA pixmap private is NULL.
commit 79dc5f3d5fe5a66f5fa53af9afc30d27d1af0bce
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Aug 24 21:28:40 2005 +0000
Don't export non-standard symbols generated GCCs stack protection feature
(__guard, __stack_smash_handler).
commit d2952de6e3d9197529695bb88d8c3af679ad71af
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 24 19:41:43 2005 +0000
Wed Aug 24 15:39:07 2005 Søren Sandmann <sandmann@redhat.com>
Add GLX_{INC,LIBS} for xprint.
Add @DIX_FLAGS@ to AM_CFLAGS
commit 81e708440ced309adc62ebf43d00becd32338db5
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 24 19:35:51 2005 +0000
Wed Aug 24 15:29:50 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally include dix-config.h
Conditionally include dix-config.h
commit 9657e0e9def47dba5b0bfa7461874362712a07bb
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 24 15:18:06 2005 +0000
Don't try to build dmx/input/lnx-*.c if <linux/keyboard.h> isn't found
Don't try to build dmx/input/usb-*.c if <linux/input.h> isn't found
Replace -rdynamic with $(LD_EXPORT_SYMBOLS_FLAG) for compatibility with
compilers other than gcc
commit 825a95a1fab69f84c99ae132888fced22e28be33
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 24 11:18:35 2005 +0000
Remove use of dix-config and xorg-config.h from public headers.
commit 1fb4a5a4ea993a7913a7bcc362315d31b2907836
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 24 09:12:50 2005 +0000
Add xcmiscproto and bigreqsproto to REQUIRED_MODULES, since Xext uses them.
commit b47535bd661743946851099f226f9e6aa4cc8c90
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Aug 24 08:49:31 2005 +0000
programs/Xserver/GL/windows/glwrap.c Wrap PointParameteriNV &
PointParameterivNV for Windows builds.
commit 9f498a37dd3d8456d2a97be9c039b63abc81a5fe
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 23 20:58:29 2005 +0000
Display more friendly mouse protocol names. Enable mouse wheel mapping by
default.
commit cff4b1c2166aa2e75618c8df09554a602c3a68c5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 23 20:12:26 2005 +0000
Check for getconfig in GETCONFIG_DIR if it's not found in module dir.
commit bfd13645867aab831b7a0f2b1757cb80837c07d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 23 09:20:49 2005 +0000
Add missing saver, evie, video, trap proto pkg-config checks. (Georgi
Georgiev)
commit 27afac2ce6a77bc68669c1af6a61c589aa9ef384
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 23 08:59:30 2005 +0000
Fix test for Xnest presence. (Donnie Berkholz)
commit fed61462be281c568df6407f94ea519748f0b720
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 23 08:58:40 2005 +0000
Fix up warning on debugging.
commit e848eb289c9251742a88e76017603952394f4262
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 23 01:14:35 2005 +0000
Rename app-defaults entries from xf86cfg to xorgcfg to match name passed to
XtAppInitialize. (Henry Zhao, Sun Microsystems) Also, display vendor
version instead of 4.0 for server version.
commit 6076fca82528da8d50b0ed6be8da6f811321474d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 23 00:32:27 2005 +0000
User message cleanups/updates for modern configurations.
commit b07602014061cb41540f6a7e74e4132e67aa1117
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 22 21:47:59 2005 +0000
If MAKE_XKM_OUTPUT_DIR is defined, call trans_mkdir to create directory if
it doesn't already exist. (ported from Solaris Xsun bug #5039004)
When BuildLikeSun is set, define MAKE_XKM_OUTPUT_DIR and set the xkb output
directory to /var/run/xkb.
commit 4a19a33db6d04b5835830a665daa679ee2fcafe7
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 22 21:29:18 2005 +0000
bugzilla #2880 (https://bugs.freedesktop.org/show_bug.cgi?id=2880)
attachment #2987 (https://bugs.freedesktop.org/attachment.cgi?id=2987)
Use system method to access PCI config space for inb and inw in
addition to inl (Olivier Baudron and Kevin Martin).
commit 5557a40a022b0ede36edd3370a60f5fc3d147796
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 22 19:52:26 2005 +0000
Fix linking errors for xprint.
commit 7693f668efd206a6c259166665bc36d3c6335e8d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Aug 22 12:05:18 2005 +0000
programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c
programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c
programs/Xserver/hw/xfree86/os-support/linux/Imakefile Add basic ACPI Linux
support so that events can be passed to the driver. (Alan Hourihane)
commit 02c834f198eab4c4686d8156b88508fe102099c1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 22 09:15:31 2005 +0000
Include Xv and XvMC headers in the SDK.
commit 3c4d605c7e8a9f6d296086a5b03b4f11b90590db
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 22 09:15:20 2005 +0000
Fix linkage for Xnest, Xvfb, Xdmx and Xorg DDXes; include all libs.
commit 79be1f6d4d1ab48841d31d5553dd36b1b3632650
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 19:29:55 2005 +0000
Fix inclusion order of dix-config.h, so _XSERVER64 gets defined before X.h
or Xdefs.h get included. (Jürg Billeter)
commit 8d6e743bc4e6854ee0bb0fa4f197acd6d7683ccd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 19:23:17 2005 +0000
Add _XSERVER64 definition to config headers.
commit 588105173840355717d7b2f7f652289a41166c3f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 19:15:11 2005 +0000
Huge cleanup. Group into sections: hardware feature detection, extension
detection/configuration, DDX options. Make building of Xorg DDX fully
optional. Clarify and correct some help texts. Change all comments to
use dnl instead of #. Quote all tests correctly, and guard
pure-variable tests with 'x' (e.g. test $DMX = yes -> test "x$DMX" =
xyes). Since the DDXes seem to have pretty divergent extension support
these days, get rid of EXTENSION_LIBS, DMX_EXTENSIONS and
XPRINT_EXTENSIONS, and go back to building extension lists by hand in
the DDX-specific sections. Use portable POSIX constructs everywhere
(e.g. test foo && test bar, instead of test foo -a bar).
Clean up old cruft.
Set _XSERVER64 on 64-bit architectures, and use x86_64 for host_cpu instead
of amd64 (Jürg Billeter).
commit 367f45073953f8f99a2d9dd054f479e1070f856e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 08:43:46 2005 +0000
Change xorg_bus_sbus to xorg_bus_sparc; build sparcPci.c on all SPARCs.
commit 71b3fea94e8845f35e47503636ca1fe78d2d48ca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 08:24:52 2005 +0000
Typo fix (SOURCE -> SOURCES).
commit db2909ce76b178663de301c09fb97f2936b1997e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 06:56:19 2005 +0000
Add test for SPARC. Build SparcMulDiv.S on all SPARCs.
Make the default font path configurable.
commit d96e6666862553d59fc1f9fdd14fb65f36d589af
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Aug 20 18:52:07 2005 +0000
Add sparcPci.c to EXTRA_DIST.
commit a402c876a465904ac71ebf39af67ea451b2457dc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 20 18:11:17 2005 +0000
Make DRI/GLcore builds srcdir != builddir safe, and invoke symlink-mesa.sh
in our builddir, not our srcdir.
commit 238d45d2f148e1e0af4b1619cc1d5e8cc4bf9661
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 20 18:10:03 2005 +0000
Make Xprint build optional.
commit abab3fd628c2d1096e8534192f33c1068a573c12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 20 18:09:21 2005 +0000
Make Xext linkage srcdir != builddir safe.
commit bb1d99ee72cc560e95010ea1008d5e796177ae62
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 20 18:07:59 2005 +0000
Build libxkbstubs.la to stub XKB DDX functions (e.g. VT switches), and
build libxorggxkb.la from within the Xorg DDX to replace the previous
xf86VT.o, et al, hacks.
commit 8a32ed46480d78b69f289c90098f5ed4a830851f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:48:18 2005 +0000
Really hopefully the last xorg-commit test.
commit 2fd951434507d2a2c0266a052bdca6e223d31bfa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:45:55 2005 +0000
Another test commit for xorg-commit.
commit 39630b301f769118959b20d962404555714a5812
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:25:19 2005 +0000
Testing xorg-commit, nothing else.
commit b13d3382de0027e897532926983b79caaa1eb655
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:21:54 2005 +0000
Fix dates on Søren's entries.
commit 8ec79e05feacd61562b53ebf36a8b30967affc1e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:15:51 2005 +0000
Make symlink-mesa.sh call srcdir != objdir safe. Remove requirement for
XF86Rush protocol headers, which we don't even use.
commit 057a8709a116feb0fd0004141bbac20d2766f3db
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Aug 19 00:13:46 2005 +0000
More updates for Panoramix -> Xinerama rename
commit bed3235d222fd6e2207f6c0d551c67d5a53322cd
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 18 21:28:09 2005 +0000
Thu Aug 18 17:27:09 2005 Søren Sandmann <sandmann@redhat.com>
Move fbmmx to a convenience library since the mmx flags may be harmful when
applied to non-mmx code.
commit a0366ddb8cb1c57b85a5806eb348abc19c7f92d6
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 18 17:14:11 2005 +0000
Replace gnu-makeism with portable rules
commit ea5c49cb17ac956d6dea6bf563e392e61c39da2b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 18 01:40:33 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2331
<https://bugs.freedesktop.org/attachment.cgi?id=2331> Lines ending in
<backslash><space> break with cpp from gcc >= 3.3 (Peter Breitenlohner)
commit 22694500e0dd8752b4c01e340f587ecba1ff7fb7
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 17 23:20:27 2005 +0000
Add xf86Sbus.h to EXTRA_DIST files (bugzilla #4128)
commit df938987d6c19fbdfff8d3334bb497f4814ae384
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 17 19:03:18 2005 +0000
Add buildsystem for Xprint, and:
Wed Aug 17 14:50:58 2005 Soren Sandmann <sandmann@redhat.com>
Include <X11/extensions/Print{,str}.h> instead of "Print{,str}.h"
Include <X11/fonts/fontstruct.h> isntead of "fonts/fontstruct.h"
Wed Aug 17 14:54:49 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally compile in xprint.c
Add Xprint
commit f2f6820c3f01810a4da5a8bb4e43119ef2a3fcb6
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 17 17:20:13 2005 +0000
Wed Aug 17 13:13:00 2005 Søren Sandmann <sandmann@redhat.com>
Make asm labels local. Bug 4073, patch from Diego Pettenò.
commit ad7f2fc67376f4fbfe81047273de12f7926f0b17
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Aug 16 16:21:09 2005 +0000
symlink.sh: Temporarily disable xkbdata, add type1mod.c
Tue Aug 16 12:09:09 2005 Søren Sandmann <sandmann@redhat.com>
Add ft and type1 modules.
commit 24597a1ee2c567ec6bc2f2208457f2778937a034
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 16 00:40:25 2005 +0000
2005-08-15 Alan Coopersmith <alan.coopersmith@sun.co>m
Convert sunPostKbdEvent to use xf86ProcessAction like xf86PostKbdEvent.
commit b86282b764387ef8315fc4045d4e1ca1bb74fee1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 15 23:48:35 2005 +0000
Set ZAxisMapping default to "4 5 6 7".
commit a6c8d0d71eef7cb964797f7595be36ee0ac10a1a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 15 19:42:48 2005 +0000
Mon Aug 15 15:41:26 2005 Søren Sandmann <sandmann@redhat.com>
Link this module with libXext.la.
Mon Aug 15 14:56:57 2005 Søren Sandmann <sandmann@redhat.com>
Remove the xkb* files.
Add xkbVT.o and friends as the last things on the link line so they will
override the symbols in libxkb.a. Add a comment on how this situation
might not be considered ideal.
commit 46aede552aa43cd59f81980303826b5c3d889c02
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 15 18:59:16 2005 +0000
Mon Aug 15 14:56:57 2005 Søren Sandmann <sandmann@redhat.com>
Remove the xkb* files.
Add xkbVT.o and friends as the last things on the link line so they will
override the symbols in libxkb.a. Add a comment on how this situation
might not be considered ideal.
commit bcc95c83406a4498227ffd8384bc272fd8cdc49c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 15 18:32:08 2005 +0000
Add AC_SYS_LARGEFILE to match flags used in monolith
commit 809906a754a1289b7e88489241a2065aa0bf27a2
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Aug 15 08:24:45 2005 +0000
make mouse support work - note you need to change the evdev devices in the
source.. hacky...
commit fe5abff38e65c1a49886924efdf0242ab8048008
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Aug 15 07:30:05 2005 +0000
Egbert's 64bit fixes for mixed 32/64bit clients
commit ebedc8bbb54b9b4e1814bc2758216af2bab93540
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Aug 14 19:46:55 2005 +0000
- Fix the exa pixmap offset/pitch alignment to deal with non-POT alignment
requirements. MGA, notably, uses a multiple of 3 in some cases.
- Rename the pixmap offset/pitch alignment fields to more clearly state
their meaning.
commit e3509c940fa1fc3988d23f884ca8bffc87d091e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 14 16:24:30 2005 +0000
Don't link libXext, as it is linked in to the server also.
commit 05071ae0fb847c211b1f20770d3b57fc2172738c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 13 07:41:33 2005 +0000
Don't link in libx86emu.a as this a) fails badly on non-x86 systems, and b)
is done via x86emu.c including all the source files anyway.
commit 1ffe9ceb2f6a7261fb62c90dfea861f9dadd27ce
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 13 06:15:35 2005 +0000
Oops, forgot a file in earlier Solaris kbd commit
commit c29051f9d108fe49c23d9cf36fd08cc64c87262a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 13 00:11:28 2005 +0000
Add LintTarget()
Bugzilla #1068 <https://bugs.freedesktop.org/show_bug.cgi?id=1068> Port
Solaris keyboard code to work with kbd driver.
Also incorporated "audio bell" feature from Xsun keyboard DDX to play bell
tones via /dev/audio (specified via Option "BellDevice" "/dev/audio" in
keyboard device options).
commit 616a65c4cc528278168db1414776f3a867cd463e
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 12 18:50:33 2005 +0000
Fri Aug 12 14:49:24 2005 Søren Sandmann <sandmann@redhat.com>
Apply another patch from Billy Biggs to fix precision issues.
commit 1eed84f227311730ce1f9ffab190e95de967c7da
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 12 18:47:17 2005 +0000
Fri Aug 12 14:45:54 2005 Søren Sandmann <sandmann@redhat.com>
Fix up multiplications based on patch by Billy Biggs. Part of bug 3945.
commit 8bfffb96b552a3facb77ff9e81658e80becbf2f4
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 12 18:31:07 2005 +0000
Fri Aug 12 14:29:09 2005 Søren Sandmann <sandmann@redhat.com>
Apply patch from Billy Biggs that fixes rounding problems with division.
Part of bug 3945.
commit 812ed2e17bfe8e232313cf9ab78000a564cb6b3c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 12 17:43:38 2005 +0000
Fri Aug 12 10:45:01 2005 S%Gï¿¿%@ren Sandmann <sandmann@redhat.com>
Make this function compute the same results as the fbByteMul macro.
commit 370b111f4882a95248bcc4727438c95a065c174d
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Aug 12 16:30:57 2005 +0000
Use '$(DRMSRCDIR)/shared-core' instead of '$(DRMSRCDIR)/shared' for DRM
includes. This matches the way drivers are built in the Mesa tree and
fixes a build problem in the Savage driver.
Convert uses of __glPointParameterfvARB_size to
__glPointParameterfvEXT_size and uses of __glPointParameteriv_size to
__glPointParameterivNV_size. This eliminates the need to hand-edit
indirect_size.c after it is generated.
commit 5f5117729de3a8a4eb6e17dc0979e4b1c1ef9918
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Aug 12 01:17:58 2005 +0000
Fix segfault when "kbd" fails to load and "keyboard" driver is not
configured.
commit 13e16ee93a328a55494c2933143c66559fe7ba98
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 11 15:46:42 2005 +0000
Thu Aug 11 11:43:32 2005 Søren Sandmann <sandmann@redhat.com>
Make sure we don't crash on glyphs with NULL bits. Bug 659.
commit 3e471ddf1dbf58ed021d6f31bdaf438872f03ca8
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 11 14:36:29 2005 +0000
Add check for whether the platform is MMX capable and add the relevant
flags if so.
commit 130fffc0cdbfdc29f33f1ee97c09e744c19e243a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 20:22:57 2005 +0000
Wed Aug 10 16:17:38 2005 Søren Sandmann <sandmann@redhat.com>
Add back non-SSE implementations. Define USE_SSE if the CPU is amd64/x86-64
commit ef50bba5694ef276a239882fae3502638b4ec784
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 19:42:36 2005 +0000
Revert previous patch as it causes build failures
commit b99360e264c9531593ce8eb67bd006275ca5e5a0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 19:15:44 2005 +0000
Add XF86DDXACTIONS to AM_CFLAGS
commit 73a335a926e50afde36816ab47dae689202df319
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Tue Aug 9 16:51:05 2005 +0000
Point xegl at the DRI driver
commit 29d0ba9f06d90a1c7f619db87d681ca53fa1bf38
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Tue Aug 9 15:58:20 2005 +0000
Touchup xgl for modular tree
commit 435e2a09de7c9dd843b05f4a0484371a67940515
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 9 01:18:04 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=3950> Xorg prints version numbers in
wrong format for modules compiled for Xorg 6.99 & later (Adam Jackson &
Alan Coopersmith)
commit 5849c69db80b2320bddb7fafb519300cc0435c84
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 8 18:02:08 2005 +0000
Mon Aug 8 13:39:45 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally include xorg-config.h
commit 5e6e5e6d8c6add3aac5c3aebc984d3afb842edc1
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 8 17:38:37 2005 +0000
Mon Aug 8 13:36:23 2005 Søren Sandmann <sandmann@redhat.com>
#undef PIXPRIV here.
commit a11ce76b0625501a202fa34e18777b7bd42b2713
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 06:25:21 2005 +0000
Build with modular X.org libraries and headers.
composite/compwindow.c Don't damage unmoved windows. Let border clip reset
leave damage alone, pending actual damage for painting.
commit 129e812c339879b68bb162331ac9b7e0f86a7474
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 02:30:31 2005 +0000
Re-add _XOPEN_SOURCE as it's needed *sometimes*. Place it in #ifndef to
avoid whinging.
commit 4dfc3357a78a52ef70750608138dfeef0371cbc4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 00:38:41 2005 +0000
Add autogenerated source files and other various non-CVS material to
.cvsignore files
Use XORG_CFLAGS. Ensure that all exa files are in SOURCES
remove _XOPEN_SOURCE as it's always in xtrans.pc these days and gcc whines
libdamage.la needs libcw.la when COMPOSITE is defined, but that
libdamage.la must be after libcomposite.la, so add libcw.la to
DAMAGE_LIB instead of EXTENSION_LIBS. Regularize library link order
across all X servers
commit 7d2b08aa4786eb4d181c88f7dc6b7eb059cc9dad
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Aug 7 20:42:50 2005 +0000
Invert the sense of the composite configure flag to match reality.
commit fcaa6f30c489578589af19ef798ab31150e696a2
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Aug 7 19:02:32 2005 +0000
Bug #3989: Fix Composite builds, enable Composite build by default. (Olli
Helenius)
commit 3639fb243450ae447e9901de9f909e975a919514
Author: Chris Lee <clee@c133.org>
Date: Sat Aug 6 23:56:18 2005 +0000
Enabling EXA by default in the modular build.
commit a16357ebc9344fbf3e393da9e7b28164ad5b9dc8
Author: Chris Lee <clee@c133.org>
Date: Sat Aug 6 23:46:38 2005 +0000
Last bits of changes to make exa build properly in the modular server.
commit cc67bd187f06bfade0d2fe1b4cca92805458b210
Author: Chris Lee <clee@c133.org>
Date: Sat Aug 6 23:34:09 2005 +0000
EXA support in the modular build.
commit 33326f4ee884aa677e4568c3eaed4311a8ed0f2a
Author: Chris Lee <clee@c133.org>
Date: Sat Aug 6 23:27:33 2005 +0000
Adding exa support to the modular server.
commit b90a88e80310e5650e2abed4c151889d9c0bd316
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 6 19:48:12 2005 +0000
Add checks for functions used in os/access.c & os/connection.c:
getdtablesize(), getifaddrs(), getpeereid(), getpeerucred()
commit 2304c14fe5d3796c557a86d0ece1f0fb92591469
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 6 19:14:24 2005 +0000
Fix endian test to work on big-endian platforms correctly
commit fc29d014aa586229cdc976aa1bfe38bd949f7cde
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 6 16:29:20 2005 +0000
Merge in patch release RC handling code from 6.8.2 (Kevin Martin)
commit 9828a38ed695fed9788ace8bba575e521fa354b7
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 6 03:14:50 2005 +0000
Solaris build fixes needed for modular builds
commit f51047c0b6749ae8f04925eb62706b4743328383
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Aug 5 15:43:31 2005 +0000
Fix 32-bit vs. 64-bit test for Solaris
commit 4220a0c4ccd0672460d31db239829384aee69f9a
Author: Matthew Allum <breakfast@10.am>
Date: Fri Aug 5 09:08:32 2005 +0000
Make Xephyr work without shadow fb
commit fedbce2186bbe3bd8d23a4d74c35f10286930a7d
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Aug 5 00:13:31 2005 +0000
EXTRA_DIST hacks to get all the OS support files into the tarball.
commit 39a80312e0c6e9f3b260d2f8279c71aef0a60d12
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Aug 4 22:31:20 2005 +0000
- Bug #3960: Add remaining GLX and pci.ids stuff to DIST (Cha Young-Ho,
Olli Helenius)
- Fix some distcheck problems for non-solaris systems
- Change server version number from the Xorg rev to an independent one
- _POSIX_SOURCE and _XOPEN_SOURCE defined to the right values
commit ed4d77a16a226a7bc88d0d4f5c595d16cdf46360
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 4 21:05:12 2005 +0000
Thu Aug 4 16:08:00 2005 Søren Sandmann <sandmann@redhat.com>
Make the fbCompose paths use the existing inline functions instead of
macros. Various other cleanups.
Remove macro definitions, move typedef to fbmmx.c
commit e62be6d2721e7f43c7bba6b8da4e5ec8c364697d
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Aug 4 18:45:46 2005 +0000
- Check for vsnprintf
- Don't build the Xorg DDX on darwin
- Workaround for gcc defining __ppc__ but not __powerpc__
commit 13bec87f45509452c643e20745e12878584d606a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 4 02:39:56 2005 +0000
Fix inline assembly versions of in*/out* for Sun compilers Add check for
ancient USL console code on Solaris to allow building on old Solaris
x86 versions
commit 9802106864a6b2c24df8e9fcb3c3471033abd5c6
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Aug 3 01:41:34 2005 +0000
dist fixes for cw and GL (Donnie Berkholz, me)
commit d7c246f35b1ba7ecbbc086dd1229b298faddec96
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 2 23:57:52 2005 +0000
Only build ix86Pci.c on x86 & amd64 platforms Set DEFAULT_INT10 to x86emu
on everything but Linux/x86 Fix Sbus.c inclusion on sparc platforms
commit 3d0d95004c65cd3a29c94fec99e13ab7fdc19c7c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 2 20:47:47 2005 +0000
Add check for walkcontext() to enable stack trace dumper on Solaris
commit bb5258a21d9efbb7d8b4226a44bd5738eb46d32a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 17:57:36 2005 +0000
Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are
regenerated after 'make clean' and to make parallel builds work right.
commit 0c608a690e85064345d7ebdf6b03e2f3bd861708
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 06:48:20 2005 +0000
Note yacc and lex generated files as BUILT_SOURCES so they are created
before anything is compiled; required for parallel builds
commit d31de217e6e9bfb0e1cc99141d80def9382de9a9
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 2 03:36:09 2005 +0000
distcheck fixes
commit c83772fef7ea0379db9bab1120f064b80b74f377
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 2 01:50:48 2005 +0000
Set OSNAME for "Build Operating System" line in Xorg log
commit 005a9cf1f5fe688f303b954870afd35635fc33bf
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 2 01:03:25 2005 +0000
Fix Solaris assembly source to work with libtool
commit 48b130285ad1309a1ff5b2148b3bae5f5b642488
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 2 00:47:08 2005 +0000
Move AM_CONDITIONAL for ia64 to global scope
commit 03379474e0fd9c21ac058e2319618934359b3262
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 2 00:45:30 2005 +0000
only do the AS_HELP_STRING workaround once, d'oh
commit 2d7b1893befb84850f3221cbe70b3bce4e621d63
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 2 00:41:07 2005 +0000
- Workaround for AS_HELP_STRING compatibility with older autoconf.
- New intermediate build target for Xorg server
- ia64 fixes
commit 7c84189ea1dc236bc979bb4bf158ecb1a6b45137
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 1 22:22:16 2005 +0000
Bugzilla #3566 <https://bugs.freedesktop.org/show_bug.cgi?id=3566> Patch
#2906 <https://bugs.freedesktop.org/attachment.cgi?id=2906> Fix for
RENDER, repeating pictures and offscreen memory (Owen Taylor)
commit 2acd29c93fd3b3d438887f0ca9be6713db81c1e8
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Aug 1 22:13:20 2005 +0000
Bump autoconf dependency to 2.57 from 2.53. Add 2.57 compatibility hack for
the new AS_HELP_STRING syntax from 2.58+.
commit b7a43fa0f112d92cce71642142e07276da4de681
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Aug 1 19:00:21 2005 +0000
Bug #3739: Fail soft on unknown extension string.
commit 0285804811bd24ad7de8894f8188b87e821e54cc
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Aug 1 18:41:54 2005 +0000
GLX fix for loadable servers: indirect_size.c goes in libglx, not libGLcore
commit 78d51253e229bcb428039911d80a5d89d4bf4491
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 1 16:07:14 2005 +0000
Fri Jul 29 17:20:53 2005 Søren Sandmann <sandmann@redhat.com>
Fix rounding bug.
commit fd84b3b56280ef88a8c848c4338f0bea906ce6d8
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 30 18:56:32 2005 +0000
Clear compiler warnings. (Stefan Dirsch)
commit 9e9f9cb4878d597b3fa6de7732d2866e24c32f54
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Jul 29 21:55:57 2005 +0000
Need to define SVR4 on SVR4-ish systems since many headers and source files
check for it, expecting Imake to have defined it already. (Should be
replaced with more specific checks & defines, but there's too many to
get them all right now.)
commit 14ade55b83aa72240a555b3b9def9f40a6a38cd9
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:58 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 2654f88cee86fae9db169dc8668492857fbbad98
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 18:40:54 2005 +0000
Fix code to handle printing 7.0 release candidates properly.
commit d5d669b04ecbd91bb2db9ddc6238acabbeaabbe0
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 28 23:33:57 2005 +0000
If neither --enable-dmx or --disable-dmx are specified, default to "yes" on
Linux, "no" on everything else (matches defaults in monolith Imake)
commit 86529c07d6ff69ef936ee370be07b373e2961360
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 28 23:28:34 2005 +0000
Fix distcheck for server
commit 3e4bf8a8f46e14078c64c56ad303c80cd9d8d5be
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 28 02:38:23 2005 +0000
Rework wrapping of common mouse driver to not require mousePriv.h, so that
modular tree xserver can be built on Solaris. Wrap more ioctls in
SYSCALL() to restart on signals.
commit cfd6c74067de7fdb2aeddee6780c29231a56acdc
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 27 17:50:13 2005 +0000
Add dbestruct.h to sdk_HEADERS
commit 5ced854186b851ba2c9ac84eb6d7f141fdee487b
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 27 17:35:25 2005 +0000
Add miwideline.h mistruct.h mifpoly.h to sdk_HEADERS
commit 7bd6b0640e69552ed4c9daac26e41410dd7338b4
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 27 08:16:35 2005 +0000
Add #include <dmx-config.h> for building dmx/glxProxy in the modular tree.
commit b9ccd89918e1c79d6013fe563c7fa933c1274837
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 27 08:11:26 2005 +0000
Fix dmx/glxProxy build
commit 8f6664fcff319ee155e7864ce25fa11c1fa5594b
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 23:40:45 2005 +0000
Add these files to the sdk:
cbf32.h cfb16.h cfbmap.h cfbunmap.h cfbunmap.h cfbmskbits.h xf86sbusBus.h
mifillarch.h mispans.h
commit 3cbb55f309b8eaba246d1d948b59883f9ed28bf4
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 22:17:27 2005 +0000
Install xorgVersion.h
commit df5d47560c19b01f2998806c4b62f459a6b5fc02
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 18:56:45 2005 +0000
xserver/xorg/fb/Makefile.am: install fboverlay.h
commit b25e6f82a1189a67208a2a4980d732ab77e64a35
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 18:21:22 2005 +0000
fb/Makefile.am: add fbpseudocolor.h to sdk_HEADERS
hw/xfree86/xaa/Makefile.am: add xaaWrapper.h to sdk_HEADERS
commit e7502158d6922a149d0aaf1de209f0b58fa444bf
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Jul 24 16:24:17 2005 +0000
Add xf86DeallocateGARTMemory stub so that Xorg can be built on Solaris
again.
commit 7c1148c0fbc00716bb7ec621a1b968b4127cbb00
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 19:32:57 2005 +0000
Fire the Mesa symlink script from the configure stage.
commit f331a325447449982efba8adc5bc079371dfb77a
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 19:29:58 2005 +0000
Add the symlink script for the Mesa source.
commit a5532e456d763718036e84891ff57c6f7417615a
Author: Stuart R. Anderson <anderson@netsweng.com>
Date: Sat Jul 23 18:16:06 2005 +0000
Change the default depth back to 8 like it was originally. Disable the
addition of depth 12 & 30. It causes more than MAXFORMATS depths to be
added to the screen which causes an array in the Screen structure to
overflow and crash on server reset.
commit d8a1241a24d75c258548875350bff4d0acc795ab
Author: Stuart R. Anderson <anderson@netsweng.com>
Date: Sat Jul 23 17:49:45 2005 +0000
Add a safety check to catch when numDepths GCperDepthexceeps MAXFORMATS
commit 93d29b4554d26b22ca43311264f85ea8e14804c2
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 02:04:39 2005 +0000
Emit makefiles for glapi, slang, and grammar. Conditionally define GLX_LIBS
if GLX support is requested. Add GLX_LIBS to the link deps for Xvfb and
Xnest. All GLX support should work now for the vfb, xnest, and xfree86
DDXes.
commit 525d663ec5a8a181a1e36f3787b24cdb77290c17
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 02:02:18 2005 +0000
glapi build (forgot this one somehow)
commit 6aaceef3231818682dccf1969b211f1dc798da1f
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 02:00:52 2005 +0000
Fix the build system to reflect the rest of the Mesa core. Almost links,
needs a code fix to Mesa though.
commit d7e2cadb13ef0e77d864c8282489f544b0e1dede
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jul 21 02:29:05 2005 +0000
GLX needs gl.h from Mesa too
commit bf32f4739c6ef7f41cde6cc409d42e00462402fb
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Jul 19 20:51:46 2005 +0000
programs/Xserver/hw/xfree86/os-support/shared/agp_noop.c
programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
//bugs.freedesktop.org/show_bug.cgi?id=3164> Add xf86DeallocateGARTMemory()
function call (Austin Yuan)
commit 931abdba8410bf1188d69d54c57543a21ea36968
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jul 19 02:50:00 2005 +0000
Change #include "X.h" to <X11/X.h>
commit 4f2e731aba0c5694abb65a877395cc5f9869c556
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 17 07:34:31 2005 +0000
objdir != srcdir fixes.
commit a6bd7ad985e138874bb0e1f33f545651dfde32a9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Jul 17 01:52:33 2005 +0000
Set GLX automake conditional after we've tested for mesa source and set GLX
to "no" if it's --with-mesa-source wasn't set.
commit ead37b08699f665a856c7ba29578c27c27db4100
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 20:52:25 2005 +0000
Mark variables modified in signal handlers as volatile (part of Sun bug id
4496504)
commit bbb49449cbc0815fd9c4faf9b6ee32be99a8aa3d
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 16:30:40 2005 +0000
Fix --with-mesa-source parsing, and turn GLX off if no path to Mesa given.
commit d69e9872ae91c9c17a33e1ed763f98453d950b39
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 16:29:30 2005 +0000
Typo fix, and re-add GLcore to the dixmods build
commit 8bc883c48c8f99502707998a8257c0563cae7d3a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 09:00:44 2005 +0000
Update build instructions. Add details about how the expat, fontconfig,
libpng, freetype, and xterm builds are now handled.
Update text docs from SGML masters.
commit 8e600b87643f7f4e19923dd6a0f2eec83303363a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 07:39:48 2005 +0000
Only pass -rdynamic when using gcc
commit 4f04e26c69747929243f176feaa90f3042481f53
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 04:30:33 2005 +0000
Say --with-mesa-source to get GLcore built.
commit 4913316f25e76381844cf15aa64eff620c2807a1
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 04:29:28 2005 +0000
Switch to MESA_SOURCE which we're already AC_SUBSTing
commit 7facb209a705ca406b05272c233ea0cfd6a5b266
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 04:24:21 2005 +0000
Hook in the GLcore build
commit 2f9a7c6ee1012b2c7664c53f405affaf82bd0953
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 04:13:33 2005 +0000
Hey look, GLcore links
commit 5f81eb1d89f623dd9281e686a4d4d4f403e459c6
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 16 03:49:59 2005 +0000
Fix the *-config.h includes so that it is possible to build modules without
having to use -include in the Makefile.
commit 0635acab08bade9bfd9d2abd3ea5a3fe525bc647
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 16 03:46:01 2005 +0000
Add record module building support Change module building to not use
-include Fix xnest, dmx and vfb builds to -DXFree86Server for fbcmap
compilation
commit 92b23ff426936909e1ff5e063b75e5f112b93ca1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 01:17:52 2005 +0000
Update to match recent changes to pci.ids & extrapci.ids for people
building on systems without perl.
commit 6ce3743948a7151c721194594091a7e1183e2f32
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 00:51:14 2005 +0000
start the GLcore build system
commit 2f0487521da3da6784dd964c915071b82d749108
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 15 23:08:31 2005 +0000
Fix the *-config.h includes for the files that have moved in the modular
tree.
commit a407fa373bb72f29050e3f027042011075b3bdf0
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 15 22:51:05 2005 +0000
Move drm up to os-support since the files are shared by multiple platforms.
Fix the dri and drm build. Fix server-side DMX extension build. Make
xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef
_HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers.
commit eb6fa0dc15516a0a436090efc6d85f22baeec015
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jul 15 22:14:28 2005 +0000
Enable GLX build by default
commit 0e352a8b2b4c78c291074b9531ed7afa7a20ac17
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jul 15 21:59:39 2005 +0000
disable GLcore momentarily until a build system exists. --enable-glx should
work now.
commit 4bf453086418e93e81b24d3d2a0f49a9357acff3
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 15 05:48:29 2005 +0000
Fix keyboard state when XEVIE is not enabled (Keith Packard).
commit 562acf2e69dcf08f8db8f8eeaa162949d45f70b2
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 14 23:41:15 2005 +0000
Add -I$(top_builddir)/hw/xfree86/dixmods/extmod to Xext/Makefile.am Patch
from Stefan Dirsch
commit defeb56fc9559661fa632935a4c76c500c7edcf4
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 14 22:20:16 2005 +0000
Fix the build when DRI is enabled
commit 6b546d0ec07e493b501e82300b3e6c143cd4d0ac
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 14 03:36:44 2005 +0000
Add #include <xnest-config.h> to the Xnest source files for modularization.
commit 7375f4d13626bbba4204e2f08f41c212b2eed992
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 14 03:32:09 2005 +0000
Add support for Xnest
commit c582560c62fd8181b7521e470f118a59c418a95f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 14 02:59:34 2005 +0000
Add partial in*/out* assembly support for Sun compilers on x86
commit 64bf3a81a3212dc2c0f55aebdc74a618ca6a32c0
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jul 14 02:53:31 2005 +0000
loadable extmod build system.
commit 6c96e0c9e4b3f1e8dfa5dcf7366bb838dc0724ec
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jul 14 01:36:58 2005 +0000
loader support for extmod
commit 8ea4a1b759eae0279ce619c663f2cd2f6dee8d71
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 14 01:00:39 2005 +0000
First pass at Solaris os-support
commit f07e905553783dc0133015bcbf94d3b6be68b19c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 14 00:28:47 2005 +0000
- Add build system for xf86-video-ati
- Add build system for xserver/xorg/hw/xfree86/dri
- Add glcore.h to symlink.sh
- Symlink.sh: add some more DRI files, symlink glcore.h from
extras/Mesa/include/GL/internal to proto/GL
- proto/GL/Makefile.am: install glcore.h
- xf86-video-ark: s/module-dir/xorg-module-dir/
commit 939b7720f17ec5ac5edcc6cfe70453160ecb0161
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 14 00:02:05 2005 +0000
Merge SVR4/pre-Solaris 8 and Solaris 8+ sections for greater consistency,
easier maintenance, and to fix some missing headers when building the
modular Xorg on Solaris.
commit 23d25a656d7fdbafa1c78be2950fb405f0a1b87b
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 23:41:21 2005 +0000
Remove references to DDX-specific extensions
commit f4626bb72b9955846abee018ae31c1aeb51b8dbf
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 22:59:39 2005 +0000
dlloader is the default in 6.9, but the loader doesn't get told to prefer
dlloader modules unless you -DDLOPEN_HACK.
commit 4f38526566dbcc296d124bb852adfa30ac4d927e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Jul 13 22:54:02 2005 +0000
- Use fbdevhwstub.c if <linux/fb.h> is not found
- Use x86emu on Solaris instead of vm86
- Better per-OS control over which xf86Kbd*.c and *Pci.c files to build
- Set various #defines to be defined or not on Solaris as needed
commit db8aa17f15f62f243400b0267bf281dd27738644
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 22:19:36 2005 +0000
updated comment for libbitmap
commit 4f9e76ed6a61b414ffc94550727a138c3f73996f
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 22:09:52 2005 +0000
Dear libtool: Loadable modules do not need version numbers. kthnxbye.
commit 40ad7321f5d8d216523d575c4414736d8cfe9e88
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 21:52:51 2005 +0000
Generate useful loadable modules by actually linking in the blobs from the
DIX
commit 0e08818d3951c324e5953bd23a8a9457b3fec78f
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 21:41:02 2005 +0000
Hook dbe into the build
commit 2d4ddb5606b7328c591a7bffafbb49bdaf2adcf9
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 21:36:27 2005 +0000
double-buffering extension
commit c2ec9fbb15c776b9c64451cf32927b1b8d1c560c
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 13 21:17:53 2005 +0000
Only build Xi/stubs.c on DDXs that don't support the Xinput extension
commit 74a534f63c1ed016f24dbc3ca31f05b81076e8f0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 20:19:38 2005 +0000
xc/programs/Xserver/hw/xfree86/drivers/i2c/*.c: include xorg-config.h
instead of config.h xserver/xorg/hw/xfree86/i2c/Makefile.am: Add i2c
drivers
commit 1dc3e96e4077a912dd3aa13fa80099f5864b641f
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Jul 13 16:30:53 2005 +0000
Fix compilation where uint is not defined.
commit 19e20c1470c1f8d15f2a78fb29545bde06a65516
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jul 13 08:58:37 2005 +0000
don't clobber %ebx in the assembler.
commit bfb10bd2dcca65ba5d346c9d7da594a81c35c101
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jul 13 07:28:17 2005 +0000
Fix potential buffer overflow and a smaller bug in the convolution filter
commit 778a2703b233641e298fa81ef9c477943c496305
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jul 13 07:12:33 2005 +0000
fix compilation
commit 66bc36473c238fdee7e6c1d31e6e5f6813a7541a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 12 23:36:27 2005 +0000
Use builddir, not srcdir, for built files.
commit d6808a48d2dffd72f618fa372fba993736638799
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jul 12 18:16:03 2005 +0000
Fix scanpci -v core dump when subsys vendor/device id's are NOVENDOR &
NODEVICE. Bug #3763 <https://bugs.freedesktop.org/show_bug.cgi?id=3763>
Patch #3074 <https://bugs.freedesktop.org/attachment.cgi?id=3074>
commit cda9c7b2678ea08ac6176a9eee72e6e511134b8e
Author: Lars Knoll <lars@trolltech.com>
Date: Tue Jul 12 14:50:10 2005 +0000
add x86emu.
commit 41002623f314444bd416fd5f445a0425c5b59df0
Author: Lars Knoll <lars@trolltech.com>
Date: Tue Jul 12 10:02:10 2005 +0000
Add MMX Code paths for the basic composition operations in
fbComposeGeneral.
commit 697cf74fb50a550b8f7e124dc8f463a55519795f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 12 03:09:20 2005 +0000
Make Xprt run when linked against Xlib for Xrm
commit 419448ea7b0d7f672e568cb1d8b4e190a1f54825
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 03:03:16 2005 +0000
Pull libdri out of the build for now until I get something better worked
out
commit f054bf2ff6b94e285e7f2d174163c01b07b07143
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 01:29:41 2005 +0000
build fix
commit 02427d4d04f70109a499578c6762654463ebdae4
Author: Kevin E Martin <kem@kem.org>
Date: Tue Jul 12 01:20:36 2005 +0000
Add support for building Xdmx and Xvfb
commit 3fe6b5bb30e8e1b9017a9cf818fcceb279a28e65
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 01:17:39 2005 +0000
GLX server support
commit 377e3bddd4d73154520a9582d75de2b20ae532a5
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 00:55:43 2005 +0000
Forgot to add these for some reason
commit e348ac4b4dfb1112c19fe5fe5441182e66716087
Author: Kevin E Martin <kem@kem.org>
Date: Tue Jul 12 00:52:48 2005 +0000
Prepare Xdmx and Xvfb for modularization by adding appropriate #include
<{dix,dmx}-config.h> to the source files.
commit b7a9a6a03560bdf6584c71bf0b546301bba9ab89
Author: Kevin E Martin <kem@kem.org>
Date: Mon Jul 11 17:52:00 2005 +0000
Remove unneeded xf86drm.h includes to fix modular build.
commit cf4dfd650dbc2bb65eae4eea2acfb4a4c5295548
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:29:50 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
commit c5548086f3864c828f0cad65d2708cefd2025947
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 00:42:52 2005 +0000
Start filling in glx build. Add xf86Version.h and a few DRI headers to the
sdk (needed for modular driver builds).
commit 955fe17133d841758a18072a9acabedc81dc4562
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jul 10 21:45:55 2005 +0000
add some convenience variables for the drivers
commit 78fab90230c61241af29f0c94f401ce0bc749b6b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 9 16:51:58 2005 +0000
Bug #3740 <https://bugs.freedesktop.org/show_bug.cgi?id=3740> Patch #3058
<https://bugs.freedesktop.org/attachment.cgi?id=3058>
08-Jul-2005 nv driver updates from Mark Vojkovich:
Change some console restore code for NV11. Hopefully, we can more reliably
restore the console for desktop systems using DVI. This may correct a
recent regression on NV11.
Also, new PCI IDs.
Add new nVidia PCI ids to match nv_driver.c changes.
commit 3c92389185f0c9fa3b8c299a084b10c12bcab52c
Author: Zack Rusin <zack@kde.org>
Date: Sat Jul 9 14:15:35 2005 +0000
Patch from Thomas Winischhofer to kick out all pixmaps to system ram upon a
VT switch and vice versa when returning.
commit 327741486e807c068383a771c04c9042b0589c37
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 9 02:22:29 2005 +0000
Don't try to link fb, shadow, or vgahw into the loadable Xorg server, as
they're only supposed to be loadable modules.
commit 2b8e4db9ac4b4c8f8fd73c00436d6abec2faa535
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jul 8 20:27:30 2005 +0000
-lXfont isn't enough for libbitmap, you need to get the -L from pkg-config
commit e84648df7d7eb700b7c2d35fdef0be1f463853fa
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 8 17:07:52 2005 +0000
mark drawable as dirty on copying/painting windows
commit 4ab73a73f4aa1f02cc8dada185b5dcbddfe43878
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 8 07:43:00 2005 +0000
heh, oops (thanks Thomas)
commit 0a28516a6e641b41e674f69fc228b0babbe1743b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 19:07:28 2005 +0000
More compiler warning fixes for missing prototypes:
Add prototype for XkbSetExtension()
Add #include <ctype.h> for isspace() & isdigit()
Add #include <grp.h> (for initgroups()) and remove extra *
Add prototype for xorgGetVersion()
commit 2c3c4060fd2a52f147eda01b11222c341c6e3dee
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 16:18:52 2005 +0000
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Add prototype
for XdmAuthenticationInit() (Peter Breitenlohner)
commit d0dc574adb79ffacf90b786d4ccfcd1cd8598728
Author: Zack Rusin <zack@kde.org>
Date: Thu Jul 7 15:05:02 2005 +0000
Check vtSema before accelerating primitives and sync in fallbacks only if
we got vtSema
commit 6cba5f1260c20b3bc072fdcc5f3e49fa28ba6414
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 14:59:48 2005 +0000
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2332
<https://bugs.freedesktop.org/attachment.cgi?id=2332> This patch avoids
79 gcc-3.4.3 warnings 'xxx' declared `static' but never defined mostly
due to including "ftfuncs.h" with the declaration of static functions
defined in "ftfuncs.c". (Peter Breitenlohner)
commit 7da3f4a786d9b61f4129c7dbbef80c84abbfde68
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 03:12:40 2005 +0000
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Fix warnings
about redefined macros (Peter Breitenlohner)
commit f86562540d1c945bfd96d4b89259d81e4ed25255
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 02:47:06 2005 +0000
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2325
<https://bugs.freedesktop.org/attachment.cgi?id=2325> Avoid 38
gcc-3.4.2 warnings: suggest parentheses around assignment used as truth
value suggest explicit braces to avoid ambiguous `else' suggest
parentheses around && within || suggest parentheses around arithmetic
in operand of ^ "/*" within comment (Peter Breitenlohner)
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2326
<https://bugs.freedesktop.org/attachment.cgi?id=2326> This patch
removes these 2 gcc-3.4.3 warnings: missing braces around initializer
implicit declaration of function `XpOidTrayMediumListHasTray' (Peter
Breitenlohner)
commit 4047191124c237518110e698bde6dab445644449
Author: Damien Ciabrini <braun@club-internet.fr>
Date: Wed Jul 6 15:34:22 2005 +0000
Added hardware support for transformation matrix (zoom, rotation, etc...).
Fixed the composition function for RGB and A8 format. Avoid syncing
hardware after HW fills or copies.
commit 4073f24c90d4aff3f7d83af4c0e733eed082b53b
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Jul 6 15:14:30 2005 +0000
add missing PictureTransformPoint3d call
commit c48f631cdb6a279ab1a24a486b05956cfa9ca3da
Author: Damien Ciabrini <braun@club-internet.fr>
Date: Wed Jul 6 13:57:41 2005 +0000
Fix offset alignment code in the offscreen memory allocator to prevent
textures from being allocated in the next free memory area.
commit baa99be190c51b533bf8748c6c6a9bce62594e96
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jul 6 07:16:19 2005 +0000
Put the correct value in the length field of the reply. Previously, the
number of tag/date pairs was specified. This was incorrect. The correct
value is the number of values (one for the tag and one for the value).
Xorg bug: #3210
commit 6ba4a2e78a73858648b5b6a39306446d519c3a75
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 23:01:51 2005 +0000
Add more defines for XWin DDX Make building of cfb*, afb and mfb
conditional Set FD_SETSIZE=256 on cygwin
commit 71ed3ae0c696152e82a98ce2ac0fa67ce6f23464
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 22:58:29 2005 +0000
wrap fInternalWM with XWIN_MULTIWINDOWEXTWM
commit 456844a613240ce56181f6f3ec7873be9b2dc85d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jul 5 18:42:32 2005 +0000
Remove Speedo font module documentation.
Remove Speedo from list of font directories
Update default font path to remove Speedo, add TTF.
commit 20c15003f9648de0c03f7d4fa4508afd896b19f5
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 18:25:44 2005 +0000
Fix crash on server shutdown
commit d72fef26d44e649f39a56730830148d48d77ee9e
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 17:52:35 2005 +0000
Fix simultanious presses of Left and Right Control and Shift keys.
https://bugs.freedesktop.org/show_bug.cgi?id=3677
commit 0f2c8221c938ce8eebd9f0e111a6b87223c18f9e
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 16:35:42 2005 +0000
Fix typo which broke window titles
commit 0bb2eb8eaaf4054fefbc45bf3cb47bbcf10b7cfd
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 15:43:20 2005 +0000
Fix problem with fake Control press on Alt-Gr
https://bugs.freedesktop.org/show_bug.cgi?id=3680
https://bugs.freedesktop.org/show_bug.cgi?id=3497
Fix static declaration of winGetBaseDir
commit 3af77ad3e754c4d419a1996ca73a9fd01f92388a
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 14:09:48 2005 +0000
External windowmanagers could connect in multiwindow mode which lead to
strange results with the internal windowmanager.
commit 426282268bcdd0e0ca973fa79b414e9065fbfd9d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 23:40:09 2005 +0000
Build miinitext.c and fbcmap.c as DDX specific files
Do not define _POSIX_SOURCE on cygwin.
commit 845a0ac68b02148db6f2cca81debf20b2331607b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 23:11:20 2005 +0000
Revert last changes. They have to be addressed in a different way
commit 048045a9e714fc85c26028c4de36dff47644b826
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 22:18:40 2005 +0000
Add XWin DDX, make Xorg DDX conditional Make XF86VidMode and XF86Misc
conditional
Add XWin DDX
Added DDXTIME, DDXOSFATALERROR, DDXOSVERRORF and DDXBEFORERESET
Added fbcmap.c
Added miinitext.c
Added -I$(top_srcdir)/Xext/extmod to INCLUDES
commit 508cdb5cb01a91b1bf3ef31da80b6b1d36286bf0
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 22:10:43 2005 +0000
Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11 includes
handling Warning fixes
commit 5e50ae22bf206d6c2cc05e772e05fa5a363acb81
Author: Zack Rusin <zack@kde.org>
Date: Mon Jul 4 18:55:53 2005 +0000
remove the temporary debugging output
commit 7586ac6edea64b30d6187f9ec4d867521c1e769c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 4 18:41:04 2005 +0000
Bug #2216: Multiseat support. From various Debian and Ubuntu patches by
Aivils Stoss, Andreas Schuldei, Branden Robinson, and Daniel Stone.
commit ba011dc77dcfaea2843481fbba45a76d8cb9aa83
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Jul 4 14:47:03 2005 +0000
don't be too smart and try to replace PictOpOver by PictOpSrc when we have
an external alpha map.
Make fbmmx.c compile on gcc 4.0.1.
commit a4df8ad75579d9c183f110d79d87cfb9aaf23acd
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Jul 4 14:23:59 2005 +0000
Fix handling of "super luminescent" colors Fix off by one error in the
transformation handling.
commit e34f31762e0454930f30547a9407cc8b941c70f2
Author: Zack Rusin <zack@kde.org>
Date: Mon Jul 4 14:15:57 2005 +0000
This fixes the close screen mess (crash reported by Thomas). Also hide the
private Exa screen definition. Properly cleanup on screen close and do
not delete the private screen in the DriverFini call.
commit 4ef813961dc8dea8924a79e0954d5b6da12e77c0
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 09:01:43 2005 +0000
provide the uint datatype on WIN32
commit 7dc547252af3b23652b1d496957645726c7125a4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Jul 4 00:16:23 2005 +0000
Fix builds on non-GLIBC systems (missing __GLIBC_PREREQ). Add Solaris stack
backtrace dumper.
commit d010de6979a6c51a628f2f8e6d7f479a542d1e8b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 15:51:23 2005 +0000
Abandon the nostdinc experiment.
commit b0d80e76d28dbc1ee14453950db000bb4d7f377f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 12:17:04 2005 +0000
Add missing include paths.
commit 461eb6ebd9273dc3dcd601ee0a0491981a98acd9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 12:16:29 2005 +0000
Change HAVE_CONFIG_H to HAVE_DIX_CONFIG_H.
commit c1e69798ad14fb706f5f6de67e3f53df56f524c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 12:15:16 2005 +0000
Add explicit PSZ defines, remove unnecessary dix-config.h include.
Add -DXF86PM, forgotten from last commit.
commit 4e501d35e260775a43f340b3e1a9aa092570aba4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 10:51:16 2005 +0000
Remove needless usage of DECkeysym.h.
commit a107f599518a175dd689417b48788a746303966a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 09:39:54 2005 +0000
Predicate usage of xf86OSPM functions on #ifdef XF86PM.
Remove needless include of ../input/mouse/mouse.h.
commit 0bb669638f032e61471007b2fa88285aa5d63903
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 08:53:54 2005 +0000
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
commit 401e4580d6dd9867a691045688680ce410f84cb5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:55:00 2005 +0000
Move misc.h and os.h from proto/X11 to xserver/xorg/include.
commit 46b64bd5c66abb1bb9f3538c887d10867607bfff
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:37:35 2005 +0000
Fix more include paths; add dix-config.h to XKB code.
commit e03198972ca78b03ad13cb49112c03a052bb763b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:02:09 2005 +0000
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
commit b8aef6c474ffc6d637bec178674898ea95ccde47
Author: Kevin E Martin <kem@kem.org>
Date: Sun Jul 3 03:28:27 2005 +0000
Fix build issues.
commit 826a6f029faeabaa783a93dfdccca846f9326b58
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 2 18:59:44 2005 +0000
Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere.
commit e58c09d31bdf90210e2ec1ef976cea0459cdc02a
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 2 18:06:05 2005 +0000
Bug #3687: Print backtraces on fatal signal on glibc systems.
commit e6602b041fe489d51a1d7fac55cbbb12b1826ba1
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 2 17:02:23 2005 +0000
Bug #3546: Use MAP_LENGTH instead of a magic number. (Mark McLoughlin) Bug
#3664: Further fixes to Xnest modifier state handling. (Mark
McLoughlin)
commit 9b1debcdb6c7df956c06350a6525afb8e6d691fa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 22:43:43 2005 +0000
Change all misc.h and os.h references to <X11/foo.h>.
commit 657b4cb8aa0076acae85997c4f0c353b4d86b632
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 22:32:34 2005 +0000
Change all misc.h and os.h references to <X11/foo.h>.
commit 303c281f956d55e35b05ef8521d0b60d24aa7a10
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 21:15:20 2005 +0000
Add auto-generated header files.
commit 9a6ec34d2545a23586f11ad51c81f41a940d73d0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 21:13:36 2005 +0000
Use canonical autogen.sh, which supports srcdir != objdir autogen.
commit 7ecc2d526c4ea5db2589644a2fec0daf71df36da
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 21:12:24 2005 +0000
Remove fbcmap.c hacks from the DIX.
commit 6251f9c00a866f64207d23b0a06306ead15298e8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 21:11:16 2005 +0000
Minor build system tweaks.
commit 641f32c4368db07831d9d703161a9d4699307621
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 20:54:30 2005 +0000
Adding initial build system.
commit 507d30546f56bfd172fc43857459c78c1026e97c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 20:54:01 2005 +0000
Adding initial build system.
commit a822df1cc16d150614dead70fd00750095a05c35
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 20:49:35 2005 +0000
Adding initial build system.
commit ded56b1a74e6b3e4c48054b7e142d924b19e6104
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 20:29:53 2005 +0000
Adding initial build system.
commit aabb868920658c9d3979dc194c6bd9702171f101
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 1 13:30:29 2005 +0000
removing all debugging output from the default build :)
commit 0fa9d1fb4886c418e3d8e0886ad815513eda0633
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 1 12:24:30 2005 +0000
Leave debugging output for only the interested parties.
commit 0df446ab8875430508ff51d3548955a215475084
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 1 10:39:21 2005 +0000
Missed this. Spotted by Thomas.
commit b5b2a0522efd61bd99b5d5d75cdd27960cd1c7e1
Author: Lars Knoll <lars@trolltech.com>
Date: Fri Jul 1 10:05:43 2005 +0000
Add support for gradients and solid fills to Render.
Changed the semantics of the Convolution filter a bit. It now doesn't try
to normalize the filter values but leaves this to the client. This
gives more reasonable behaviour in the limit where the filter
parameters sum up to 0.
commit 30c019e847adef6f7f3963df8ef1f3f994669a54
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 1 08:56:12 2005 +0000
Adding the new acceleration architecture: Exa. It's meant to replace XAA in
the coming months.
commit 276821605ee50e71f30dd52f2c12237fc61f288f
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Jul 1 03:14:54 2005 +0000
Fix return values in Xgl render texture implementation
commit 5e381441fff411316ea202a9f85aceb0e0dcf46b
Author: Alex Deucher <agd5f@yahoo.com>
Date: Fri Jul 1 02:56:04 2005 +0000
- Fix Support for Philips FM1236/F tuner on ATI AIW 9600 XT (Jeff Smith)
Bug 3401
commit c4d1b4e0424d53cd0470e0e3f57c10ee8fe3d8c2
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jun 30 21:33:46 2005 +0000
Added another test of checkForInput for WIN32 Windows keyboard and mouse
events are added to the input queue in Block- and WakupHandlers. There
is no device to check if input is ready.
commit 1230c55ac3f75f4902b51b223d40354a54d0d0ab
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jun 30 18:50:20 2005 +0000
Pass serverClient instead of NULL to ConfigureWindow. This should fix a
crash reported by Øyvind Harboe
commit 0929f79c1baa5b65808ab034591510906623e841
Author: Matthew Allum <breakfast@10.am>
Date: Thu Jun 30 13:39:00 2005 +0000
Another Xephyr focus/modifier fix
commit b6c7afe0b9faed7025c70334d464fd75ce5c84c4
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jun 29 15:19:14 2005 +0000
compile
commit d8a98454e305973dd7fec76db2ef80705cf7c298
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jun 29 11:57:16 2005 +0000
Add support for gradients and solid fills to Render.
Changed the semantics of the Convolution filter a bit. It now doesn't try
to normalize the filter values but leaves this to the client. This
gives more reasonable behaviour in the limit where the filter
parameters sum up to 0.
commit ce0e11aeac76119b96b463605bc1f5318e3d2bde
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jun 28 21:05:31 2005 +0000
Bug #2447: Fix argument order to xf86DrvMsgVerb. (Luc Verhaegen)
commit 5ef5aec9bb5ee85295c0913afca891572d1315a4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jun 28 02:04:54 2005 +0000
Update to latest snapshot (27-May-2005) from http://pciids.sf.net/
commit b262a18aad36b2de729f6d00d144ac7277687f19
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jun 26 02:48:36 2005 +0000
Cosmetic correctness fixes: miEmptyBox and miEmptyData are variables, and
miGlyphExtents is a function.
commit aa7fb99bc76e62036c73ff50f58337558859b814
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:28:48 2005 +0000
Bug #3030: Fix Xnest keyboard state handling. (Mark McLoughlin)
commit 8562f800b879ae461317da9640961f753e107250
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:16:54 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
commit 582a9f0d2ec01f1a3c5625e2f45a4599be7a11d5
Author: Zack Rusin <zack@kde.org>
Date: Sat Jun 25 12:39:58 2005 +0000
Correctly handle empty rects on region initialization.
commit 56201222067e793a3542bcdcd39bb257b4fad2a6
Author: Matthew Allum <breakfast@10.am>
Date: Thu Jun 23 16:50:07 2005 +0000
Fix issues with focus in and modifiers from host confusing Xephr
commit a668b6c11a2d6b4800407ad918481d90be87a732
Author: Matthew Allum <breakfast@10.am>
Date: Thu Jun 23 16:34:07 2005 +0000
redo tslib
commit 5e863851a61207ade1ac807bc8cff7d9cf02dbbe
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jun 19 01:30:29 2005 +0000
Build workaround. Add glcontextmodes.[ch] from Mesa.
commit 9743adbe94f29417818b90e18aebb96a72f332f0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jun 16 20:50:12 2005 +0000
Add Type1 subdirectory to lib/Xfonts, update build system accordingly.
commit 68e856ff5b1842ba10421714b5f6b21d528f6071
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jun 15 18:31:52 2005 +0000
DRM 20050615 import
commit 6e301a8e97e99d58eaed25453f66c6d73bafd460
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jun 15 18:31:52 2005 +0000
Initial revision
commit f0c76610b72a5b54bae5a5eb51ff4c420a27320e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 15 16:46:59 2005 +0000
Conditionalise another use of XEvIE.
commit 28ee3dd955302a1e99ffdc66cf0f512c6234d043
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 15 16:27:16 2005 +0000
Conditionalise building of XEvIE code with #ifdef XEVIE.
commit c6166ee74137084775c7550b708c5f71f16e7d3f
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jun 15 14:51:12 2005 +0000
Fix projective transformations in fbcompose.c Bugfix for convolution
filters
commit bd54b96034e640f202821eac0a2c40e66c1ddfd0
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Jun 15 05:50:15 2005 +0000
Shut up compiler
commit 7fa782dfd548498474830c7268032ffc5fb406a5
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Jun 13 21:51:46 2005 +0000
Add xkbfile to symlink.sh, conditionally include "config.h" in
xc/lib/xkbfile
commit 0802a2824c06d294ea42f0f6256644da5c0038c2
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jun 13 18:14:53 2005 +0000
Correct the CHIPSET lines for the 3dfx cards so the tdfx driver will
recognize them. I'm not sure if this file is supposed to be maintained
still, but I'd like to close FreeBSD ports/32121 which has been around
for far too long.
commit 2eab094816726542c4de6c9db5efa102ab1e1593
Author: David Reveman <c99drn@cs.umu.se>
Date: Mon Jun 13 16:38:06 2005 +0000
Build fixes
commit 49476ca73c86a599a1bc49cba1117d42f59996a8
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Jun 13 14:40:25 2005 +0000
add the convolution filter from xserver to xorg
commit f0ab6d57df66da5de1a8182f8250cc2c8e1450ad
Author: David Reveman <c99drn@cs.umu.se>
Date: Mon Jun 13 06:00:35 2005 +0000
Remove xgloffscreen.c
commit f5aeaa7710de5ba4aad125bc8472bad1f17e23c6
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jun 13 00:09:23 2005 +0000
Bug #3513: Silence unhandled event messages from Xnest when running with
-parent. (Mark McLoughlin)
commit 521916d0074901db58ab6b9edab52373da28bdb3
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Jun 10 12:30:39 2005 +0000
New implementation of GLX_MESA_render_texture
commit bdb3eb86f02e233b6aeef0995ea9afeaa7b035ac
Author: Kean Johnson <kean@armory.com>
Date: Fri Jun 10 06:54:07 2005 +0000
file usl_xqueue.c was initially added on branch sco_port_update.
commit 988ffddfe082fb27fadf9aa60ab22dce6855508c
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jun 10 04:01:14 2005 +0000
Bug #2799: Input shape. (Keith Packard)
commit d24ed90547122832d4168ad761f68e107bb1a2db
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jun 10 02:14:44 2005 +0000
Axe a few dead fields from the port priv struct and add my name to the
"Copyright" line of the license to ati_video.c that already has my name
in the text.
commit 75065f3a54ec760bbe81160fa233810f14d8aaa2
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 9 23:22:55 2005 +0000
Perform a warnings sweep on hw/kdrive. A number of these were my fault, but
some come from others.
commit e11e60b361d63ae02918dd6b43038a5c92b73a49
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 9 21:59:26 2005 +0000
Greatly improve the correctness and performance of the MGA render
implementation. Includes cache flushing to prevent bad first reads of
the framebuffer, fixing blending of many formats, falling back on many
unsupported operations, and falling back early to prevent migration.
Passes all of rendercheck except some of the blend (!) tests.
commit 9f81ce945680515e6db7da6c87458bee7c0f053d
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jun 9 21:48:45 2005 +0000
Re-enable GL_HP_occlusion_test. The problems in Mesa that caused this bug
were fixed by Brian Paul in Mesa version 6.1. The current Mesa version
in the X.org tree is 6.2.1.
Xorg bug: 762
commit 92b3775ae8bdd4a84d7e101b36b306fbd3ac17a2
Author: Matthew Allum <breakfast@10.am>
Date: Thu Jun 9 16:22:27 2005 +0000
TSLib fixes. Add fullscreen support to ephyr
commit 545c082cf9c86f2a809ea6b4dca33643afb0c3d3
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 9 10:44:45 2005 +0000
- Replace the syncAccel hook in the kdrive structure with a pair of hooks
in the kaa structure: markSync and waitMarker. The first, if set,
returns a hardware-dependent marker number which can then be waited for
with waitMarker. If markSync is absent (which is the case on all
drivers currently), waitMarker must wait for idle on any given marker
number. The intention is to allow for more parallelism when we get
downloading from framebuffer, or more fine-grained idling.
- Replace the KdMarkSync/KdCheckSync functions with kaaMarkSync and
kaaWaitSync. These will need to be refined when KAA starts being smart
about using them. Merge kpict.c into kasync.c since kasyn.c has all the
rest of these fallback funcs.
- Restructure all drivers to initialize a KaaInfo structure by hand rather
than statically in dubious order.
- Whack the i810 driver into shape in hopes that it'll work after this
change (it certainly wouldn't have before this). Doesn't support my
i845 though.
- Make a new KXV helper to avoid duplicated code to fill the region with
the necessary color key. Use it in i810 and mach64 (tested).
commit 72ca8e1b5432db57401e66af8a07fcd8cbbbb9f1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jun 9 03:11:58 2005 +0000
Add agpgart support for Solaris x86/x64. [Requires Solaris "Nevada" build
16 or later to get kernel side for now.] (Sophia Li - Sun Microsystems)
commit ca37d5755259ca03c61cf0567be3dea99d0c79f6
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 9 03:01:57 2005 +0000
Bug #2469: More accurate damage reports. (Jonathan Lennox)
commit cdc15e2294a9bffc570e33bc31170081abfc55fb
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 9 02:29:42 2005 +0000
Bug #1846: Add intentionally undocumented -disablexineramaextension flag to
the server to work around ignorant clients on large display walls.
(Kevin E. Martin)
commit e3cdec7cdcd76f6294ba1f296e4bcdee43b1eb3c
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 9 02:19:10 2005 +0000
Bug #1880: Remove unused xnestConfineWindow. (Mark McLoughlin)
commit 0f7136191b54e587b66958985e14d8b0687c5ee1
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 9 02:03:50 2005 +0000
Bug #3434: Don't define fbAddTraps twice. (Mike A. Harris)
commit e7fec996eb43a0bea94a37d329e3902299e6e895
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Jun 8 16:13:11 2005 +0000
Merge from CYGWIN Added layout "French (Canada)" as ca_enhanced Added Czech
(QWERTY) layout
Merge from CYGWIN Print error code if winStoreColorsShadowDDNL fails
commit d0d164e6daf6c1d8afe8099fb6187d8a74ff652b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Jun 8 09:01:41 2005 +0000
Fix crash reported by �yvind Harboe
commit d146c41882e50dd1ed6022f8a5866514067ba9d2
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Jun 7 08:53:40 2005 +0000
GLX improvements and remove use of pbuffers for offscreen rendering in Xgl
commit 8237b31f60245a8e67735d6c231dfb7dd0bbc388
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Mon Jun 6 04:06:38 2005 +0000
Keyboard sort of works now with evdev
commit c5026577cbc70c7365a9c81b2775136b45c850d2
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Sun Jun 5 17:32:41 2005 +0000
Create a default colormap
commit 021a5cd170051aae25cf61651d07b47a4df31ab4
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Sun Jun 5 01:58:41 2005 +0000
Enable egl server in automake
--enable-xeglserver
commit aa959672863aad71c807d6c09938bb296c347bcf
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Sat Jun 4 23:33:03 2005 +0000
Initial Xegl check-in. Works on EGL fbdev driver Input is totally broken.
commit 88d49bed008264092245c4f6c53174f93f6ab387
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Jun 3 21:49:11 2005 +0000
Need to set initial screen size at device open time too.
commit 0d206e177f46eedfffd8f88e985efdfaf117021c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jun 3 08:12:22 2005 +0000
Backout last winRaiseWindow patch which caused stacking problems
commit 2fc290f646eb48f3c20ccff98355c2d082569160
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Jun 1 17:45:17 2005 +0000
Solaris VUID mouse protocol updates:
- support for mouse-like devices that report absolute coordinates
- support for mouse-like devices that need to know screen size so they can
scale absolute coordinates to screen size
- fix 3-button emulation
commit 8537146e3662cdc66ef4692bfd3886a676096fb8
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 30 18:44:55 2005 +0000
Bug #3368: Cosmetic cleanup to DIX export list.
commit 547c47aaea9f31f7c873376b0db859c1c1d3d918
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 30 18:36:19 2005 +0000
Bug #3407: Clean out ancient #ifdef X11R5 conditionals.
commit cebd7348d271591b7ebeebe3b332f835cfa8a068
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat May 28 00:08:03 2005 +0000
Change hardcoded /usr/X11R6 to PROJECTROOT. Change hardcoded XF86Config to
XCONFIGFILE.
commit 1cb18a4bad565d1f783a4cefb3ed467699051068
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed May 25 12:14:29 2005 +0000
Workaround bug in pthread.h
commit 62343f5162066f19ca6e62d1c85a4a40d45b3295
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun May 22 01:12:49 2005 +0000
Bugzilla #2800 <https://bugs.freedesktop.org/show_bug.cgi?id=2800> Xevie
extension crash with signal 11 on keyboard Bugzilla #1205
<https://bugs.freedesktop.org/show_bug.cgi?id=1205> Xevie client
receives two KeyPress events on consumed keys when XKB is enabled
Patch #2223 <https://bugs.freedesktop.org/attachment.cgi?id=2223> Fixes for
both of these and some other Xevie bugs (Derek Wang - Sun Microsystems)
commit a8a61bbe22361b12d4a2dd511894987a338e3eef
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat May 21 07:46:38 2005 +0000
Initial experimental support for AMD64 builds on Solaris 10 x86. Improved
support for 64-bit SPARC builds on Solaris as well.
commit ef4401ff8a8c4d7c22ef6af7bf47ccb24f83967f
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 19 18:53:51 2005 +0000
Bug #3334: Clean up remnants from the PEX, XIE, and BEZIER extensions.
commit 1e51e18382de61a67027759eccee9ccbb0924304
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu May 19 01:25:02 2005 +0000
Wed May 18 21:20:35 2005 Søren Sandmann <sandmann@redhat.com>
s/dst/src that I missed in the previous patch. Pointed out by Owen Taylor.
commit be3875994d7778ffad0cd957a4bd1500bf58ac2c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed May 18 20:49:31 2005 +0000
Wed May 18 16:47:44 2005 Søren Sandmann <sandmann@redhat.com>
Actually assign the computed results. (Reported by Michael Dänzer, patch
by Owen Taylor).
commit 07d1e9ae5f0da65427ac52f065b173d340d70d6d
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed May 18 19:44:35 2005 +0000
Bug #3066: Promote frameBufferPhysicalAddress to pointer from CARD32; bump
DRIINFO version to match. Fix various pointer printfs in libdri to be
64-bit aware. Silence a warning about redefining noXFree86DRIExtension.
(Jesse Barnes)
commit b87a32fb0eafa6d5f12a6faa634662c71fdc97fa
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed May 18 17:47:35 2005 +0000
Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
version number. Modify DRIQueryVersion to return the libdri version
number, which all DDXes were requesting implicitly. Fix the DDXes to
check for the DRIINFO version they were compiled against.
commit fddcde777f50611099d8888456d93be7e566c84e
Author: Egbert Eich <eich@suse.de>
Date: Wed May 18 15:38:50 2005 +0000
VBESetVBEMode() calls int10 0x4f02 to set a VBE video mode. This can be a
standard mode solely determined by the mode ID or it may be a detailed
mode with almost arbitrary mode parameters. The mode parameters are
passed to the BIOS in a memory area pointed to by es:di. If bit 11 in
the video mode is set this memory area is evaluated. When we don't have
such an area (passed to VBESetVBEMode() this function should unset this
bit for sanity reasons. (Bugzilla #3329)
commit f28d644d9fb1feeab1bbb3d5e68255bfa20905d8
Author: Zack Rusin <zack@kde.org>
Date: Wed May 18 14:24:14 2005 +0000
rewrite the rootless compositing code (1) compiles which is already a huge
improvement ;) , 2) matches the new render composition semantics)
commit bbbb0a3a84bf21f5120c73ef387d6190154c0f65
Author: Egbert Eich <eich@suse.de>
Date: Wed May 18 10:31:53 2005 +0000
Avoid segfaults if the number of user supplied monitor ranges exceed the
number of preallocated slots. We should really make this dynamic - but
I don't think this ever caused a problem so it's more or less academic.
A. Avoid that *SyncStart starts before *BlankStart. If *BlankStart >
*SyncStart it is made = *SyncStart and its width is made maximal but such
that the blank does not exceed *Total. Since the Sync width has the
same restrictions as the Blank width monitors should still be able to
clamp after the sync pulse. B. Over time mode validation has become
inconsistent when people started to add additional features to the mode
validation. One such feature is that the mode->Crtc* values have been
(ab)used to allow the driver ValidMode() function to pass driver
normalized timing values back to the validation function. The
introduction of these features made the code less readable and created
numerous possibly unintended side effects in the validation semantics.
I've attempted to consolidate these changes making the code more
consistent and eliminating a number of side effects. This should not
cause problems for the majority of drivers, still it should receive
testing - especially with ATi Mach64 and Radeon code. (Bugzilla #3325).
commit a90af4a2e6e38cbe20af13aaa7822836c01290ae
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Sun May 15 17:45:47 2005 +0000
Bug 2750: Prevent mtrr_remove_offending from ending up in an endless loop
if the offending region refuses to be removed.
commit f58a54668b96884ece6ecbff732e880677d5d19e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat May 14 20:13:45 2005 +0000
Change return statements to fix compiler errors: "fbcompose.c", line 2815:
void function cannot return value "fbcompose.c", line 2861: void
function cannot return value
commit a9d820b454bbb418d04e1d3c3d5d4dd10d7bb3af
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri May 13 22:53:44 2005 +0000
- For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in
<X11/...>
- For Xcomposite and Xdamage, don't link the build system out of the xc
tree
- Link the public X11 headers into their own directory
- Add links to XKeysymDB and XErrorDB
- Add links to all the Xlib man pages
- Add links to the lcUniConv subdirectory
- Conditionally include config.h in Xlib source
commit 8993e70d8da89e130455369ccb504b3adea5344f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue May 10 00:12:17 2005 +0000
Bugzilla #2561: Disable some keycode translations on PC98, which had
various bad effects including modifier keys not working.
commit e78abf3bdfbf5fc13fbc5b1d3ec00e9484297b89
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 9 23:42:26 2005 +0000
Bugzilla #2429: Correct the sysarch prototype for FreeBSD/alpha.
commit 3f1a1551df2a9f45b3b8821f3f168d4dc8b8b438
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 9 23:26:02 2005 +0000
Increase the maximum number of buttons from 12 to 24. Helps with
button-happy mice like the Logitech MediaPlay. (Bugzilla #2390)
commit eca5dff173d5af0a31bbf84579909b88a86e4c92
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 9 12:46:53 2005 +0000
Render performance improvements. (Lars Knoll, Zack Rusin)
commit 2de24db63eb65974ac547facf2a99aa4709d54b3
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun May 8 23:34:15 2005 +0000
Render performance improvements. (Lars Knoll, Zack Rusin)
commit 2c9b1e337b2e82e10909f62e8cd8c2c7a402fdd8
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun May 8 21:14:55 2005 +0000
Only call ConfigureWindow from winRaiseWindow if the windows message
dispatch loop is running.
commit 78e4cb67d0f595f4fba5e98a9fa46de044556905
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri May 6 00:45:30 2005 +0000
Fix build issues on Mac OS X 10.4.0.
commit d5739efd2c266081ed6b844767dcdd0a3331bfd3
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed May 4 04:14:58 2005 +0000
Port X.Org to FreeBSD/powerpc. This makes a bit of math for sysmouse in
mouse.c explicitly signed, avoiding the need for -fsigned-chars. (Peter
Grehan, grehan at FreeBSD dot org)
commit 6700847458427cbdbaf837ab06bfea9b80d92df2
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon May 2 22:01:08 2005 +0000
Fix comments for pointers in parameter lists to work with fussy compilers
commit e50ab8feade400efd8e88ee0b2deeb924f169034
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon May 2 21:57:32 2005 +0000
Fix message type (respose->response) and fix */*comment*/ blocks to work
with fussy compilers.
commit baa0cfc15442287557e44fa2614d89ab0b5c2539
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon May 2 14:07:31 2005 +0000
Print correct logfile in FatalError message
commit bc977945a53206d70ef9817d6ede4137eb5f7e3c
Author: David Reveman <c99drn@cs.umu.se>
Date: Mon May 2 00:33:52 2005 +0000
Set stencil size for Xgl GLX visuals
commit 5b4462ed9bbb17212dd57617cb7e837142b6270a
Author: David Reveman <c99drn@cs.umu.se>
Date: Sun May 1 22:55:25 2005 +0000
New algorithm for calculating glyph extents in Xgl
commit e4b33f4e91a5379c99ecf78ffb6a3e836cb42491
Author: Egbert Eich <eich@suse.de>
Date: Wed Apr 27 15:42:15 2005 +0000
Catch SIGCHLD in OsBlockSignals() too to make sure this signal doesn't
intercept reading the authority file (Fabian Franz, Bugzilla #3137).
commit 246b14cb29250517912d9c661ab037a953f4bbf4
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Apr 27 10:34:33 2005 +0000
Minor optimization
commit 28a2d841cee596c0242b1649587d6b180529c0ef
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Apr 27 09:29:33 2005 +0000
Line drawing improvements to Xgl
commit abcc8c352e5fe6dd3b7ce5c6a25f435f877264c3
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Apr 27 08:45:16 2005 +0000
Fix typo
commit 8bc5a387c365d6367813eac374150440d0edbf6e
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Apr 26 11:04:23 2005 +0000
Add glCopy operation and glPushAttrib/glPopAttrib support to Xgl GLX
commit f010131a1964b5ec35f3b333ffa7459c38f8ce45
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 26 06:12:07 2005 +0000
xc/programs/Xserver/Xprint/Init.c
//bugs.freedesktop.org/show_bug.cgi?id=2879) attachment #2556
(https://bugs.freedesktop.org/attachment.cgi?id=2556) Refix for bug
2879 - downgrade 15bit PseudoColor to 14bit - the current datatype for
the |ColormapEntries| is a |signed short| which is too small for
|32768| colors (=integer overflow).
commit ba24ae89d33fbf3aacb8bbaf920d7436b77fda46
Author: David Reveman <c99drn@cs.umu.se>
Date: Mon Apr 25 17:18:01 2005 +0000
Add scissor based clipping to Xgl GLX
commit 07cc29cf69ff1e079efe3c9bfc55e8ac0f9bac93
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 25 00:25:39 2005 +0000
Bug #2138: When the server is built with MakeDllModules YES, prefer
dlloader modules to elfloader modules, and vice versa when
MakeDllModules is NO. Based on 028_loader_speed_hack.diff from Ubuntu
(Daniel Stone).
commit 6c37648754c9bd901adecf8d38f9bb46db65efad
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 25 00:11:21 2005 +0000
Bug #2141: Rework misleading warning message when APM support is
unavailable. (Previous patch on 2005-04-14 changed the wrong message.)
commit a369d390a87ab0189c465be6cfd914e4b9329691
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Apr 24 01:10:12 2005 +0000
xc/config/cf/X11.tmpl
xc/programs/Xserver/Xext/Imakefile
xc/programs/Xserver/dix/Imakefile
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/xpstubs.c
xc/programs/Xserver/mi/miinitext.c
//bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2526
(https://bugs.freedesktop.org/attachment.cgi?id=2526) bug 2792 part II:
Make Xprint headers in dix/, mi/, os/ and Xext/ conditional on whether
the Xprint extension is build or not. Patch by Egbert Eich
<eich@freedesktop.org> and Roland Mainz <roland.mainz@nrubsig.org>.
commit 13fcfee37305f46e95ff81d7d5eec4d88a63a63b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Apr 23 22:55:40 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=3118) attachment #2525
(https://bugs.freedesktop.org/attachment.cgi?id=2525) Get Xprint server
working again which was broken by the
05/04/20 05:49:46 commit commit (the CPP symbol |XPRINT| is not universally
available when building the Xserver and should be used with care).
commit 39eb2797183bf871a2dd01bff63dd35c146471f5
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 23 19:16:10 2005 +0000
Bug #3016: Don't complain as loudly about failing to load a module that's
already loaded.
commit 139f900c56a6f44df2b411fe4bbc025a147e3abe
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 23 19:01:13 2005 +0000
Bug #3109: Handle R_ALPHA_BRSGP relocations in elfloader. (Sergey Tikhonov)
commit 0e80fe0e607cc73856332563becd70ef92d1aa75
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Apr 22 22:11:26 2005 +0000
Clean up formatting, projectroot substutition, and grammatical nits.
commit dcfb97204b021738c0ee9f1f8f40243dfa0b2ce0
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Apr 22 22:04:37 2005 +0000
Work around clash between Solaris headers and module loader headers over
definition of FILE.
commit 07bd7df6a6a07834277b4bf505db6727841e1153
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 22 20:49:50 2005 +0000
Bug #3069: Drop the BuildLowMem hack, it doesn't compile and isn't useful.
commit d450a70e00b50427ecb2065d3cc44f43d102cade
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 22 17:45:14 2005 +0000
Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
Bjorn Helgaas, Egbert Eich.)
commit 16c2499b8f5c2405e36c7d5a922bb0b150df1762
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 22 16:49:22 2005 +0000
Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
Bjorn Helgaas, Egbert Eich.)
commit 8565b6c0e2851cc3f194ba72d3db02a4e2976528
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Apr 21 00:31:31 2005 +0000
Change xf86bigfont.h include to X11/extensions/xf86bigfont.h.
commit b241c703a2c4164420dd26ee11f583bbf9cfe0f3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Apr 21 00:31:13 2005 +0000
Change keymap.h includes to X11/keymap.h
commit 44528218d5ca75b842e4cefd8fdc58be2f35f0f4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 23:33:53 2005 +0000
Change dmxext.h and dmxproto.h to <X11/extensions/...>.
commit efa9d5f4757bfc0588cee361bcc78dd8a09efa62
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 23:11:12 2005 +0000
Change "eviestr.h" to <X11/extensions/eviestr.h>.
commit db5bd04097fd815ab6523f187679682a5e5047fa
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Apr 20 16:40:52 2005 +0000
Fix includes right throughout the Xserver tree:
apply changes to windows specific includes
Fix includes right throughout the Xserver tree:
apply changes to Xdmcp.h
commit 8963a220f36cf0ae2a8a653fd39c983140e29736
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Apr 20 16:34:46 2005 +0000
warning fix for Win32
commit e6a0820d1b479058bddef66018d321940e79260c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 15:16:36 2005 +0000
Change "xf86bigfstr.h" to <X11/extensions/xf86bigfstr.h> for includes.
commit 025724f9f5874159c20ebd705288ec60b960caac
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Apr 20 14:17:35 2005 +0000
Add missing space after -query hostname
commit 35cd1684622f4528c68e07eea798c33bc4b93667
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 14:16:37 2005 +0000
Change xf86bigfstr.h to X11/extensions/xf86bigfstr.h for includes.
commit c7c27e61870b42de044b183c854a960582d98dbf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 13:33:54 2005 +0000
Change xf86bigfont.h to X11/extensions/xf86bigfont.h for includes.
commit abd246c6c272a2c6f9c37404b2ed439911880e75
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 13:01:55 2005 +0000
Add glyphstr.h to includes.
commit 956dfa22f6076969776546fb1151e900d8d773a1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:49:46 2005 +0000
Conditionalise usage of Xprint functions and headers.
commit 2cdfab0ed7eb33a6a50f9b7ec212b498dd8318b5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:42:02 2005 +0000
Change keysymdef.h to X11/keysymdef.h for include statement.
commit fa5539247d3b246db9ff1469d08167178c85d7ad
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:39:28 2005 +0000
Change Xalloca.h to X11/Xalloca.h for include.
commit 292c4cff26687e6ef86c285b97813ab587daf009
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:25:48 2005 +0000
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
commit c062d7f96f47bdd31640be1fbce682d0774db3d9
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Apr 19 18:21:01 2005 +0000
Prevent recursive calls to winRaiseWindow.
commit 4e914c5ed7679a1102f3e25af0c087380f834865
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Apr 19 14:51:29 2005 +0000
Hash texture objects and display lists in Xgl
commit 6bde764de102a56d2c71b971eaa36535e9760b52
Author: Bogdan Diaconescu <b_diaconescu@yahoo.com>
Date: Sun Apr 17 23:02:25 2005 +0000
Added a log pring for the parameters
commit 8594b8f2893e58ae824e140334c18ba3d7467217
Author: Bogdan Diaconescu <b_diaconescu@yahoo.com>
Date: Sun Apr 17 23:00:58 2005 +0000
Added new tuner FM1236MK3 PAL version
commit 7f74e3aebdf79fbca4141e6ffcdad39812df9335
Author: Bogdan Diaconescu <b_diaconescu@yahoo.com>
Date: Sun Apr 17 22:58:03 2005 +0000
This is the UDA1380 sound coder-decoder module
commit 7a4e5f4006319e025e3ff561eccc3f1ad6c661a0
Author: Torrey Lyons <torrey@mrcla.com>
Date: Sat Apr 16 00:21:21 2005 +0000
Fix cases in Darwin build where a variable is declared static and later as
extern (XFree86 Bug #1576, Jordan Frank).
commit 4f686f158b00478a3d074128f9e4cb6dc0d928cd
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Apr 15 23:34:39 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2885) attachment #2434
(https://bugs.freedesktop.org/attachment.cgi?id=2434) Fix Solaris build
bustage caused by namespace collision between symbols defined in
<sys/kbd.h> and those in "xf86_OSlib.h". Patch by Alan Coopersmith
<alan.coopersmith@sun.com>.
commit 7472fcfdd40e29cd2847e45d4bd2dd11ccc41ff5
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 15 00:18:58 2005 +0000
Bug #2141: Rework misleading warning message when APM support is
unavailable.
commit 504067819a4f1a8564dcacc278933f533618b666
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 14 17:51:51 2005 +0000
Bug #3025: gcc4 build fix.
commit e40db7f26af39a8b1f3675a2c87ce90c4fd59d85
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Apr 13 14:27:47 2005 +0000
Add GLX code to Xgl
commit ddfa6f00da7c80b246b57c592361baa4bc5a8e9d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Apr 13 00:05:37 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=3001) attachment #2404
(https://bugs.freedesktop.org/attachment.cgi?id=2404) Improve rendering
performance when glXSwapBuffers()| or |XPutImage()| are called for the
PostScript DDX via optimizing the codepath around
|PsOut_OutImageBytes()|. Patch by Simon Toedt <simon.toedt@gmail.com>
and Roland Mainz <roland.mainz@nrubsig.org>.
commit f45208a7e9c39345ac431c2e7da8777d6c466dcc
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Apr 11 11:06:21 2005 +0000
update static file from pci.ids
commit b47f39b417cbe220690155a08c6bc18cd7cfa388
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Apr 11 10:57:33 2005 +0000
import latest pci.ids file
commit 00a551393ce7aa9d2b23634737ced5071e3cdd35
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 11 10:54:13 2005 +0000
Reenable BackingStore in Xvfb.
commit 1fbd38f3b46df62561f8be74cbc05fcf8ad88a21
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Apr 11 10:16:25 2005 +0000
Added wizard page for clipboard selection and additional server parameters
commit 6848b0353897a6a5d1218b266c22fb87a7c6d730
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 11 10:05:38 2005 +0000
Correct the mask bits when checking for a 64bit memory base in PCI config
space (bugzilla #2963).
commit adac7011965ed75ea399b93dae917cb48180c77a
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 11 09:33:43 2005 +0000
Preventing hight for drawing from becoming negative when face->dy < 0. The
height value is used in miFillPolyHelper() to calculate the size of
memory to be allocated. A negative value will lead to a crash (Bugzilla
#2690, Keith Packard, Egbert Eich).
commit 5e2080ef93a598c6d68e1b2f446f251ab025b702
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Apr 11 01:06:15 2005 +0000
xc/programs/Xserver/Xprint/attributes.c
xc/programs/glxgears/glxgears.c
xc/programs/xdbedizzy/xdbedizzy.c
xc/programs/xedit/Imakefile
xc/programs/xedit/Xedit-xprint.ad
xc/programs/xedit/util.c
xc/programs/xedit/xedit.h
xc/programs/xlogo/print.c
xc/programs/xlogo/xlogo.c
xc/programs/xlogo/xlogo.h
xc/programs/xman/Imakefile
xc/programs/xman/print.h
xc/programs/xmore/Imakefile
xc/programs/xmore/print.c
xc/programs/xmore/print.h
xc/programs/xmore/printdialog.c
xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
xc/programs/xphelloworld/xphelloworld/xphelloworld.c
xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
//bugs.freedesktop.org/show_bug.cgi?id=790) attachment #2379
(https://bugs.freedesktop.org/attachment.cgi?id=2379) Implement support
client+Xserver support for passing output (stdout+stderr) of the
spooler command started by the Xprint server back to the application
using the "xp-spooler-command-results" XPJobAttr attribute
(applications can fetch the attribute value after the XPEndJobNotify
event was received; more details can be found in
http://xprint.mozdev.org/docs/dtprint_fspec.ps).
commit 9af443f5976ab3987e4ee9d397391e82206676b4
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Apr 9 19:20:03 2005 +0000
Fix passing of non-RGB visuals. The old code did not initialize the
structure properly which lead to a crash in 8bpp mode
commit f02440dfa3439ab493c7918b472c23bb22e29707
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Apr 6 15:18:59 2005 +0000
First import of xlaunch frontend for Xming
commit de5d24a200e4426e458fc447884d1a5b0257faaa
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 4 10:17:06 2005 +0000
Fixed sentinels in Xt, editres and xedit to reduce number of warnings with
gcc4 (Andreas Schwab).
commit 277ff06e9999f2efe0f082a3565f6279219c13e4
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 4 10:11:51 2005 +0000
Fix typo leading to bogus code in xorgcfg (Andreas Schwab).
commit 7eb6b69ebd945c753ee0988e1a85dffde982446e
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 4 09:55:25 2005 +0000
Support for HP's IPF ZX1 systems (Alex Williamson).
commit 231c00e8fba91b580ec3e2703dd1ceacf13a6624
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 4 09:47:07 2005 +0000
When not using dlopen ia64 needs an extra cache flush to ensure the icache
is coherent when modules are loaded (Alex Williamson).
commit 55dc930a180553c08d8546cc2078451c20e34934
Author: Torrey Lyons <torrey@mrcla.com>
Date: Sat Apr 2 02:29:24 2005 +0000
Fix XDarwin's handling of Wacom tablet mouse buttons (Based on patch
suggested by Daphne Pfister).
commit 03d126081e5ba57ea2304753289528a896f3baaf
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Apr 1 21:45:20 2005 +0000
xc/programs/Xserver/Xprint/Init.c
xc/programs/Xserver/Xprint/ps/Imakefile
xc/programs/Xserver/Xprint/ps/Ps.h
xc/programs/Xserver/Xprint/ps/PsArea.c
xc/programs/Xserver/Xprint/ps/PsColor.c
xc/programs/Xserver/Xprint/ps/PsImageUtil.c
xc/programs/Xserver/Xprint/ps/PsInit.c
//bugs.freedesktop.org/show_bug.cgi?id=2879) attachment #2287
(https://bugs.freedesktop.org/attachment.cgi?id=2287) Follow-up to
bugzilla #1299: Add new visuals in the Postscript DDX (including
TrueColor 16bit, PseudoColor 15bit/12bpg(12 bits per R-, G-, B-channel
as in PostScript Level 2 (and above) colors can have 12 bits per
component (36 bit for RGB)), PseudoColor+GrayScale+StaticGray
12bit/12bpg) and switch the default visual from PseudoColor 8bit/8bpg to
PseudoColor 12bit/12bpg.
commit fe37cc7e7b3036e538930c16bbdb39a7915b1685
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Apr 1 21:28:50 2005 +0000
programs/Xserver/hw/xfree86/loader/xf86sym.c
programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Fix setjump0
declaration for DllLoader.
commit ef60998a828951e61f1480e29c2fec62e7454bbc
Author: Kevin E Martin <kem@kem.org>
Date: Fri Apr 1 20:21:38 2005 +0000
bugzilla #2880 (https://bugs.freedesktop.org/show_bug.cgi?id=2880)
attachment #2285 (https://bugs.freedesktop.org/attachment.cgi?id=2285)
Use system method to access PCI config space.
commit 33ab2a2abc8c1e4ca9c7139454c60f5ad8a61a94
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 1 20:05:11 2005 +0000
Bug #2835: Add symbol exports to support the ReadDisplay extension.
commit cbccac448a1466ab098e8fe5dbfff98264c7260a
Author: Alex Deucher <agd5f@yahoo.com>
Date: Thu Mar 31 23:18:10 2005 +0000
- Add new Radeon pci ids (ATI devrel), bug 2827
commit 59d7222b13775efb2159159cc897e7789bdf10b2
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Sun Mar 27 00:17:12 2005 +0000
Sat Mar 26 19:00:30 2005 Søren Sandmann <sandmann@redhat.com>
Remove accidentally committed prototype.
commit 476ae15640d2b97cb0ebccab8255ccf728596c62
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Sat Mar 26 23:50:24 2005 +0000
Sat Mar 26 18:49:21 2005 Soeren Sandmann <sandmann@redhat.com>
programs/Xserver/fb/fbmmx.h
New function.
Hook it up here
commit 0d33b588376a4d86d50ed8b7e06eaf0dbd8c5ba5
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Mar 25 23:11:14 2005 +0000
xc/programs/Xserver/Xprint/ps/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=2821) attachment #xxx
(https://bugs.freedesktop.org/attachment.cgi?id=xxx) Remove the cfb
dependicy from the PostScript DDX as this is not needed in a vector DDX
(mfb is still needed to fill the |BitmapToRegion()| callback with
|mfbPixmapToRegion()|).
commit 5f320335c3a8148ae98f82a00ff44954197f4251
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Wed Mar 23 21:09:48 2005 +0000
bugzilla #2194: fix an alignement problem on 64 bit architectures.
commit f4e9f522fe8bec3dd6294d062c2244a06623add3
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Wed Mar 23 21:03:41 2005 +0000
Bugzilla #2750 (https://bugs.freedesktop.org/show_bug.cgi?id=2750)
Linux-only fixes: Fix case where a smaller write-combining region
blocks write-combining setting of the whole frame buffer. Fix bug in wc
setting code when regions are first splitted and setting of
write-combining then fails.
commit 1be6e2388bcc5835ab62f0855d443fb508697deb
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 23 20:49:52 2005 +0000
xc/programs/Xserver/hw/vfb/InitOutput.c
//bugs.freedesktop.org/show_bug.cgi?id=2791) attachment #2197
(https://bugs.freedesktop.org/attachment.cgi?id=2197) Add support for
12bit PseudoColor and 30bit TrueColor to Xvfb.
commit 26aec10adad51deb35a8398abb884d90be077a6b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 23 19:58:45 2005 +0000
xc/programs/Xserver/Imakefile
xc/programs/Xserver/Xprint/DiPrint.h
xc/programs/Xserver/Xprint/Imakefile
xc/programs/Xserver/Xprint/Init.c
xc/programs/Xserver/Xprint/ddxInit.c
xc/programs/Xserver/dix/Imakefile
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/xpstubs.c
xc/programs/Xserver/os/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2193
(https://bugs.freedesktop.org/attachment.cgi?id=2193) Fix build bustage
when |PrintOnlyServer| is set to |NO|. Patch by Roland Mainz
<roland.mainz@nrubsig.org> and Julien Lafon <julien.lafon@gmail.com>.
commit ac18f8e308221af368fd4153b4eee7b89f8dd4bc
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 23 00:32:49 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2789) attachment #2187
(https://bugs.freedesktop.org/attachment.cgi?id=2187) Fix Xvfb to honor
the "-dpi" option (instead of using a hardcoded value of 100DPI).
commit 45bcb8e22ad949c456368b7d4f4226110f8b5cfc
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Mar 22 21:30:43 2005 +0000
Bug #1821: Typo fix in xorg.conf man page (Jens Schweikhardt)
commit cc95e597b51f06e835c6a9def1bc6681029bf41e
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Mar 22 17:49:14 2005 +0000
Tue Mar 22 12:47:16 2005 Søren Sandmann <sandmann@redhat.com>
Only validate the source if it is a viewable window. Stops the cursor
flickering when it is above an unviewable window.
commit 1d68ede0eed62b48354a954a62fca98aa2ce9d2d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Mar 19 20:51:34 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2771) attachment #2148
(https://bugs.freedesktop.org/attachment.cgi?id=2148) Remove RENDER
extension from exclusion list for the standalone print server (Xprt) to
get this extension enabled if the print DDX support it.
commit 64f1b3fe7e85245865666607d7b32ef7807df08f
Author: Michel Daenzer <michel@daenzer.net>
Date: Fri Mar 18 22:36:47 2005 +0000
Add support for production version of ATI RN50/ES1000. (ATI Technologies
Inc.)
commit 36dcc9bb1d51fb8c0d67c7e15700e3473a06e47b
Author: Torrey Lyons <torrey@mrcla.com>
Date: Thu Mar 17 01:12:07 2005 +0000
Fix build on stock Mac OS X: Out of the box, Mac OS X does not include
Freetype2, Expat, or PNG. Also global variables should be initalized in
the Xserver.
commit 82f5a127522e48ff7ff78400eadbce0a5a362064
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Mar 16 21:25:43 2005 +0000
Wed Mar 16 16:17:43 2005 Søren Sandmann <sandmann@redhat.com>
Only validate the source if it is a viewable window. Stops the cursor
flickering when it is above an unviewable window.
commit 226c0907d4327a440fb0ac5380a19538ffdc6fa0
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Mar 16 21:05:51 2005 +0000
Add cursor support to Xglx
commit 7109ae147c3a9d243d11f386cfbcfbf7b4ea7918
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Mar 16 20:05:19 2005 +0000
Fix a few problems in Xgl
commit 04ccba4d40bef6cee902b118598272f26eebb1df
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 16 12:16:06 2005 +0000
Don't fail calling function when DriverFunc() for RandR fails as
DriverFunc() also returns FALSE when the specific sub function isn't
supported. In the case of xf86RandRGetInfo() we simply rely on what has
been set before and return TRUE. In the case of xf86RandRSetConfig() we
only bail with FALSE if we have to do a rotation and the call fails. We
presently cannot do rotation on the fly without the help of a driver
function (Bugzilla #2745).
commit 1011762254b41db5ce67cb652a2d4965efd7ec20
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 16 11:54:54 2005 +0000
Make message that gets printed when loader encounters a .o with no symbols
less conspicuous.
commit 816606b9eabee334ce6e0b79e8aa67544f428c19
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Mar 11 12:26:20 2005 +0000
Return early from xglFillRect when no rectangles should be filled
commit 4de5aa428514f2cacc60d4708dad996dedee1092
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Mar 11 00:58:49 2005 +0000
Use negative stride and PBOs in Xgl
commit 8653db5d57199d53c9b2b993c35a7b70c8949989
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Mar 10 20:05:46 2005 +0000
Force rebuilding of window stack if a window changes it's state from
minimized.
commit 522628f25b4a075c8daf547991ea5b80c5efe9c7
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 8 10:26:59 2005 +0000
Adding more errnos to the libc wrapper (Bugzilla #2672).
commit db7c9d349b86216ed00888181c64ab707fbe18d4
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 09:27:09 2005 +0000
Return early from xglCopy if fall-back is more efficient
commit e09d1d2ae3ccd59408b1dc6f264897ae12dfa2b8
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 09:12:17 2005 +0000
Better ShmPutImage support in Xgl
commit 5d9885c5b95286c8d7f777c7232283e8b1e81d1b
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 09:03:38 2005 +0000
Minor improvement to CopyArea in Xgl
commit 51155ca68bf7539bd3ace2ac068a2be1fbcf400c
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 08:48:22 2005 +0000
Improve Xgl offscreen memory manager
commit e26a096cb662700387c7b43289d1f6f7ab4a0aac
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 08:30:47 2005 +0000
Fix Xgl glyph caching
commit 8d0e520721ab7697d2d4f639425499b79c61b43f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Mar 7 23:02:59 2005 +0000
xc/programs/Xserver/dix/atom.c
xc/programs/Xserver/dix/colormap.c
xc/programs/Xserver/dix/cursor.c
xc/programs/Xserver/dix/devices.c
xc/programs/Xserver/dix/dispatch.c
xc/programs/Xserver/dix/dixfonts.c
xc/programs/Xserver/dix/dixutils.c
xc/programs/Xserver/dix/events.c
xc/programs/Xserver/dix/extension.c
xc/programs/Xserver/dix/gc.c
xc/programs/Xserver/dix/glyphcurs.c
xc/programs/Xserver/dix/grabs.c
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/pixmap.c
xc/programs/Xserver/dix/privates.c
xc/programs/Xserver/dix/property.c
xc/programs/Xserver/dix/resource.c
xc/programs/Xserver/dix/swaprep.c
xc/programs/Xserver/dix/swapreq.c
//bugs.freedesktop.org/show_bug.cgi?id=2560) attachment #2037
(https://bugs.freedesktop.org/attachment.cgi?id=2037) ANSI-fy
Xserver/dix code. The conversion preserves the comments which annotate
variables. These have been moved into doxygen(esque?) "stubs" above
each function. Patch by Mike Owens <etc@filespanker.com>.
commit cb0aa2b4d8875f1ea66e720ca7c6cc2f403be26a
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Mar 7 22:26:59 2005 +0000
Prevent winRaiseWindow from calling ConfigureWindow if the message was sent
from within winDestroyWindowsWindow
DestroyWindow send a WM_WINDOWPOSCHANGED to another window causing a
restacking of all windows, even of the window which is just about to
destroyed and whose structures may not be intact anymore.
commit 978f3b496b9951ee8120a0efcc5cd12503e26770
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Mar 5 21:38:29 2005 +0000
xc/programs/Xserver/Imakefile
xc/programs/Xserver/hw/xnest/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=2653) attachment #2020
(https://bugs.freedesktop.org/attachment.cgi?id=2020): Cleanup Xnest
usage of the DPMS dummy stub functions from dpmsstubs.c instead of
using it's own copy of these functions.
commit 602209990dbbc96b4c5a96e2221a418cf29e613d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Mar 5 20:47:12 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2543) attachment #2019
(https://bugs.freedesktop.org/attachment.cgi?id=2019): Fix
|xf86SignalHandler()| which resets the signal handler before setting
the flag indicating a signal has been caught, theoretically allowing
the possibility of infinite recursion. Patch by Andrew Church
<xzilla@achurch.org>.
commit d995fe631a5706de93a05fda498333442af3d207
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 2 14:21:40 2005 +0000
xc/programs/Xserver/hw/xnest/Screen.c
xc/programs/Xserver/hw/xnest/Window.c
//bugs.freedesktop.org/show_bug.cgi?id=2546) attachment #2005
(https://bugs.freedesktop.org/attachment.cgi?id=2005): Fix Xnest to
update the shape regions in the backend server whenever a client
changes them in Xnest (the fix is to add a new wrapper which calls
|xnestShapeWindow()| before calling |miSetShape()|). Patch by Mark
McLoughlin <mark@skynet.ie>
commit 3f79c5eefc0d62d3a9b095472cd75b446ba2a56e
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 2 11:20:30 2005 +0000
xc/config/cf/DragonFly.cf
xc/config/cf/Imake.cf
xc/config/cf/Imakefile
xc/config/imake/imake.c
xc/config/imake/imakemdep.h
xc/extras/drm/shared/drm.h
xc/include/Xos_r.h
xc/lib/xtrans/Xtranssock.c
xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
//bugs.freedesktop.org/show_bug.cgi?id=1712) attachment #2004
(https://bugs.freedesktop.org/attachment.cgi?id=2004): Add support for
DragonFly/BSD platform. Patch by Jeroen Ruigrok <asmodai@tendra.org>
and Mike Verona <firedragonfly@gmail.com>.
commit 6c6151b2339a05c60ec58e013f915f79a3f9d756
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Mar 1 18:58:17 2005 +0000
If a context is already attached copy it instead of reattaching to keep
displaylists and share displaylists Enable tracing of often called
functions with GLWIN_ENABLE_TRACE ForceCurrent is a no-op now
commit d323c4f59a653f364164d2a57fbbd102306a6ee9
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 1 16:57:54 2005 +0000
Minor improvement to pixel transfers in Xgl
commit 2d2c1732620a83215983ee7a7dd469a1a85fcc12
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 1 16:34:31 2005 +0000
Add dither support to Xgl
commit b4b27e9eaa43401ae70e5d03823012bf8c78848f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 28 20:45:15 2005 +0000
Force DPMS normal on screen enable
Add placeholder for bit used to redirect input
Add macrovision register defines
commit 409c0618bced6df02eed7af77107ff74508c0f3f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Feb 24 22:53:17 2005 +0000
on WM_WINDOWPOSCHANGED raise window directly and in sync without utilizing
the async windowmanager thread. Fixes some restacking problems occuring
which were timing dependent Do not raise the window on WM_ACTIVATE
Removed unused code for WM_WINDOWPOSCHANGING ESC is debug key. Print
status but do not abort processing the message
commit 775efdbd79448040b822fcc0556e98d3968ba8c3
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 23 19:17:10 2005 +0000
Bugzilla #2599 (https://bugs.freedesktop.org/show_bug.cgi?id=2599)
attachment #1964 (https://bugs.freedesktop.org/attachment.cgi?id=1964):
move miScreenInit in front of pScreen->function initializations to
prevent it from resetting ClipNotify.
commit c4b3fcda98a92c204534f04bd386ace5d3620d86
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Feb 21 03:44:10 2005 +0000
Move the draw tracing supplies into ati_draw.h, and do some touchups on it.
(When tracing drawing, I want to know what I'm drawing to, at a
minimum).
commit de34b0eefc9f8a29147659454398cabb187c7cb6
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Feb 21 03:05:55 2005 +0000
Extend the filter support to R200, and do the check for filter settings in
Check rather than Prepare, to avoid migration of things we won't be
able to accelerate.
commit 535c178286f94cc593b6cda753bbeb9b7cf6df4c
Author: Michel Daenzer <michel@daenzer.net>
Date: Fri Feb 18 19:55:35 2005 +0000
Bug #2576: Add support for ATI RN50/ES1000. (ATI Technologies Inc.)
commit 2f07222106358a02f56bf1e344d1fbf7ead14cbd
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Feb 18 17:52:48 2005 +0000
Bug #2455: Make x86emu handle JNL correctly. (David Wong)
commit 01b156240ce66703b38a67ee3cfbb475352cdf68
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Feb 12 14:55:24 2005 +0000
winmultiwindowwindow.c
winmultiwindowwndproc.c
Cleanup some message debugging
commit 8df7126f09d6d7cb35a5912a71531cad28ba2545
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Feb 12 14:47:17 2005 +0000
win.h
winfont.c
winmultiwindowshape.c
winmultiwindowwindow.c
winpfbdd.c
winshaddd.c
winshadddnl.c
winshadgdi.c
Fix incorrect wrapping of functions. Ensure the pointers from pScreen point
to the called function even if wrapped functions changed it
Set the window properties to NULL to avoid referencing freed memory because
of timing problems after deleting a window
Do not wrap ChangeWindowAttributes. All functions are noops currently
commit 676fdb03f3fb27ac24834aeb895df7d6d6e83f78
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Feb 12 14:43:07 2005 +0000
print window handle in message outout
commit 046bdb17169ecb1361a42ab52043da699590d39a
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Feb 11 20:19:20 2005 +0000
Fixes a few problems in Xgl
commit 35bd81dfec62402f9d6c68d98e651e8cd87a8758
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Feb 11 19:38:04 2005 +0000
Fri Feb 11 14:28:22 2005 Søren Sandmann <sandmann@redhat.com>
When COMPOSITE is enabled, call CopyWindow even when the pixels "don't
move" on screen.
Don't reject modes that are not supported by the unused monitor.
commit e5ccccfbd45c78c1be5e311b2cb4135a9a27540b
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Feb 11 06:37:38 2005 +0000
Bug #826: Make xorgconfig respect font installation outside $PROJECTROOT.
(Donnie Berkholz)
commit e7369daba58bb4fad5cef37fefbd851e59446045
Author: Egbert Eich <eich@suse.de>
Date: Wed Feb 9 11:12:54 2005 +0000
Added PCI2Host bus translations for linux PPC and fixed fixed bugs in
macros that apply these functions (Bill Randle Bugzilla #325 and #327).
commit aab9a8dd99e52297ed9b40c936600429f38fe9ad
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 9 03:56:35 2005 +0000
Add initial evdev framework
commit a85c33b52c40fbae544c7dd40df8c8968e0cf7e9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 8 22:45:21 2005 +0000
update Xgl to changes in damage API. Remove some flags to support software
mesa
commit db2c83551cd3516800b88784c461fb33ee15aacf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 8 22:43:54 2005 +0000
hw/kdrive/ati/radeon_composite.c Support linear filtering
Change how touch screens work -- make them just another 'mouse' device. Add
unfinished (and unused) code to accelerate tiled fills.
commit 70d3a9192feefd54be93ea71231574c3ed815bf2
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Feb 8 15:20:01 2005 +0000
Updated fix for ABNT2 and HK_Toggle keys.
commit 384099457e9d938871019ba2e5afc20280328884
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Feb 8 10:15:49 2005 +0000
Backout ABNT2 and HK_Toggle fix since it broke keys F1 and F4.
commit ea5b09f95d6f25d8b0f8858c36b680055edd0da9
Author: Egbert Eich <eich@suse.de>
Date: Mon Feb 7 18:16:05 2005 +0000
Save gs register before calling the vm86_old syscall thru int 0x80. This is
required for linuxthreads as the TLS uses this register to keep track
of local thread storage (Bugzilla #2431, J. Scott Berg).
commit 4d55065b35baa7e13f6e726cb9d6675562648000
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Feb 7 15:08:31 2005 +0000
Moved keyboard layout table to external file.
commit e132cb7590b5518ef1b7fce5f9151beed916fafc
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Feb 7 15:05:39 2005 +0000
file winlayouts.h was initially added on branch CYGWIN.
commit c12ef1b34a55544f54401a5a66a36cd728e2f944
Author: Egbert Eich <eich@suse.de>
Date: Mon Feb 7 11:56:31 2005 +0000
Check the pixel clock choosen for a specific refresh rate against the
maximally allowed pixel clock when choosing mode lines for
VBESetVBEMode() and VESA BIOS version >= 3.0 (Bugzilla #2486).
commit 859be7a52b778df8acb676683351a6562a6d4400
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Fri Feb 4 01:14:49 2005 +0000
Applied patch (id=1354) by Mike A. Harris from bug #1901: The attached
patch updates a couple of PCI IDs for the Savage driver --
Debian/Ubuntu/Red Hat/Fedora.
commit 5feca068d740b165d3c36a690f5a68b7588b6625
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Feb 3 09:58:47 2005 +0000
Bugzilla #1865 (https://bugs.freedesktop.org/show_bug.cgi?id=1865)
attachment #1827 (https://bugs.freedesktop.org/attachment.cgi?id=1827):
check for va_copy not being defined and use __va_copy if available
commit 3dda2fe0e2e7e4d2c058d32fa8691d12386b978d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 2 18:06:14 2005 +0000
Force ShowWindow if XWin was started via run.exe. Fixes mainwindow not
showing bug
commit e8d3da3c753677cc1ae86bc5a79f2b7eba181d74
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 2 17:17:56 2005 +0000
Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866)
attachment #1819 (https://bugs.freedesktop.org/attachment.cgi?id=1819):
Define APIENTRY on windows to prevent <GL/gl.h> from loading
<windows.h> removed leftovers from attachment #1818
commit 81b862509c87281705f8a8641c28ae2f45f15751
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 2 15:03:44 2005 +0000
Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866)
attachment #1818 (https://bugs.freedesktop.org/attachment.cgi?id=1818):
Include Xwindows.h before GL/gl.h on windows to prevent loading
windows.h which pollutes our namespace with some symbols.
commit b532bfb483cc8ea87c28302e3d676234cab7c3f0
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 2 04:07:04 2005 +0000
Bug #1294: Make sure RenderAccel hooks get wrapped in XAA init.
commit 44e2d9167943182fea530dfd7ec16aa53db20f4c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Feb 2 00:55:21 2005 +0000
xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
//bugs.freedesktop.org/show_bug.cgi?id=825) attachment #956
(https://bugs.freedesktop.org/attachment.cgi?id=956): Fix build
problems on Linux/SPARC. Patch by Jeremy Huddleston
<eradicator@gentoo.org>. Approved in the 2005-01-31 Xorg
release-wranglers phone call.
commit 15c555a25df76e0e95bc8eaa2ca7ec80a7695a6c
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Feb 1 21:22:02 2005 +0000
Use negative stride for trapezoid masks in Xgl
commit 2f0bdf77dd37d1763c4f4f409d55a6aad6031b9f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Feb 1 18:14:01 2005 +0000
xc/programs/Xserver/xkb/ddxLoad.c
Bugzilla #2245 (https://bugs.freedesktop.org/show_bug.cgi?id=2245)
attachment #1649 (https://bugs.freedesktop.org/attachment.cgi?id=1649):
cleanup the generation of xkbcomp command lines. Allocate them
dynamicly and remove unmaintainable length calculation.
commit d3ca132061a861cb9292b5a95dbcb2f67695883b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 31 10:49:30 2005 +0000
winmultiwindowwindow.c
Create windows with SWP_NOACTIVATE flag (updated) (Kensuke Matsuzaki)
Fixes for window ordering problem (updated) (Kensuke Matsuzaki)
commit 374b9aa8ce14cd20a6768519eee63948c83488d6
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 31 10:47:32 2005 +0000
Added hungarian keyboard layout.
commit 8d277ceb22929fcb44f2d4def8c5b70535eb087f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 31 10:43:37 2005 +0000
winmessages.h
winmsg.h
winmsg.c
winmultiwindowwndproc.c
winwin32rootlesswndproc.c
Make logging of messages configurable with environment variables
commit 2982d173cad762b801869b7ceacc237afdad88d6
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 31 10:32:19 2005 +0000
resolve SHGetFolderPath dynamicly since it is not available on all Windows
systems.
commit 8ac3be3f6c4bcaa8c3f6080cbfe72db4967feff8
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Jan 30 21:18:46 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1692> Remove reference to
nonexistent Monitors file from xorgconfig (Report & patch from Dejan
Lesjak <dejan.lesjak@ijs.si>)
commit 206072c475408b8d4cfd75d897854d8478fe0905
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jan 30 20:12:07 2005 +0000
programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c Fix option
dontVTSwitch under *BSD, when XKB is disabled. Bugzilla #2252.
commit 327922f006dcc2e30ec0391d7fa786560fcd1599
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jan 29 01:01:03 2005 +0000
Update to latest rev from http://pciids.sf.net/
Remove entries that now duplicate pci.ids Add entries for new Nvidia boards
added in recent nv driver update
commit d23c46dd3e2cbf84012055bad43b1bb15809a244
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 28 16:13:00 2005 +0000
Modifying X.Org Xserver DDX to allow to run X with ordinary user
permissions when no access to HW registers is required. For API changes
which mostly involve the modifications to make the RRFunc (introduced
with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch
applies changes to OS specific files for other OSes which I cannot
test.
commit 1562ec5cc3706acfac1db04366f78e4949ef5502
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jan 27 20:33:34 2005 +0000
Functions like glGenTextures and glBindTexture are in OpenGL 1.1 and can be
resolved at linktime. Fixes tuxkart (at least with wine)
commit 5ca5fe71119f35f1f24aeb49e2608684024d450a
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 27 05:25:57 2005 +0000
Add an OUT_RING_REG macro for use with DMA_PACKET0, which is like OUT_RING
but includes debugging to ensure that the reg being submitted is the
one that follows in the packet. Convert most uses of OUT_RING to it,
and convert a couple of OUT_REG sets to DMA_PACKET0/OUT_RING_REG. Also,
add checking to see if more registers are submitted to a DMA_PACKET0
than should be, to avoid hangs during stupid mistakes (checking for
less isn't done).
commit 0bd459488bf88084d703d801bfd5e79ea6d2b5a5
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 27 03:52:49 2005 +0000
Move the bailing out due to ATIUploadToScreen() being unfinished up
farther, so that the traces aren't as confusing.
commit a973af4a9ade68b271d0695898d72aea50d8953b
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 27 03:50:48 2005 +0000
Remove an unused field.
commit 59c7005bb155393c44792d457d98d72e34bb1b51
Author: Egbert Eich <eich@suse.de>
Date: Wed Jan 26 15:50:17 2005 +0000
When we tested if a PCI base address was unassigned we didn't take into
account that this bar could have been the upper part of a 64bit base
address. This fix makes this code 64bit bar aware (Bugzilla #2382).
commit 7c3dd0a5a76bea2c64972ae19d99775b5a992513
Author: Egbert Eich <eich@suse.de>
Date: Wed Jan 26 15:45:49 2005 +0000
Rewrite of RemoveOverlaps() to make the code more readable. It was
virtually impossible to determine if the old code did what it was
supposed to do. Also changed paradigm: Trust the based address more
than the (guessed) size. (Bugzilla #2383)
commit 9817582328cdafee59de616136172c2ce361a4b3
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Jan 26 10:58:52 2005 +0000
Xgl improvements
commit 13b5a93b70839053b9165b5087872164f0612536
Author: Egbert Eich <eich@suse.de>
Date: Tue Jan 25 10:08:18 2005 +0000
Fix interpretation of 64bit PCI bases: read hi long word from the right bar
(Michael Yaroslavtsev, Bugzilla #2322).
commit 8813898ef6b9eb470e079bcdcffa89d1243b63b9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 25 06:04:21 2005 +0000
Fix R100 text by forcing the 3d engine to idle before executing more 3d
commands. Add docs for the ISYNC_CNTL register, which doesn't quite do
what we want.
commit 33155b4fd3ce025d555f07833f96b760d5cdfbd3
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 25 03:37:05 2005 +0000
Finish converting RB2D_DSTCACHE to RB3D_DSTCACHE. Remove an extra pixel
cache flush in the idle function. Init an extra reg for r200, and
annotate the TCL_BYPASS better. Also, clean up some style nits from the
last commit.
commit 3b1f1508b13520626839d45185dec09a42b9ff71
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 25 02:39:48 2005 +0000
Add tracing. Hack Radeon cache registers to use 3D addresses. Works on M6
commit 6eaca06dac037851ae5c9575048faf932ad5ffc8
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 25 01:40:18 2005 +0000
Fix a leak of a region when the driver's CheckComposite fails.
commit 8a1bee8ea9a028eef65b8884f73a79fbe84a9f3a
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 25 01:38:26 2005 +0000
Silence a warning about uninitialized variable (though it would be).
commit 67eeede4e16324990e1a6afc237a3f51b8edea39
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jan 24 20:44:49 2005 +0000
Bug #2004: Make DDC delay slightly longer. (Thomas J. Moore)
commit 55736aa8c17f762b15e9bcd7b3f68f8680b7cb33
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 21 14:25:26 2005 +0000
Alan Cox requested that we check the kernel version before we use kernel
VGA font save/restore as the required features have been added to Linux
2.6.11 (Bugzilla #2277).
commit d7263b11f043c8c0f83d6e05095143c70177926b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 20 20:51:27 2005 +0000
Reinitialize offscreen memory before enabling cursor on VT switch-to
commit 13c6b2f0b6c464ce11f6c332b2fa1a529bdbab01
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 20 16:22:04 2005 +0000
Add a set of macros for dealing with the repeated code to wait for a while
reading a register/attempting DMA. Now it'll wait for a certain number
of seconds rather than a certain number of times through the loop
before deciding that it's timed out and resetting the hardware. Also,
add more timeout handling, and reset the draw state after resetting the
engine.
commit dbe45c71590ac319250d04a2bf37ec07cd79e42a
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 20 07:28:02 2005 +0000
Use RadeonSwitchTo3D() instead of doing the WAIT_UNTIL ourselves (RST3D()
also does DC_FLUSH, which may be important).
commit fc43c154943fb1d277a9cffa9a4db7e76db461bc
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 20 07:09:00 2005 +0000
Add R200 XV support, and make R100 (hopefully) use linear filtering instead
of nearest. Also, use RadeonSwitchTo3D instead of doing the WAIT_UNTIL
ourselves.
commit 77755065345eb71c997c1ff74dcfd2b2bbbf1305
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 20 01:09:48 2005 +0000
Make R200 PDMA work -- primary queue sizes are now 9 bits, not 8.
commit 9bd876768b2165ec3903ad0848ae2ae950330290
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Jan 19 22:23:20 2005 +0000
Fix debugging ErrorF() so it compiles when DEBUG is true.
commit ff433adba3a643512fdd44e41cd08965fab9c9cb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 19 06:35:28 2005 +0000
Prefer 32bpp to 24bpp. Fix 16 color planar mode (!)
commit cbcdae5a3f7c4009121f86de52bba6c657f20fff
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jan 17 17:17:45 2005 +0000
more static server build fixes
commit 79a7120983eff6fa114d4250fe01b62d4a99a612
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jan 16 01:59:23 2005 +0000
Bug #1895: Fix fbComposeGetSolid for BGR. (David S. Miller)
commit 24cdd188dc3c10b56d6a7b46dafefb16c6d13efc
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Jan 14 22:07:59 2005 +0000
Fri Jan 14 17:03:40 2005 Søren Sandmann <sandmann@redhat.com>
Fix from Keith Packard for bitgravity bugs in the Composite extension,
reported by Amir Bukhari.
commit 7db2e666e2dc9a1dba468e35e9d382e76ed8be54
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Jan 14 21:56:51 2005 +0000
Fri Jan 14 11:12:46 2005 Søren Sandmann <sandmann@redhat.com>
Use mmx CopyArea in a few more places.
commit 761f937fdee9ccd10ad54c1f06e12f2f102547a6
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 14 19:29:18 2005 +0000
- Don't suspend Xserver on APM standby request as this seems to cause
problems on may systems which don't support APM standby and might not
be required as according to the APM specs the chips should receive
enough power to retain its state.
- Print out power state change requests to log file in all verbosity
levels.
- Don't change server state if no driver PM function is registered.
(Bugzilla #2279)
commit 16f9d2d72a2378470e9c5b31c59fa6c9a00892d6
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 14 18:42:26 2005 +0000
Let the OS instead of X save/restore text console fonts on Linux. So far we
relied on the generic VGA layer to restore text console fonts for us
when shutting down the server or VT switching back to the text console.
This has worked rather well but it has some downsides on Linux: a. Many
people use fbdev as console text mode. In this case it is not necessary
to save/restore console fonts as the console is running in graphics
mode anyway. b. Some architectures don't have a fbdev console but
require a full POST of even the primary card (ie. IA64). This posting
has to take place before we even have a chance to save anything.
Therefore the fonts we save are the once written to the chip by POST,
not what has been programmed by the user. c. Certain chipsets utilize
the BIOS to perform mode setting. This may interfer with the vga
save/restore font function in a strange way. It would therefore be
preferrable to let the OS - which has been used to set up the font in
the first place - take care of saving/restoring the data. I will attach
a patch which will do so for Linux. To make this fully functional a
small patch needs to be applied to the Linux kernel. To disable this
feature add: #define DoOSFontRestore NO to your host.def. (Bugzilla
#2277)
commit 6c0b03a2362f33ae24a2f6845ed1418c9af4b8bc
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 14 17:14:08 2005 +0000
Build fixes for static server.
commit df4a1fa9c5cc5d54a9347a2bf4843cae87a942f1
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jan 14 12:17:10 2005 +0000
Added copyright notice.
commit 2137bc6eb9f36f4ba999023d83c637024f3a6e4c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Jan 14 08:37:30 2005 +0000
xc/programs/Xserver/afb/afbbres.c
xc/programs/Xserver/afb/afbbresd.c
xc/programs/Xserver/afb/afbclip.c
xc/programs/Xserver/afb/afbhrzvert.c
xc/programs/Xserver/afb/afbline.c
xc/programs/Xserver/afb/afbmodule.c
xc/programs/Xserver/afb/afbpixmap.c
xc/programs/Xserver/afb/afbpolypnt.c
xc/programs/Xserver/afb/afbpushpxl.c
xc/programs/Xserver/afb/afbtegblt.c
xc/programs/Xserver/cfb/Imakefile.inc
xc/programs/Xserver/cfb/cfballpriv.c
xc/programs/Xserver/cfb/cfbbitblt.c
xc/programs/Xserver/cfb/cfbcppl.c
xc/programs/Xserver/cfb/cfbgc.c
xc/programs/Xserver/cfb/cfbglblt8.c
xc/programs/Xserver/cfb/cfbmap.h
xc/programs/Xserver/cfb/cfbpixmap.c
xc/programs/Xserver/cfb/cfbscrinit.c
xc/programs/Xserver/cfb/cfbtab.h
xc/programs/Xserver/cfb/cfbteblt8.c
xc/programs/Xserver/cfb/cfbunmap.h
xc/programs/Xserver/mfb/maskbits.c
xc/programs/Xserver/mfb/maskbits.h
xc/programs/Xserver/mfb/mergerop.h
xc/programs/Xserver/mfb/mfb.h
xc/programs/Xserver/mfb/mfbclip.c
xc/programs/Xserver/mfb/mfbfont.c
xc/programs/Xserver/mfb/mfbgc.c
xc/programs/Xserver/mfb/mfbmisc.c
xc/programs/Xserver/mfb/mfbpushpxl.c
//bugs.freedesktop.org/show_bug.cgi?id=1114) attachment #667
(https://bugs.freedesktop.org/attachment.cgi?id=667): Convert afb and
cfb{,16,24,32} to be dlloader-friendly. Patch by Adam Jackson
<ajax@freedesktop.org>.
commit 61b3c3aef5437f14d413a60da792257b01e9f8fa
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jan 13 23:07:41 2005 +0000
Thu Jan 13 17:45:13 2005 Søren Sandmann <sandmann@redhat.com>
Make sure the pixmap is a valid new resource
Make sure the context is a legal new resource.
Handle null attrib_list.
Handle null attrib_list; copy attrib_list to data; actually allocate the
new GLXDrawable.
commit 433c38f22fa96486a43dc0c9871cc09875251b34
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jan 13 20:49:21 2005 +0000
Thu Jan 13 15:40:29 2005 Søren Sandmann <sandmann@redhat.com>
Add MMX implementation of non-repeating source IN repeating mask, aka
"translucent window".
Add MMX implementation of CopyArea.
Use MMX implementation of CopyArea.
Use the new implementations.
commit a303670107f205c6ca76919ca6cd6af6013073f1
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jan 13 01:22:53 2005 +0000
Bug #2114: PPC64 Linux build fix: use system definition of eieio().
Originally Gentoo bug #66223. (Tim Yamin, Donnie Berkholz)
commit 15895b411779aa3c14ffb92fb58cd8ec24845ea7
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Jan 12 16:10:00 2005 +0000
winmsg.c
Introduce function winTrace which prints log message with verbosity 10
Use winTrace for 3 heavily called functions
commit 8aabc94596dae0fd4ce2c975de75946685faf2cd
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jan 11 17:33:03 2005 +0000
Document the -silent-dup-error switch
commit b6301dc41090899b20003eab1356bc09fc5eed1a
Author: Egbert Eich <eich@suse.de>
Date: Tue Jan 11 14:59:02 2005 +0000
Minor format fix.
Added explanatory comment and debug code.
Added comment.
commit 27fc6874b34d70a7ddae5ed8f516f6cfaab518b8
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jan 11 12:03:34 2005 +0000
Do not grab ALT-TAB when window is in multiwindow mode
commit d365664c58919edb5e121a7c884384438df79776
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jan 11 11:58:12 2005 +0000
Fix crash with not matching definitions of PATH_MAX
commit 65b893a707ad8b3e4d0971825c05a965dca36d10
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jan 10 23:38:50 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2167) attachment #1641
(https://bugs.freedesktop.org/attachment.cgi?id=1641): Fix broken
Solaris print queue enumeration.
commit c6b5a9431178ac7eb90ec498e6830366865d1268
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jan 10 18:47:55 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2254) attachment #1659
(https://bugs.freedesktop.org/attachment.cgi?id=1659): Refix for gcc4.0
build failure. It seems that the |ExecCommand()| function has no
consumer and can safely be removed.
commit eb701e9b4481f984fdcfece181126f7424e2bf45
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 10 17:54:31 2005 +0000
winkeybd.h
Adjust keysyms for Hiragana_Katakana toggle and backslash/underscore on
Japanese and ABNT2 keyboards
commit 2ef9d01c4d3b03f0a5d829304f2a7e2cc1327f3b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jan 10 14:16:29 2005 +0000
xc/programs/Xserver/Xprint/Util.c
xc/programs/Xserver/Xprint/attributes.h
//bugs.freedesktop.org/show_bug.cgi?id=2254) attachment #1654
(https://bugs.freedesktop.org/attachment.cgi?id=1654): Fix gcc4.0 build
failure. Patch by Egbert Eich <eich@freedesktop.org> and Roland Mainz
<roland.mainz@nrubsig.org>
commit 57387e115caf5a4b9501cc8f6ddeb1946b0e6547
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 10 13:13:08 2005 +0000
winkeybd.h
winkeyhook.c
Make keyhook feature work in multiwindowmode too Hook windows keys
commit f417159e51afe22de7d4e6ba9f154313c6af59bc
Author: Egbert Eich <eich@suse.de>
Date: Mon Jan 10 12:20:33 2005 +0000
Make option 'DontVTSwitch' work again with kbd driver under Linux. The kbd
driver now calls the OS layer to handle special keys. Possibly other
special keys and other OSes need to be looked at also. (Helmut
Fahrion).
commit fe4e74241f6791cb1cefdddeb492ed0f56ce99b4
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Jan 9 17:35:47 2005 +0000
xc/programs/Xserver/xkb/ddxList.c
//bugs.freedesktop.org/show_bug.cgi?id=2245) attachment #1647
(https://bugs.freedesktop.org/attachment.cgi?id=1647): export
Win32System and Win32TempDir remove #ifdef WIN32 block for building
xkbcomp commandline create win32 tempfile in system tempdir use
PATH_MAX*4 for commandline buffer unlink tmpfile again
commit ba25f7e8dcaa2690ce3eab839904fac034002e0b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Jan 9 15:29:45 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2245) attachment #1645
(https://bugs.freedesktop.org/attachment.cgi?id=1645): cleanup some
#ifdef __UNIXOS2__ and WIN32 blocks. make OutputDirectory check the
size of the buffer quote all file and pathnames in the xkbcomp
commandline use PATH_MAX*4 for commandline buffer
commit 2410b61f430c3ac4be79043f8b00defe6d53148c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Jan 9 00:38:08 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2240) attachment #1642
(https://bugs.freedesktop.org/attachment.cgi?id=1642): Fix incorrect
usage of /usr/bin/tr in startup script (the used "[\n]" is neither
correct or portable, using "\n" seems to be sufficient (this fixes
various "random" issues, including including Debian bug #258419 and
Debian bug #264983). Patch by Drew Parsons <dparsons@debian.org>.
commit 709a2343a8c12ea7e158c63a9737b11744b50994
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Jan 8 13:01:03 2005 +0000
Fix a possible null-pointer dereference (Keishi Suenaga)
commit d332a909f8b8741af75047d78a62a3d19e0776e1
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jan 6 21:29:09 2005 +0000
Imakefile
InitOutput.c
XWin.rc
winerror.c
wintrayicon.c
winvideo.c
winshaddd.c
Set PROJECT_NAME in Imakefile to create alternative window titles for
Cygwin/X and Xming
commit d6a74f2c4aec9c914ec0837bd0bf0d212019093f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jan 6 16:02:47 2005 +0000
Imakefile
InitOutput.c
XWin.rc
winerror.c
wintrayicon.c
winvideo.c
Set PROJECT_NAME in Imakefile to create alternative window titles for
Cygwin/X and Xming
commit 3165236483de936b4ca22f8b6d2d2b8b1a1a4909
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jan 6 13:24:57 2005 +0000
Fix crash with non-nullterminated strings (reported by �yvind Harboe)
commit 591ac9c811de0871d3bdcc19cada0ff6715bf67c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jan 4 00:16:20 2005 +0000
Bugzilla #2211 (https://bugs.freedesktop.org/show_bug.cgi?id=2211)
attachment #1627 (https://bugs.freedesktop.org/attachment.cgi?id=1627):
xorgconfig default keyboard model outdated (should be pc105, not
pc101/pc102)
commit af8bd7161724b6709ffe582dfd830c05d9bf4f26
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Jan 3 21:32:22 2005 +0000
Mon Jan 3 12:45:10 2005 Søren Sandmann <sandmann@redhat.com>
Clean-ups and support for AMD64. Bug 1067. Patch by Nicholas Miell
(nmiell@comcast.net)
Add support for AMD64
Many cleanups using <mmintrin.h> instead of __builin_ia32_*, and intrinsics
instead of inline assembly. Also unconditionally use pshufw on AMD64.
s/USE_GCC34_MMX/USE_MMX/g
commit 5f39eff85109a73d006832ad35d9d5b58f93ef0c
Author: Egbert Eich <eich@suse.de>
Date: Mon Jan 3 15:43:55 2005 +0000
Added missing return value (Bugzilla #2205) Problem found by Stefan Kulow.
commit ae6d52092bca6068a7847b3944148336ab489869
Author: Egbert Eich <eich@suse.de>
Date: Mon Jan 3 15:39:35 2005 +0000
Added missing return value (Bugzilla #2206) Problem found by Stefan Kulow.
commit 83e13e21c8d9a3b54cae2ecc2943be3316659870
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Dec 24 14:40:28 2004 +0000
Print error message if CreateProcess fails Simplify popen simulation code
for WIN32 Remove temporary file after executing xkbcomp
commit 106703edf67139fa52f6810f9ced0ce5ba86a3cd
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 22 18:39:41 2004 +0000
Back out the previous day's broken R200 "fix" -- the same number of coords
are always emitted. Fix the real problem, which was not enough regs
being initialized in ati_draw.c. Fix a typo that was resulting in alpha
coming out as 0 * src or 0 * broken instead of src * 1 or src * mask.
Assign the blending results to R0, as appears to be necessary. Unbreak
the dst-alpha-blend-with-no-dst-alpha code. Yow. And set the right DMA
count for the r200 traps code.
commit 3035739e5b7d5a9042292d64455feb4b38788fe4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Dec 22 08:28:16 2004 +0000
Bug #2123 <https://bugs.freedesktop.org/show_bug.cgi?id=2123> Attachment
#1587 <https://bugs.freedesktop.org/attachment.cgi?id=1587> Call to
uname should not check for return == 0, but for >= 0 instead
commit fa0677ab43722462042f87c4636a7d59d1cb873f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 21 09:51:47 2004 +0000
Fix r200 render (for real this time?) by setting tex1_comp_cnt right for
non-mask rendering. Reenable it. Also, R200TexFormats was used instead
of R100 in one place. Harmless so far, because the formats were in the
same order.
commit 4b0247b9e0a6b7f40cd2738fb29d2ed1acba99e7
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 21 09:49:30 2004 +0000
Whitespace nit.
commit 894431412613265fd315cf7a707ffa741f93cf47
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Wed Dec 15 20:51:25 2004 +0000
Use snprintf.
commit eea11301fd9247a28b1daeb340a018c7ea309c41
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Wed Dec 15 15:05:35 2004 +0000
Another fix for MiscPassMessage(): Initialize returned "status".
commit 264c3eefe6c0cdee1ff0a5de914f051ab23026b7
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Dec 15 12:22:39 2004 +0000
latest changes from CYGWIN
commit c7fec26b50f8a64360d1252cdf48370935fb2f76
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Wed Dec 15 00:32:56 2004 +0000
Make MISC extention's PassMessage() actually work and fix memory leaks
commit d0b17bda4dc469e2ce72f4f8965916b316e1deb7
Author: Egbert Eich <eich@suse.de>
Date: Tue Dec 14 08:59:20 2004 +0000
Removed #ifdef'ed out code together with the comment explaining why it was
#ifdef'ed out.
Fixed typo.
Added comment to a changed that's been committed with one of the previous
commits.
commit 0e6a122316a94c96051f1d832990032a386097bc
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Dec 13 03:42:32 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1695) attachment #1230
(https://bugs.freedesktop.org/attachment.cgi?id=1230): Fix crash in
Xscreensaver code which allowed any authentificated X client to crash
the Xserver using |XScreenSaverUnsetAttributes()|. Patch by
ajax@nwnk.net
commit 159e443a2209eb3ea305e84b847b76ef1637d005
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Dec 13 02:13:32 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1688) attachment #1530
(https://bugs.freedesktop.org/attachment.cgi?id=1530): Fix the current
implementation to make it possible to slow down the mouse pointer or
use arbitrary fractions (without running into rounding error issues).
The change is using the same method of preserving rounding errors that
the exponential method is already using. Patch by Jan Brunner
<Jan_B@gmx.ch>.
commit f1768677f73150c686cf5678f5f5d63c0cfa8e56
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Dec 12 23:29:20 2004 +0000
Reduce vidmode logging.
commit 9286a5d032ea6bed102db39281c3d2537da4dccc
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Dec 12 22:58:37 2004 +0000
Add fix for 460gx pci scan code.
commit 8266a2581d21a1a2880a0e8babb8b0305c435ec0
Author: Torrey Lyons <torrey@mrcla.com>
Date: Thu Dec 9 22:40:35 2004 +0000
Fix crash with more than one screen reported by John Davidorff Pell.
commit 081b33d73f73572cfefba7e5489408a7117b6e9f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Dec 8 15:48:15 2004 +0000
import changes from CYGWIN branch
commit 6c317c1c1323bd11292f8f9f179d75c96a18e616
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Dec 8 05:52:20 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #1287
(https://bugs.freedesktop.org/attachment.cgi?id=1287): Avoid DRI
initalisation when the Xfree86-DRI extension was turned off. Patch by
Kristian H�gsberg <krh@bitplanet.net>.
commit b9476cd96faf19153c11e3370e9fced8045600f4
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Dec 8 05:48:16 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #938
(https://bugs.freedesktop.org/attachment.cgi?id=938): Allow more
extensions to be enabled/disabled.
commit 47935dd7f010f2f77768774ceb6f85667efe4264
Author: Matthew Allum <breakfast@10.am>
Date: Mon Dec 6 22:29:31 2004 +0000
Xephyr on Xorg fix
commit 8091b301c941473ab99626a6e66f72acdb6750f7
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Dec 6 21:54:19 2004 +0000
xf86Config.c references USE_DEPRECATED_KEYBOARD_DRIVER so define it if
needed when building this file
- bug fix: pointerMsg -> keyboardMsg in auto-configuration code.
- make the 'kbd' driver the default for autoconfiguration everywhere.
commit cde3a175005104e061c1ff133f07c598868bdc4e
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Dec 6 18:28:12 2004 +0000
include windows.h
commit 9c94971617db11861aed82e16804fc14a9ca1260
Author: Egbert Eich <eich@suse.de>
Date: Mon Dec 6 15:53:00 2004 +0000
Use the same method of finding the screen pixmap of COMPOSITE extension is
compiled in or not.
Removed stale make variable.
Updated xaaWrapper.c: Under certain circumstances the accel path was not
used when possible. Removed some debugging stuff and stale code that
had been commented out.
Check if maps are really installed before attempting to list them.
commit 4945034792b28d1a222a615404bfceaf48a130c5
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Dec 6 12:26:50 2004 +0000
problem with max() macro. this one slipped though again
commit 531776becf95f66e6e435aad0dc21ead436ff5aa
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Dec 5 21:33:23 2004 +0000
missed another wBOOL issue
commit 9bd1328c49aafae67a6a6d9fd17063c75d8547a2
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Dec 5 21:24:48 2004 +0000
redone ddraw.h to be able to mix it with w32api style COM header files.
obj_base.h is not needed anymore. Using <objbase.h> instead.
Use Xwindows.h instead of windows.h
do not include win_ms.h
remove extra definition of sleep()
Set HOME to Documents and Settings/username if not set
Use Xming basedir instead of ProjectRoot for system.XWinrc
Fix callback functions to use wBOOL instead of BOOL
Fix compiler warnings. Added debug output.
Fix warning about undefined macro max
commit bf0a760331e2fe4dbc00e78f87022c7464d9ca4f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Dec 5 04:39:34 2004 +0000
//freedesktop.org/bugzilla/show_bug.cgi?id=1800): Fix Postscript DDX's 1bit
StaticGray visual to report only 1bit of significant bits in color
specification (instead of 8bits). Patch by Julien Lafon
<julien.lafon@gmail.com>
commit 44f4713a056b7a6a076b2f65fbed43e0cfe9ff06
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Sat Dec 4 00:43:13 2004 +0000
Encoding of numerous files changed to UTF-8
commit f264a7ea741f57fbc3bb900cfbb9e0cc23f46e90
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Dec 3 12:04:15 2004 +0000
Removed scprintf, aprintf and snprintf stuff and use newXprintf
commit 16a683f4d164899ecfdafb853f48cff10fd13fd4
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Dec 3 11:57:42 2004 +0000
Bugzilla #1865, https://bugs.freedesktop.org/show_bug.cgi?id=1865 Added
X(NF)printf and X(NF)vprintf functions which allocate the buffer with
X(NF)alloc
Bugzilla #1865, https://bugs.freedesktop.org/show_bug.cgi?id=1865 extend
snprintf to work on NULL.
commit fe2a2213d1db8700f6078379f86ebe8827793c20
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Dec 2 23:47:39 2004 +0000
//freedesktop.org/bugzilla/show_bug.cgi?id=1998): Fix Xserver standalone
build when RENDER extension includes are not availabe.
commit 30a4202f3d59a32fd6f93dfd257d93ee21b68ed9
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Dec 2 21:58:58 2004 +0000
Use __printf__ in gcc function attributes to avoid clash with libc wrapper
define, and remove the last bits of the old workaround.
commit e62d85baa31fc853aefdef49962ad4cb86ae8245
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Dec 2 21:49:54 2004 +0000
Remove some of the ifdef WIN32 checks from WaitForSomething
commit 2782b8871196ef28f9a6c84bf6c8b5086d00d5d4
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Dec 2 14:19:01 2004 +0000
Adjust the width of the rootless backbuffer to match 32 bit alignment
Make multiplemonitors default for -internalwm
commit 3b3e24dc4d89b471d80428dd9ad122f259b1fc81
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Dec 2 13:38:30 2004 +0000
Set HasFfs to NO
Fix link order problems with mingw. Add libdix.a after libmi.a.
Pass -DHAS_FFS to compiler
remove inline code for ffs(). It will link to dix/ffs.c instead added
declaration for ffs()
commit 2620676306d1eccd24a6bf0637a60842656e6f7c
Author: Phil Blundell <pb@reciva.com>
Date: Wed Dec 1 19:43:29 2004 +0000
Patch from Florian Boor <florian.boor@kernelconcepts.de>:
Check return value from ts_config. (TslibInit): Likewise.
commit 96545d038837bbc7dc435ed7c1f631454e86cecb
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Dec 1 14:57:45 2004 +0000
Remove code which sneaked in recently. It is not proven to be correct, just
a workaround and disabled by default
commit 3f063fc49cc2d456359a1b0b9f36f27befdb09b0
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Dec 1 14:16:07 2004 +0000
Set XERRORDB environment variable to relocate the XErrorDB file
commit 908442301478b21febab17e31aa55918eaaa5101
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Nov 30 23:43:33 2004 +0000
//freedesktop.org/bugzilla/show_bug.cgi?id=811): Updating generated
Xprt.html which was forgotten during the previous work.
commit af717ae57dd6c5e6ad41b4142d62cdbb55f13777
Author: Egbert Eich <eich@suse.de>
Date: Tue Nov 30 08:38:44 2004 +0000
Make Xorg the default server to install.
Avoid PIO access on IA64. Some IA64 machine check if legacy ports outside
the VGA range are accessed. The ATi driver however does this to probe
for ISA Mach8/32/64. Since no IA64 has ISA slots this restriction
should not be relevant to the user.
Avoid recursive calls of xf86scanpci(). This function normally detects that
it has been called before by checking if the PCI structure is filled
out. So far if this was not the case (because PCI probing has failed
for some reason) the function is traversed again. With the chipset
specific PCI bus probing this can lead to an endless recursive loop as
the post-probing code calls xf86scanpci() from within this function.
The OS specific PCI code for Linux worked only if bus 0 was populated as it
checked for the presence of /proc/bus/pci/00. Fixed to check for
/proc/bus/pci/<bus_to_look_for> instead.
commit 59ccc6465ca15e046ad11362ae5fbb3c71d2c148
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 29 12:34:55 2004 +0000
Fixed windows.h include for cygwin.
Bugzilla #1945: Stop unnecessary reordering.
commit df2f2ff5a4ebf6c5289da64bf3f572341a0f7656
Author: Phil Blundell <pb@reciva.com>
Date: Sun Nov 28 23:20:17 2004 +0000
Re-read "fix" structure from kernel after mode selection, in case line
pitch has changed.
commit 6062f6a6e7b3c444a35e3f11b2541df2aa0066a2
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Nov 25 22:42:51 2004 +0000
xc/programs/Xserver/Xprint/Imakefile
xc/programs/Xserver/Xprint/Xprt.html
xc/programs/Xserver/Xprint/Xprt.man
//freedesktop.org/bugzilla/show_bug.cgi?id=811): Add missing manual page
for "Xprt" (DocBook master file (Xprt.sgml) and the generated files
(Xprt.html, Xprt.man).
commit cbce4cf96dfa2eeecb253d73d7d9acecbc52ad67
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Nov 25 12:48:21 2004 +0000
Bugzilla #1914: fix size limit for -fp argument
commit 2b75c19ea2bb76512d51e99c5c9ecb073fdb9163
Author: Matthew Allum <breakfast@10.am>
Date: Wed Nov 24 17:50:50 2004 +0000
minor Xephyr fix
commit a96254234fc9410944406f6ae878815cd3cfcee3
Author: Matthew Allum <breakfast@10.am>
Date: Wed Nov 24 17:08:06 2004 +0000
XEphyr -parent switch fixes
commit a7a07d0c71aa3f2e224cceea7e8d8348523136ee
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Nov 24 16:56:03 2004 +0000
Finally the multiwindow mode defines a default cursor
commit ca4da62478a3ad86ab087245bf8eb7d7fadf31de
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Nov 24 09:07:58 2004 +0000
Add <sys/types.h> include to unbreak build on FreeBSD.
commit da3df7522d15855fa871c45f3b8db23e7c639a44
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Nov 24 02:45:33 2004 +0000
Remove this file and all references to the binary expiry code.
Remove old obsolete include/extensions/damage.h.
Include srvrv_ctrl(xfree86) in macintosh US XKB symbol file so VT switching
works again on mac (#1872).
Remove out of place #define's of printf to xf86printf. This definition
should only be in xfree86/os-support/xf86_libc.h
commit 9a26d6f39e199bad287d4e538ef75700a0102788
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Tue Nov 23 17:29:47 2004 +0000
Bugzilla #1883 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1883): Fix
insufficient SHM detection in XvMC local test. Removed reference to
getpagesize() which caused linking problems on s390. Reported by Stefan
Dirsch <sndirsh@suse.de>
commit fec868bf0f67a8f62fc69d55e2ff72b6cacea6f8
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Nov 23 17:10:55 2004 +0000
//freedesktop.org/bugzilla/show_bug.cgi?id=1204): Fix X11 test suite
(caused by DAMAGE layer) failure with Xvfb when rendering text using
|XDrawText*()| (XDrawText() tests 1, 3, 4, 27, 28,
29, 30, 34, 37, 39, 41, 43 and XDrawText16() tests 1, 3, 9, 10, 11, 12,
13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 34,
37, 39, 41, 43). Patch by Hong Bo Peng <penghb@cn.ibm.com> and Stefan
Dirsch <sndirsch@suse.de>.
commit b09f2a0495071a068c2b6b36084c974acf7aab9b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 16:04:04 2004 +0000
Windows does not have ffs() implementation. added one
Enable RootlessSafeAlpha and RootlessAcceleration for the Windows port too
commit bb43f234c5d418e064c89b928b81b53987f14e92
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 15:00:04 2004 +0000
Use GetTempPath for finding a place where to store temporary files on
Windows
commit bc7493801d1f5177d9ba3fe09accc2a2d72cfe3d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 14:28:25 2004 +0000
Fixes for building multiwindow and internalwm on mingw
Changed some debugging output
commit 255c3c0e8ca0f402b2c327d70c8a254ba65eda03
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 14:12:33 2004 +0000
Xming: Place logfile in users tempdir
commit 0f7874cbfc01da339cc6be221351ddffdb37805d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 13:23:25 2004 +0000
Use a simple hashtable as ConnectionTranslation instead of a plain array on
Windows because socket fds are not sequential and do not start at 0
commit e6bc551e3451efe4fcbb55475d6d0ff53fcc9807
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 15 18:13:41 2004 +0000
Use CreateProcess instead of system() to spawn xkbcomp on windows. system()
can not handle spaces in the path component. Quoted all filenames on
the commandline.
commit 6618567311f41f5e237f12b4204aa32ce174a514
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 15 15:58:51 2004 +0000
Remove override of HasSnprintf
commit 9826b83826190e514ed115e15691ca015780f9bc
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 15 15:06:51 2004 +0000
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
mingw (Win32) port
commit cecb668149e1956fb29bc89855182349122e2f4e
Author: David Reveman <c99drn@cs.umu.se>
Date: Sun Nov 14 23:21:29 2004 +0000
Add xglPixmapToRegion
commit 343f965749af0a985573c525dc6084c2519b6ffe
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 14 17:29:56 2004 +0000
Fix typos in output file. (Bugzilla #1849, reported by Yi Ren-Chen)
commit 636a9e786881dd42cd6fd579e13b7895cf9f10eb
Author: Phil Blundell <pb@reciva.com>
Date: Sat Nov 13 18:03:16 2004 +0000
Don't leave stale pointers hanging around after ts_close(). (TslibFini):
Likewise.
commit 36d9e01c0d36eaf0d9cb1e77dd2908b09d55a35d
Author: Phil Blundell <pb@reciva.com>
Date: Sat Nov 13 16:41:00 2004 +0000
New global variable. (KdProcessArgument): Set it to TRUE on -nozap switch.
(KdUseMsg): Add help for -nozap and -rgba switches.
Declare.
Honour dontZap flag.
commit 3b0dce3620e4cce74c3a2c7f9077cc28be11740d
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Sat Nov 13 11:09:23 2004 +0000
lib/XvMC/Imake
Added support for automatic loading of the correct hardware XvMC driver.
This involves a protocol extension of the XvMC protocol. The XvMC
revision number was bumped.
commit a97548b1c9bb69b5824609c1da1ad66c3a9c5065
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Nov 11 20:10:28 2004 +0000
Cosmetic fix to make xf86pciBus.c use standard min() macro.
commit e5040e24f03a2fe770139e6f37acef3da48aa0f9
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu Nov 11 16:09:58 2004 +0000
oops commited wrong version previously
commit e380fd548ed5452d08184723145dd992ad72288c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu Nov 11 15:44:31 2004 +0000
update shared lib revisions on OpenBSD (Bug #1828).
update references to xf86site.def in comments (Bug #1827).
fix kbd driver for wskbd protocol and pure wscons console driver (Bug
#1825).
don't add '-4' to generated default file name (bug #1826).
typo in resource name (XFree86 bug #1300, X.org bug #1825)
commit d7f46f71d892768ea85552a0d5458b69b561fe21
Author: Matthew Allum <breakfast@10.am>
Date: Thu Nov 11 14:55:30 2004 +0000
Xephyr grab fix
commit 2854fa438ff721637f2e53fbafa141b3db8a9082
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 9 17:06:15 2004 +0000
Bug #557: Don't use "bool" as a variable name in xf86cfg, to avoid compiler
bugs. (Donnie Berkholz)
commit 367b963b6333ee58e197845f1389a95ff26f108e
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 9 15:58:41 2004 +0000
Bug #1765: Add support for R_ALPHA_SREL32 relocations in elfloader.
Originally Debian patch
202_alpha_elfloader_support_R_ALPHA_SREL32.diff. (Falk Hueffner)
commit 50cdff7ee2a1b448da24e85efae02237cff9b6b7
Author: Matthew Allum <breakfast@10.am>
Date: Tue Nov 9 11:36:49 2004 +0000
Xephyr improvements
commit 81a3b6fe27567b4f91033ece69996aa6bf8d01a3
Author: Matthew Allum <breakfast@10.am>
Date: Mon Nov 8 22:39:47 2004 +0000
Add support to Xephyr for lower depths than hosts
commit e494e24c508b34b144355cb380aac16abf2fb891
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Nov 6 11:56:57 2004 +0000
Wrap all mwextwm and internalwm code with XWIN_MULTIWINDOWEXTWM
commit 16ee24cd994fa3f8d479c972f18c8207a5116cb7
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Nov 5 19:51:38 2004 +0000
Use ROOTLESS instead of platform specific defines.
commit 64c7f8e667eef955b266c359291206c7188ce20c
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Nov 5 13:26:07 2004 +0000
Use UTF-8 encoding in Xgl sources
commit 1d994e1d14225c1dec5251edeae40e24923a31c6
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Nov 5 12:46:29 2004 +0000
Use negative strides in Xgl if pixel data have bottom-top scanline order
commit 2dd76d646c517e1988897692e9ff8b6194d25c87
Author: David Reveman <c99drn@cs.umu.se>
Date: Thu Nov 4 23:19:13 2004 +0000
Add working Xgl server code
commit 1aef1060647d22b676a29f6dcf1ac54f9fe7ff5d
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Thu Nov 4 11:52:22 2004 +0000
Add InternalWM mode.
commit 522c878fca3bfe97cd408e37065f827c004faa04
Author: Egbert Eich <eich@suse.de>
Date: Tue Nov 2 08:54:53 2004 +0000
Removing unneeded private FreeType2 symbol.
Updating to EDID 1.3. (Bugzilla# 1490, Jay Cotton, Egbert Eich).
Removing unneeded code.
Fixed KGA handling for i810. KGA handling for chips derived from C&T chips
is slightly different. The changes make the code consistent with the
C&T (chips) and i740 drivers.
commit 1074992c285835ca9d96d11e8352bbe2cdbc2a28
Author: Egbert Eich <eich@suse.de>
Date: Mon Nov 1 16:05:27 2004 +0000
Fixed sig11 which occured when calling a CloseDisplay() after
XScreenSaverSetAttributes() followed by XScreenSaverUnsetAttributes().
Caused by missing FreeResource() in XScreenSaverUnsetAttributes().
Removing unused DDC sections that caused misinterpretation of DDC data due
to a missing break statement in a switch.
Fixed typo: #if <-> #ifdef.
commit 7e588ba9abdcc2078b6c361c81806337b8ff0827
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 30 20:33:43 2004 +0000
Add -d flag for compilers like the Sun C compilers that produce dependency
lists themselves. To use with the Sun compilers, add to host.def: #
define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun
bug id #4245688 - fix by Alan Coopersmith)
Add Solaris to the platforms on which mprotect is run to set execute
permissions when necessary. (Sun bug id #6175128 - fix by Alan
Coopersmith)
Internationalize digital output (Sun bug id #4119396 - fix by Steve
Swales), add -bgpixmap option to set XPM file as background (originally
from STSF project version of xclock by Alan Coopersmith)
xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which
are one too low in error messages (Xorg bugzilla #1739, Sun bug id
4637857 - fix by Sam Lau)
commit 612bd1c27322a69a98b59193e7d31501688359bd
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Fri Oct 29 02:07:15 2004 +0000
Add facility for catching signal 4 from driver. This can be used to check
for OS SSE support. (Part 2)
commit 09fdfaa28d2afe33dfadd4293b39a34da268fbdb
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Fri Oct 29 02:06:17 2004 +0000
Add facility to catch sig 4 from driver. This can be used to check for OS
SSE support. (Part 1)
commit b0185a4bf77a668e65e94197bdb13331680521c7
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Thu Oct 28 22:12:23 2004 +0000
Add xf86[GetGammaRamp|ChangeGammaRamp|GetGammaRampSize] to symlist in order
to allow drivers to use them
commit 9d4823adc8319a20d2ace3d0944ca32e300f6eeb
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Oct 28 14:23:08 2004 +0000
Import recent changes from CYGWIN branch
commit db65fce04ddec1dac0d92ad3abc95ab4996bd206
Author: Torrey Lyons <torrey@mrcla.com>
Date: Mon Oct 25 19:09:11 2004 +0000
Fix rootless Cygwin crash due to acceleration code illegally modifying a
const structure (Reported by Kensuke Matsuzaki).
commit a57e85b52357f15f52e81c8d9b310a76e0c62b3f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Oct 25 07:12:21 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1664 - RFE: Add
support for the DOUBLE-BUFFER extension to the Xprint server and DDX.
Additionally a "pixmap-scrubber" optimisation is added to the
PostScript DDX to remove all content from a vector pixmap when a
|PolyFillRect()| call covers the whole pixmap surface with a solid fill
(this avoids that a backbuffer vector pixmap gets constantly filled
even when the content is not visible anymore after |XdbeSwapBuffers()|
has cleared the hidden buffer with the background color).
commit e0cc4871491ab7a8c52749ff2c077d8f11516b15
Author: Phil Blundell <pb@reciva.com>
Date: Wed Oct 20 18:06:58 2004 +0000
Add epson.
Build Makefile in hw/kdrive/epson.
commit 258c9016a0c966187a81f9d956766791d6e8c505
Author: Phil Blundell <pb@reciva.com>
Date: Wed Oct 20 18:02:32 2004 +0000
Block SIGIO before disabling input fds. (KdEnableInput): Unblock it after
enabling them again.
commit cbd5fbcb7e5b802cbcff317fdc2f848043207690
Author: Phil Blundell <pb@reciva.com>
Date: Wed Oct 20 08:20:51 2004 +0000
Import Epson 13806 driver from Costas Stylianou:
New files.
commit 0584d92b36910d42e4fba96cee5f3380eeb3b493
Author: Egbert Eich <eich@suse.de>
Date: Mon Oct 18 14:21:46 2004 +0000
Made handling of DevelDrivers for x86-64 more conformant to other
platforms.
Compress all font encodings (Stefan Dirsch).
Fixed warnings.
Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and
Root mode (bugzilla #1580, James Su).
Added another compose key combination for the Euro symbol (Stefan Dirsch).
Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian).
Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian).
This is the encoding that is also used by glibc. We may break other
libcs - lets see who complains.
Added explanation for DESTDIR to install to a different directory than /.
Added some early bailouts to atiprobe if PCI structure pointer is NULL to
prevent sig11.
XV support doesn't depend on 2D acceleration any more. This patch removes
this limitation from the NSC driver. This is a patch that I have
committed to XFree86 a while ago but never ported over to X.Org.
Matthieu Herrb contributed some build fixes.
Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate
timer. This takes advantage of the fact that TimerSet() with a timeout
argument 0 behaves like TimerCanel().
Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink).
Create missing links for backward compatibility to XFree86 (Stefan Dirsch).
Changed comment to mention xorg.
Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If
you don't like it we can change it back (original author unkown).
Added 'pic' to the man page rendering command pipeline (Werner Fink).
Added missing return value (Stefan Dirsch, Roland Mainz)
commit 77dab254402073bf96234a6b1056b2277578a976
Author: Alex Deucher <agd5f@yahoo.com>
Date: Sun Oct 17 20:29:35 2004 +0000
- Add interlaced support to S3 driver (bug 332, Leo Savernik)
- EmulateWheelTimeout (bug 323, Mathias Fröhlich)
- single button double-click (bug 322, Rob Brown)
commit 9a0cf1eb43878308c0a83e4f935933b647edc6d5
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 17 10:46:14 2004 +0000
Remove some remaining AMOEBA specific code.
commit 5505555c15bfa2de1f596ae0997335fdbf07eb5a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Oct 15 22:29:40 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1647 - Fix the
problem that |XpSubmitJob()| returns a random value (patch by Stefan
Dirsch/SuSE).
commit 60caca718d23012c4c85ce70547610fe05168342
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Oct 15 22:08:38 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1646 - Fix the
problem that |PsCreateColormap()| returns a random value (patch by
Stefan Dirsch/SuSE).
commit 4782b2f7c10708f9662d9fc743c692d0bec85743
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Oct 15 21:43:31 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1637 - Fix
problems in oid code which may cause the usage of an invalid string
pointer (original patch by Egbert Eich).
commit 881b5756dc96dc33f6966ec6fccd324f63559dc2
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Oct 14 23:10:30 2004 +0000
Bug #1628: Convert xf86{BusToMem,MemToBus} to PIC code, eliminating a text
relocation and enabling the server to be built as a
position-independent executable. (PaX Team)
commit a0251ee285e1f1e28d06927d8ab7d35d59fda607
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Oct 14 02:20:52 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1629 - Fix crash
on AMD64, regression caused by bug 1496 ("Xorg Xprt does not support
"*xp-listfonts-mode: xp-list-internal-printer-fonts" to toggle the
usage of printer-builtin fonts").
commit 3a055ea35b687e381da4d729dbdd0ebac47f673b
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Wed Oct 13 23:02:42 2004 +0000
Modified:
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c
xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.h Squash annoying warning
about fi1236_dump_status
commit 3364e7fbd44537b98212820fb2b1941abf0d5ef3
Author: Egbert Eich <eich@suse.de>
Date: Tue Oct 12 19:13:43 2004 +0000
Set fbdev mode as the default mode on PPC (Olaf Hering).
Added support for IBM space saver keyboard (Stefan Dirsch). Added support
for Cherry CyMotion Master XPress (Marcus Schaefer).
Change order of SetDisplayDevice(), HWRestore(), UnbindGART() and
RestoreBIOSMemSize() to be exactly opposite to the Save procedure in
EnterVT() (Matthias Hopf, Alan Hourihane).
Fix text mode restauration by removing the assumption that the register
which determines which head is programmed is set. to the active head by
the BIOS (Mark Vojkovich).
When I wrote the resource code 5 years ago I made some assumptions which
turned out to be false: I've assumed that the bus number of the PCI
hostbridge would be the PCI bus the bridge links to. This is not
correct. Fixing this assumption is not easy. However I hope that the
attached patch will make the system work regardless as it 'ignores'
host bridges from which the target bus is not known. This should not
matter at all as we really don't care about host bridges (unless we
have bridge specific code which retrieves information about the
bridge).
Fixed server crash on reset when a structure allocated in PreInit() was
freed on CloseScreen().
Fixed ring buffer lock ups that happened because the structure that
contained ringbuffer data was not zeroed after allocation.
Fixed numerous warnings due to signed unsigned comparisons.
programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c:
(NVBacklightEnable): Changed the order in which the sequencer registers
and the backlight control registers are written. The sequencer control
register need to be written first otherwise DPMS screen blanking
produces vertical bars on a mobile device. lib/Xau/Imakefile: Build
libXau static library PIC so it can be linked into toolkits that would
like to wrap its functionality.
commit 4ab7d316eceb23c81c1b208f9291750cf6b37513
Author: Egbert Eich <eich@suse.de>
Date: Mon Oct 11 09:58:04 2004 +0000
Improving DPMS handling on VT swich and server termination/abort: previous
version called the driver directly and too late.
Unblank secondary screen explicitely. Don't rely on the value read during
register save as the BIOS have blanked the secondary head.
Checking if server isn't switched away before calling sync. Sanity check
for possible bugs in aother areas of the code.
Fixing default amount of of allocated video memory from AGP for i810: Use
16MB if less than 192MB are installed else use 24MB (Matthias Hopf).
commit ca1fda2a3f674a6d59de236612c7077387738ec3
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 10 17:48:43 2004 +0000
programs/Xserver/Xext/saver.c Fix for XFree86 bugzilla #1224.
commit fa9847aeb9094aafc3798aee1fc8379e77a18d6a
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Oct 8 00:35:08 2004 +0000
Allow rootless implementations to override frame reordering. This is used
on Mac OS X when genie-restoring from the Dock to ensure that the
animation completes before drawing the frame.
commit d737bc3300cf1847bcea08ca781f37ee3ee62692
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 5 17:28:15 2004 +0000
Make xorgconfig ask again instead of giving up and throwing away all your
answers when you give a bad file name or bad amount of video RAM. (Sun
bug id 5070654 - Derek Wang)
commit 75217be88ccb87a54c84e31697ffb98b5f9b8e0a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Oct 4 05:34:32 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=661 - Xprt
producing spurious characters in PS output when using the bitmap cache
(Originally reported against Solaris Xprt as Sun bug id #4369307, and
fixed in Solaris by Jay Hobson.
commit 658b4ed81f777df2d8b9f47904de90bde1897113
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Oct 4 05:04:14 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1299 - Add more
visuals to the Postscript DDX (8bit GrayScale/StaticGray, 1bit
StaticGray and the basic infratructure for "deep" visuals with more
than 8bits per RGB gun).
commit e622b346113f65788110777d7d1b5fc436600a4d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Oct 3 23:29:21 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1496 : Fixed Xprt
font handling which did not support "*xp-listfonts-modes:
xp-list-internal-printer-fonts" or "*xp-listfonts-modes:
xp-list-glyph-fonts" to toggle the usage of printer-builtin and glyph
fonts in XListFonts*(), XLoad*Font(), etc. Additionally the Xprint DDX
now explicitly list "xp-listfonts-modes" in
"document-attributes-supported" (for document-level) or
"xp-page-attributes-supported" (for page-level) when the DDX implements
this feature (as described in the CDE DtPrint specification).
commit 8b2f127ea0db2c7fee223b69f4fceee0427fb2e4
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Oct 3 15:34:33 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1416 - Fix Xprt
PostScript DDX crashes when copying offscreen pixmap content to the
same pixmap.
commit 7b27bf869dcf02bccf730706fc451c6f4c72b1f0
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Sun Oct 3 15:01:31 2004 +0000
Modified:
xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.c Make sure formatting
style is consistent within a single function. MT2032 functions are best
be in separate file anyway.
commit 4046653cb63f4cd752212e7cf65fad5408d8f5b8
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Sun Oct 3 14:38:31 2004 +0000
Modified:
xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.c Fix compilation with
gcc 3.4.x Cleanup xf86DrvMsg noise.
commit ebe7b3fe160259b6f19fe760d6ff4f5bb1dd4b72
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Sat Oct 2 01:35:33 2004 +0000
xc/programs/Xserver/hw/xfree86/drivers/i2c/*_module.c Change version
strings to XORG.
commit 0d474149f1cb68a60927529f6eac611a12acf5e6
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Thu Sep 30 22:58:07 2004 +0000
Initial code from GATOS. This needs to be cleaned up, for example the bt829
code is practically untouched since xatitv (which was a standalone test
program). However, it all worked and was debugged over long period of
time, so I prefer to to mess with these for now.
New drivers: fi12xx (including MT2032 - this would be be split off later).
tdaXXX msp34xx bt8xx
commit 1dfafe2aeec864a9bdfd6da3324243b2be8e3a62
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Sep 29 04:17:44 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1489 - Use |long|
instead of |int| for BIGREQUESTS commandline option.
commit de89181444a2f2258a446fe20a25e37fd225a568
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Sep 24 02:11:14 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1453 - Fix spaces
in usage output for BIGREQUESTS extension (option "-maxbigreqsize").
commit 884cb060eea2b914191c269a0c9955ed83d07ff9
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Sep 22 23:52:39 2004 +0000
Update XDarwin project to Xcode 1.5 format and remove unused
QUARTZ_SAFETY_DELAY code.
commit 35a3bf13a8be96bb29dce32399c3684c6baa527d
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Sep 22 23:38:33 2004 +0000
Add option for XDarwin to track system keyboard layout changes as they
occur (John Harper and Torrey T. Lyons).
commit 1b3fa4d53b287cbe9d38c5f8c9fbbc2298690959
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Sep 22 22:52:03 2004 +0000
Warning fixes.
commit de68a3339b9f19630e29a17773cad060b1f65300
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Sep 22 17:20:56 2004 +0000
Allow overriding DPMS defaults (timeouts & default for on/off) from
#defines/-D options.
programs/Xserver/hw/xfree86/common/xf86DPMS.c Use defaultDPMSEnabled global
for the default state of DPMS if not set in any config files.
programs/Xserver/hw/xfree86/os-support/sunos/solaris-sparcv8plus.S Add
support for required assembly inline functions for Sun compilers on
Solaris/sparc.
Add support for Solaris/sparc libraries.
commit d7514b9162648f894211884b199ef2edc458aa86
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Sep 22 04:38:03 2004 +0000
Bug #1252, #1253, #1255, #1256: Various typo fixes from Dave Jones.
commit 269012e6014d7c23bf6805ba14ca0b598cdd6313
Author: Torrey Lyons <torrey@mrcla.com>
Date: Tue Sep 21 22:01:14 2004 +0000
Add offscreen GLX direct rendering with XDarwin's xpr backend (John
Harper).
commit 0514f8b65616d8878000764485e71384b71e3860
Author: Egbert Eich <eich@suse.de>
Date: Tue Sep 21 17:57:36 2004 +0000
Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and
Alan Coopersmith from release 6.8.1.
Fail during initialization with error if font/fontset is not set for
widget. This prevents a sig11 later when the non-existent font/fontset
structs are referenced.
Check if xf86Info.kbdProc pointer is really set before calling it on abort
as this pointer won't be set if the new modular keyboard driver is used
(Matthias Hopf).
Added new libs to the bindist control files.
Removed inclusion of unnecessary kernel header on Linux. This may fail in
an -ansi environment.
commit 814b74662103710665c0b5659a93974ad609276c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Sep 20 08:44:54 2004 +0000
Bugzilla #1402: The last patch was broken on linux. Take definition of
badSysCall out of the OS specific block.
commit b600fcda38f4ab4796b5536cbedc5dee1abd25b1
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Sep 20 03:12:00 2004 +0000
Fix the R200 Render code. Composite and Trapezoids are now supported just
as well as on R100.
commit 908287addaff10a0f5f6f14bf06a9b85870737ec
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Sep 19 12:59:52 2004 +0000
Bugzilla #1402: fix BigFont extension if SHM is compiled in but not
working. Does not access SHM and privates if the SHM syscall failed
during extension initialization.
commit 90ff3688cdc0c2c1b5ccdbd9cc0659b9a355e85f
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 19 10:57:31 2004 +0000
Unbreak the AGP DRI case. That was quite a pile of broken code.
commit 9297c6149f83de22395503c484a2ca65dbffaf6b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Sep 18 23:18:35 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1404 - Fixing
random crashes (like in DAMAGE code etc.) in Xnest due uninitalised
GetWindowPixmap. Original patch by Alexander Gottwald
<ago@freedesktop.org>
commit 6344bb51e2a97d9678cec2ec1dab19abfe9d9e8d
Author: Torrey Lyons <torrey@mrcla.com>
Date: Sat Sep 18 00:38:30 2004 +0000
Bugzilla #1032: Make rootless acceleration functions compatible with
Damage.
commit cedb9a8d62df3391fd89a8b05a2dd64bd098a7df
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Sep 17 21:57:26 2004 +0000
Update Apple's list and hash utility routines to latest versions (John
Harper).
commit b56f4532d1a5febb8df45da0e3d3ad7bf8838e5f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Sep 16 13:22:52 2004 +0000
Remove code which prevented the use from specifying the window size in
nodecoration mode.
commit c4083511acd1d0f20a242b8cd3ed62629629ce8f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Sep 15 17:58:50 2004 +0000
add support for mice with more than 3 buttons and one scroll wheel (Chris
B)
commit 516f452e78170bc643117a71bd2246a83b071316
Author: Egbert Eich <eich@suse.de>
Date: Wed Sep 15 09:23:59 2004 +0000
Adding support for OS dependent probing of IA64 chipsets. Not all IA64
chipsets can be probed without OS support as probing them is only
possible using ACPI. One example of this are the HP ZX1/2 chipsets:
previously the code assumed that these chips were present when no other
of the known chipsets could be probed. This assumption brought SGI
Altrix machines with 64 CPUs to a grinding halt.
commit a3aa6a2d865239c5b8f29cbd849ae3288e36b8a9
Author: Egbert Eich <eich@suse.de>
Date: Wed Sep 15 09:05:22 2004 +0000
Unregistering events in XSelectInput() when unregistering IM filter
callbacks may be a bad idea as others may be interested in this event.
Removed the call to XSelectInput() altogether as we are in root window
anyway (Lubos Lunak).
Fix size of a variable that gets assigned the value of SmartScheduleTime
(long) to long. This should help to prevent smart scheduler lockup on
64 bit systems due to overruns (Andreas Schwab).
commit f642fc729b481c55073c75beca301b2f17881179
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Sep 14 23:21:22 2004 +0000
Refix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow
enabling/disabling of more extensions (fixing duplicate symbols caused
by previous checkin; attachment #899)
commit 0d95bdfbabf4c526f6f54d6f1de8811f4e6d5d5f
Author: Phil Blundell <pb@reciva.com>
Date: Tue Sep 14 23:08:10 2004 +0000
Only set screen parameters if resolution has changed from current values.
Patch from scoony@noos.fr.
commit ba3b6fd23be5f1f900fcff57bc586e08bc524e99
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Sep 14 06:26:54 2004 +0000
Add proper PCI/AGP detection, based on Mike Harris's code for Radeon, but
using the MMIO mirror of the bits instead of config space.
commit d9df39ee2b5b462be87718046b16d30c231563ec
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Sep 14 00:51:25 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow
enabling/disabling of more extensions
commit 80dc84d067c5af29e33a0c7ac62eecc8ba4e0871
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 23:22:31 2004 +0000
- Fix a segfault on VT switch with DRI. Still dies due to cursor allocation
troubles.
- Move the RemoveBlockAndWakeupHandlers to match
RegisterBlockAndWakeupHandlers.
- Enable R100 trapezoid "acceleration" when DRI is working, so that it can
be exposed and worked on.
commit ab50679aabdda9e6197568f745d02fe1e65c7a24
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 23:01:24 2004 +0000
Fix a bad argument missed in the previous commit for ATIDRIDMA* functions.
commit 2d069b1d1950b5f6f9140e5573e349e6559251e6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 22:21:12 2004 +0000
Move the RegisterBlockAndWakeupHandlers to before DRI initialization. The
change to use that instead of manual wrapping made the DMA dispatch
come after the lock had been dropped, causing lots of pain.
commit 27b5a65f05c78a0b6de0d0ace4f4275d990cc3a4
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 20:31:39 2004 +0000
Reset the CCE/CP on engine reset, and make the ATIDRIDMA functions take a
more useful argument.
commit fcd52d276f0276490ef08af2f0d6c52ed631f130
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 20:19:15 2004 +0000
Add missing kaa.h include for kaaInitTrapOffsets.
commit b5d406e8c84d8aba2b45e985e43d02c2e6770019
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 20:02:10 2004 +0000
Fix handling of is_agp. is_agp is whether the card is actually AGP, while
using_agp should say whether AGP is being used as part of DMA/DRI.
commit 7cab70d1cb7298035429dd8953e521a31fc6770d
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 19:52:51 2004 +0000
Improve error handling, especially in the DRI case. Do some FatalErrors
instead of ErrorFs for things that are really bad, and put limits on
some loops. Now, sometimes instead of hanging the entire system, we
(mostly-) cleanly drop to console when the card has hung.
commit 0cd662ea80579c317d706ebe04971bb29d0f9b4f
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Sep 11 09:28:19 2004 +0000
- Add disabled WIP trapezoid code for R128 and R100. The R128 rendering is
not doing an add of 1 per triangle like I hoped, and instead seems to
be saturating all the pixels or something. The R100 acceleration
renders pretty well, with some gaps. Note that both are slower than
software due to lack of DMA to submit vertices.
- Mostly fix R128 and Radeon transform support, including supporting
bilinear filtering on R128. Subpixel offsets are still probably an
issue (reported by rendercheck), but I want to make 100% sure about my
understanding of the protocol before changing everybody, including fb.
- Add support for dst formats without alpha to R128 Composite.
- Remove the R128 Blend code, which has long outlived its usefulness. (I
kept it around for one reason: It could be useful for the w/h > 1024
case with no mask and a non-src op. That seems pretty infrequent and
not worth the trouble).
commit 396100dd235105a0e2c9013f1e07e4dae0cc3404
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Sep 11 09:23:12 2004 +0000
- Don't require Imrecise mode for Trapezoid acceleration. It looks like we
might be able to do Precise in hardware, so leave it up to the driver.
- Add a helper function for computing a set of offsets for smooth trapezoid
rasterizing using many sharp trapezoids.
commit 501dcf37aac4ec9298e8c79ca65c048c362bce31
Author: Matthew Allum <breakfast@10.am>
Date: Wed Sep 8 11:31:49 2004 +0000
cursor fixes
commit 20918ab480c8c8285a68e9f974b0208a18acec94
Author: Matthew Allum <breakfast@10.am>
Date: Tue Sep 7 19:00:04 2004 +0000
avoid ephyr breakage when tslib enabled
commit 8bf6ea903be4c052c747e3e81fc977155072299d
Author: Matthew Allum <breakfast@10.am>
Date: Tue Sep 7 12:44:19 2004 +0000
fixes to Xephyr debug mode
commit b3322257815ec4550e1634453167535b02c1bfbd
Author: Kevin E Martin <kem@kem.org>
Date: Fri Sep 3 23:41:21 2004 +0000
Update formatted docs.
commit b2135e589baeb2ea26da50b9167feaea23bcce3c
Author: Kevin E Martin <kem@kem.org>
Date: Fri Sep 3 16:18:23 2004 +0000
First set of documentation updates.
Include more correct fix for rootless interaction with damage (Bug #1168,
Keith Packard).
commit d7fef52254126aa5897a5c58faeda1f61d5b13d8
Author: Kevin E Martin <kem@kem.org>
Date: Thu Sep 2 04:04:47 2004 +0000
Workaround for servers using rootless layer with damage (Bug #1168, Torrey
T. Lyons).
commit 0e56515aa3ebc5ee8cc33213fb22b69bb4b3a0da
Author: Kevin E Martin <kem@kem.org>
Date: Thu Sep 2 01:38:17 2004 +0000
Fix AGL display problems (Bug #1210, Torrey T. Lyons).
commit 2753c8e2c84cc1fb6d73a05258ab7200068e7830
Author: Matthew Allum <breakfast@10.am>
Date: Wed Sep 1 15:30:58 2004 +0000
see changelog
commit 7c0aaa53bf8dcf3d0a8c9e78d31cf62b1766fb35
Author: Matthew Allum <breakfast@10.am>
Date: Wed Sep 1 11:13:36 2004 +0000
'-dpi' fixes for Xephyr
commit 16ff3a872731633b6f1f4920f793153722026189
Author: Matthew Allum <breakfast@10.am>
Date: Wed Sep 1 08:31:20 2004 +0000
Actuall select events for -parent option
commit 2d065c4c33b9ec17c4c791070cf8189cb57bbb9c
Author: Matthew Allum <breakfast@10.am>
Date: Tue Aug 31 16:33:05 2004 +0000
Added ephyr server sources
commit 6ec9ecd591fba9e9b69b8ebbd2fa08c0a2beac08
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Aug 30 22:16:46 2004 +0000
Add a set of three hooks for accelerating trapezoids, and use it for the
RasterizeTrapezoid screen function. These hooks will be called for
imprecise, non-sharp trapezoids with A8 destinations.
Note that the current main consumer of trapezoids, cairo, is requesting
precise, sharp trapezoids by not changing the default Picture
attributes, but gets non-sharp effects in software because fb bases its
choice of sharp/non-sharp on the mask format being A8 vs A1, and cairo
asks for A8. Follow fb's (poor?) example by ignoring the sharp setting
and basing the choice off of the mask being A8.
commit ccaf332ce3a9393715317edd3b92420c27fc94eb
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Aug 30 16:43:10 2004 +0000
Rather than initially place pixmaps in framebuffer based on a size
heuristic, delay the decision until the first
kaaPixmapUse{Screen|Memory}, and put it in framebuffer if UseScreen was
called. Provides a significant improvement in cairo speeds (100%
speedup in cairogears here) and is likely to improve text performance
as well.
commit 14b2db63e7ae0c0d356062cd15811484038f97d9
Author: Kevin E Martin <kem@kem.org>
Date: Sun Aug 29 21:06:00 2004 +0000
Fix make install when BuildServersOnly is YES (Bug #1213).
Fix build failures when UseDeprecatedKeyboardDriver is YES and
DoLoadableServer is NO (Bug #1229, Kristian H�gsberg).
Fix failure when using DLL loader and LD_BIND_NOW is set (Bug #1212, Adam
Jackson).
commit ac038e9cc6f7708fdd9f36494861d2f611d5a90a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Aug 29 00:48:17 2004 +0000
Don't define _XOPEN_SOURCE before including math.h on Solaris - it's not
needed on older releases, and breaks builds on Solaris 10. (Same as
bugzilla #189).
commit 89d702763875831604751bac396c3d2400ec59b6
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 21:44:54 2004 +0000
Fix for XV memory allocation: Also use tiled area for allocation even if it
hasn't been used before.
commit 971755765d6ef9cadf11127478af59189034d356
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Aug 27 21:09:23 2004 +0000
Bug #1101: Fix PaintWindow in the pixmap case when the window's origin is
not at the backing pixmap's origin. Resulted in incorrect rendering in
at least aisleriot, fluxbox, and KDE apps, and probably many more.
While here, move the ParentRelative loop above the drawable grab -- may
improve correctness with ParentRelative background origins as well.
Note that the border code doesn't handle ParentRelative yet.
commit 1840a50bb763d5c94195eaffa3954c1afd77a31a
Author: Kevin E Martin <kem@kem.org>
Date: Fri Aug 27 20:39:17 2004 +0000
Add missing reply for DMX (Rik Faith).
commit f30fbc600f3e5c3b4aceafb8256594af0069f2c9
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 20:20:54 2004 +0000
Fixed typos.
commit 276cf271527b7a6f464025457e5dd452ac13605e
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 20:16:28 2004 +0000
- adding missing file
commit ecd889c6ff7427b4e7d3f820586aac178a4dfdc2
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 19:27:12 2004 +0000
Added support for LynxOS 4.0 (Thomas Mueller).
Fix arm netwinder build (Donnie Berkholz).
commit 7c087078694a6895a9bcbe62d091665c05a86b5a
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 12:32:14 2004 +0000
- Make DDC code more VESA compliant: when MaxClock is set to 0xFF it means
'no value specified'. Therefore setting it to 0.
commit c0bff215de2d034118d06cac42e234008612204b
Author: Kevin E Martin <kem@kem.org>
Date: Fri Aug 27 01:15:10 2004 +0000
Fix xtest failures in Xvfb from XMatchVisualInfo test.
commit 5335bc8a0657b3e378795b44698ed23020c13891
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 26 20:32:59 2004 +0000
Bug #1138: Wrap funcs in CW's GC ops as well. While this is unnecessary
according to the rules as I understand them (bug #1045), not everybody
follows the rules. GC funcs were being called on the same GC from
within GC ops, and the cwValidateGC caused a loop in the funcs chain
that resulted in a crash, notably in cwPolylines.
commit c8672e7ac79c872344f287f7cc106cb5c006e619
Author: Egbert Eich <eich@suse.de>
Date: Thu Aug 26 11:58:08 2004 +0000
Fixed support for LynxOS 3.1 (LynxOS 4 will follow) (Thomas Mueller).
2
commit 198e62c44b99ee0890b944f92b162387f77aa10d
Author: Torrey Lyons <torrey@mrcla.com>
Date: Sat Aug 21 00:46:01 2004 +0000
Documentation only update: Update XDarwin application version for release.
commit 74d84d7b122802230579a4da8c2e6914d2f5f060
Author: Kevin E Martin <kem@kem.org>
Date: Fri Aug 20 05:22:39 2004 +0000
Fix keyboard driver failing to initialize if DoLoadableServer is NO (Bug
#1133, Kristian H�gsberg).
commit bd3e6e44259155cb37f39eb2ca5e1f0de1c2ebb7
Author: Kevin E Martin <kem@kem.org>
Date: Thu Aug 19 04:08:40 2004 +0000
Add missing no.*Extension symbols (Bug #1131, Aaron Plattner).
commit 87842285007e9ac4f9de0349abee1fb66b7c795f
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 18 21:11:17 2004 +0000
Fix CopyArea for non-redir dst, redir src (Bug #1105, Eric Anholt).
commit 9223baf985778c536ce93846c431b46a0192cf32
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 18 18:41:41 2004 +0000
Fix AIX build problems (Bugs #1020, 1102, 1103, Dan McNichol).
Remove old config files (Bug #1123, Jim Gettys).
Remove old log message (Bug #1123, Jim Gettys).
commit a45bc0df7a1c369e8429e84414ac813187c90059
Author: Kevin E Martin <kem@kem.org>
Date: Tue Aug 17 17:55:02 2004 +0000
Fix DRI module loading (Bug #1057, Ronny Vindenes).
Fix Xvfb at 8bpp (Bug #1091).
Fix link order when building with Xprint in glxgears (Bug #1060, Alexander
Gottwald).
commit 75de2fe82e7da755555028a724f68b9fb9ddfb14
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 16 22:48:50 2004 +0000
Update release and date for first RC.
Fix kbd/keyboard driver for DoLoadableServer NO.
Revert change since it is better to set date in the config files.
commit 1798cac6fa2e909c9f3df26b97ee8232a0bf1592
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 16 20:17:51 2004 +0000
Add kdb <-> keyboard aliasing when UseDeprecatedKeyboardDriver is NO (Bug
#1072, Kristian H�gsberg).
commit 6cac342517892a20bab6a6177f8b5742feaaed38
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Aug 16 15:48:53 2004 +0000
document broken composite in XWin
commit 9aa6beb6b7e6272b05a03e0a4fd34eb8ad21bf47
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 16 02:07:53 2004 +0000
Fix banner to print out proper version information.
commit 9da0c214ab5f4ee9c1610b4888f5c7c0dd2bcacc
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 21:13:11 2004 +0000
Clip destination instead of source. Should be the same, but it looks nicer
to me.
Clean up transition between cheap and expensive GC wrappers by using the
prologue and epilogue macros. Before, the GC would be left unvalidated
sometimes which would cause all kinds of entertaining bugs against a
DDX which cares (XAA).
commit a68f350195c1c54034f98e2b78c2c3da70044884
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 19:05:01 2004 +0000
Remove debugging code which did a full tree walk on every window operation
Eliminate needless (and, it turns out, dangerous) call to ChangeGC on
DestroyGCPrivate.
in cwSetWindowPixmap, check if the pixmap is the screen pixmap and disable
the wrapper by setting the private to NULL.
commit 5db70ae2575e3e8669d7a66e2218ba28e8bdfa68
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Aug 15 15:40:19 2004 +0000
Remove #error used for testing.
commit 1e728c3e88f6a74b93dc11827c9fcfe7b39ca5a5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 03:34:18 2004 +0000
Copy bits from parent window when allocating pixmaps so that Background ==
None works.
Copy filter to backing picture during validation.
Mark picture serialNumber when setting Filter or Transform so Validate
occurs.
Initialize xf86Screens[i]->pScreen to NULL so that RADEON driver doesn't
crash during server reset using old pScreen.
commit 943308517905d16bda1bb27cd745bd291a84dbf6
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 00:43:39 2004 +0000
Redraw window borders when switching window pixmaps around
Make cw "own" the window pixmaps by wrapping
GetWindowPixmap/SetWindowPixmap.
commit 597fdae93e6e1b7e4052097baf3d91e7a134c162
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sat Aug 14 23:59:52 2004 +0000
More kbd fun: write out "kbd" from Xorg -configure (#1078).
commit e483fe3ec384da556c31292001a86ec95c2ddc46
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 14 21:57:58 2004 +0000
Fix offsets again. Really, it works this time. Promise.
commit e6216b48f5feee72f107348cb21bad724536ec62
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 14 21:36:10 2004 +0000
Fix offsets, do whole region at once by using GC clipping
commit ed425d1d88a72586d5d7a4aad9d0be0b06637070
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Aug 14 20:29:28 2004 +0000
Bug #1077: Fix source copy performance problem exposed by Composite.
commit cc3ad0ed4302f54318e190a2b10646337f242d40
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 14 19:53:36 2004 +0000
Fix clip list computation and setting to ignore clip changes to "real"
GC/Picture and track serial numbers correctly when copying
pCompositeClip down.
commit 183c6d06455114c61f6db57ec0a084caf11ece3a
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Aug 14 19:51:11 2004 +0000
Wrap CopyWindow in cw, which fixes scrolling in many apps.
commit e61b5d38ab30c4f73ba0d070f485a32708a03eb6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 14 07:12:37 2004 +0000
Use XLIB_SKIP_ARGB_VISUALS environment variable to disable all depth 32
visuals. Necessary to keep Flash from crashing.
Must call ValidateGC/ValidatePicture on "real" GC/Picture to ensure
pCompositeClip is set correctly.
Need to take the composite clip from the "real" GC/Picture and turn it into
the clientClip for the backing version.
Adjust pixmap screen origin to account for drawable->x/y Change debugging
output a bit (disabled by default)
commit 05f6329eb6f564ad4fc366d75f4ebf9f3ba4b5dd
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Aug 13 23:57:38 2004 +0000
Don't enable speedo & type1 modules if they're not being built
Clean up a couple of hardcoded paths & vendor names to use defines set by
Imakefile
commit 3f84e4f71d9c7c560f9bef675b1cc96fa1d83b14
Author: Kevin E Martin <kem@kem.org>
Date: Fri Aug 13 19:51:34 2004 +0000
Fix Xprt bug by disabling code that merges multiple audit messages (Bug
#964, Roland Mainz).
commit 922fd3a2e568571171dfd64a94f804350829230f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Aug 13 19:18:29 2004 +0000
Added $(MESASRCDIR)/src/mesa/glapi to INCLUDES. Removed $(SERVERSRC)/mi
from INCLUDES. Rearranged INCLUDES for better readability.
Removed mipointrst.h and miscstruct.h from #include since they are not used
anymore.
commit f63f4b768cd5ec5bffd270e448e6e51b8ad67016
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 13 18:24:07 2004 +0000
Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com>
Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike
Harris.
Call xf86EnableDisableFBAccess though the function pointer instead of
directly. #1041, Patch from Aaron Plattner.
Swap the phsyical size of the screen when rotiation. #1050, Patch from
Aaron Plattner.
Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann@redhat.com>
Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead
of proping it. This way it will work with the monolithic version too.
#1062, Patch by Owen Taylor.
commit a29bfbd3d0a5d39ccee5b83ac1ba632091b031bb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 13 08:16:14 2004 +0000
Empty damage object when freeing pixmap.
Wrap InstallColormap so that the DDX doesn't see colormaps from our ARGB
visual (avoids lovely green tint to screen). Also, set visual->nplanes
of ARGB visual to all used (including alpha) planes so DIX can set
pixel values correctly.
Translate automatic update regions correctly to account for borders
When nplanes == 32 (ARGB visuals), mask in all ones for alpha values to
allocated pixel values.
Remove redundant fbAddTraps declaration
Fix fbCopyWindow to work on non-screen pixmaps (not needed yet)
Replace broken clipping code with that from modular tree.
Respect subWindowMode.
commit 24bed5cff908a6f8b1857e3dadac22d6db54c69e
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Aug 13 07:47:21 2004 +0000
Fix copy'n'paste-os of x/y in CopyPicture for AlphaXOrigin and ClipXOrigin.
commit 5825e4559e7aaf3b40205a0dca49a785c8de7b92
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 12 23:14:50 2004 +0000
Fix after Mesa 20040812 merge: revert glxext.h to vendor branch, and fix
bug #1022.
commit 2889ad2cb8827f20b6d69da4fe99db33bf9c5ff2
Author: Torrey Lyons <torrey@mrcla.com>
Date: Thu Aug 12 20:24:36 2004 +0000
Fix crash in rootless XDarwin due to rootless being initialized before
damage extension.
commit 961333143e2df3e3f33e8624fc61e79cf3e86cd1
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 12 08:45:33 2004 +0000
Apply a kludge to initialize the composite wrapper before DamageSetup. If
not, DamageSetup will wrap some operations first, and the cw
initializes during ExtensionInit, so cw comes higher in the wrapping
chain. cw going first will result in damage getting confused when the
drawables get changed around.
commit 6e0228722cc2fa37a0e2359bc3dab3646e36c4b7
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 12 08:11:59 2004 +0000
Fix various cw issues, including a couple reported by deronj:
- Fix wrapping of GC ops/funcs according to policy described in bug #1045.
- Remove ValidateGC/ValidatePictures on the redirected drawables/pictures
-- it's not needed, and DDXs shouldn't be seeing redirected drawables
in render or GC ops/funcs when cw is running.
- Mark all GC/Picture state as dirty when moving from redirected to
non-redirected, since it hadn't been passed down in Change* or
Validate* while redirected.
- Remove CreatePicture wrapper that didn't do anything.
- Comment on why AddTraps wrapper isn't needed.
commit 789cf3ed846045d91f950cb177ef6bae4c8966fc
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 12 07:57:03 2004 +0000
Fix some issues reported by deronj:
- Hopefully fix a crash in compCheckRedirect on unrealizing windows.
- Remove an extern that doesn't point at anything.
commit 1a073786e0159a80ac3b8772a1d89b0618a8ff33
Author: Kevin E Martin <kem@kem.org>
Date: Thu Aug 12 05:11:57 2004 +0000
Update version and date for next snapshot
commit 47ee5f4ba72f0e0bc92a5e04073c70808e85fc08
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Aug 12 01:57:51 2004 +0000
Add call to SourceValidate() when pDst == pSrc, so misprite.c get a chance
to remove the sprite before the area is copied. The drivers handle pDst
!= pSrc (#1030).
commit 09d0056b8bc103f67a35980934f03d28fed51164
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Aug 12 01:30:57 2004 +0000
Wrap the Propolice fix in #ifdef __SSP__; Propolice doesn't define this yet
but an RFE has been submitted upstream.
commit e30c22dbbffa2605f8d7ac010c8208a135a2293a
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Aug 12 01:16:36 2004 +0000
Back out the propolice fix for a second, it causes linktime errors.
commit 9d0213525f4f692c250f10309146fe9db76ba12d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 12 00:09:30 2004 +0000
Paint to parent window instead of parent window's pixmap (helps for servers
that don't have a pixmap for the root)
Fix offsets for render drawing.
commit c7bc76f663008119b3681d4b7adef7dc9ffdc236
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Aug 11 23:53:36 2004 +0000
Fix leftover XF86_VERSION_SNAP macro.
commit eb607030e32cbad846696a20cfb3045c5f8f65c1
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Aug 11 23:10:02 2004 +0000
Teach the loader about the extra symbols needed for Propolice-protected
modules to work under elfloader. From Travis Tilley (Gentoo).
commit fd439afdfe7ba451aff19b62d1764e4dfd0b782f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 11 22:40:14 2004 +0000
Add COMPOSITE change to fbCopyWindow (not needed yet)
Xnest was half-using midispcur and doing a bad job of it. Replace all of
that code with mipointer which does a lot of the work.
Support DDXen which don't provide GetWindowPixmap, or which return NULL for
the root pixmap.
commit f95293e5253904883d3b40f9e68e6175247754a3
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 11 22:27:50 2004 +0000
Fix bogus contact address in Xserver/os/util.c (Bug #738).
commit 56520ecd5ceb9526541c241634b467eba6a8f7cf
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 11 22:13:01 2004 +0000
In CopyPicture, add missing call to ChangePicture to notify about the
changes that CopyPicture has done.
commit f77f1d50723aceb5059a96f7a4068046b7961c51
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 11 21:14:18 2004 +0000
Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith).
commit 3dbaeb2e126d9424b21df91f0be9129c4eea6f1b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Aug 11 20:25:13 2004 +0000
Patch xorgconfig to generate config files with correct keyboard driver; use
"kbd" by default, "keyboard" if UseDeprecatedKeyboarDriver is YES
(#1040).
commit ca458e3c9b25c3efc10532eb8e31bdcff44dc321
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Aug 11 13:55:03 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=492 -
/etc/init.d/xprint did not source xorg.conf for font paths additionally
to xfree86 config files
commit 81881b96861d707b0729e0146a4b53b3dd234885
Author: Kevin E Martin <kem@kem.org>
Date: Tue Aug 10 21:37:35 2004 +0000
Update version to 6.7.99.1 and fix problem with snapshot string generation.
commit 21c7c8cdc7d2f607177634601cef8b0290fb0e80
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 9 22:37:22 2004 +0000
Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,
Harold L. Hunt II, Alexander Gottwald).
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
David Dawes).
Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
Fix attempt to read video ROM before enabling it (Bug #843, Ivan
Kokshaysky, Mike A. Harris).
Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
Harris).
Clarify xset man page description of how to use the keyboard repeat rate
settings (Bug #846, Mike A. Harris).
Fix problem where print-screen key would get remapped to sys-req in certain
keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
Taylor).
Fix several render problems:
- MMIO mode support
- Hang on IGP chips
- VT switching hang
- 3D render corruption (Bug #922, Hui Yu).
commit 26847ef9268f687c4f45f3d048eff4b06c2ba3bf
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 9 03:40:50 2004 +0000
Move the new render symbols to dixsym.c instead so they are grouped with
the other render symbols.
Initialize screen_x and screen_y to 0. This fixes a problem with the new
Damage based sprite, where intersection test against the root pixmap
would fail because the two fields were not initialized (damage.c,
166-170).
commit 57eab4dc87670da42e645a4c341d1ee661b43b5b
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 9 02:08:35 2004 +0000
- Fix building without Xfixes extension
- Fix building without Xevie
- Fix building without DPMS
- Fix "Extensions" section config file support to accept general boolean
options
commit a2e51b13ea5a2e5fc5626905b6c2caac6358eb11
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Aug 8 20:56:56 2004 +0000
Disable legacy keyboard driver "keyboard", unless
USE_DEPRECATED_KEYBOARD_DRIVER is defined. Print warning if the old
driver is used.
commit 3431692bf44e7be01187b421cfb0e46131c5e4c7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Aug 8 17:02:19 2004 +0000
Add new render symbols to list of exported extension symbols so
DoLoadableServer works again.
commit 1e694d2b51a954d1bc4afdde390723e9a1a5b9bf
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 01:23:07 2004 +0000
Fix minor timestamp lossage in mieq.
Replace miSprite implementation with Damage-based one. Otherwise damage and
misprite conflict causing looping.
Change pScreen usage around a bit to eliminate warnings
commit 45fde3b041c071ae5a604cefbbfa4da5c1e828f8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 01:19:01 2004 +0000
Eliminate mfb support. Fix visuals to match "normal" PC hardware (making
lightpipe work).
commit 2bdbc2c0d39b1618440a6a8ed1c38a11703e898c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 01:02:41 2004 +0000
Clean up cw initialization, make sure wrappers re-wrap on exit.
commit cff0043a347ba06e8ab16a84a35c99794b45149b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 00:58:21 2004 +0000
Remove alpha-related fields from visual structure to retain binary
compatibilty. Applications using ARGB visuals will need to use Render
or other mechanisms to compute pixel values instead of AllocColor
commit 196aafb19a3cfdc8c21f9bf75814cf0d84ff4446
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 6 23:42:10 2004 +0000
Add RenderAddTraps. Rewrite trapezoid rendering code.
commit e847bcda0827ffb87689a0162c648570de6d6f69
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Aug 6 00:31:28 2004 +0000
Fix missing ';' in cw.c and unwrap the render wrapper properly.
commit ae1580c494fde2b56f9faa40f7ebcf637728efc8
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 5 18:24:58 2004 +0000
- Add a new Render function, CopyPicture, which will update a picture with
the flagged bits from a source picture. Approved in principle by
keithp.
- Use CopyPicture and SetTransform to update most of the backing picture's
state in the composite wrapper. Filters are still missing.
- Don't allocate a picture private, now that we calculate clipping properly
and don't need the serialNumber or stateChanges.
- Use the format of the source pixmap rather than generating the format
from the window's visual.
- Wrap the rest of the Render primitives that were stubbed out before.
commit 73e14bd611fa7eac649a2b4c7964959d9eae887b
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 4 23:18:38 2004 +0000
- Always validate the backing GC in cwValidateGC, not just when the clip
list changes.
- Use FillTiled instead of FillSolid for painting tiled border/background
pixmaps, and don't needlessly change the scratch GC's defaults.
- Use the preferred dixChangeGC instead of DoChangeGC.
- Simplify a silly loop and clean up a couple of comments.
commit d240c41a3ab9cde9921cc96cf86e630ca5c9005a
Author: Egbert Eich <eich@suse.de>
Date: Wed Aug 4 12:21:48 2004 +0000
Optimization of CJK rendering when using versions of freetype prior to
2.1.8 (Chisato Yamauchi).
A small backward compatibility fix to make the freetype module build with
freetype version < 2.1.7.
Fixed/added some debugging code.
commit 751fd11a9ad1a473d7311362246b0869a008001b
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 4 10:05:37 2004 +0000
- Add two new XAA hooks, SetupForCPUToScreenTexture2 and
SetupForCPUToScreenAlphaTexture2. These add a dstFormat argument after
the previous format argument, which the driver needs to use to properly
set up the destination format. Two new arrays are added for the list of
destination formats supported that correspond to the previous format
arrays for sources.
- Make Render acceleration only occur when the new hook for that
acceleration type is supplied and the dst format list is set, along
with the src format list being set. Without knowing the destination
format, the Render acceleration couldn't properly support all the
destinations it might encounter.
- Bump XAA module minor version.
- Update the Radeon Render acceleration to use the new hooks when the XAA
module is sufficiently new. Fix a bug in the src/dst alpha booleans for
ops, and use them to set blend_cntl to support destinations without
alpha. Add missing PICT_a1r5g5b5 texture format, and add list
terminator. (!)
commit 9c1d52a69db841ac85ef97d7223361b83a66ae29
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Aug 3 10:12:25 2004 +0000
Merge from CYGWIN branch
2004-08-02 Kensuke Matsuzaki
Fix the bug that we can't copy & paste multi-byte string to Unicode-base
Windows application. Rename fUnicodeSupport to fUseUnicode, because it
don't mean wheather Windows support Unicode or not.
commit defcfe3c7ee3e39ef02da08b7227b758dbede325
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Aug 3 09:33:54 2004 +0000
programs/Xserver/hw/xfree86/ddc/xf86DDC.h
programs/Xserver/hw/xfree86/vgahw/vgaHW.c
programs/Xserver/hw/xfree86/vgahw/vgaHW.h
programs/Xserver/miext/shadow/shadow.h
programs/Xserver/miext/shadow/shpacked.c
programs/Xserver/miext/shadow/shplanar.c
programs/Xserver/miext/shadow/shrotate.c Fix glitches in pointer to
functions declarations.
commit e6d0b18c24f7f84aabed763be1cc8414883fab95
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Aug 3 08:52:17 2004 +0000
Fix declaration of XAACachePlanarMonoStippleProc. Rename
XAACachePlanarMonoStippleWeak to XAAGetCachePlanarMonoStipple() for
consistency with other parts of xaa and fix forward declaration in
xaalocal.h. Fixes last comments on Bug #962.
commit bfbb40c28ce6e98c82973bd96054d4787579eaa6
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 3 05:49:48 2004 +0000
Major improvements to Composite wrapper. Several issues remain, but it now
appears stable in limited testing.
- Allocate the picture private, avoiding segfault.
- Wrap PaintWindow to draw the background/border to the backing pixmap
(based on Deron Johnson's comptran.c).
- Set the x_off/y_off returns to translate coordinates properly.
- Don't bother allocating temporary areas for the modified coordinates.
Layers above are responsible for handling lower layers changing the
arguments, so cw doesn't have to worry about it. mibstore.c has to do
the allocation because it calls down twice (front buffer and backing
store). (Suggested by keithp)
- Handle the mode argument to PolyPoint, Polylines, and FillPolygon.
- Remove some dead elements in the cw privates.
- Kill a prototype warning in compinit.c by adding the cw.h header.
commit b7ba272da0910c6558f71cfedd0bf9836fc892c1
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 3 05:39:19 2004 +0000
The Damage extension has to wrap after (be called before) the Composite
extension so that the redirecting of drawables by the wrapper doesn't
confuse Damage.
commit d112e55992e9e03e74fdf5738c8c47cd90033a37
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 3 02:44:23 2004 +0000
Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
DoLoadableServer NO builds work again.
commit 734cb34dc1697530ecd971b84e1061ed86b4c2a4
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 2 21:15:30 2004 +0000
Mon Aug 2 21:49:33 2004 Soeren Sandmann <sandmann@redhat.com>
Remove double cast.
commit e6b9cc79c204420117a1f7b23d131ec24923d612
Author: Egbert Eich <eich@suse.de>
Date: Mon Aug 2 19:35:07 2004 +0000
Removed distro specific stuff.
Fixed FreeType module to build with FreeType versions older than 2.1.7.
Fixed typo.
Added vtSema to protect call of driver DPMS function.
removed unneeded variable
Modified RandR driver hook to reduce the number of function calls to one.
Function is sufficiently generic to be extended in the future.
commit b759da83ae62a897b7727d9180a68b962b571286
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Aug 1 16:16:18 2004 +0000
added README for Cygwin/X
This file currently contains the Cygwin/X specific release notes from 6.7.0
and a first collection of what will make up the release notes for the
next release
commit d638a50f3f039d84d86c00696d7d3ec22560bc3c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Jul 31 18:33:56 2004 +0000
adjust prototype for winInitCmapPrivates to match Egberts change.
commit 488be6611919af97d7e4f8b0994487882eb78e18
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 31 09:41:27 2004 +0000
Fix typo
commit 383b6b59864098b03d991628ff5933d997793ea1
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 31 09:14:06 2004 +0000
Add "Extensions" section support to configuration parser
commit d690556d496c7331bd112903a0c9e6553c7d3342
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 31 08:24:14 2004 +0000
Integrate COMPOSITEWRAP branch including composite wrapper. This code still
has several issues, including:
- CopyWindow and PaintWindow wrappers missing (will be done soon)
- Some segfaults seen in the Render wrappers.
- Xprt server build breaks with Composite.
- DDXs must be recompiled for Composite due to VisualRec size change.
- Composite bugs pointed out by Deron Johnson in email.
Also, reorder XFixes initialization according to comments by Keith which
are also in xserver CVS.
commit 8763cca7f9927bd6c9caf804bf09dcfea929eed0
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 31 07:26:50 2004 +0000
Update xfixes server code to major version 3 from xserver CVS, and perform
minor diff-reduction versus xserver CVS.
commit 25bd6ff4a622d09fb0c247b7c40281744c61431e
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 31 04:23:21 2004 +0000
Add new extension enable/disable feature. This code is a small step in the
right direction -- i.e., moving towards full run-time config of
extensions. Currently, only XTEST, XINERAMA, RENDER, XKB, and XEVIE are
supported.
commit 326729ebca863c99cf913445126294a3c6d3db5d
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 31 01:48:27 2004 +0000
- Add some XFIXES bits apparently missed in the DAMAGE-XFIXES merge
- Add missing XCSECURITY ifdef.
- Sync some whitespace to xserver CVS and surrounding style.
commit 370bda820b2912b93dcc34c088075f8e65a9e5cb
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 31 01:38:46 2004 +0000
Integrate latest damage bits, including the addition of Composite code.
Includes REGION_INIT -> REGION_NULL necessary to avoid segfaults with
inlined region macros.
commit 7542d8a17ad469f9c760f0f843bd6a4fb6deb57d
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Sat Jul 31 01:37:47 2004 +0000
Turn on XEVIE https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified
Files: miinitext.c
commit b2065f376b932e49f1f96dfb92ddb52d15796abe
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Sat Jul 31 01:34:26 2004 +0000
Integration of XEVIE branch to trunk, latest updates
https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified Files:
Imakefile xevie.c
commit e68bfc801680f2852c59099aa3d7502e49b48b2c
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Sat Jul 31 01:33:40 2004 +0000
Integration of XEVIE branch to trunk, Some updates from latest reviews
https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified Files:
events.c
commit 706b2a7e02aa0085769fb87782118488d0f90eaa
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 31 01:21:19 2004 +0000
Change several LoaderSymbol calls introduced by the bug #400 patch to
*Weak() resolver functions.
commit 9e13805b02f37497971c789b4035abc29463c550
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Jul 31 00:44:45 2004 +0000
adjust prototype for winInitCmapPrivates to match Egberts change.
commit 4da507a03fd5659e5944d9e47dd2f8920636383b
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 31 00:32:43 2004 +0000
Fix compiler warning
commit 64a6d3e9c84a36b4e0550d112f288b695c5056cd
Author: Hui YU <hyu@ati.com>
Date: Fri Jul 30 22:20:21 2004 +0000
Support for New radeon chips: R420/M18, R423, RV370/M22, RV380/M24, RS300.
Add special handlings for DELL triple-head server (RV100). Misc. bug
fixes for flat panel, host aperture, etc (Bug #946)
commit d3c98fed2c37a863a6765a3e288bcdbc2738878a
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 21:53:09 2004 +0000
Add support for on-the-fly screen rotation when supported by hardware (Aron
Plattner).
commit 4baf0029418d3eeeac5d1026a7cfea3234e44e48
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 21:46:38 2004 +0000
An experimental pseudocolor emulation layer. Not fully completed, currently
only works for 16bpp.
commit 63a152f7812d0981e3e7aa41a42e59cd0c3e50dc
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 21:39:20 2004 +0000
removing some unnecessary restricitons on the allowed visuals.
commit 0ba15599466ddb644728c6b68e64e05b1317ac2e
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 21:10:46 2004 +0000
Adding a colormap index to the InitColormapPrivate() func call. Without it
it was completely useless.
test if colormap with index really exists in the list of installed maps
before using it.
commit bbfe7bed3fe4d9bd089327cd59e6faedb592dabb
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 20:56:53 2004 +0000
Set DPMS to ON when VT switching away or shutting down the server. Failing
to do this may leave the text console blank.
commit 40b975e3acb11c1ec2fd4c5984f5efa20b669489
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 20:51:09 2004 +0000
Improved error messages.
build fixes for AMD64.
Made shm* functions in the libc_wrapper more standard conformant by setting
errno correctly.
Use xf86ExendedInitInt10() in VBEExtendedInit() to be able to pass flags.
commit 7643199de1c4f12a2aadeaf2d539a37ddb45672b
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 20:38:27 2004 +0000
Fix static build.
add i845 to the list of chips that allow memory size tweaking.
commit 48514fee3c8ec26f36e142ffc9272e510b9a4238
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jul 30 20:30:57 2004 +0000
Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
framebuffer formats except cfb and the overlay modes should work, and
r128 and radeon need to be loaded from the ati driver (both issues to
be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
drivers. elfloader users shouldn't be affected.
commit 29012adb37c533f57c684ad94c4d83a6c31793e5
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Jul 30 19:28:03 2004 +0000
Add generic rootless layer documentation missed from last commit.
commit 784e4d1cc02dea837a38a4140a18013953296366
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Jul 30 19:12:18 2004 +0000
Merge many XDarwin improvements:
- Fix launch of X clients by double clicking in the Finder when there is a
space in the path (Torrey T. Lyons).
- Interpret scroll wheel mouse events correctly when shift is held down
(Benjamin Burke).
- Add option to always use Mac command key equivalents (John Harper and
Torrey T. Lyons).
- Add support for dynamic screen configuration changes in rootless mode
(John Harper and Torrey T. Lyons).
- Add documentation on generic rootless layer (Torrey T. Lyons).
commit c2275b31adc3c4292c171055db16e00ee0e69e43
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 19:04:14 2004 +0000
Removed bugs on TweakMemorySize() which prevented it from working at all.
Initialized last element of BIOS version number string to 0 to avoid random
problems.
commit 5ed0aefc67e86abaddf1b6bffdc832996b86fb46
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 18:40:36 2004 +0000
Fixed typo in a comment.
Deleted bogus comment.
Added debugging support.
commit d380647739e4767da69edc44bbb441b3b9554b03
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Jul 30 18:22:13 2004 +0000
Add initial Xinput support for XDarwin (Greg Parker).
commit 41641c11ec8994f1bc4bd1b05ae2cb38167c8312
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Jul 30 17:37:09 2004 +0000
Make XDarwin not default to StaticColor on ix86 (Shantonu Sen).
commit f4c84e7dbf0f25a2544d4400e600310421683f3c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Jul 30 12:03:56 2004 +0000
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=940
- Filter /etc/init.d/xprint throught CPP/|MakeScriptFromCpp()| to allow
platform-specific customisation.
commit ed923a42b800e3f701084ef5828cabbbefe8361f
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:41 2004 +0000
file cw_render.c was initially added on branch COMPOSITEWRAP.
commit 69e379ddaf85feda6a163b5f4e855ffe86b254df
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:41 2004 +0000
file cw_ops.c was initially added on branch COMPOSITEWRAP.
commit 0ee93acd103af947fef0a28e32b5b3f2857789bf
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file cw.c was initially added on branch COMPOSITEWRAP.
commit 3bdaa0e7fa7b6f5d550907d5fe7d0fb16c53e243
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file cw.h was initially added on branch COMPOSITEWRAP.
commit 94e1ea569171334eb40a2d4a63138c02915203db
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compwindow.c was initially added on branch COMPOSITEWRAP.
commit 705536d04c4f09c84bb04827c07bb899584f399d
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compinit.c was initially added on branch COMPOSITEWRAP.
commit b80dbd886d7cc3a72772f3231a8c8e8df7f6679f
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compalloc.c was initially added on branch COMPOSITEWRAP.
commit beb26caf68d3e25bf85fd63dbb499eca4b1f05ba
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compext.c was initially added on branch COMPOSITEWRAP.
commit 97afc846003bb521cf9d6e92b298024d83db8759
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compint.h was initially added on branch COMPOSITEWRAP.
commit 854c1afa867ff617b47c4cde3cfd86bd26e9931a
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 30 04:44:13 2004 +0000
Fix "DoLoadableServer NO" build
commit 71164d118c192e96eb2b0fc45514233e9563a568
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Fri Jul 30 01:21:57 2004 +0000
Integration of XEVIE branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=947
Modified Files: cursorstr.h input.h inputstr.h windowstr.h
commit 82a6a659248bb66a0364eb9eaf331747834fb5c6
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Fri Jul 30 01:20:42 2004 +0000
Integration of XEVIE branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=947
Modified Files: Imakefile Added Files: xevie.c
commit dd7077cadcdc323e1a301ed5eefa7ff12599aa4d
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 30 01:15:57 2004 +0000
Cleaned up code since client's saveSet is no longer defined as a pointer*
(forgot one change in previous check-in)
commit 813d75f9d3c7b540977926e37310fa683daf12e1
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 29 23:43:40 2004 +0000
Use LibraryTargetName when not building a loadable server
Move extern function declarations to window.h
Cleaned up code since client's saveSet is no longer defined as a pointer*
Added externs back in
Change #if to #ifdef to fix compiler warning
Add function declarations that were inadvertently removed by previous check
in
Disable extensions that are not (yet) supported by DMX
commit 274d5044ac41523ff23912c223177c429c710e09
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:49:42 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Modified Files: Imakefile miinitext.c
commit 406c49eb810cbdcfd833cac4eeaa465598238691
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:46:37 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
DAMAGE calls some shape functions. Modified Files: Imakefile shape.c
commit 0bca00e1205bf1a4537cbf7be6339b3b1f9b953f
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:43:58 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Modified Files: dispatch.c dixutils.c events.c window.c
commit d4a101d4ef9943dcddf08b00b2d3ab4319597193
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:37:54 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
These RENDER changes come from the experimental freedesktop tree formerly
known as "Xserver". Partly motivated by compatibility with DAMAGE as
pulled from that tree, also some of the code just is better
implemented.
Modified Files: filter.c picture.c picture.h picturestr.h
commit e1281790bb3d7cdcc5de85829806dd53da67e326
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:16:56 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Modified Files: cursorstr.h dix.h dixstruct.h regionstr.h window.h
commit d2f798b6dbaebd0300f42c2e083a962c37647620
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 14:42:24 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Added Files: Imakefile damage.c damage.h damagestr.h
commit 682ee8a9f8d55c6a6f517a277d1bfad2a0f28594
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 14:40:33 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
commit 6ed1c3845517c7731dcc74baa51bb801838afaff
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 14:33:43 2004 +0000
bugzilla 859 -merging DAMAGE-XFIXES into trunk
commit 736e511824c4f5e77e637c680a4e45f0b7631644
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Jul 28 03:57:19 2004 +0000
Fix shared reqs for Xlibi18n, Xaw6 & Xmu for Solaris
Improved support for Compose and Kana Lock LED's on Sun keyboards
Add event definitions for additional keys on Sun Japanese keyboards
VUID mouse protocol support for Solaris Make default mouse message clearer
on machines that use a default other than /dev/mouse.
commit d374dffb20364a3df184cc28888ee7edbe50f474
Author: Rik Faith <faith@alephnull.com>
Date: Wed Jul 28 00:28:00 2004 +0000
When using DMX console input, make detached screens display as grey (vs.
white for attached and black for dead-space).
commit 1498414cc85c148ef15b9b57d9f9b6b850bf2702
Author: Torrey Lyons <torrey@mrcla.com>
Date: Tue Jul 27 20:26:47 2004 +0000
Fix Xprint build on Darwin.
commit ddd58356123f61b863754eb0bdd42a8defa0461b
Author: Torrey Lyons <torrey@mrcla.com>
Date: Tue Jul 27 20:24:00 2004 +0000
Fix XDarwin's broken build of libGL and server side GLX. GL library is only
known to build correctly on Mac OS X 10.3.4 and still needs some work
for earlier versions.
commit 8ef3e7052e8e1db869411e9f6fc88491e3f05474
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 27 09:53:14 2004 +0000
Merge latest changes from CYGWIN branch
Use find | xargs combination instead of simple shell globbing to prevent
commandline argument overflow
commit a12a678bc9af8df1a3078f574b0c910e3e6983f8
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jul 27 06:20:52 2004 +0000
Fix a bug that caused an entire batch of events to be thrown out when one
of an unknown type is encountered. (Ty Sarna, NetBSD).
commit 19002e47a0dbf55e035b674116a533ec9814edfa
Author: Alex Deucher <agd5f@yahoo.com>
Date: Tue Jul 27 02:50:41 2004 +0000
- enable maven support for TV detection, DPMS, and DDC on crtc2 on G400
(Ryan Underwood) (http://bugs.xfree86.org/show_bug.cgi?id=1098)
- expose I2CStart; needed for mga maven support (Ryan Underwood)
commit 2a7b137d41eb8ce6efc45b47b5df0c89eb4f5d93
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Jul 26 22:41:47 2004 +0000
remove extra ';' (Alan Hourihane, Keith Packard).
commit 799208dd44a65b18dda97b4843a27a2628f955f4
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 26 19:06:04 2004 +0000
Bug #377: Make lib{glx,GLcore,dri} work when compiled as dlloader modules.
commit f15f881727cee9a879bd43be8dc849320f8d3cbd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 17:14:27 2004 +0000
Eliminate bogus rate check in fbdevModeSupported. Hmm. Potentially bogus
rate selection necessary for Mac fbdev
Don't know about fb changes to pixmaps, so can't track dirt.
Add Mac specific 1280x854 mode. Warn when requested mode isn't found.
Add ability to soft-boot video cards.
Add region expand request. FIXME: need test cases
commit 20913b7d5daf90e0f7ad1ee967ad2f0daaec40f9
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Jul 24 17:35:39 2004 +0000
Fix a problem with wsmouse driver loosing events on 64bit architectures
(XFree86 Bugzilla #1438, John Heasley). "To fix this, I've added a
mouse buffer (Xisb buffer) "scale" value to the MouseDevPtr type. If
set, it is used as structure size of which we want space for a few."
commit c57944cd9aaac717d4d4ada44626e35925b39bbd
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 24 17:02:49 2004 +0000
Check for mmio before restoring crtc/crtc2 pitch registers
commit 5fdff8b95e8f90221a46717c2f84715ab238460c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Jul 24 16:32:39 2004 +0000
Bugzilla #884: OpenBSD/amd64 support.
commit cc3e0173d9fae8a40eb46606d9951e3aa1df975a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 22 19:24:50 2004 +0000
Thu Jul 22 20:03:11 2004 Soeren Sandmann <sandmann@daimi.au.dk>
Call MMX solid fill routine when available.
Call MMX operations when available.
New HasGcc34 macro
New file with many operations implemented with MMX intrinsics, conditional
on having GCC 3.4 on i386.
commit 9565d9e0cf85e6f5fb47acebdd66212bd6cc3e08
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 22 18:17:59 2004 +0000
Correct pitch so that accelerator can run on 1400x1050 screens. Add a few
more register sets for cursors.
commit 67dbad6b3b9163eafae7d9dd7698708e10372a21
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jul 22 06:48:19 2004 +0000
DRM 20040721 import
commit 829b2c72a6433ebaf63f2d2726259c73cca4bd1a
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jul 22 06:48:19 2004 +0000
Initial revision
commit 448e0754e369d433a61ae337bbfd7dba195c5e69
Author: Phil Blundell <pb@reciva.com>
Date: Wed Jul 21 20:33:35 2004 +0000
Include -lts if appropriate. Patch from pattieja@bentham.ispvip.biz.
commit 0c32a94623b13dd1ac5b015b465bdf890f498282
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 20 15:15:13 2004 +0000
Bugzilla #889: Bind -from address to port number 0 instead of 177
commit 07e6011106dcfa0ab69861aa7dcbb88382625c16
Author: Phil Blundell <pb@reciva.com>
Date: Tue Jul 20 14:33:42 2004 +0000
Select optimized
16bpp shadow copy functions if screen is 16bpp. Select -YX versions for
90 and 270 rotations if architecture is ARM.
commit 797114414096d7bf7ed0d73a878d0cffef262301
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jul 19 22:01:52 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=893 - Fixing the
bug that Xprt did not honor ${LC_ALL} when looking for model-config
dirs.
commit 8853f9331826899229e5b7c964e9c852c0371ce5
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 12:07:01 2004 +0000
Add support for a8b8g8r8 and x8b8g8r8 pictures, which showed up frequently
with metacity usage.
commit adf4b38f49da063576b48f9c0750b78bb753b3de
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 11:42:49 2004 +0000
Breakage in last commit to this file: pCurPriv->area isn't set up until
Enable, these days.
commit d2e74e419d2c75c5a5b97236d2714730e6f69ee0
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 11:19:12 2004 +0000
Set the right number of texture coordinates for r200 Render support (still
disabled, needs to be tested).
commit cefcb7f123c962c3715b0c46f30430e87c82a017
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 11:16:13 2004 +0000
- Add Radeon picture transform support.
- On R128, don't refer to an old Composite's mask transform when the
current Composite doesn't have a mask.
- Staticize some global variables in r128_composite.c.
commit 9fe216a45836b98b5aea55725019668de3900e83
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 07:53:54 2004 +0000
Use the offscreen memory manager as much as possible to do the reservation
of memory at startup. Do some drive-by cleanups while I'm here
(sorry!).
commit e2bb9f38cdcb74fd7630f4efe310ad14d597171e
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 07:20:01 2004 +0000
Add support for transforms of textures on R128.
commit c04264727860cbe2e276e1934d6700d0baaf9f73
Author: Rik Faith <faith@alephnull.com>
Date: Sun Jul 18 22:19:33 2004 +0000
Addition of console input after removal of core backend input that is not
on screen 0 can cause a segfault. Fix by preventing reinitialization of
detached inputs. When Xinerama is active and screen 0 is detached,
pixmaps for XGetImage must be obtained from another screen.
commit 0addd0d499046fc8a6cdc18fc41d34cac2ba77ea
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Jul 18 05:21:20 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=858 - Fixing the
problem that clients cannot use the TrueColor visual without calling
|XInstallColormap();|.
commit 7f9e263658b1c9c435db851a8afd904a2f584d13
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 17 20:44:14 2004 +0000
Revert change to MAXFORMATS to maintain binary compatibility
commit c47a1bdd7463b6863018e2c4237acfd28b89f38f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 17 01:13:31 2004 +0000
Fix typo in debug message in MakeAllCLTSServerListeners
Add $(GETPEER_DEFINES) to DEPEND_DEFINES for makedepend
Add "localuser" and "localgroup" access types to server-interpreted
authentication scheme.
commit 3e52373fc8179a59efc9e7ab22ce0cb5160d0409
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Thu Jul 15 09:56:40 2004 +0000
Enable i810.
commit aeb78eaa980ac93f6af3e947ab1ad8bce5bc5bd1
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jul 8 08:21:25 2004 +0000
Commit the rest of the dirty optimization from 20040703 and add a missing
header include. I don't know how this happened, but I'm going to blame
a "few" fscks having happened between testing the code and committing
(due to other driver changes that made me not blame dirty for the
failures I saw) for disappearance of kasync.c changes. Fixes a lot of
corruption.
commit b46767352822b09e5dab8b54cbb7a37a9b62de53
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jul 8 06:57:58 2004 +0000
Remove duplicate protos in kdrive.h.
commit 764d9e822b01fdfe3ff088028959cbc48b349026
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Wed Jul 7 20:43:25 2004 +0000
missing xkb/[xkb.h, xkbDflts.h] and hw/kdrive/mga/g400_common.h
commit f96ef08d48b01f6119799ede9ffc43d0134cbf8b
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Wed Jul 7 19:21:07 2004 +0000
Initial kdrive XKB/XINPUT support, use --enable-xkb --enable-xinput
commit a5c9b3229ce418a5e3eacc40b7a7f11c0a26d958
Author: Rik Faith <faith@alephnull.com>
Date: Wed Jul 7 04:32:52 2004 +0000
Bugzilla #817
commit 1498d7a096f0855fa965585acd9ca4a2780cc959
Author: Kevin E Martin <kem@kem.org>
Date: Tue Jul 6 23:51:00 2004 +0000
- Disable building DMX on OSs that have not been verified to build
correctly (Kevin Martin).
- Fix DMX build when Xinerama is not enabled (Kevin Martin).
commit 0e45f2a7536bf4b66d6f64d96b44431310884af3
Author: Egbert Eich <eich@suse.de>
Date: Tue Jul 6 14:49:13 2004 +0000
ifdef'ed some IA32-only assembler statements. Presently these chipsets are
IA32 only, anyway (Egbert Eich).
Disabling generic VGA testing for IA64 architectures. Temporarily disabling
support for ZX1 bus. This code is extremely invasive and is executed as
fallback without testing for a ZX1 chipset. It brings a SGI Altrix to a
grinding halt. (Egbert Eich).
commit df2b55a25b7056ac92c1f6cbee9f16bd0a37ba8c
Author: Egbert Eich <eich@suse.de>
Date: Tue Jul 6 14:37:48 2004 +0000
Separated Intel drivers from default DriDrivers to avoid building them on
IA64 (Egbert Eich).
Fixed wrong function prototype (Egbert Eich).
Don't test for generic VGA on IA64 (Egbert Eich).
Fixed a segfault when accessing a structure before verifying the pointer
exists (Egbert Eich).
Added a showcache option for debugging (Egbert Eich).
Increase default video RAM size to 16MB when DRI is enabled and more than
128MB are available (Egbert Eich). Fixed lockups during mode switch.
Problem was introduced when attempting to copy the behavior during
LeaveVT()/EnterVT() but but forgetting to call I810DRILeave() before
I810DRIEnter(). The entire DRILeave()/Enter() scenario has been
commented out as it didn't seem to be necessary (Egbert Eich).
Fix TweakMemorySize() (tested with i855/i865) (Egbert Eich).
increased MAX_DEVICES to 128 (Egbert Eich).
Use OS provided PCI config space access as default method (Egbert Eich).
Added support for Linux 2.6 proc file format.
Fixed unaligned accesses to pieces of the VBE info block. VESA did not
align elements to size (Egbert Eich).
commit 7c466d64c34e68e0bc50e083861874161ae02db9
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 3 10:23:03 2004 +0000
Clean up Rage 128 composite code. Now it composites more operations
correctly and is simpler.
commit 020701566916c8569f5af7f2efe1de36fea2002e
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 3 09:16:30 2004 +0000
Add a "dirty" flag to the pixmap private. Clear it when setting up an
offscreen pixmap area, and set it when any rendering occurs. When
moving a pixmap out of offscreen, don't read data back if it wasn't
dirtied (compared to the system memory copy).
commit fd594b0559caa98ee0823be956aecf9c9d2e52bc
Author: Phil Blundell <pb@reciva.com>
Date: Fri Jul 2 21:30:00 2004 +0000
Call ts_read multiple times, to avoid events getting stuck in the pipeline.
commit 7976ee51afcad41b611e642d2feb31d805dedcf6
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jun 30 20:06:56 2004 +0000
Add Distributed Multihead X (DMX) support
commit d5db59bd79f5d8788b99056bf9d969b5b3ad99e1
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jun 29 20:37:51 2004 +0000
Add an offscreen area scoring to improve choosing offscreen areas to kick
out when allocation can't find a free area of the requested size. When
offscreen pixmaps get used, the offscreen area's score is increased by
a constant value. Every certain number of increases, all offscreen area
scores get decreased by a fraction. When choosing a set of areas to
remove for a new allocation, the set of areas with the smallest total
score is chosen for removal. While this is not the smartest system, it
prevents things like always removing the first offscreen area in memory
(likely the most recent) to be kicked out when doing replacing.
commit ea78d1c6fcd27d28e69cb97faf72b7b719f6f93e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Jun 28 18:08:26 2004 +0000
Add GLX_ALIAS_VOID for GLX_ALIAS of functions with return type void to fix
builds with non-gcc compilers that refuse to let you do return
function_that_returns_void(...)
programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c Remove includes
of xf86drm.h that break non-DRI builds
commit 7ff67f2872ddd15908f789ec9bdb76e8211d6431
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 28 00:48:51 2004 +0000
Separate out off-screen allocation from Init. Fix Enable to update
off-screen addresses. Wrap RandR to update off-screen addresses.
Set off_screen_base and memory_size fields correctly.
commit 5b75aae2cf1ad38556e9a55da72ad65419aa7f84
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 26 04:13:03 2004 +0000
Add ARGB cursor support for Radeon cards.
commit 8bc0bc6d36dbc5000069017a1984905065164016
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jun 25 08:58:18 2004 +0000
#Bug 784: Ignore unconfigured interfaces with xdmcp
commit c5ab3fdd928d12b4dc28108f2242b3b75e1ac65f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jun 25 08:56:04 2004 +0000
#Bug 780: add RRSetScreenConfig
commit f8226cee08a00b49f32dc3db814478490febe45d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Jun 25 00:02:11 2004 +0000
Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=791 - Adding
special support for Canon C3200N
commit ad6b9644a39343437967b4c3b2442dbd47508443
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Jun 24 06:26:27 2004 +0000
Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=660 : Fix
for the issue that GetPrinterList does not return printer descriptions
on Solaris. The patch implements a framework which allows the printer
enumerator scripts to pass additional printer attributes to the
information pool (currently only "xp-printerattr.descriptor" is
implemented).
commit 884908a63c624585c9b5fcf22d565236298c2916
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Jun 22 10:18:13 2004 +0000
Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=789 : Adding
a workaround for the issue that Xprt may hang when the CUPS spooler
frontend sends messages to stdout.
commit c66cc2a219e860ae3c0b5d4ad18b22a6dc4e16df
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:51:57 2004 +0000
Bug 783: rootless patches for cygwin
commit ed7f92e791f052d64cffef4b44eae5160fb24689
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:44:14 2004 +0000
Bug 778: add ddxBeforeReset
commit 68d92cca1a696521599db6a826d2187ec0c15f01
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:35:05 2004 +0000
Bug 782: Merge native OpenGL for Windows from CYGWIN branch
commit d6e8b1affec7351549c0006cc63b6923091cdd68
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:19:32 2004 +0000
Bug 777: Merge from CYGWIN branch
commit dfdbb60bf5f613b3554d5435f08f16bde72aa353
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jun 21 00:29:46 2004 +0000
Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=772 - RFE:
Switch default resolution from 300DPI to 600DPI
commit dd831c7a5c1b0c540a78350aadaeb34a8aa67395
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Jun 19 21:56:01 2004 +0000
Refix for http://freedesktop.org/bugzilla/show_bug.cgi?id=764 : Rework
previous solution and make Xprt to default to "-noreset" (the default
of Solaris version of Xprt) and add a "-reset" option which can be used
to restore the default behaviour on demand.
commit da78a4ddd833f78baf1d2579a1adea8208016ddb
Author: Damien Ciabrini <braun@club-internet.fr>
Date: Wed Jun 16 21:36:54 2004 +0000
Update MGA composite patch commit. (some files were missing in the previous
commit)
commit e56e24af252bd3b8e58076adf0f8eabf1103f187
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:37:59 2004 +0000
Merge DRI-trunk-20040613 changes in programs/Xserver/GL.
commit 2e1868b560315a8b20d688e646c489a5ad93eeae
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:25:21 2004 +0000
DRI trunk-20040613 import
commit f45c46c630855e8e0d1c28b1f0d3b2ad54334619
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:25:15 2004 +0000
Initial revision
commit 22bad9474b8822f03f84a8a39edce624bfb9befa
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:22:17 2004 +0000
DRI XFree86-4_3_99_12-merge import
commit 1c133c27ccc1f09b95922fdece3c8d73cc182def
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:22:05 2004 +0000
Initial revision
commit b61ff0daa4bd1e3b828dc5b985c3a2f3c92b202e
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:16:01 2004 +0000
DRM 20040613 import
commit bcc1eab1fd57e8cb686d625934a6e527b7ae4ea2
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:16:01 2004 +0000
Initial revision
commit 580b9a7da1bf0e20acdcddd676d471b3d6589023
Author: Jaymz Julian <jaymz@artificial-stupidity.net>
Date: Mon Jun 14 08:43:57 2004 +0000
MGA composite support from Damien Ciabrini - thanks!
commit 95d65cf6bb753d10f4db3d857fb98bb09389228e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Jun 13 04:50:21 2004 +0000
Manual page X(7) does not reference Xprt(1x), xplsprinters(1x), etc.
xc/config/cf/Imake.rules Correct comment to match rule name for
InstallDriverSDKObjectModule
xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c Log results of
ioctls to probe keyboard type & layout
commit 4ffde8a6b3299f002c10b1abd881e4c6849767ea
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 10 19:22:58 2004 +0000
- Pass the right pixel mask (all ones) in to PrepareSolid in the
solid-fill-based composite acceleration.
- Use a real pixmap when doing an UploadToScratch (For pDrawable->type ==
DRAWABLE_WINDOW, you need to get the backing pixmap).
- Pass back the x/y offsets from kaaGetOffscreenPixmap unconditionally,
because they'll be used in the scratch case.
- Turn on the Render acceleration for Rage 128 and Radeon 100-series at
last!
commit c3bc6dd551436d5e37a07f37b3b77a83bb5b5da0
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 10 09:50:59 2004 +0000
Align scratch area offsets to the offscreen byte alignment.
commit cf3f95d2164604047866b283fe0071574bf16dbc
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 10 08:37:28 2004 +0000
Oops, testers reported that the last patch actually didn't work (conflicts
occurred), so the R300 PDMA doesn't work. Disable.
commit 0b7647ee359537953b67b0dbf9daa807e356062b
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 10 05:57:31 2004 +0000
Bug #242: Fix setup of R300 cards, by providing R300 CP code from
volodya-project and initializing PDMA.
commit b3a18ca8b827cfe2ebb295a03a9776028242c1a0
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Mon Jun 7 05:13:29 2004 +0000
Neomagic driver enabled
commit 893ea125597f3c6273f45a51673d4dc514e754e9
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Mon Jun 7 05:05:10 2004 +0000
small fixes. README added
commit d9cca52feba13b69f3eea9e1d958b8a4711e7d67
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 4 17:06:18 2004 +0000
Add (stubbed out) Xgl server code
commit f8a1dd3ce725195baa6f38a880299752c6c6c2c4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 4 16:10:50 2004 +0000
Add top-level build support for GL X server (not working yet)
Fix a few allocation bugs with alternate visual ids Allow for non-8/8/8
alternate visuals
Turn off any existing shadow before enabling it again (avoids
re-registering existing damage)
Add some validation code to catch re-registered damages
commit 6741fadc52598af0096f106a2cefd640abb434b3
Author: Phil Blundell <pb@reciva.com>
Date: Wed Jun 2 20:49:50 2004 +0000
New conditional. (REQUIRED_MODULES): Demand xcalibrateext if building
XCalibrate.
New file.
Add xcalibrate.c.
Read raw events if requested.
commit d4d0c8470c4272dec642ab4c68f44a83cda06971
Author: Phil Blundell <pb@reciva.com>
Date: Sun May 30 20:40:30 2004 +0000
Add -lts if using tslib.
commit 8124810950d7e0b9db7f66dadee7218b0c26c4c3
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Sun May 30 13:51:18 2004 +0000
Initialize permedia engine for acceleration to work.
commit ea1bbf8d83d3780ccce5ebcdff48f0b19863cee1
Author: Ralph Thomas <ralpht@68k.org>
Date: Sat May 29 12:15:46 2004 +0000
Adding driver for VIA CLE266 graphics chip. Currently it only accelerates
copy and fill operations.
commit 6af411b02e808220d3afcef14abb97eec86cf1f3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri May 28 04:56:49 2004 +0000
Hey, I like devfs.
Try /dev/fb/0 if /dev/fb0 fails.
commit a7b42f685e7a4bf57cf89a3ef664a581ecedb50f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu May 27 14:11:42 2004 +0000
file ChangeLog was initially added on branch CYGWIN.
commit 05a3dbf5dc55ea534c68fc9d05b3949805a0752e
Author: Egbert Eich <eich@suse.de>
Date: Wed May 26 17:44:29 2004 +0000
Updated x86emu and resynced with upsteam at Scitech.
commit 9549f628e066396e6bc9a7edfc919bdd6860f170
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 25 20:33:46 2004 +0000
getconfig: file '/usr/X11R6/lib/X11/getconfig/xorg.cfg' has bad signature
(Change "Xorg Project" to "Xorg Foundation" to match getconfig script)
commit f8124d3ef5890d59c3ce41bee46b5e3576d0f9b1
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Tue May 25 13:02:44 2004 +0000
Add pm2 to the build
commit 32d0920ef9ec3c5e61089b88dedc82ffab294276
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Mon May 24 19:31:41 2004 +0000
Initial import of Permedia2 driver
commit 5b2211ec3545f1634f807daf84b6c4bc2c0fdecf
Author: Egbert Eich <eich@suse.de>
Date: Mon May 24 19:05:01 2004 +0000
Muffle compiler warnings.
fix option name in log message.
improve debugging messages.
commit 932efe8e6d4e6280aed9b5e25af56888c964d37b
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 21 03:32:27 2004 +0000
Allow for multiple composite-based visuals, then add an RGB24 visual in
addition to the ARGB32 one. This allows 'glitz' to run on top of any X
server using mesa.
Switch to using 32bpp for depth 24 pixmaps (even when the frame buffer is
not depth 24).
commit cde51fd05b2bd413d8db8ad750e6a72398a7039c
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 20 19:51:44 2004 +0000
Miscomputing pitch in 24bpp modes because of rounding errors.
commit b9d920f3dc060d230a4a7b2d40210524acf50666
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 20 05:27:03 2004 +0000
Fix SYNC_ALWAYS (debugging) code to use mach64WaitIdle instead of
KdCheckSync -- the boolean used in the latter won't be set yet.
Oops. == instead of =.
Must sync hardware before rasterizing trapezoids in case the mask is in
off-screen memory and has just been erased. Yes, it is silly to place
masks in off-screen memory. That's a separate issue.
commit 94648799c82e59166155ca5abf22a9391693e6a1
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 20 02:42:20 2004 +0000
Pin header-only pixmaps in memory.
Off-screen reallocation could have used a stale pointer.
Separate framebuffer mapping computation from actual frame buffer mapping.
Now map the frame buffer from vesaEnable so that VT switch shares the
same mapping code. This makes sure any shadow framebuffer is allocated
again.
commit cade317d31dddab61199d5e90bcff36fb12f3cd1
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 17 20:18:02 2004 +0000
Overhaul of the ATI driver:
- Add monochrome hardware cursor support.
- Try to auto-detect AGP support for DRI on Radeons. And fail. Detect it
properly on R128.
- Set up card for pseudo-DMA if possible. Convert 2D rendering code to
prepare DMA packets only. Use generic code to decode DMA packets to
MMIO if PDMA is unavailable. Add WIP code to support "real" DMA without
DRM support.
- Dispatch pending DMA commands when the server sleeps. Otherwise some
things, such as typing in an xterm, wouldn't show up for a time.
- Fix Radeon Composite acceleration in many ways, and add Rage 128
Composite acceleration. Disable them both due to still-not-understood
issues they have. They fail with In, Out, AtopReverse, and Xor, and
text rendering is strange.
- Add textured XV support for R100 and Rage 128. No brightness/sat
controls, but it does support multiple ports, and cooperates with
Composite.
- Add WIP code for hostdata uploads.
- Many cleanups and fixes.
commit 834537e212e01314b60737278b7abc6bb7cef102
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 17 07:19:49 2004 +0000
Make kaaMoveInPixmap public. This will be used by the ATI driver's xvideo
support to ensure that the destination is in framebuffer.
commit 85f46e0bcdf60d145a6868ee71d10688c9113e6e
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 17 07:14:23 2004 +0000
Add new CheckComposite hook. This allows a driver to avoid the migration of
pixmaps for a Composite operation if the operation can't be supported.
This hook is optional.
commit 47fb207c8ae2b54e976066f78892a1ee3fb35d30
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun May 16 05:08:39 2004 +0000
xc/programs/Xserver/fb/fb.h
xc/programs/Xserver/fb/fboverlay.c
xc/programs/Xserver/fb/fbscreen.c
- Change #ifdef for checking for old format miScreenInit to
FB_OLD_MISCREENINIT for easier portability to xservers with updated
screen structs but old function prototypes. Make it automatically
defined if FB_OLD_SCREEN is defined.
- Add _LP64 to list of #ifdefs for 64-bit platforms to support
64-bit Solaris.
commit fc2dd516c3c7382915452207180a1c483d0d73ca
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun May 16 00:03:54 2004 +0000
xc/programs/Xserver/hw/xfree86/xf86config/Imakefile
xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c
- Clean up server name changes from TM branch
- Set default XKB rules file name correctly
- Use default font path from Imake configuration for the default font path
in generated xorg.conf files.
- Use path variables from Imake configuration for paths to files, in case
vendor has configured them to install somewhere other than the
defaults.
commit b1aa9499ffb827f4b1acc75f197e332bba382565
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat May 15 14:43:05 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=622 -
RFE: Xprt default BIGREQUESTS extension buffer size should be 8MB (to
make |XpPutDocumentData()| happy and to improve performance).
commit 74b2a7694791297a4f798ecc05c7eb8f68634722
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri May 14 00:34:28 2004 +0000
Add new flag, KAA_OFFSCREEN_ALIGN_POT, which tells KAA to align pixmap
pitches to a power-of-two number of bytes. Useful for Render
acceleration on older cards.
commit 2bea33e881693e7d7dcf938db79c888a71dfb2fb
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri May 14 00:27:29 2004 +0000
Don't let the visible screen get "migrated" offscreen, which manifests
itself as a hang.
Reported by: Ginokas <ginokas@free.fr>
commit 40354e761892dc2ef88d2e722d8d7896642003eb
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu May 13 22:57:15 2004 +0000
Add generic functions for copying packed/planar XV data, copied from
mach64.
commit 2e330e980f61b256c55f5b9debb00574e4e85b26
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu May 13 21:41:48 2004 +0000
Move fourcc.h to a generic location in src/.
commit f52a4d472d2463482d865c5006208182c294e670
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 13 21:25:51 2004 +0000
Follow GLX in setting ARGB visual nplanes to 24.
Retry current mouse protocol when sync is lost
commit aa5a87847290d49b03a33351ebfd8df652a42489
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu May 13 21:15:06 2004 +0000
There's no need to explicitly set softCursor -- kdrive handles this if the
cursor hooks aren't set.
commit 4078457919708a8dbf9db8ee6e4871ecbf72518f
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed May 12 01:49:46 2004 +0000
Fix problems in render fb implementation found by rendercheck:
- fbCombineSaturate was pointed at fbCombineDisjointOver, instead of
fbCombineDisjointOverReverse as it should. Instead, point
fbCombineDisjointOverReverse at fbCombineSaturate (which is likely to
be faster).
- fix previously-unused fbCombineSaturate implementation.
- fbCombineMaskAlphaC was just a copy of fbCombineMaskValueC. Make it do
what it's supposed to (return a cs.alpha).
- fbCombineAtopC didn't invert the source alpha value.
- fix copy'n'paste errors in fbCombine(Dis/Con)jointGeneralC, also source
alpha wasn't treated in a component fashion.
- fbCompositeSrc_8888* didn't handle when the source lacks an alpha
channel. Rather than adding that and possilby slowing down the (normal)
alpha case, don't let x8r8g8b8/x8b8g8r8 Pictures be used in
fbCompositeSrc_8888* because Over with one of these is just Src.
commit a43d5412b4d79d67af20dc8af144a9ca80263e9d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun May 9 16:20:13 2004 +0000
file ChangeLog was initially added on branch CYGWIN.
commit 0498d818fe40cb4eb03983e27a980791bbadf6db
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat May 8 02:06:46 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=608
("Can not print on Debian/CUPS due to error |Xprt_64:lpr: unable to
print file: server-error-not-accepting-jobs|"): Xprt did not setup the
list of supplementary group ids, causing print failure when the the
calling user must be a member in a specific group to be allowed to
print.
commit 75d96afcc4a1f201da665bd73b7067e8e7139a3f
Author: Egbert Eich <eich@suse.de>
Date: Thu May 6 17:31:17 2004 +0000
BugZilla #601: Fixing makedepend choking on floating point exception
because CHAR_BIT is defined to __CHAR_BIT__ which is a compiler
intrinsic define. BugZilla #605: Fixing build on IA64 which is broken
due to the inclusion of the kernel header asm/page.h. Kernel headers
however don't work with
-ansi. The inclusion of asm/page.h can however savely be removed as it
there are plenty of other ways to determine the page size.
commit 7124cfaa006e840ba48dcc466c0dc8b34503a686
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 6 16:19:32 2004 +0000
Use current resolution by default, change rate to 75 to match
fbdevModeSupported cut-off (?). Glenn McGrath <glennm@hydrix.com>
commit e4ac2411eddf1f01ef9204f27b6d1ce8f1749439
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu May 6 01:53:52 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=551 -
PS DDX will not build on platforms with BuildFreeType NO. Patch by Alan
Coopersmith <alan.coopersmith@sun.com>.
commit b1c65e1ca6828ea82ee7790f22c26503b0a5e17d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu May 6 00:24:32 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=536 -
RFE: PS output should contain the FreeType2 version being used.
commit 8d4f21ab53c44ca48501d6211ea6db0c0b8af916
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:15:41 2004 +0000
Add XACE and XSELINUX extensions to the build system
commit 0106715000196c7b349a0b4494b61545f0f5e138
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:07:37 2004 +0000
Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
commit 8526cd6395490b03b279f1962df777fb0e4a9878
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:04:52 2004 +0000
Replace XC-SECURITY code with XACE security hooks
commit 6d066cb10990d951449b342b40dec1f1b1ae593c
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Tue May 4 19:44:02 2004 +0000
Merge the new release from HEAD
commit b5f200ce9d495c6ce94e0170909465a30e8799d9
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 4 03:28:06 2004 +0000
Attached is a patch to fix a build error whe ncompiling with tslib support,
a variable wasnt set, i just changed it to be like the other
MAkefile.ams :) -- Glenn McGrath <glennm@hydrix.com>
commit 5ca651e66f3d0ab189962bb4609b87a865364ef8
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Apr 30 12:48:56 2004 +0000
file winmessages.h was initially added on branch CYGWIN.
commit 2c2c1704b542f29fe5ac9917e1141040a0dbd3e9
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Apr 29 23:59:15 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 -
Xorg Xprt starts to consume 100% CPU when being idle for some time
(internal screensaver goes mad after 10mins)
commit a8429d76103ff0f4fc61db86201c741f91bfcba2
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 28 07:26:46 2004 +0000
Add completely fake X server -- draws to allocated buffer, has no keyboard
or mouse.
commit 85e4e5445218d70f627fb132a8e8f18470e6749d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Apr 26 11:07:03 2004 +0000
Work-in-progress for
http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=542 - GLX
support for PS DDX / part #1: Fix visual setup (attachment #243)
commit 46472cbee679f9757c4003a0dcf158aeb3852f47
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Apr 26 02:39:58 2004 +0000
xc/config/cf/sun.cf
xc/config/cf/sv4Lib.rules
xc/programs/Xserver/Imakefile
xc/programs/Xserver/hw/xfree86/os-support/sunos/find_deps.pl Make Solaris
builds work when using MakeDllModules (it's not the default yet, but at
least it works now if you turn it on) Also improve default compiler,
optimizer, & linker flags for Solaris builds using either Sun cc or gcc
xc/programs/Xserver/cfb/Imakefile.inc
xc/programs/Xserver/cfb/stipsparc.s
xc/programs/Xserver/cfb/stipsprc32.s Remove text relocation error when
building shared versions
commit 36e3e5430e1ca7103a4e0b796eb3817975b40d90
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Apr 25 22:42:09 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=541 -
Xorg Xprt may crash with "Freeing resource id=40200000 which isnt
there"
commit 2fb588620030ad393f8500d60e16144d59e4effe
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:30 2004 +0000
Merging XORG-CURRENT into trunk
commit 0664db19bf37f9dd69cca6adff4e238e310c3092
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:54:16 2004 +0000
Merging XORG-CURRENT into trunk
commit 68fd529608c58334f13beb88dbcc1d5db85b9b00
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Apr 21 23:24:20 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=535 -
Xprt should not annouce extensions which are not supported
commit 1af13123fa79ad1c6747aad60ed458bbd69da12d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Apr 21 10:03:41 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 -
Land XPRINT branch on XORG-CURRENT
commit 449e83a9470ec4bdd0871e2f263f608b24455423
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Apr 18 03:00:43 2004 +0000
xc/lib/GL/glx/Imakefile
xc/lib/GL/mesa/src/Imakefile LargePICTable required for Solaris SPARC
builds
xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c
xc/programs/Xserver/hw/xfree86/common/xf86Events.c Add != NULL to if
statements to get past syntax error reported by Sun Forte 6.1 cc.
xc/config/imake/imake.c
xc/config/cf/sun.cf
xc/config/cf/sunLib.tmpl Allow compiling with Sun compilers installed
somewhere other than /opt/SUNWspro
xc/programs/Xserver/hw/xfree86/common/compiler.h
xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h Check for
defined(sparc) as well as defined(__sparc__) since Sun compilers don't
define __sparc__
commit 425251a752805affb6ce14baa58d92c384f39501
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Apr 17 18:47:05 2004 +0000
Bugzilla #495: LocalClientCred should use getpeerucred on Solaris 10
commit 7215fb186f076a24d0a04c9c20ac9b92cae1f49b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Apr 16 00:21:24 2004 +0000
xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c Solaris mouse
enhancements, including autoprobe support, VUID wheel mouse events, and
streams module pushing. Bugzilla #434. (Russ Blaine & Alan Coopersmith,
Sun Microsystems)
xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c Xorg doesn't
reset console to text mode on Solaris x86 8 and later Bugzilla #469.
commit c6c6d0de2309019999fa75a2f36a4f4a93ad2f31
Author: Egbert Eich <eich@suse.de>
Date: Thu Apr 15 10:17:35 2004 +0000
Merged changes from RELEASE-1 branch
commit 9d24a5fa91bf165bbd2048a844edeb59b5e34aad
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Wed Apr 14 00:01:22 2004 +0000
file XWinrc.man was initially added on branch CYGWIN.
commit 01bb5eb5032a7566c86a51053146dba98a3ed749
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:46 2004 +0000
file psout_ftpstype3.c was initially added on branch XPRINT.
commit cb3f3d8f2283d384dc5a3af3f38053cc8a2d192e
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:46 2004 +0000
file psout_ft.c was initially added on branch XPRINT.
commit 7cfb4c2b33ae2147b5d6ddc2afc8b777686a666f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:46 2004 +0000
file psout_ftpstype1.c was initially added on branch XPRINT.
commit 4ae42e79d46d7db30f7b6f321bbb0d134862138d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:46 2004 +0000
file PsFTFonts.c was initially added on branch XPRINT.
commit b5fb71922b02024aa5a8f349c9d2c956e2f83f0f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:45 2004 +0000
file xprint.sh was initially added on branch XPRINT.
commit ca9a9a58be51a21f123b11dd68047034696cae84
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:45 2004 +0000
file xprint.csh was initially added on branch XPRINT.
commit 7c1f840108172d6b18af47465ea72f4820640598
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:45 2004 +0000
file cde_xsessiond_xprint.sh was initially added on branch XPRINT.
commit 579221198aeac7010435b29db1ad8fe9ee2d7c5d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:44 2004 +0000
file spooler.c was initially added on branch XPRINT.
commit 7677b4992fee7eb73cc97914163dcf689ad13d6a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:44 2004 +0000
file spooler.h was initially added on branch XPRINT.
commit d3907ca519b476c99e29a58c22258f22dbe63244
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:44 2004 +0000
file document was initially added on branch XPRINT.
commit 3646bb9c894d5f011e2df4fac402118d8350102e
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:39 2004 +0000
file spooltodir.sh was initially added on branch XPRINT.
commit 8c006df3c6d8e5ac95f0b0fa38a030100541598f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:39 2004 +0000
file model-config was initially added on branch XPRINT.
commit 95a84bc0cb809e5c7141d0411e329a3ec300b8aa
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file ZapfDingbats.pmf was initially added on branch XPRINT.
commit 5527b39e668ea7a88c41186dbb6d7b66e892547a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Times-Roman.pmf was initially added on branch XPRINT.
commit 69c405ac66b1a15076e247dd1b578b7b4b210b00
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Times-Italic.pmf was initially added on branch XPRINT.
commit b6b75f677292ed0c694921df0abf40038dd5e99d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Times-BoldItalic.pmf was initially added on branch XPRINT.
commit 6605566bcf008551d33a9a68bd03e9a0c57c4f60
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Souvenir-LightItalic.pmf was initially added on branch XPRINT.
commit 38ad2972bffea1019214785ee479f7670ca70d1f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Souvenir-Light.pmf was initially added on branch XPRINT.
commit 10d8eace174a9778a3313ac36a3422637b020d5f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Souvenir-DemiItalic.pmf was initially added on branch XPRINT.
commit fb5ac8e2bdfe1217663679f5eae8045473456752
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file NewCenturySchlbk-Roman.pmf was initially added on branch XPRINT.
commit 5ec311b05dc1e509c115ccca808ee05090cfddad
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file NewCenturySchlbk-Italic.pmf was initially added on branch XPRINT.
commit 70947a8f1addf4ca17e50d9e6ae590266ac446cc
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Symbol.pmf was initially added on branch XPRINT.
commit 436ff77b21515cd9fe9732e0bd5361f2bfba44ed
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Times-Bold.pmf was initially added on branch XPRINT.
commit 4db563027844245d6c9085f997e75da743410885
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file NewCenturySchlbk-Bold.pmf was initially added on branch XPRINT.
commit 79110faa2eac849756b859071ce68fba64de57aa
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file NewCenturySchlbk-BoldItalic.pmf was initially added on branch XPRINT.
commit 4e1ae7e9cc04806f4436759764cc680ecf1f014c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Souvenir-Demi.pmf was initially added on branch XPRINT.
commit 433913bacf988908b94c420452c042eebcb381ac
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file LubalinGraph-Demi.pmf was initially added on branch XPRINT.
commit d5bae63138ab833fdd56bb983436ac514536d7b6
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file LubalinGraph-DemiOblique.pmf was initially added on branch XPRINT.
commit 3acd6856617e784ee30333dc9b779189a3f44052
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file LubalinGraph-Book.pmf was initially added on branch XPRINT.
commit 5f73192458136fe4b6b82372c3b1653fbf831ebd
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Helvetica.pmf was initially added on branch XPRINT.
commit e129abc3bf269e857aa65065cc18a31a56ba0373
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Helvetica-Oblique.pmf was initially added on branch XPRINT.
commit 576a4cddf995082d10e2e29e1b58c1564eb11ee7
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Helvetica-BoldOblique.pmf was initially added on branch XPRINT.
commit cf26c87833a79427b665abce67ca19f2b68bc8e5
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Helvetica-Bold.pmf was initially added on branch XPRINT.
commit a091408c372a2aa89fb83b023248f45aa8cd4173
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Courier.pmf was initially added on branch XPRINT.
commit 9e4221d08ff9a408fb25a32887390b14788b1558
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Courier-Oblique.pmf was initially added on branch XPRINT.
commit 6b2674078079a5959a2b7758e6c628a14ec1a46c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Courier-BoldOblique.pmf was initially added on branch XPRINT.
commit 6aee2d37b95170a65ee08c0866c425f115ebc9f1
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file LubalinGraph-BookOblique.pmf was initially added on branch XPRINT.
commit 7a59fe1dd987e1ef0abd92e0ac80dd87a15137fe
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file AvantGarde-Demi.pmf was initially added on branch XPRINT.
commit 22e0316acc8992033fc82a38f663fce130e4031b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file AvantGarde-DemiOblique.pmf was initially added on branch XPRINT.
commit f8aded3a7f8c97731e33b4362243da947fb4e774
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file AvantGarde-Book.pmf was initially added on branch XPRINT.
commit 2224187c05d4dc05f7e03e22307cf7816d69f789
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file AvantGarde-BookOblique.pmf was initially added on branch XPRINT.
commit 9eafaaf83294d1988b30bde4485a299cf8ae5035
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Courier-Bold.pmf was initially added on branch XPRINT.
commit f9eea9864e333efde97143278916da44639cc18a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file ps2pdf_spooltodir.sh was initially added on branch XPRINT.
commit 20248eedd69c42c27605d7bcfb265994f5846f17
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 16:39:48 2004 +0000
fixed Changelog format
commit bc7168ee763ffac9cbb992096a53b346cd640a13
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 16:24:03 2004 +0000
Added ROP
commit 784d37ee369b94c83c4cc6e280a39f32da8aa678
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 15:51:04 2004 +0000
Fixed size calculation in solid rendering
commit 056322336cbb6093d74aa9d22bbfd42e2248a16a
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 15:20:17 2004 +0000
Basic bitblt implementation
commit c231856a1343e38381e1b4e545ff1ac279141bf0
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 00:53:10 2004 +0000
First acceleration function implemented (DrawSolid)
commit 47436a8af82a00d0d392cef4d5906729d9a37649
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 00:15:57 2004 +0000
Finnally got MMIO working all timecat ChangeLog cat ChangeLog cat ChangeLog
:-D
commit 1740b938e4c4f1cd3de700ea26143b01c0312325
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Tue Apr 6 18:09:44 2004 +0000
Return back to VESA only version
commit 07bc231872e7e056fa3049a0fcd963c61f826f80
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Mon Apr 5 18:19:34 2004 +0000
small fixes, but still can't get this driver woking again
commit b526276faa765df893197e04370a915ed73947dc
Author: Brent Cook <busterbcook@yahoo.com>
Date: Mon Apr 5 02:52:35 2004 +0000
removed hardcoded vesa references so we can operate with any backend. fbdev
works for initializing the screen, but input fails shortly after.
commit 920e6ff81baeec16465f81bacbcff711ce82e149
Author: Brent Cook <busterbcook@yahoo.com>
Date: Sun Apr 4 07:30:07 2004 +0000
Begin separating VESA calls into a more generic backend wrapper like the
ati driver, cascading between VESA and FBDEV. We only have init
functions done so far; need to add all of the others. Fixed some
compiler warnings. Whitespace and formatting cleanups (using 4 spaces,
no tabs)
commit 530371ceaf7f593badf38bbc2d2e50f6a920d24f
Author: Brent Cook <busterbcook@yahoo.com>
Date: Sat Apr 3 22:26:37 2004 +0000
added touchscreen support, detect all known PCI chips in the Neomagic line.
We'll not bother with ISA for now.
commit 962b898868dcab959c390986dcb0b4dd750dc107
Author: Brent Cook <busterbcook@yahoo.com>
Date: Sat Apr 3 22:22:48 2004 +0000
initial import of original driver by Franco Catrin L. Wraps VESA for most
parts, with some hardware acceleration enabled for the cursor on the
NM2300.
commit 8a2fce3b90b5efc8bab19675cb8e02690e24442e
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Sat Apr 3 05:01:21 2004 +0000
file winkeyhook.c was initially added on branch CYGWIN.
commit 12d5371ed2fbefab069dea46be972a7269b8c2db
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file xfixes.h was initially added on branch DAMAGE-XFIXES.
commit a4b319dbf375461c975450659723e6326153e536
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file xfixes.c was initially added on branch DAMAGE-XFIXES.
commit 5319d30d45d5f8ec04a496327f32cc6431c6a511
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file select.c was initially added on branch DAMAGE-XFIXES.
commit 76f247bd0ef23d688028c63b5f8bd3e9ad6b1b45
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file saveset.c was initially added on branch DAMAGE-XFIXES.
commit 83f0f1babb612774f609c71879a225c43f63ac1f
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file cursor.c was initially added on branch DAMAGE-XFIXES.
commit 52bc7693dbe7e3db916f8d463d9a750e3c6ffa4d
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file region.c was initially added on branch DAMAGE-XFIXES.
commit 5d9098cb17cd88cfdf49de92bec2a787d6681649
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file xfixesint.h was initially added on branch DAMAGE-XFIXES.
commit ace9aa7c45ff2ea6b3476006574da5c27d05afd4
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 17:41:24 2004 +0000
file damage.c was initially added on branch DAMAGE-XFIXES.
commit 72dc7569c6bbc216f613be21ea4f79d3ef1d5534
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 17:41:24 2004 +0000
file damage.h was initially added on branch DAMAGE-XFIXES.
commit 95da7b7e061b6925d8cd85bc7b25708ff253fcb1
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 17:41:24 2004 +0000
file damagestr.h was initially added on branch DAMAGE-XFIXES.
commit 629c3792225cec28572081ebc8dda3fd803fe616
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 30 14:23:15 2004 +0000
36. Conversion: __AMD64__ > __amd64__ (Egbert Eich).
35. Fixed stretching option and centering in C&T driver (Egbert Eich).
34. Added support for memory size tweaking in BIOS for i845 (Egbert Eich,
thanks to Christian Ziez)
33. Removed video playback dependency on Accel in NSC drivers (Egbert
3Eich).
32. Fix HW cursor state on Savage driver when entering VT as some BIOSes
seem to enable it unconditionally (Egbert Eich).
31. Fixed Emulate3Button message to distinguish between 'hard' (ie.
configured) and 'soft' (ie. automatic emulation that is disabled as
soon as the middle button is pressed) (Egbert Eich).
30. Free XrmDB in XCloseDisplay() only when implicitely allocated by
XGetDefaults(). If Client allocates it itself it should free it also.
Trying to free it for the client may result in segfault if the client
has already freed it (Egbert Eich).
commit b5e400867feab935aa04e9aadb12deb0601b7f83
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 30 14:14:31 2004 +0000
- backing out XFIXES and DAMAGE related code that accidentally went in
here.
commit 0017ddaa6406524d0a86ff7020eed4c33758ddbd
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 02:16:15 2004 +0000
file damageextint.h was initially added on branch DAMAGE-XFIXES.
commit 4b5112fd0593b34e6e096d88b0841a28636600f6
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 02:16:15 2004 +0000
file damageext.c was initially added on branch DAMAGE-XFIXES.
commit 733bfa4b5dd5255713a98f390a1fb65be6e16c2d
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 02:16:15 2004 +0000
file damageext.h was initially added on branch DAMAGE-XFIXES.
commit b1ed473ef2e1da99d7fe3df14fdef4d8b6365626
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Tue Mar 30 00:31:28 2004 +0000
file winrandr.c was initially added on branch CYGWIN.
commit fec5095bdfb376d0046e2f52188c68bef4e31fd7
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 28 07:14:30 2004 +0000
file xorgcfg.man was initially added on branch XORG-RELEASE-1-TM.
commit 136a9364be80f407f498e9e9695cadaab39227ad
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 28 07:14:30 2004 +0000
file XOrgCfg.cpp was initially added on branch XORG-RELEASE-1-TM.
commit 881afb356d6992bcfbbfcbdf31f1f71c64d648da
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 27 17:01:11 2004 +0000
file Xorg.man was initially added on branch XORG-RELEASE-1-TM.
commit d2119ac7c56ba94db1d8639937b13e72288a328c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 27 17:01:11 2004 +0000
file xorg.conf.man was initially added on branch XORG-RELEASE-1-TM.
commit 5a9f3a36a35549f30fc67a8e3a3e9a201efb91ec
Author: Egbert Eich <eich@suse.de>
Date: Fri Mar 26 20:02:03 2004 +0000
file xorgHelper.c was initially added on branch XORG-RELEASE-1-TM.
commit b2b0e70fe5c65c8f2d518f5f0ce89a86938701ed
Author: Egbert Eich <eich@suse.de>
Date: Fri Mar 26 19:54:39 2004 +0000
file xorgconf.cpp was initially added on branch XORG-RELEASE-1-TM.
commit 83880dd464a415d3d0efa546b1f0b9887342e809
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Mar 26 17:11:49 2004 +0000
29. XkbWriteRulesProp fails if XkbRulesFile is NULL. Bug #376. (Alan
Coopersmith)
commit 861a33678243349b987ff30912985968ede8ac84
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Fri Mar 26 01:22:18 2004 +0000
oops
commit 23d552bbef2984afee889f82ded154478548ee15
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 25 11:00:52 2004 +0000
file xorg.cfg was initially added on branch XORG-RELEASE-1-TM.
commit d1e52f13ad4610ec4907432c21384d08d6aaaf27
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Mar 25 05:11:16 2004 +0000
oops
commit f0336f18ee4106050104cb060c38fe87541615da
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Mar 25 03:45:49 2004 +0000
built,working DAMAGE/XFIXES in mono tree
commit f1394ec3cec09ff9c5fbbff3c1f595a642b25f91
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Mar 24 22:15:25 2004 +0000
Change XFree86 Project to X.Org Foundation in localized XDarwin splash
screens.
commit d2bbcc0deed3a607d347ed4ef07ded9bcb44f1bb
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Mar 24 22:12:34 2004 +0000
Change XFree86 Project to X.Org Foundation in XDarwin splash screen.
commit 84d25a5e178835234261a63f0a1b8131c01bbe1f
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 24 15:58:45 2004 +0000
file xorgVersion.h was initially added on branch XORG-RELEASE-1-TM.
commit 685d1630c1540e29644849254bd45708aa5763bb
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 23 12:46:30 2004 +0000
file xorgconfig.man was initially added on branch XORG-RELEASE-1-TM.
commit 6631bd586f74f89e2dce74fe1cc25ee982883323
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 23 12:46:30 2004 +0000
file xorgconfig.c was initially added on branch XORG-RELEASE-1-TM.
commit 05a16f4acce3b6ef4ddafe044f96774de3f75b7c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Mar 22 13:43:35 2004 +0000
file glwindows.h was initially added on branch CYGWIN.
commit 3c2e2d9ae0704931737bb0879a49a8575a07d13b
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Mar 21 22:55:35 2004 +0000
bug #357. Fix XDarwin so it builds on Mac OS X 10.2 and earlier. Merged
down from -RELEASE-1-TM and -RELEASE-1
commit 122be5328ffea0a3b92612b8ea0f5b02736ac175
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Mar 19 23:16:06 2004 +0000
no bug report. Restore Credits to the hw/darwin ddx that were deleted
previously. RTF may or may not be "human readable," but with a little
effort it's about as readable as SGML, IMNSHO.
commit 551c93da612923f8d32707adc16431979bad6fb0
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon Mar 15 04:33:23 2004 +0000
file winkeynames.h was initially added on branch CYGWIN.
commit 0c97b290015186acbaadae9a9bf79f37c3d38b40
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon Mar 15 04:33:23 2004 +0000
file winkeymap.h was initially added on branch CYGWIN.
commit dae90c3af98edd5e95289abd930b3872c996c503
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:34:49 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 4e996f9d76f51e9b1e33bef610bb9c2a746c8b9c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Mar 12 21:05:47 2004 +0000
file winpriv.c was initially added on branch CYGWIN.
commit c79b4bfd15534de12aaf8eca9965403b4913ca4b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Mar 12 21:05:47 2004 +0000
file winpriv.h was initially added on branch CYGWIN.
commit 24c02f84cc31475bfba27417dfef66b11c09b25c
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Fri Mar 12 01:11:23 2004 +0000
file X-boxed.ico was initially added on branch CYGWIN.
commit 45b638b87f0daf94f9fce566179775fb2889c663
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 10 11:49:11 2004 +0000
Twenty link errors for Xizzle now - count 'em. 20.
Get rid of all references to SCO.
Change SDK include dir to $(includedir)/xizzle. Add SDK libs where
necessary.
Reformat to be nicer and easier to shuffle around; also, fix lib ordering
so we get so much closer to the elusive final link. Shuffle
common/xf86Init.c into libxizzle.a.
Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK stuff
conditional as needed; fix the SBus includes.
Name library os-support/libxizzleos.a, not os-support/foo/libxizzlefoo.a.
Clean up ARCH_SOURCES so it's always initialised to something.
Move linked libraries to _LIBADD, which somehow escaped my attention. Make
inclusion of drm/libxizzlelinuxdrm.a dependent on DRI.
s/VERSION/VBE_VERSION/;
Axe this redundant dir.
All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of
required modules to be vaguely sane, add some pertinent libs/incs.
commit 519f76a0867fb2711d311b7929632408c3633e37
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Mar 7 23:45:10 2004 +0000
24. Update license for Xinerama code from DEC to the version requested by
Compaq for X11R6.5.1 that allows redistribution without written
permission from DEC. Originally X.org Defect #9263. freedesktop.org
bugzilla #283. (Alan Coopersmith)
commit 505fe2ba307e9270627ca7f3cb6b4e1dbacc327b
Author: Egbert Eich <eich@suse.de>
Date: Fri Mar 5 13:41:12 2004 +0000
23. Merged with XFree86 4.4.0. Added changes that went into infected files.
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
commit 1b22db1ebcf1ba98ca8519fa38210e275373f8f6
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Mar 4 02:13:09 2004 +0000
21. X server crashes when X-Resource has to byte-swap. Sun bug #5007488.
freedesktop.org bugzilla #267. (Alan Coopersmith)
commit 47c9395969593a4e897e8c8110d5f2414e47b06a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Mar 3 17:03:46 2004 +0000
file solaris-ia32.S was initially added on branch XORG-CURRENT.
commit ed066cc67b1fca03fb38c80ecb8194b5b40963be
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Mar 3 17:03:46 2004 +0000
Enable inlining of assembly functions for inX/outX on Solaris 8 with Sun
compilers
commit 867451f1ab7b9870621725bd4be3dd8694c364b8
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:50 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 2934f0731b3d2bc9c1e25ceab26d9e0d9cadb054
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Tue Mar 2 20:00:16 2004 +0000
file winvalargs.c was initially added on branch CYGWIN.
commit f72efebf280547c80ff7010e32f56416e7121164
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Tue Mar 2 19:26:34 2004 +0000
Replace a handful of calls to ErrorF and exit(1) with a single call to
FatalError. These direct calls to exit(1) made it impossible to do
anything ddx-specific in these cases; note that most of these calls
occur during argument processing.
commit 7557d4da10cc482fcec40acadf7744b04c1615a0
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Mar 2 19:00:06 2004 +0000
bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has
been decided that the priority is to preserve the server's internal
API/ABI so that third-party drivers that depend on symbols like
noPanoramiXExtension, etc., would not need to be recompiled. Toobad gcc
on Linux doesn't support ELF's weak symbols as that would have been a
reasonable solution for preserving the ABI. N.B.: While symbols, i.e.
functions and variables revert to the old name, I did not revert build
names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and
it's just a build issue that has no impact on the binary output of the
build.
commit 215a13aa8f537dcb62b0a2f6d335901ee47e9e9b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Mar 1 16:38:20 2004 +0000
Add the .stab.indexstr section produced by Sun's compilers to the list of
SHT_STRTAB sections with debug information to ignore when loading ELF
objects.
commit d87b05563dc13ba8d9825ec3bb772702dce6c9fe
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon Mar 1 03:33:28 2004 +0000
file indirect.c was initially added on branch CYGWIN.
commit f81d63ec5396c8d7f62ddd6ff6bab10b32493264
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Feb 29 20:11:11 2004 +0000
bug #240 Instead of both Meta keys generating Meta_L, and both Alt keys
generating Alt_L, etc, fix the implementation so that you get Meta_L
for the left Meta key and Meta_R for the right Meta key. Ditto for Alt,
Control, and Shift.
commit 6c412a43e42538a51d3a4d92a6db12b0b6cf0e9b
Author: Jaymz Julian <jaymz@artificial-stupidity.net>
Date: Sat Feb 28 09:47:55 2004 +0000
sdl x server so that we can x-on-x the fb stuff for ease of debugging. if
anyone uses this in production, a big scary monster will eat them. hrm,
perhaps i should make it have a --i-know-what-i'm-doing param that it
doens't start without, heh
commit bb93fef9877a885da2c6108410155fa996b19abf
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Feb 27 19:35:49 2004 +0000
bug #238 test for root-window that XFree86 fixed in their
programs/Xserver/Xext/shm.c
3.37 and programs/Xserver/Xext/xvdisp.c 1.26 got zapped when Xinerama2 was
merged into the tree. (Xinerama has since been reverted to 1.1, but
that's another story.)
commit cb718ce08eb25c3999c91b8d614fb88237fad03d
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Feb 27 16:17:12 2004 +0000
Revert to Xinerama 1.1 In order to make a "quick" release it has been
decided that the priority is to preserve the server's internal API/ABI
so that third-party drivers that depend on symbols like
noPanoramiXExtension, etc., would not need to be recompiled. Toobad gcc
on Linux doesn't support ELF's weak symbols as that would have been a
reasonable solution for preserving the ABI. N.B.: While symbols, i.e.
functions and variables revert to the old name, I did not revert build
names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and
it's just a build issue that has no impact on the binary output of the
build.
commit df0313d35bc89abe9374ed25533db283430716e0
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:15 2004 +0000
readding XFree86's cvs IDs
commit 147aae87fde5edeed395f77e60f0f8e812d3b6af
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:53 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 8844423f890194bcb0419a38249029f1997c8c66
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Wed Feb 25 23:28:43 2004 +0000
file xevie.c was initially added on branch XEVIE.
commit b052486adb9ea26f37be120966eb60cd3ac3db2f
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Wed Feb 25 21:47:10 2004 +0000
bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has
been decided that the priority is to preserve the server's internal
API/ABI so that third-party drivers that depend on symbols like
noPanoramiXExtension, etc., would not need to be recompiled. Too bad
gcc on Linux doesn't support ELF's weak symbols as that would have been
a reasonable solution for preserving the ABI. N.B.: While symbols, i.e.
functions and variables revert to the old name, I did not revert build
names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and
it's just a build issue that has no impact on the binary output of the
build.
commit 14ab4ade74e946c09d633b15ab4d447d7b69ea29
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Feb 24 15:22:40 2004 +0000
bug #214. Merge most of 4.4RC3
commit 9343c8f5ac180043c29ead5e83a3efef16d7b3f2
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Feb 24 15:16:35 2004 +0000
bug #188, #214, see versions 1.1.4.3 and 1.1.4.4 of this file. fix bad
merge
commit 03d893bff9bf5d6be9663a21cc983873d8e8d4c7
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Feb 23 21:37:29 2004 +0000
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214
commit 4ee0a53de870192d57c02baffa106b10bae6e0bf
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Feb 23 20:35:22 2004 +0000
Import most of XFree86 4.4RC3. This import excludes files which have the
new license. If we want to, later we can import 4.4RC3 again and pick
up the files that have the new license, but for now the vendor branch
is "pure."
commit dcdd47ebbd4e9b5f4cbb598a5217004df0e80844
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Feb 23 20:35:19 2004 +0000
Initial revision
commit 30ac3efde2c3f08b98f31833df4ea7d87f33b092
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Feb 23 16:32:14 2004 +0000
bug #188 report bugs to X.org bugzilla, not XFree86
commit d52f3ac58fd596fca392394f16acff84115f6e1d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Feb 18 21:43:19 2004 +0000
Additional fixes to allow building with Sun compilers on Solaris x86
commit 07109fd63e0999905e6f7df8fd7f9c713d0dc2cc
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Feb 18 21:30:12 2004 +0000
Sun cc on Solaris x86 defines __i386 but not __i386__ so the x86
architecture #ifdef should accept either form
commit a27ffd2678ef76453c4fa27932462425d804df6d
Author: Warren Turkal <wt@penguintechs.com>
Date: Wed Feb 18 02:12:44 2004 +0000
completely get rid of NeedNestedPrototypes
completely get rid of NeedVarargsPrototypes
remove a lot of NeedFunctionPrototypes
ansify many function declarations
commit d17586c4dc858d0127fa021e6db62f8cc28ef7a6
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Feb 16 20:19:59 2004 +0000
[fd.o bugzilla #189] _XOPEN_SOURCE defines break builds on Solaris Express
commit b146ef1548d36d6897fbd674f1c3b8324bed11a7
Author: Warren Turkal <wt@penguintechs.com>
Date: Sun Feb 15 15:04:57 2004 +0000
Moving toward a working input extension.
commit e90274c2bba1f66a68c2bc30ddb589dbf6fa0929
Author: Egbert Eich <eich@suse.de>
Date: Wed Feb 11 19:29:37 2004 +0000
2. Fixing segfaults that may happen in some corner cases when VT switching
and during int10 initialization (Egbert Eich).
commit 453a0743eb524da88dd364ccac86f35e61899e64
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Feb 8 00:17:31 2004 +0000
revert to RC1 version of file with the license we like
commit d6f33d897221450f3cfcc1162e2a6d09b227326e
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Feb 8 00:12:27 2004 +0000
revert to RC1 version of the file with the license we like
commit bd20c8d340fce0700ae813bd5b55fe7f4b9e0c98
Author: Jaymz Julian <jaymz@artificial-stupidity.net>
Date: Thu Feb 5 09:09:51 2004 +0000
Polling input mode for the kdrive os layer. And a moose!
commit af798d27743dbc4f70e85e297daa5863ec89640b
Author: Jaymz Julian <jaymz@artificial-stupidity.net>
Date: Wed Feb 4 16:08:27 2004 +0000
More NULL checks. These ones are more useful than the last (which just made
debugging a bunch of problems easier), since you can implement less in
the basic simplest case driver now (not that i'm lazy, mind :-p)
commit 3c64b65d805915e5c5628663113c54c3e9c3013b
Author: Egbert Eich <eich@suse.de>
Date: Thu Jan 29 08:08:57 2004 +0000
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
commit 2ec70aa70133190ad31a83114fdb9a218e6aa8e6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 25 05:31:24 2004 +0000
Disable GLX visuals code on !GLXEXT, and remove a useless prototype.
commit 01e9cc858ac646b3140d1d85ea9c069bc708fb28
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 25 01:30:33 2004 +0000
- Add glx visuals code based on XFree86's Radeon driver.
- Reserve areas for back/depth/span when USING_DRI && GLXEXT. This would be
better in a TransitionTo3d, but we'd need to work with the offscreen
memory manager for that.
- Misc. fixes to ati_dri.c for DRI+GLX. Needs more work still.
commit f2bedd17af7c3b9241c02dc1c899f32fc0cd2f10
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 25 01:16:19 2004 +0000
Oops, turn fallback output back off.
commit 26c5a8dfdd2aa09db46c4cf963ca697df3e777ef
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 25 01:04:12 2004 +0000
Whitespace cleanup.
commit 6870c081572fcf32997e7906a54d09da0ca58ac3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 15 09:19:56 2004 +0000
Oops, lost a diff needed for the non-screen format pixmap code
commit 3867e03cb63e49aeb1742a8a4bdaed0b7a23749e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 15 09:15:53 2004 +0000
Fix up some mis-used variable names
commit f233bbf3652327e62e03efbb8a355e6af2703a1c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 15 09:13:01 2004 +0000
Accelerate non-screen format pixmaps.
commit 751fb0374b12679f63c922adf0f0e7cadd83d861
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 15 06:06:44 2004 +0000
file winresource.h was initially added on branch CYGWIN.
commit a265167f19e37aec2173c0ca6c9955450aa69941
Author: Anders Carlsson <andersca@gnome.org>
Date: Wed Jan 14 10:00:00 2004 +0000
Add IPAQ modeline by Dennis Noordsij.
commit 6c97b277d9140b9d6bca047c56e303f6fc1d92e0
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 11 00:10:34 2004 +0000
Support 1x1 repeat sources in R128's Blend.
commit 92702565657d48f1fcc2bae1b5989b1d6d3dd164
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jan 9 08:43:48 2004 +0000
Change PCI ID information field to be one of r128, r100, r200, r300. This
is all the information we need so far. Put that information into atic,
and use it correctly in the code (unlike before).
commit 5d51dfc69cb245f6a1c7b106954a3365524741e2
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jan 9 08:40:32 2004 +0000
Use the scratch area for Composite when one of src or dst is in memory.
commit 6d8001f4688e2149fcdd480401c46c7540680576
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 8 20:18:13 2004 +0000
Compile fixes for non-DRI case and for non-C99 compiler.
commit 1be4b2d5e8048eb3653fad3a1267a0da865bcee8
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 8 08:25:49 2004 +0000
Forced commit: Previous commit included the removal of the 8192 scanline
limit on offscreen memory in the fbdev case. I remember daenzer (who
originally put that code in) saying he wasn't sure of it, and there
doesn't seem to be any reason for that limit given how acceleration is
done.
commit b27729ec88f5d4153a0debfe2347bbed022329ba
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 8 08:16:24 2004 +0000
- Add a new UploadToScratch kaa hook for putting the data for a single
pixmap into temporary offscreen storage. Subsequent UploadToScratch may
clobber the data of previous ones. This allows hardware acceleration of
composite operations on glyphs.
- Add a new UploadToScreen kaa hook for doing the actual moving of data to
framebuffer. This would allow us to do things like hostdata blits or
memcpy to agp and then blit.
- Add an UploadToScreen on ATI which is just memcpy, but which will be
replaced with a hostdata blit soon.
- Add UploadToScratch on ATI and reserve 64k of scratch space. This
provided a 3x speedup of rgb24text on my Radeon.
commit d640cf4cb4e031a0e93dfd5955405847fe4475c0
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 8 05:10:33 2004 +0000
file winprocarg.c was initially added on branch CYGWIN.
commit 77183abbc499c69fbbbae1d92a6b012c5f80b6c4
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 8 05:10:32 2004 +0000
file winglobals.c was initially added on branch CYGWIN.
commit eb5bb9c1a16db308eae84ea45a5920c768d4a2ff
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 8 05:10:32 2004 +0000
file winclipboardwrappers.c was initially added on branch CYGWIN.
commit e93d468df21840007cbeea03ed545e75f0f0baf1
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 8 05:10:32 2004 +0000
file winauth.c was initially added on branch CYGWIN.
commit 737eddfa4b6a8851e20823405b7269dd49c49b89
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jan 7 09:50:28 2004 +0000
Disconnect the sis300 driver. I've never managed to fix it, and it breaks
the build on PPC.
commit 5a2c23f8a18767f0eb2fe2846ca3ba18fd236284
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jan 7 02:30:29 2004 +0000
Speed things up slightly by removing Z values from emitted vertices and by
emitting as a tri fan rather than a tri list. A rect list would save an
additional vertex (out of 4) per rectangle, but there's no measurable
speed difference and the tri fan may be useful when transforms come
into play.
commit cff782078cec9b10606c5873816b7acd9977ce4d
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 4 20:51:53 2004 +0000
- Don't forget to UNINIT miComputeCompositeRegion's regions
- Fix a bit of whitespace nearby.
commit 34d1529731fff0cb61c71f76edc5c6499ece68d1
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 4 20:47:30 2004 +0000
- Correctly set the texture coordinate set source for the second texture
unit.
- Re-enable Radeon's Composite accel now that fonts work again.
commit 9f1a92cd092e87f774ce4ed99d4b3e15f905d4f7
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 3 21:52:14 2004 +0000
- Call appropriate Done function for Composite.
- Don't allow src transforms for Copy acceleration.
- Minor whitespace fixes.
commit 3db761a17b60b80acb83f365628b093f0ba6958c
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 3 11:46:57 2004 +0000
- Add more Composite operations, including Saturate, to Radeon Composite
accel. I don't 100% trust that the math works for Saturate, but I can't
tell from existing information.
- Fix texture pitch fallback checks.
- Fallback when src or mask have transforms.
- Disable Radeon Composite accel until the offset thing is fixed.
- Set offscreenPitch to 64 on Radeon thanks to new information and a kaa
fix. Fixes acceleration at width!=1024.
commit d15acfa79b64b8dab1e930ce8e5423a212a1360b
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 3 11:25:27 2004 +0000
Split the various attempts at accelerating Composite into separate
functions. Along with making things more readable, it fixes a problem
where the coordinates would get messed up if acceleration failed due to
things like pixmaps being in the wrong locations.
commit 1e1a35e20c1d281bc9700b349cda1e67f65905dd
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 3 11:17:44 2004 +0000
Actually align the offset of allocated offscreen areas.
commit 354f8f7e943d1a0732f4181420211efff27532b8
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 31 23:24:33 2003 +0000
Some strange \240 character snuck into the original commit of this file.
commit 5f947b04da13256e5f514c40dedb98c6e1cbe0f1
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 30 08:45:53 2003 +0000
There's never a copy between different depths. Remove the check.
commit c8eb20a08ee9174374b6f5ac6e79f31fce26e181
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 30 08:23:56 2003 +0000
- Add new Composite hook for kdrive drivers, which only ensures that the
pixmaps are offscreen and don't have alpha maps. It is the last case
checked before going to software fallback
- Use the new Composite hook in the ati driver to implement acceleration of
most Composites that get done in an xcompmgr environment on r100 series
cards. It is only available when using the DRM. There are still some
corruption issues, but the DRI is still non-default and I need to get
this into version control.
commit adfc1ed8e1e150100accf014e46241201275138f
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 29 09:04:20 2003 +0000
Add dependency lines so that servers are rebuilt when server libraries are
changed.
commit df03e80ae9162ec87f503322ccbcf2846ad38bef
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 29 06:24:01 2003 +0000
Merge dri-0-1-branch to trunk. Notable changes:
- Add libdrm and libdri. Portions of the DRI extension are stubbed out.
- Use the DRM in the ATI driver when available. This provides a minor
performance improvement in x11perf, and opens the possibility of using
the 3d hardware for acceleration in the future.
- Implement solid fill acceleration for Composite in KAA.
- Implement Blend hook for Composite and use it on r128.
- Fix a bug of mine that resulted in overuse of offscreen memory.
- Fix many miscellaneous bugs in ATI driver and add PCI IDs.
commit 9bea538745f1a0c14faaac0e61dee5cf86f98dc6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Dec 28 09:56:54 2003 +0000
file kaa.h was initially added on branch dri-0-1-branch.
commit fb8cd7454baec0bc0f693d222f3920ce03dde7c6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Dec 28 09:56:54 2003 +0000
file kaapict.c was initially added on branch dri-0-1-branch.
commit f388f1509cb131cdf0675415214c9610d3d322c7
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 23 22:29:38 2003 +0000
file r128_blendtmp.h was initially added on branch dri-0-1-branch.
commit 918958705dd97ce678b8901666c85fb359d0e013
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Dec 21 13:39:58 2003 +0000
Use a different icon
commit e97c634593dd171a05aa0fa5a35d218dcc3ecfb0
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat Dec 20 00:28:31 2003 +0000
merge XFree86 RC2 (4.3.99.902) from vendor branch
commit 12e532010b9e8cb67bedd44d489c9c40dd265165
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Dec 19 20:55:39 2003 +0000
XFree86 4.3.99.902 (RC 2)
commit 4b75c7f6358b28978b05ffa4b73853d936454f50
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Thu Dec 18 19:32:17 2003 +0000
First pass at "Standard" Xinerama. The sources for this came from Heather
Lanigan's xinerama tree on Sourceforge.Net. No attempt has been made to
handle previous, non-standard versions of the protocol. Nor has any
attempt been made to preserve the ABI of previous versions -- that part
will be added at a later time, and then probably only on systems that
have nice object/linker semantics, e.g. ELF systems with weak symbols.
commit 305c444de3baa863d7abc4221e8cebb973805847
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 8 01:55:10 2003 +0000
Add initial SiS 300-series (300, 305, 540, 630, 730) driver based off of
the ATI driver. It suffers from hw/sw synchronization problems, it
looks like, but may be good enough to work on Render acceleration
experiments. Committing it as-is so I don't lose it again.
commit 8a7481a27496c842ec2ef5bac5e4d0b5e6279deb
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat Dec 6 13:24:29 2003 +0000
merge XFree86 4.3.99.901 (RC1) from vendor branch
commit e82928826f60a2e76a670c936bd557838fc1764c
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Fri Dec 5 03:37:26 2003 +0000
file winwin32rootlesswindow.c was initially added on branch CYGWIN.
commit fc40d0a3cbee053d446032ae3150b06edf66a335
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Fri Dec 5 03:37:26 2003 +0000
file winwin32rootlesswndproc.c was initially added on branch CYGWIN.
commit c3f26a1b989dbbf5167e6e352aebf2f53bfcc442
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Fri Dec 5 03:37:26 2003 +0000
file winwindowswm.c was initially added on branch CYGWIN.
commit 0f06636a9a088fc27262da0f0bc9a20a3dbeab69
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Fri Dec 5 03:37:26 2003 +0000
file winwin32rootless.c was initially added on branch CYGWIN.
commit a84f16a9ad2ed0f874d2c1816aedee96725d2657
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Thu Dec 4 22:03:38 2003 +0000
XFree86 4.3.99.901 (RC 1)
commit 33fdd50a94baab1db342bfce442907db8f8ad03e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 2 01:59:38 2003 +0000
Wrap ClipNotify to see region motions during MoveWindow.
Check window reorigin in PositionWindow and bump pixmap serial numbers to
revalidate GCs.
Fix picture clip region origin in automatic update
Initialize client private 'critical' value
Clean up pixmap bounds checking code to only affect contents allocated by
fb.
Oops. Call SourceValidate for Composite operations.
Add Xchips server (vesa based)
commit 6db77925406a0ee600998ad558a50190ba631649
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file radeon_sarea.h was initially added on branch dri-0-1-branch.
commit 313046b42832fa2434d617997d5701157b55e7c8
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file radeon_common.h was initially added on branch dri-0-1-branch.
commit 2ad126286e524392741164babe530210892c377f
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file r128_sarea.h was initially added on branch dri-0-1-branch.
commit f486c136ad8d2d893cdf3aee6aa752578a6809d7
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file r128_common.h was initially added on branch dri-0-1-branch.
commit 1eb63ef1b5d0ce10117196df3e81e8312a55a93c
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_sarea.h was initially added on branch dri-0-1-branch.
commit 1fa5f28406f8a7ad54049e4bec129953149bd3ed
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_dri.c was initially added on branch dri-0-1-branch.
commit 14ce4f2c3ebc20e5f6d57adda0a7e14229541a72
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_dri.h was initially added on branch dri-0-1-branch.
commit 8887456e7d4fc1280287ed3e35c6c4464525827b
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_dripriv.h was initially added on branch dri-0-1-branch.
commit 6c9e7f47357b02f41b9f1f43f7f1d9b5a139e5b6
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_draw.h was initially added on branch dri-0-1-branch.
commit 2ad20d4e99d0d8ecb922507e0bfead8b7b7d4a55
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_drawtmp.h was initially added on branch dri-0-1-branch.
commit ae2454f65698eef66b3507e586e4f8125cb1790d
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Dec 1 22:11:12 2003 +0000
Add support for setting the video mode.
commit e31051ba26c18f6232798c5a5c4725f5ce53d6b9
Author: Phil Blundell <pb@reciva.com>
Date: Mon Dec 1 21:49:41 2003 +0000
Call KdShadowUnset before fbdevSetShadow.
commit 9cdd6fd9e3d6e44adf392279093f92fb6678a49c
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 04:33:36 2003 +0000
- Add fbdev mode-setting backend to Xati. It and vesa are compiled in when
available, with fbdev being used by default.
- Use depth 16 by default when vesa backend is used.
- Add MMIO defines for PowerPC (should be in a common location).
Many thanks for Michel Daenzer for much of this code.
commit ec7f5539302fafd1ac7609ac423f1379f54916ab
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 03:15:13 2003 +0000
Add more RV250 PCI IDs.
commit d221c484f9521c780fc3c7e88833c62e50463c6d
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 01:46:42 2003 +0000
Remove sys/io.h inclusion from some files that didn't need it, and change
asm/io.h to sys/io.h in vga.c, which newer Linux complains about.
commit 5fd7f82390d78621a8aad959eb216b8fb7e1a97f
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Nov 30 16:47:13 2003 +0000
xfree86 merge
commit 77836ebda2a47e04c56c5842f62fab5992909712
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat Nov 29 16:08:53 2003 +0000
xfree86 merge
commit 88193e928be7cf5a526b50ad1e0b4ac9cddef297
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat Nov 29 15:10:02 2003 +0000
xfree86 merge
commit 0097b6fe2d1739e46e4e7726aaa481b6dc84870c
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Wed Nov 26 22:49:07 2003 +0000
merge latest (4.3.99.16) from XFree86 (vendor) branch
commit d803918a9fb5f80a2d6e4b711d8e43916cd09da5
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Nov 25 22:39:54 2003 +0000
Add new Radeon 9200 PCI IDs.
commit adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:29:01 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 90f1536dd315cd265bfc7ef35058761a65a01734
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:29:01 2003 +0000
Initial revision
commit d461855a73d8c9f51a18673aef7ce88f94a71629
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 23 10:12:04 2003 +0000
- Fix Radeon offscreen pixmap pitch alignment.
- Remove usleeps from idle and waitavail code, recommended by keithp.
- Add a workaround for apparent broken acceleration with Rage 128 and
offset alignment with 8-bit acceleration (24-hack and plain 8-bit).
- Minor cleanup of setup code.
commit 8e09afe657b110bc1ea9e58dea81a120c343d16e
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 23 02:08:16 2003 +0000
Add RV250 PCI IDs.
commit b3247251fb7d9f2d50ef41d9c2089629544d534d
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Nov 20 07:49:46 2003 +0000
- Fix a bug in pitch alignment for offscren pixmaps.
- Add 24-bit acceleration for Xati using the 8-bit trick from mach64.
- Add offscreen pixmap support to Xati.
commit 41dde24b229f4bc4738637d9cd0a86b74b9f8457
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Nov 20 00:05:56 2003 +0000
- Fix confusion of depth/bitsPerPixel in ati_draw.c
- Disable acceleration with 24bpp due to apparent broken acceleration.
Accel at 24bpp was the cause of the crashes when people tried to use
any depth over 16. XFree86 doesn't support 24 either.
- Disable at < 8bpp, too.
- Add the other Rage 128 PCI IDs.
- Remove unnecessary setting of scissor registers (only default scissor
gets used).
commit 7abbcce4222958b4670873a17f67ea1ec1d958e2
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Nov 19 08:32:38 2003 +0000
- Add PCI information (device/vendor id, bus location) to KdCardAttr to
help with ati, and future DRM drivers.
- Add new "ati" kdrive driver. It has ancestry in the r128 driver from
andersca, but took a detour through being the WIP SiS 300 driver on the
way. It supports Radeons (tested on QD VIVO and 7500) and Rage 128.
Current limitations include that it requires depth 16 and that the
other Rage 128 PCI IDs aren't included yet.
commit e9cb70dae0a85fcd116d7ffac73d1322ec282a94
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 18 18:38:48 2003 +0000
Reset available offscreen segment save function pointer. (Not a functional
change, just cleaning up a bit)
Reset the screen->memory_base value when frame buffer is remapped. This
makes sure new off-screen allocations point at the newly mapped region
rather than the old (now unmapped) region.
commit f333581b7b4066ab054dd765a1c9bae0f3407188
Author: Seth W. Klein <sk@sethwklein.net>
Date: Tue Nov 18 04:53:16 2003 +0000
Added infrastructure for driver specific usage messages and added vesa
usage message.
commit 003e87717cfe378261ed1a1e7bcb2cf0d200b1b8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 17 22:09:12 2003 +0000
Recompute winSize/borderSize to fix them when changing redirection.
Sufficient, but not always necessary.
Add borderClip to damage on creation so that clients needn't guess.
Fix API to FbDots functions to make PolyPoint work with screen_x/screen_y
offsets
Add debugging code to make sure no pictures are left pointing at freed
pixmaps. "Can't" happen, but it did once.
Change KdOffscreenArea structure to eliminate separate private structure,
eliminate the ScreenPtr, change from doubly linked to singly linked
list.
Don't damage BackgroundNone windows on PW_BACKGROUND. Re-clip damage to
borderClip in DamageSubtract.
commit c57959ad6a4c0f5329762f401fd7871ffb2ee90c
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Nov 17 19:03:47 2003 +0000
merge XFree86 4.3.0.1 to -CURRENT
commit acd200770513ad03dd3f4bdc7448edfd69b1ff9d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 17 06:54:52 2003 +0000
Clear window when Manual Subwindows redirect is destroyed
Fix Tile/Stipple origin with non-zero pixmap window origins
Use computed depth for TrueColor visuals as fbdev doesn't have one.
commit d568221710959cf7d783e6ff0fb80fb43a231124
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:49:22 2003 +0000
XFree86 4.3.0.1
commit 9508a382f8a9f241dab097d921b6d290c1c3a776
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:57 2003 +0000
Initial revision
commit ded6147bfb5d75ff1e67c858040a628b61bc17d1
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:54 2003 +0000
R6.6 is the Xorg base-line
commit cb6ef07bf01e72d1a6e6e83ceb7f76d6534da941
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 14 07:46:20 2003 +0000
Accelerated image text code drew glyphs at wrong location when compositing
manager enabled.
commit 318d525bf2fe52b059b1568e9b31d144b297a781
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 13 09:14:29 2003 +0000
Have the composite extension tell the damage extension about clients which
have redirected subwindows in manual mode. Those clients are marked
Critical and given a significant scheduling boost whenever they receive
a damage notify event. This dramatically improves update frequency.
If the kernel reported a large number of keys, readKernelMapping would walk
off the end of the kdKeysym array.
Fix usage of _IOWR; the 'size' argument is actually a datatype.
commit e9904cefa39e1c9d3c7bf2f335dbafb23809cdba
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Nov 11 05:46:15 2003 +0000
Fix Makefile.am's to include header files needed for distcheck. Remove
-Werror default and add --enable-werror switch to add it back.
commit 5dc119b73ffcae32c2d470b734dfa2f8af58e77e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 10 20:35:05 2003 +0000
Fix KdXv interface to pass drawable down so that bits can be put into
drawable pixmap rather than directly into the frame buffer. Rewrite
logic in kdoffscreen to make space for new allocations, now deals
correctly with locked areas.
commit e500986657ea8b4e14a1ff4730ecda4583c75277
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 10 06:40:23 2003 +0000
Must offset composite parameters by drawable coordinates in accelerated
case.
commit d694b44259ff51cfca2c3ec9a58bf164010cc1ad
Author: Phil Blundell <pb@reciva.com>
Date: Sat Nov 8 18:51:59 2003 +0000
Avoid ugly shell error when libXdmcp isn't present.
New functions. (TsInit): Register them.
commit 3e18c6363454aa87e1ad8c121019bab185e613b8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 8 00:28:19 2003 +0000
Fix KAA to work with screen_x/screen_y hacks from COMPOSITE Also add
kaaComposite acceleration for simple bltblt case.
commit 1280f79054dc16ccf321006cd2de53e0f53c7b70
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 7 23:29:29 2003 +0000
Ok, Composite extension is semi-working; when no-one asks for redirection,
the server seems to act as before. With RedirectSubwindows (root,
automatic), the server looks just like a regular X server. Now to go
rewrite the (currently lame) compositing manager to get some real
action on the screen.
Some of the fixes here are to make valgrind quiet with various ioctls used
by kdrive/linux.
Also fixed a bug where fbdev initialization was out of order in fbdev.c and
smi.c
commit d319a0a610c90524ad29cab3c6d4d21b5298fc7f
Author: Phil Blundell <pb@reciva.com>
Date: Fri Nov 7 23:00:06 2003 +0000
Fix warnings.
commit 598c5d549abbb819f3391a2c88432941b546a213
Author: Matthew Allum <breakfast@10.am>
Date: Thu Nov 6 14:01:46 2003 +0000
tslib improvements
commit 7e1a564c416f6dc337a0021b1c0e1f2cb3b27296
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 5 06:46:13 2003 +0000
Replace translucent compositing hacks with PictOpSrc to match eventual
extension semantics. Replace mouse acceleration with quadratic.
commit 5378236aa647ec9a723a3e5fbd2a57eb286a1938
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 2 19:56:10 2003 +0000
merge xfixes_2_branch back to HEAD
commit 9e94665cf9cf0f74dff5b3cdaa4cde99e234fa45
Author: Phil Blundell <pb@reciva.com>
Date: Tue Oct 28 22:28:33 2003 +0000
try /dev/misc/apm_bios if /dev/apm_bios doesn't exist
commit bb99451f275827da580dcfa3b66cd0705fcc900a
Author: Phil Blundell <pb@reciva.com>
Date: Tue Oct 28 22:27:35 2003 +0000
move smi into VESA_SUBDIRS
commit 9a05f8f7858641b780046ad69d61f21ccbb93db8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 19 20:46:23 2003 +0000
Minor cleanups -- remove a couple of bogus KdCheckSync calls, restructure
KdOffscreenSwapOut to avoid unneeded 'continue'
commit 16b2ea64e7e0bd32d6dba078b4891167bd335d44
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 16 08:03:25 2003 +0000
Discard/reconstruct list of offscreen areas on VT switch so no allocations
can occur while switched away.
Set type of off_screen_areas member to actual type instead of pointer
commit f4bcd36a386116c450ea6893ab3d08e81cea663b
Author: Anders Carlsson <andersca@gnome.org>
Date: Wed Oct 15 05:34:54 2003 +0000
Add a memory_base variable and use it.
commit f5916edb172738c73c8f78b23981abfd8d03a079
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 15 04:59:45 2003 +0000
hw/kdrive/*/Makefile.am Libraries in local dir must not use global path or
make doesn't build things in the right order (-j)
hw/kdrive/mga/mga.h, mgadraw.c Fix warnings
commit b3e47ce18ff9c86833fc6302b1e074912edce404
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 15 01:00:38 2003 +0000
various Split out pixmap allocation debug statements Fix bogus offscreen
pixmap size test Add migration to composite function for source
operands
VbeDPMS Remove extraneous call to VbeGetVib.
commit 28bcd2efd134bfea3daa0738c9155b36cdf84168
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 21:33:04 2003 +0000
Avoid attempting acceleration on non-screen formats (for now)
Offscreen allocator API changes.
commit cb46169759a833605b78409ae68c9fb57618ceba
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 21:10:53 2003 +0000
Use same assumptions as layergc about what layer kind is approprate for
unwrapping pixmap operations. This makes sure the accelerated code gets
invoked for pixmaps
Add pixmap migration support to kaa. Can't quite automatically migrate
pixmaps off-screen, but soon we will. Can kick objects out of video
memory. Move per-screen linked list pointers to pixmap private. Wrap
Composite in preparation for migrating pixmaps. Have kasync ignore
drawable type so that pixmaps trigger sync Add KdOffscreenFini to
cleanup on server reset. Switch off screen area to have only a 'save'
function; moving objects to off screen memory is done by saving then
freeing the area.
commit 109b94951654171ada94e2ffb29568b8a1bcde77
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:08:35 2003 +0000
-Wall fixes. Might have fixed VESA based DPMS code as a result
commit 4b844cafb2516139c8407822b61939cd6c743742
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:07:39 2003 +0000
Check for off-screen pixmap support in KaaDrawableIsOffscreenPixmap. -Wall
fixes. Allocate pixmap private space only for screens with off-screen
pixmap support
commit cdf3377f6d3789628495ac64df80ac7dc235e46d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:05:53 2003 +0000
-Wall fixes. Support off-screen pixmaps
commit 777f31cd0b5ec387d975e6d10ae73fa325e4c311
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:05:28 2003 +0000
-Wall fixes. Add klinux.h to export function declarations
commit a398339b6d5209a11af93a3b836b0cad326a0799
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:04:22 2003 +0000
-Wall fixes
commit 44f2e82f1b463e272f4e521561f74eb14bf24082
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Oct 13 02:19:47 2003 +0000
Use pixmaps instead of drawables in the kaa functions. Have the mga server
support accelerated operations on offscreen pixmaps.
commit 47a9fab5e286c5224047690482a2cb36a3c17b88
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Oct 13 01:19:37 2003 +0000
Add support for offscreen pixmaps.
commit c538fa874257a2cbf53f329d3982e7a01fefe629
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Oct 13 00:56:21 2003 +0000
Fix a couple of bugs.
commit a50438b4709b32ec869e232628971b0dccd27adf
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Oct 13 00:19:58 2003 +0000
Add offscreen memory manager and update the servers to reflect the name
change for the kaa structure.
commit 307f3dbd10e0c8e392865e85e9e3e4dff108df02
Author: Anders Carlsson <andersca@gnome.org>
Date: Sun Oct 12 14:17:24 2003 +0000
Remove this for now.
commit ab3305d0ac805d0c9e917c35b316d9b58dde2187
Author: Anders Carlsson <andersca@gnome.org>
Date: Sat Oct 11 19:36:13 2003 +0000
Add ATI Rage 128 server.
commit ed98d3814ee65cd9fd18eeadbd20c8fc6b4ab342
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 23:35:44 2003 +0000
use #if instead of #ifdef
commit 4dd37de858464c576bfdcd10255a8e233a5b05d5
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Oct 9 16:21:24 2003 +0000
Build smi after vesa.
commit e5a1c9952f7d621493f08257c8b9456b7608c55a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 07:29:31 2003 +0000
Initialize smi chip on graphics setup. Seems to help some.
commit 10f721acc5e59ea4152b94246b62963f2ff9d678
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 07:12:01 2003 +0000
Leave iopl set to 3 so vesa module will work
commit f74555e94264e6f703d399a5e0475c7283e20a88
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 06:36:26 2003 +0000
Add xfixes, fix smi driver to use either fbdev or vesa. Add hole mapping to
vesa server by default
commit 346aff7ef6f47a191c7f134b7843a634189b9e83
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 06:35:11 2003 +0000
Use either vesa or fbdev, selectable at compile time
commit adc5b8068d5532a6f3f23e64d3c668a22d5b1504
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 5 05:22:35 2003 +0000
Fix fbdev server to allow accelerated servers on top to use RandR. Switch
smi server to fbdev (vesa bios doesnt work on the Acer I have here)
commit f3d8476ced1e3ba4b4ca7c9e23e98c2cc7ffcc14
Author: Phil Blundell <pb@reciva.com>
Date: Sat Oct 4 02:56:54 2003 +0000
few more fixes for h3600 ts
commit aae3e6dcb3d72eba6d7d8d99079782ed1bfe63bd
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 4 02:43:16 2003 +0000
configure.ac Makefile.am os/oscolor.c Xext/saver.c Xext/Makefile.am
hw/kdrive/linux/ts.c hw/kdrive/src/Makefile.am hw/kdrive/src/kdrive.h
hw/kdrive/src/kinput.c hw/kdrive/src/kmap.c Autodetect VM86 (for vesa),
AGPGART, APM, MTRR, tslib and handhelds.org touch screen. Add
USE_RGB_BUILTIN and code for fileless RGB database. Add
MIT-SCREEN-SAVER
commit efbf205a2ac4792b71d39f8fe3ef3b1cf12697c0
Author: Phil Blundell <pb@reciva.com>
Date: Fri Oct 3 15:27:46 2003 +0000
add --disable-kdrivevesa option
commit 89a536f349525e642bb4cd233bc47864ed4a6ad7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 2 02:30:28 2003 +0000
Add smi server
commit 5a21f4f4d0c03e0e34f1979fd7cec8f0d19b00d4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 1 06:43:50 2003 +0000
Add XDM cookies. Fix up support for pkgconfig X bits
commit a42e31b28c493dc3d6b32cde4e72ff17fc983183
Author: Matthew Allum <breakfast@10.am>
Date: Tue Sep 30 22:14:59 2003 +0000
Fixed tslib driver to handle VT switches
commit a0876ade6479c40dcef63f70f4c6c5a5988edeba
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 30 20:49:47 2003 +0000
Enable maintainer mode from autogen.sh. Fix vesa build to create library
before program. Remove bogus AC_SUBST lines for XSERVER_CFLAGS and
XSERVER_LIBS
commit e8c02296476f068bc8158d112dc15df00dddac2a
Author: Matthew Allum <breakfast@10.am>
Date: Tue Sep 30 20:15:14 2003 +0000
Added --enable-tslib configure option
commit a42384e9356ec79510682bacf08410e87d7102ff
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 29 01:42:40 2003 +0000
Use other freedesktop.org packages to build the server
commit 6a098a88af174db1674662c09e2385b4e6e0bb4e
Author: Anders Carlsson <andersca@gnome.org>
Date: Wed Sep 24 23:36:54 2003 +0000
Add beginnings of offscreen memory manager.
commit 918a8273eeabcb14fc82742cc68223d8a7c2a67a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 24 21:07:06 2003 +0000
hw/kdrive/src/kdrive.c
hw/kdrive/src/kdrive.h Add -switchCmd option to set command that is
executed whenever the VT is enabled or disabled. This permits input
device to be customized by external apps when switching to X.
commit 20bbd750d0d359e55cbdcc86aeea6013ac665bce
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Sep 22 21:14:59 2003 +0000
Accelerate server.
commit 49771e3f074cae3947b0084e6514a19dc4c4cad1
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 18 20:48:48 2003 +0000
Add mga server to the build.
commit 07ab15d61d2468fc858453cdabe7296d19fc9e10
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 18 20:47:43 2003 +0000
Add mga server
commit b260825e880615f589e2bad35491ebb598e21a0f
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 18 14:44:57 2003 +0000
Try this.
commit b889d4ba2c2e59769a3ff6fd00ee5bb395108827
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 18 14:42:00 2003 +0000
Try things out.
commit 85ff67670c6216a8c4368a8bd70fd0434a4e0aca
Author: Anders Carlsson <andersca@gnome.org>
Date: Tue Sep 16 21:07:16 2003 +0000
Add fbdev server to the build.
commit be12dcdcf39a30f69fe73cbb5a4acacef8024db6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 12 07:00:19 2003 +0000
Switch to freedesktop.org libXfont
commit eca43a59ec95646836f9704714823249a15747fa
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 12 01:51:16 2003 +0000
Clean up mach64 for autofoo
commit 6b16b827bb125b43b41b7f8558991e90ada316de
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 12 01:49:46 2003 +0000
Add some configure options, make the mach64 server build
commit ce55d3234dc34157f0fc8059a6793cdd17fa4519
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 05:15:08 2003 +0000
Move kdrive common sources to src dir
commit 269b9dac5a96005fe38379377526592cb7930a51
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 05:12:51 2003 +0000
Get Xvesa building
commit 0d775576b9b3cf410e9a463b87340612d34bc13d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 03:26:03 2003 +0000
Add Makefile.am
commit ef8977a30ccb55af8e8bbb635127efb94f232983
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 03:23:13 2003 +0000
More build fixes
commit 14a8311bb3b6273617f7c7b70222e97835e9c8af
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 02:31:24 2003 +0000
Make more stuff build
commit 8bc8fd8678b20dde2a3fc47ff5b617bc8046ea9f
Author: Mike A. Harris <mharris@redhat.com>
Date: Thu Sep 11 02:02:54 2003 +0000
POSIX sigaction cleanups - removed act.sa_restorer as it's not in POSIX and
is not portable
commit 514ab46ce3c6eb0163720315474cba884d029b62
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 11 00:47:36 2003 +0000
Start autoifying everything.
commit 283a7f32c449b1970e5a484351f8396a8afd99da
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 7 19:13:03 2003 +0000
Update RCS tags, fix keyboard hang on VT switch, fix scroll wheel mice, add
-rawcoord option to not transform mice on rotate, fix mtrr to use
power-of-two size, add a few vesa options
commit 804b89284665f19e2c92a07fadc72c25fbb3f5d9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 2 17:53:46 2003 +0000
Silicon motion driver for kdrive
commit b923d897a51707c25b2dc62395d9765ba1a47bfe
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 2 17:53:46 2003 +0000
Initial revision
commit 544ee9bb7a060d6a85b5168a2de74ff1db430c89
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Wed Apr 23 21:51:18 2003 +0000
136. Fix bug that prevented fbman from using the last partial scanline of a
Mach64 framebuffer (Marc La France).
135. Make ATI Mach64 FIFO cache integrity testing optional (Marc La
France).
134. Export ATI Mach64 hardware overlay as an XVideo adaptor (derived from
GATOS project, Egbert Eich, Marc La France).
133. Reorganise ATI Mach64 support into separate source files (Marc La
France).
132. Refine atimisc's decoding of the panel mode on server entry in an
attempt to reduce the effect of atyfb bugs (Marc La France).
131. Make Rage128 and Radeon XVideo available even when 2D acceleration is
disabled (Marc La France).
130. There is no longer any need to require hardware cursors during Rage128
and Radeon XVideo displays (Marc La France).
129. Initialise v4l's XVideo adaptors last (Marc La France).
128. Reduce cut&paste effects by adding more helpers to Xv (derived from
#5645, Bj�rn Augustsson, Marc La France).
127. Centralise a region comparison primitive into 'mi' and use it instead
of local definitions throughout the server (Marc La France).
126. DPMSExtension & XvExtension driver cleanups (Marc La France).
commit 870d0f8752c11c3df42185786ab1e2bd200e4de1
Author: Egbert Eich <eich@suse.de>
Date: Thu Dec 12 18:29:05 2002 +0000
621. Let kbd driver test if Xserver is in suspend before handling any input
events (Egbert Eich).
620. Fixed agp version checking to accept minor versions >= the specified
number (Leif Delgass).
commit 7827fce0b5ff600d0adc3a30eab69e8141c2e548
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 13 16:37:39 2002 +0000
Allow input devices to be closed while the VT is switched away (needs
per-driver support)
commit 3eaea6608bc33633c00860008f246f59ad5687a7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 12 22:20:42 2002 +0000
Update ipaq-specific ts driver to match generic tslib version
commit 612e82053d986df70bcc9c87038244eab8c3dc13
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 5 05:28:34 2002 +0000
Clean up touch screen hacks for controlling pointer on alternate screen
commit 358d887cbef4d2ec34532a364dd44205eab36c23
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 1 22:27:49 2002 +0000
Add support for ARM linux TS lib (disabled by default) in kdrive
commit f0a8d06fcaf3fe0a652efa65966f4b0b0d688c12
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 31 18:29:50 2002 +0000
Refix mouse matrix computation for touch screens. Update usage message for
-screen option
commit 28d191680ecbcd50dc1cccec12e55a3c433fbf48
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 30 21:25:53 2002 +0000
Uninitialized mouse matrix elements
commit dd7c85f108d01d207248300019e88d56012c33c9
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Oct 30 12:52:06 2002 +0000
441. Import Mesa-4.0.4, and resync with the DRI trunk (DRI Project).
commit d04246c8fca4132063234ab44a68a7fac8c22261
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 06:31:17 2002 +0000
Changed arguments to vesaRandRSetConfig
commit 7d214e2e2a2a1601ca14be6b52190c5b22611e2d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 06:08:10 2002 +0000
Fix additions of RandR support in kmode.c
commit 5bb4a7b6998132d574d823301333b7e119dc7213
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 06:00:29 2002 +0000
Fix other half of kdrive mach64 video code after randr update
commit e1c304e22b1a29a5259aec1e956dbc75e0fa0138
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 14 18:01:42 2002 +0000
Add refresh rates to RandR (v1.1)
commit 5804e69f4c20dcd33f69673aa82da3051e6eed3c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 13 19:35:56 2002 +0000
Custom file for rotating pcmcia screens
commit b5d1c538622b21bed8eb59b557d79323f65ffbd7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 8 21:28:05 2002 +0000
Add vtxx option to kdrive servers
commit f214cab20baf57fc23389ef9b63a3e3a50b2a4f6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 8 21:27:18 2002 +0000
Clear screen on mode switch
commit b28a8c6e2a1fbc57d96d94b7445c86f94c2d8d4d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 8 21:25:35 2002 +0000
Add another mach64 PCI id
commit 9373d9186b413e1d53200b191816b9143d19c4bf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 01:44:20 2002 +0000
Fix mouse mapping under reflection
commit a80e1e5aed07cb57151408b0481f18e2ffb7f146
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 3 22:09:04 2002 +0000
Update kdrive servers to support reflection
commit 238a2ec201a52d59a46540ddd419d8d6f6bf8daa
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 29 23:39:47 2002 +0000
Update RandR to 1.0 (library version 2.0)
commit 5d871996431e33b0d64ad9158e040e46770b6ee4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 26 02:56:48 2002 +0000
Add image transformation and sub-pixel ordering to Render
commit a2637ba1f6c8417a48c95c9b65542c696ba0c8c0
Author: Egbert Eich <eich@suse.de>
Date: Mon Sep 16 18:05:35 2002 +0000
319. Moved LdPreLib define after the vendor/OS specific config files as it
may depend on setting done there (Egbert Eich).
318. Several fixes for cross compile environment (Egbert Eich).
317. Added code to allow for building of static only libraries with
-fPIC for platforms which require it (Egbert Eich).
316. Added '-m32' to gcc flags as default for ia32 builds when gcc version
is >= 3.1. This allows building a 32 bit Version of X on 64bit x86-64
(Egbert Eich).
315. Changed direct calls of ld to 'gcc -nostdlib' for Linux (Egbert Eich).
314. Changed calls to as to 'gcc -c -x assembler-with-cpp' for Linux
(Egbert Eich).
313. Added '-fno-strict-aliasing' flag to gcc version >= 3.1 (Egbert Eich).
Strict requires that one address must not contain pointers to different
types - a feature heavily used by X (Egbert Eich).
312. Fixed a core dump problem in libXtt (?) (Egbert Eich).
311. Removed '#pragma pack' from structures that contain function pointers
in x86emu. This causes problems on gcc 3.1 for ia64 (Egbert Eich).
310. Added defines for missing X types to saverproto.h (Egbert Eich).
309. Fixed compiler warings generated by gcc >= 3.1 in mesa drivers (Egbert
Eich).
308. For platforms that allow both 32 and 64 bit libraries to be executed
split Xlib i18n modules path into
<libpath>/X11R6/lib/X11/locale/lib/common and
<libpath>/X11R6/lib/X11/locale/lib64/common. 'lib64' has been defined
to be the default path for 64bit shared libraries on these platforms
(Egbert Eich).
307. Fixed obvious typo in OMlib (Egbert Eich).
306. Fixed code in cfb that didn't comply with C sequence rules. Modern C
compilers tend to be more aggressive on code reordering (Egbert Eich).
305. Changed arguments of NoopDDA() from VarArgs to void. Handling of
VarArgs by gcc isn't compatible with the way it was used on certain
platforms (Egbert Eich).
304. Added support for 32bit pixmaps for 24bit overlay framebuffers in fb
overlay code (Egbert Eich).
303. Fixed kdrive to print a meaningful error message instead of just core
dump when no matching graphics cards is found (Egbert Eich).
302. fixed portability bug in xwd (Andreas Schwab <schwab@suse.de>)
301. fixed X Server crash, which happended each time a proportional
iso10646 font was loaded with xtt backend (Yong Li
<rigel863@yahoo.com>)
300. Added some ARM specific fixes to compiler.h (Uli Hecht).
299. Added a virtual 'dummy' driver (Egbert Eich).
298. Fixed core dump when certain access functions are not set in xf86Bus.c
(Egbert Eich).
297. Fixed problem where SIGIO could be disabled after a server reset.
296. Added configurable list of devices the xf86Misc extension is allowed
to change the mouse device to (Egbert Eich).
295. Changed default mouse type to 'auto' when generating config file with
'-configure' (Egbert Eich).
294. Made sure keyboard modifier settings are consistent after exit from
DGA when the xkb extension is used (Egbert Eich).
293. Disabled keyboard processing when Xserver is suspended by power
management. This allows effective locking of laptops when stolen
(Egbert Eich).
292. Added/improved options for lockfile syncing (Egbert Eich).
291. Added support for backup copy of Xserver logfile (Egbert Eich).
290. Fixed GetTimeInMillis() to use deltas instead of absolute time
returend by gettimeofday(). This ensures time is monotonic in X (Egbert
Eich).
289. Fixed xf86Misc extension to allow modification of Expps2 mice (Egbert
Eich).
288. Made code in xf86MiscExt.c more readable (Egbert Eich).
287. Fixed PCI CardBus bridge handling (Egbert Eich).
286. Added code to reenable PCI bus mastering after coming back from a VT
switch to radeon driver (Charl P. Botha <http://cpbotha.net/>) (Egbert
Eich).
285. Dito for r128 driver (M. Harris).
284. Dito for glint and mga driver (Egbert Eich).
283. Fixed double scan issues for low res modes in C&T driver (Egbert
Eich).
282. Set rgbBits to 8 for all HiQV chips in chips driver (Egbert Eich).
281. Moved initialization of accel funtions past initialization of
offscreen fb manager in chips driver (Egbert Eich).
280. Fixed initialization of video in chips driver (?).
279. Fixed HALlib problem restoring text mode on G550 (Egbert Eich).
278. Restructured and included Matrox's Merged Framebuffer changes to mga
driver (Egbert Eich).
277. G450/550 clockchip programming fixes (Matrox).
276. Fixed HW Cursor for HALlib frame granularity (Egbert Eich).
275. Enabling 2D accel in 24-bit for neomagic 2360 and 2380 (Egbert Eich).
274. Added support for builtin 1024x480 mode of Sony subnotebooks for
Neomagic driver (Egbert Eich).
273. Fixed support for lowRes (320x240) modes in neomagic driver (Egbert
Eich).
272. Fixed RAC function registration in S3 driver (Egbert Eich).
271. Added some voodoo to screen initialization of S3 driver (Egbert Eich).
270. Fixed vbe/int10 support in SMI driver. It used to core dump when BIOS
was not usable (Egbert Eich).
269. Separated BRIGHTNESS and and CAPTURE_BRIGNTESS video attributes in smi
driver: CAPTURE_BRIGHTNESS refers to the capture chip (ie. Philips
SAA7110) while BRIGHTNESS controls the video overlay of the SMI chip
itself (Egbert Eich).
268. Disable automatic loading of DRI when running SUN ffb as this is
inconsistent with other drivers (Thorsten Kukuk).
267. Fixed Gamma/Brightness code in trident driver (Egbert Eich).
266. Added FpDelay debugging option (Egbert Eich).
260. Fixed video support for Trident 9397 (Egbert Eich).
265. Fixed Cursor/VT switch support for vmware driver (Egbert Eich).
264. Fixed Blit problems in vmware driver when running KDE (Egbert Eich).
263. Added RENDER support to vmware driver (Egbert Eich).
262. Added C&T 69030 to extrapci.ids (Egbert Eich).
261. Improved mouse autodetection code (Egbert Eich).
260. Restructured int10 code so that vm86 and x86emu support can be loaded
as modules. Implemented heuristic to try vm86 first and fall back to
x86emu. This allows 32 bit Xservers to run on x86_64 on 64-bit kernel
without vm86 support (Egbert Eich).
259. Restructured elf loader: determine which section to load from
elfheader flags (Egbert Eich).
258. Adding RENDER Support to RAC (Egbert Eich).
257. Using borderClip instead of borderSize region for redisplay function
in miext/shadow code to avoid core dumps when vt switched away (Egbert
Eich).
256. Replacing sprintf() by snprintf() in lbxproxy to eliminate possible
buffer overrun exploits (Egbert Eich).
255. KP_Decimal fixes to Czech and Slovak keybards (Jan Holesovsky
<kendy@suse.cz>) (Egbert Eich).
commit 2698ee9f29189a44de1c92df99f48d45f0111577
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 15 18:07:57 2002 +0000
Prefer touchscreen to mouse
commit fe477855d7d714c154dc9fcb1d0aa67fb8e4e5a5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 2 16:30:50 2002 +0000
Fix for iPaq IOCTL changes
commit cf49ce6f26caee30f4160e6e0b2b658863e7a145
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 2 16:15:02 2002 +0000
Allow both touchscreen and mouse at the same time
commit 1a5f923c62dcffb3a81c6532f3dc071c70345cb3
Author: David Dawes <dawes@xfree86.org>
Date: Tue Jun 4 22:19:58 2002 +0000
174. Fix makedepend so that it can parse a unary '+' operator (#5185, Mark
Snitily).
173. Fix a typo in Xvesa's emulation of instructions forbidden in vm86 mode
(#5184, Juliusz Chroboczek)
172. Fix a bounds check in Xlib's Region code (#5183, Owen Taylor).
commit 98f8d7af3cb7a10cc268a8bdd3039539b1bf90f2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 19 00:18:05 2002 +0000
kdrive/vesa: apply vm86 patch from Juliusz
commit 6d8cedf68c7803330bc920cf7506727c4ad6108c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 14 16:08:05 2002 +0000
update kdrive manual and usage
commit 44b20bfa587def11f3127980e67ff47e695c3e51
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 1 00:52:15 2002 +0000
kdrive/mach64: recognize the mach64li
commit 3abb3e073961986137f8fec1f194c60636b9e864
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 18 16:25:19 2002 +0000
kdrive: fix button emulation for iPAQ
commit 88810cfc02941d7e54924e25aa872e5cc740d274
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 20 16:47:30 2001 +0000
kdrive/linux/mouse.c: convert mouse data to signed values for compilers
with default unsigned chars
commit 83388cb23282471e80d513bd3ab472b51c110b35
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 10 16:34:20 2001 +0000
kdrive/i810: bit swap for i810 cursor (from Pontus Lidman)
commit 4646a6c3b925676039f50bacb4f3c780f6e81bcc
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 7 02:19:04 2001 +0000
kdrive: work around ipaq touch screen compile problems
commit 54feb8a4c8f0e0cb6eb40b494171fa4f3552cfc3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 7 02:18:19 2001 +0000
kdrive: missing registration for mouse input type
commit 636390fb9d6314e506f593da6556fa198b4e9bf6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 22 23:38:21 2001 +0000
kdrive: initialize all Linux mouse driver fields
commit 668c25a769044f06ed47a3145a11aceeb9574c9d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 8 10:26:24 2001 +0000
kdrive: fix ALTGR keyboard mappings
commit e76c6b2acae5622dd2d4944cd6f3673dbc70a571
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 8 09:35:08 2001 +0000
kdrive/linux: update ps/2 mouse detection/configuration code from FreeBSD
bits
commit 6fafe3b092f799da788a1ae75be1c23da42f0983
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 8 09:33:51 2001 +0000
kdrive: Open APM device r/w for kernel 2.4.14
commit 2f2e256de71c42b7856440ec43b1c122019b95b7
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Mon Oct 29 16:34:56 2001 +0000
DPMS warning fix
commit b8d90c5ea4659a01694864e6c05a563dcea296eb
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Sun Oct 28 03:33:10 2001 +0000
407. Fix for threaded libraries (Marc La France).
406. Finish removal of SuperProbe (Marc La France).
405. A rather large number of warning fixes throughout (Marc La France).
404. Fix bug in HTML install script (Marc La France).
403. Missing ident lines for some XFree86-modified files (Marc La France).
402. Add default half-width doublescanned modes (Marc La France).
401. Mark all driver-registered resources with ResBus (Maarc La France).
400. Fix DPMS-related build problem (Marc La France).
399. Log a message just before calling each ChipProbe() during '-probe'
processing (Marc La France).
398. Temporarily disable ISA probing on SPARCs and PowerPCs (Marc La
France).
397. Add PCI IDs for Sun hardware (Marc La France).
396. Fix memory leak in resource relocation (Marc La France).
395. Do not relocate resources that only conflict with disabled non-video
PCI devices or disabled PCI ROMs (Marc La France).
394. Re-organise SBUS code (Marc La France).
393. Add as-yet-unused definitions for PCI resource types other than I/O
and memory (Marc La France).
392. Add doc for Solaris, but don't format it yet (Marc La France).
391. Normalise driver names (Marc La France).
390. For SPARCs, disable DGA support in ATI driver (Marc La France).
389. Clean up some debugging messages (Marc La France).
388. Fix newport driver for when a /proc fs isn't mounted (Marc La France).
387. Fix DAC handling bugs in s3 driver (Marc La France).
386. Fix resource registration bug for PCI Tseng's (Marc La France).
385. Add aperture driver for Solaris (not yet used) (Marc La France).
384. Rework scanpci to fix problems that prevented it from completely
displaying non-PCI bridges and Simba bridges (Marc La France).
383. Fix build problems in some input drivers (Marc La France).
382. Fix int10 compile problem for SPARCs and PowerPCs (Marc La France).
381. Ensure master aborts on secondary buses complete normally during PCI
scans (Marc La France).
380. Some memory mapping and Solaris cleanups (Marc La France).
commit a8518b35617a479f50c735c015115b853f4aa327
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 24 20:14:52 2001 +0000
kdrive/savage: Long lines cant be drawn with accelerator
commit 28fd5f7525848cf0109f9cf2d6311f3717570a5d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 12 06:33:12 2001 +0000
kdrive: add new auto-detecting and auto-switching mouse driver
commit 5f310d7f8b566b1e331286752d349f87ef43a811
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 29 04:16:39 2001 +0000
kdrive: restructure APM/VT switch support to reset keyboard state and flush
buffer on APM resume
commit bb2e1c53b58ac94539f0d11ae195186a9ee0a2f7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 21 21:58:34 2001 +0000
hw/kdrive: Xv window private should be allocated on demand
commit 59cd35f634468acfa2e48711da09fabc811d96f9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 14 19:25:17 2001 +0000
hw/kdrive/vesa: initialize mouse matrix for non-rotated case correctly
commit fbaf3ceae0519ebdfee4b6a73b1bc0000f141cf2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 14 19:24:11 2001 +0000
hw/kdrive/trident: solid fill checks busted for planemasking
commit 216090d1aedb23c691a75da25b14d8543b932e1c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 5 07:12:43 2001 +0000
kdrive: Add primitive ct65550 server. Update kdrive/vesa code to support
DPMS using VESA bios routines. Include support for Toshiba SMM DPMS as
well
commit f856b952ec7251d6e95f0b93d62fb026d07b0ebc
Author: David Dawes <dawes@xfree86.org>
Date: Thu Aug 9 20:45:15 2001 +0000
187. Add an MS mouse driver for KDrive (#4754, Juliusz Chroboczek).
commit f4db75ac431c14e0c24ff7549c6ce1e3b0b86b87
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 9 09:08:55 2001 +0000
kdrive/mach64: support Xv under RandR
commit 628d7695d1696f6f5cba6ea1f2548aa5d0f38c80
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 9 09:06:08 2001 +0000
kdrive: disable sigio debugging
commit 958c0374a6709386e91b4b3ed7ba8fa81d415ebf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 24 21:26:17 2001 +0000
kdrive: add apm support, fix MTRR unmapping bug
commit b7eb8a35b51aa2edc9ff59f091ee88ea7000b757
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 24 19:06:04 2001 +0000
kdrive: Unmap vesa device when disabled
commit d2d221a012950b98e48e47b6dea38e6ad385fef8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 23 03:44:17 2001 +0000
kdrive/mach64: Force read of GUI_STAT on every op to avoid problems across
suspend/resume
commit 79486b3b5c792a990cb73b4efa453218262e605f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 20 19:35:30 2001 +0000
Too many changes, but all in kdrive:
Add support for global screen origins (-origin option), handles both
Xinerama and mouse crossings.
Fix XV enable/disable sequences -- can't use card wrappers as cards have
more than one screen.
Change vesa/fbdev to use new depth-independent rotation shadow update
Fix vesa to allow starting rotation value (again)
Make vesa driver write all colormap changes in one INT10 call
commit 9826d5a1339570c037ae1ef29c9a237874a6ffa2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 19 08:46:30 2001 +0000
kdrive/fbdev: only setting first colormap entry on static hardware
commit 35d8b5f44269c97497c73d3638b8f0345757c04c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 19:48:00 2001 +0000
kdrive/fbdev: fix static color case
commit 090a429573dfb965ebc4ea8ea57e3bef5f9a8539
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 16:42:17 2001 +0000
kdrive/fbdev: dont set DPMS mode repeatedly to the same value
commit 99fb2eb76d8f93578e4aba75c73b9be0766f7b6f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 05:02:24 2001 +0000
Generalize kludge in fbdev that normalizes pixel formats to something that
Render can handle
commit 562474091a3d52a062eb89d25a7d38200a785425
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 02:58:19 2001 +0000
Fix TOUCHSCREEN support in kdrive
commit 67cd53abfce7ed17ae4c428332a9e0fd908da97a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 29 14:00:41 2001 +0000
Rework kdrive input fd handling, enable multiple simultaneous mice
commit c872ee82045e8c7ce019df2577d06bec549cd71c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 29 13:57:45 2001 +0000
kdrive: typo in MTRR calculations
commit 63dd090655ba995b8f26386bb50cb5b7568f7da0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 29 13:55:53 2001 +0000
kdrive: dont touch hardware when disabled
commit 01a53daa03a8ee36ce136dde3a9a9b152e9c2e2f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 23 03:41:24 2001 +0000
Clean up mach64 video code to add ReputVideo and make StopVideo not crash
the machine
commit 31d47ec8bed1b02d04563ba502eaeb028975f653
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 21:44:09 2001 +0000
kdrive/mach64: remove useless Xv debug printfs
commit bd61c15279e2195c72b3add32961ed21e293d48b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 01:01:30 2001 +0000
Add RCS tag
commit 66c9184807997d2a0a155ba1697906c07396863f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 00:58:51 2001 +0000
Fix screen physical size in RandR code for kdrive fbdev and pcmcia servers
commit f8a456f094d8f61c021bbfb6e6f0a4723ebdc73f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Jun 20 21:53:31 2001 +0000
Add RandR support to the Kdrive pcmcia driver.
commit 918ff10f2697ee8c17013bd31596072a38c5ac9b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 19 09:31:47 2001 +0000
Finish Xv support for kdrive/mach64
commit 6d86517b0ed0db51f3eaf19c186db52feb1e47e0
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 16 05:53:05 2001 +0000
Screen flipping broken pointer remapping
commit 54aea8ec0c1c3633788fd9b19636093860c75d53
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 16 05:48:49 2001 +0000
Patch DPMS support in kdrive/mach64, add preliminary (broken) Xv support
commit f386ca6c69ba10cd8c0dd60bb25cde37ecfc8bc7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 13 19:18:44 2001 +0000
Support initial rotation in kdrive/fbdev, use that as the normal
orientation
commit 93dbdc89c172fd5d6450f21ebc91011771ac0100
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 13 19:18:03 2001 +0000
Add -dpi support to kdrive
commit a6517a3056a88fca35a47185a0e6d83f3e8b0015
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 11 01:38:54 2001 +0000
Advertise supported rotations in kdrive/vesa server
commit 4f8254b31f30bd12224c2fdcecfbd67b41ecd7e1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 5 17:17:39 2001 +0000
Attempt to make kdrive/fbdev run on static gray hardware (iPaq 3150)
commit bf4dbfbf45e4e6b1b86c624b1995a1050b7a0eef
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Jun 5 16:57:44 2001 +0000
fix some warnings due to new shadow code
commit a4ba10ba6ffb1c01a0df5b34669b9fb24ad0e7d9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 5 16:49:31 2001 +0000
kdrive/fbdev: RandR initialization sequence change
commit 7fcf46356ba70563f036f535e60667727db442ae
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 09:45:42 2001 +0000
Allow for hardware acceleration under RandR with Layer. Hardware/Software
cursor switching still busted
commit 54e66d92db917923e33e018e628a7629d6705507
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 3 21:52:46 2001 +0000
Update RandR protocol
commit 88ae32841d766c7d0df79ee25e1db62996d4ecb3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 3 18:48:19 2001 +0000
Add mach64 driver to Tiny-X
commit 14ed0c3d6d674df4edcbcd8840a7cea4b41a0673
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 30 15:36:25 2001 +0000
Fix kaa to not try Copy for pixmap sources
commit a2bd75d15a99d4ee117e17921f0426228d53f5e8
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 29 21:55:41 2001 +0000
Xfbdev: Make sure screen gets re-enabled on RandR failure
commit 562925c439cf1746f2caa720d4f2dce54ba0311b
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 29 17:47:55 2001 +0000
Fix Xipaq build after layer/RandR additions
commit 78b53386b51cde4fe4664963ddafa36b814360f2
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 29 04:54:13 2001 +0000
Add miext/layer for more complete RandR support in kdrive/Xfbdev
commit 06f758797ab3651b0e293ae26daf4df77702fdde
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 26 01:25:42 2001 +0000
Add initial RandR support to Xvesa
commit ba8351609869165aa2de92b7a876dc2d2768cb5b
Author: David Dawes <dawes@xfree86.org>
Date: Fri May 25 18:40:59 2001 +0000
38. Fix xmh's use of XtNewString() with getenv (#4694, Tim Waugh).
37. Xdm/PAM fixes: leave it to PAM to observe whether or not an account is
locked, and reinitialize credentials after calling initgroups(),
because sometimes the credentials pam_setcred() gives are in the form
of group membership (#4693, Mike Harris).
35. Fix warnings when building mieq.c (#4689, Adam Sulmicki).
34. Fix some bugs in the cz and sk entried in XKB's keymap/xfree86 file
(#4692, Ivan Pascal).
33. Add 'hr' entries to XKB's keymap/xfree86 and rules/xfree86.lst files
(#4687, Nerijus Baliunas).
32. Include <X11/Xutil.h> in shape.h to get Region typedef (#4686, Adam
Sulmicki).
commit e9314bd34ec39cc699591123cc8a05a934b66b85
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri May 25 07:44:29 2001 +0000
wrap some stuff around #ifdef TOUCHSCREEN
commit e6497f39af98cd25719eab72b0be04fa4146172f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu May 24 19:31:46 2001 +0000
fix ifdef->if
commit 0e1a49a7dd00ae494d92ab480d9776ec5320cb3e
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed May 23 17:28:39 2001 +0000
add missing pieces for the pcmcia driver
commit 85d827f5329fa93dea1125788457fac6835cd134
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed May 23 08:56:09 2001 +0000
Add PCMCIA server for HP VGA Out PC Card and the Voyager VGA Card. Use on
the Compaq IPAQ. Use -listmodes to see supported modes. Hack the
touchscreen driver to work as a mouse pad for the VGA screen. Fixup key
bindings so xmodmap can remap IPAQ's buttons as mouse buttons.
commit f9104754cda1212cf48d6d24a0a586c5368d7549
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 23 03:29:44 2001 +0000
Add RandR extension
commit dc383e8f77f99e8c2b799a6ab4e4998a1fcacb24
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Sun Apr 1 14:00:04 2001 +0000
317. glxinfo needs libGLU (Marc La France).
316. Rage128 fix to Cards database (Marc La France).
315. Minor fix to PCI resource overlap handling (Marc La France).
314. Loader code simplification and IA-64 cache flushes (Marc La France).
313. Workaround in the ATI driver for troublesome interaction between
loader and compiler optimisation (Marc La France).
312. Warning fixes for `gcc -fno-builtin`, which appears to be the default
on some systems (Marc La France).
more of #301, tags, warnings and build fixes.
commit 518e205b06d0dc7a0cd35fbc2c6a4376f2959020
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 30 17:35:55 2001 +0000
kdrive/igs: add missing register definitions that used to be in igsregs.t
commit eb3da37564593b7c9fb574af824e2f5e0cc6bb24
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 30 02:18:41 2001 +0000
Add files for Xmuu and i810 driver
commit f39a62d122b6e63e2971d8593bf6b24933f66ec8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 30 02:15:20 2001 +0000
Add Xmuu library to remove requirement for Xt/Xaw from most X utilities Add
i810 and Xv support to kdrive
commit a161cfd72870ae6dca66ef02f5cdd13b7ac75fd6
Author: David Dawes <dawes@xfree86.org>
Date: Wed Mar 21 16:43:16 2001 +0000
remove Id line
commit 0aa54b4d409647778b563d77ef6100085d86c6f3
Author: David Dawes <dawes@xfree86.org>
Date: Tue Feb 13 21:15:15 2001 +0000
144. Fix the neomagic driver so that it saves/restores the palette (#4452,
Ken Hornstein).
143. Fix a palette saving bug in the vgahw module (#4452, Ken Hornstein).
142. Fix a typo in Xfbdev.man (#4446, Juliusz Chroboczek).
141. Major updates to the savage driver, including:
- DDC support
- I2C support
- XVideo YUV overlay support for Savage/MX and Savage/IX
- DGA support
- yanks Ani Joshi's depth/bitsPerPixel patch for searching the BIOS
- fixes interactions with frame buffer and SVGATextMode consoles; VT
switching now seems quite reliable for almost everyone
- yanks unused options
- adds new options for hacks to deal with the status register hangs
- adds one special case memory configuration for Savage 4
- adds support for doublescan modes (320x240 works)
- adds LCD panel detection
- fixes a panning bug at depth 24 (panning must be to even pixels)
- adds a workaround for bugs in the latest ProSavage BIOSes (#4445, 4448,
Tim Roberts).
140. Make 'X -configure' use the long monitor name when present in the DDC
info (#4444, Andrew C. Aitchison).
139. Make glxinfo respect $DISPLAY (#4443, Meelis Roos).
138. Fix TrueType font problems in 4.0.2 (#4439, Juliusz Chroboczek).
137. Document the "DisplaySize" keyword in the XF86Config man page (#4438,
Andrew C. Aitchison).
commit 3dfa6cce9938413e10cc400ba6d9b19b8f28e485
Author: David Dawes <dawes@xfree86.org>
Date: Sat Jan 27 18:20:40 2001 +0000
88. Set the version strings in man pages dynamically (David Dawes).
87. Remove the XF86_VERSION string from xf86Version.h, leaving just the
numerical values. All the version information is now derived from that
single set of values (David Dawes).
commit 60c7a912e257045d1189a19a38d9dbedc20ae78b
Author: David Dawes <dawes@xfree86.org>
Date: Wed Jan 24 00:06:10 2001 +0000
79. Preprocess all man pages to make sure that the references to pages in
sections that are platform-dependent are correct. Also fixed some misc
formatting problems found while doing that (David Dawes).
commit dacbf5671da08d161cd7a32496e0b58f50a93453
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 23 06:25:05 2001 +0000
Integrate jg patch for iPAQ
commit 2869e08a328cb6aa51c17b96bdebd37e9eeefc88
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 13 18:06:54 2000 +0000
kdrive: non-x86 compiles broken in kmap.c
commit ec4916836c42cb4a1dc1622dddd27951a90a52c9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 8 23:04:57 2000 +0000
kdrive: dont try MTRR on non-x86, fix backspace mapping
commit d09a156d92dbcd9368be20dabe47ea197f19357e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 8 22:59:37 2000 +0000
kdrive: allow screen size specification
commit 6b61d48f2146f18c94d5f2b3d16a822c0eee9841
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 8 21:40:29 2000 +0000
kdrive/vesa: type cast warning fix
commit b59eabd230110d604515868893d9aa06e6d3b748
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 8 21:40:02 2000 +0000
kdrive: A few iPAQ inspired changes to event management
commit a25637fe789c5127451233c759074780cbc110ac
Author: David Dawes <dawes@xfree86.org>
Date: Mon Dec 4 21:01:00 2000 +0000
missing ident lines
commit 1adbdf76a903aa37d553c1c2cc43a783f21acaa5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 1 00:01:32 2000 +0000
kdrive: add Xkdrive/Xfbdev man pages, update Xvesa manual
commit 5f8e75f27d49719f5fd07d48481435f93779da6c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 29 08:42:25 2000 +0000
kdrive: add MTRR support, add clock support to trident driver
commit 02568ec5a8f278faaa26c973fcb424da3fd31f2b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 19 20:51:12 2000 +0000
kdrive: vesa get mode using uninitialized value
commit 8f634a6516caca0e4be875e696820a820e480cff
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 20 00:19:51 2000 +0000
Add VGA BIOS modes to Tiny-X Xvesa server
commit f16d5d6817f15be35293ee995d073eb57fafe283
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 11 06:04:40 2000 +0000
Add composite operator support to trident
commit d579bd5676ea570a8f2765cd2f6ba40074171593
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Tue Oct 10 14:05:48 2000 +0000
Static build fix and ident lines.
commit 5f5b9ed1ad0591d70354c2b90609051d169fc33e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 8 02:08:39 2000 +0000
kdrive: Add timeout to screen switching to avoid unintentional flipping
commit fb8b58270fcaee236337d3818df04e651acbcea9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 6 22:13:40 2000 +0000
kdrive: support jgs new linux keysyms
commit 15d45ffbd9af5ccce07264d6182b2222c417a2a5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 6 22:05:53 2000 +0000
kdrive: fix any-edge screen-switching behaviour
commit fae164a4958b95e3ba4e4d5125da4611fcb14f6d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 6 05:54:09 2000 +0000
kdrive: ignore mouse/keyboard fds in WakeupHandler while switched away
commit b814019be970bc45f808ec19eef0a48b789d6646
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 3 17:22:14 2000 +0000
kdrive: zero out fbdev screen private as its supposed to be
commit e0ccbaab226bd3e1d619d66c9ec718c67c0a559a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 28 20:58:21 2000 +0000
kdrive: fix typo initializing touch screen
commit 6171187e92152a443f7d5dd7f0dad866b3e275ea
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 27 20:47:37 2000 +0000
kdrive: memory/fd leaks fixed in fbdev/vesa/trident drivers
commit 367cab99ece8655bbd8a65096bb68bcfd7ef6fea
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Tue Sep 26 15:57:04 2000 +0000
721. PCI chip ID updates to ATI driver (Marc La France).
720. Fix i810 driver for -probe and -configure (Marc La France).
719. Change message when default modes are deleted (Marc La France).
718. Fix Xinerama byte swapping bug (Marc La France).
717. IA-64 and Alpha fixes for pswrap, Mesa, DRI, Xpm, libX11, Xt, Xaw,
Xmu, dps, Type1 fonts, cfb24, most output drivers, ELF loader, ramdac
module, xf4bpp and xf86cfg (Marc La France).
716. Improve IA-64 support by removing a plethora of 32-bit'isms (Marc La
France).
715. Default HasLinuxDoc to NO (Marc La France).
ident lines and warning fixes.
commit 94368c3b92b8513d5135fb3c20165f108b0e96fd
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 26 04:31:23 2000 +0000
kdrive: Add iPAQ and Touch screen support
commit 03e3689701007ea40422b4d729b65aaebcd84869
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sun Sep 24 13:52:40 2000 +0000
reversed a tag accidentally - put it back.
commit 61e8a40f0d4e886bec96c3f9ee90433a3fab9d54
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sun Sep 24 13:51:22 2000 +0000
DRI merge
commit 2bbb90ebd927607e0b2c7cd8f3a402b44705fe03
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 22 06:25:29 2000 +0000
Changes for PPC support under linux and a few overlay additions
commit 02777941e6ac8c79f934ba95b6b2e7f388ffbd14
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 19 23:50:48 2000 +0000
kdrive: fix bug in vesa 4plane in 8bpp mode
commit 5b9f49f64c7fb51afbfaab4f848fc7d67851582c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 19 23:49:55 2000 +0000
kdrive: use VESA instead of FBDEV for trident driver
commit 18692160c964c80ba83b63bc207660b6254e11cb
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 19 23:49:17 2000 +0000
kdrive: make sure allocation worked before accessing
commit d6e151ce4deaff506c580da7e3baf055db1c3ae3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 15 15:19:00 2000 +0000
Tiny-X: Add mouse matrix to rotate mouse, allow enable to fail, add render
by default
commit f7421d836186cd6dfb919c5a48d556a68d6c5a5d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 15 07:25:13 2000 +0000
Add rotation to fbdev and vesa
commit 5ec29fe9ea788e0dcc47534a2eca479b2c465160
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Thu Sep 7 19:44:26 2000 +0000
Ident lines
commit db1a883d32ce8138dde288d32c11e147cdfc81a0
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 3 05:12:28 2000 +0000
Rework tiny-x vesa driver for shadowing and multiple screen support. Allow
enable to fail and avoid crashing
commit c97fb611dd7dedef6d075ef9d56f3d32c8018d39
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 3 05:11:46 2000 +0000
Rework vesa driver for shadowing and multiple screen support. Allow enable
to fail and avoid crashing
commit 38059656849a5bab5b56b23359a90aca4ba396c7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 29 17:20:15 2000 +0000
Use VESA driver underneath
commit 77331f967077ca2fefbfb117c7e9bc2bf65b5e31
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 29 17:19:51 2000 +0000
Changes from Juliusz for emulating some in/out insns, make ready for other
layers to use
commit 3095deed7701a1a14be85dff4a6994028b5a6d09
Author: David Dawes <dawes@xfree86.org>
Date: Mon Aug 28 15:29:19 2000 +0000
565. Support for multithreaded libraries on NetBSD when used in conjunction
with the GNU pth library (#4113, Chris Sekiya).
564. Add /usr/pkg/bin to NetBSD's DefaultUserPath (#4112, Bernd Ernesti).
563. Add a (Linux-specific) VESA driver for Keith's small X server (#4111,
Juliusz Chroboczek).
562. Update Hungarian xkb maps (#A.145, Peter Soos). remove koi8-r encoding
file since it's built-in
commit f32448679118b77825625aafdc4d6ae4d636cc21
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Mon Aug 28 02:43:14 2000 +0000
Ident lines
commit 83a388c96d665b6bfb0ae195c8c74e0e1520ab8f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 26 00:24:38 2000 +0000
Try to avoid hitting hardware during server reset when not active, add
KdPicture code
commit 4223801110c8d5873dd668880dff411765dfc18d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 9 17:52:45 2000 +0000
Add overlay support for savage. Make sis setup code work on nIc
commit 325fb002e8832a05361516bbaf19d1e8b67a3486
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 24 23:57:56 2000 +0000
Fix 640x480x60 mode, drop inb/outb on non-x86 machines
commit a6d519e527a81341ad333cb25b410dfde07176ae
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 24 23:52:48 2000 +0000
Add modes, cursors and acceleration
commit 240aeb4cda91d19f5b19ebd7f7d6c1aad19f1642
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Thu May 11 18:14:13 2000 +0000
162. Fix possible SEGV in generic int10 module (Marc La France).
161. Fix *BSD aperture driver to allow for int10 (Bernd Ernesti, Marc La
France).
160. Fix vesafb restore problem in ATI driver (Marc La France).
159. Fix a few more compilation glitches (Marc La France).
commit 3731c184d69e3c1face0c731926433d522d48067
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 6 22:17:53 2000 +0000
Lots of Tiny-X changes:
Add overlay support in the Tiny-X Savage4 driver (required changing lots of
Tiny-X code). Savage4 now support 8/16, 8/32 overlays.
Add IGS Cyberpro 5050 driver. This chip has bus support for embeded
systems.
commit 4b54f22b6accf438f31fbbe79877545c38375351
Author: David Dawes <dawes@xfree86.org>
Date: Wed Feb 23 20:30:15 2000 +0000
remove/disable standard RCS ident lines that are in some files some bindist
updates don't define noPanoramiXExtension when Xinerama is not enabled
Add xfontsel to programs/Imakefile
commit be2dad5954b8fee09a84f417e41bb65745dadf76
Author: David Dawes <dawes@xfree86.org>
Date: Fri Jan 21 18:41:49 2000 +0000
missing ident lines
commit 306ac1db85c30a796c9a69c639e7f2e4efd98d50
Author: David Dawes <dawes@xfree86.org>
Date: Fri Jan 21 01:12:02 2000 +0000
3554. Fix "controlization" in XLookupString for chars > 127 (#3569, Ivan
Pascal).
3553. Take advantage of FB speedups in Tiny-X (#3568, Keith Packard).
3552. Speed up FB and do 32bit accesses instead of 64bit accesses (#3567,
Keith Packard).
3551. Eliminate saving the contents of the screen durint VT switching
(#3562, Keith Packard).
3550. Make using fb easier for driver writers (#3561, Keith Packard).
3549. Fix TCP font server connections (#3560, Keith Packard).
3548. Implement the "OverclockMem" option for the Millennium and Millennium
II (#3558, Andrew Aitchison).
3547. Speed up some FB performance problems (#3557, 3559, 3560, Keith
Packard).
3546. Work around a bad code generation bug in gcc 2.7.2.3 that shows up in
XAA (#3550, Rik Faith).
3545. Add a -brief option to xclock to show only hours and minutes when in
digital mode (#3549, Keith Packard).
3544. Fix some dead key problems with xkb symbols for Swiss French and
Swiss German keyboards (#3546, Charles Lopes).
commit 6d978d21b0bea6c73b65f2f47c68de4b94dd73c4
Author: Robin Cutshaw <robin@intercore.com>
Date: Thu Dec 30 03:42:58 1999 +0000
Itsy cleanup.
commit 30e35cb44b6ea11d0eac8ce0d986517f3224852a
Author: Robin Cutshaw <robin@intercore.com>
Date: Thu Dec 30 03:03:21 1999 +0000
3516. Jumbo Tiny-X patch with Itsy support (#3527, Keith Packard).
commit f13b792a3a8d307a18cd6a41aa5a06622009e42f
Author: Dirk Hohndel <dirk.hohndel@intel.com>
Date: Fri Nov 19 13:54:06 1999 +0000
3336. Fx up new MMIO macros (#3337, Matt Grossman).
3335. Clean up compiler warnings in lib/font/bitmap (#3411, Matt Grossman).
3334. TGA fixes, add sync on green (#3410, Matt Grossman).
3333. Fix NULL pointer dereference in libXaw (#3406, Christopher Sekiya).
3332. Add Rage128 support (#3405, Rik Faith, funded by ATI).
3331. Add MTRR support for NetBSD and OpenBSD. Add new NetBSD aperture
driver (#3404, Matthieu Herrb).
3330. Xterm patch #121 (#3402, Thomas Dickey).
3329. Rendition driver bugfixes and alpha related cleanups (#3400, Dejan
Ilic, Marc Langenbach, Egbert Eich).
3328. Add void input device (#3392, Frederic Lepied).
3327. Changed the Xon serial option to be able to select xon/xoff for
input, output or both. Add support for Graphire models. Change wacom
init phase to use new Xoff option (#3391, Frederic Lepied).
3326. Change the SwapAxes option to SwapXY in elographics/microtouch driver
to match an already existing option in the Dynapro driver. Add a Focus
class capability to the elographics driver (#3395, Patrick Lecoanet).
3325. Update mouse rate handling (#3388, Harald Koenig).
3324. Fix NULL pointer dereference in misprite.c (#3380, Edward Wang).
3323. Add FBDev and ShadowFB support to glint driver. Add new option
"NoWriteBitmap" (#3383, Michel Daenzer).
3322. Update SuperProbe to handle S3 Savage4, Savage200 and clean up
Trio3D/Savage3D detection (#3382,3384 Harald Koenig).
3321. Add new framebuffer code and tiny X DDX architecture (#3379, Keith
Packard).
3320. Add DGA2 documentation (#3378, Mark Vojkovich).
3319. Update XFree86 manpage wrt -bpp/-depth/-fbbpp (#3377, Andy Isaacson).
3318. Make SuperProbe check primary cards, only (#3374, Harald Koenig).
3317. Add SilkenMouse to *BSD (#3373, Matthieu Herrb).
3316. Allow SilkenMouse to work if not all drivers of an OS support SIGIO
(#3372, Keith Packard).
3315. Fix a few problems in TGA driver and add support for backing store
and SilkenMouse (#3371, Matt Grossman).
3314. Add smarter scheduler (#3370, Keith Packard).
3313. Xterm patch #120 (#3369, Thomas Dickey).
3312. Enable xf86SetKbdRate function on Solaris 8 (#3364, David Holland).
3311. Fix some bugs and add acceleration to Rendition server (#3360, Dejan
Ilic).
3310. Make raw DDC information available as properties in the root window
(#3357, Andrew Aitchison).
3309. Fix for xf86CreateRootWindow (#3355, Andrew Aitchison).
3308. Add manpage for the chips driver (#3353, David Bateman).
3307. Update contact info (#3352, Andrew van der Stock).
3306. Add kbd rate support for Linux (#3363, Harald Koenig).
3305. Update Portuguese XKB map (#3351, Joao Esteves, Francisco Colaco).
3304. Fix text clipping in 3dfx driver (#3349, Henrik Harmsen).
3303. Fix S3 ViRGE hw cursor (#3348, Harald Koenig).
3302. Fix clipping in 3dfx driver (#3342, Daryll Strauss).
3301. Enable SilkenMouse for 3dfx driver (#3341, Henrik Harmsen).
3300. Enable SIGIO support on LynxOS (#3339, Thomas Mueller).
3299. Get TRUE defined in sigio.c. Fix xterm compile problem on ISC (#3338,
Michael Rohleder).
3298. Correct DPMS suspend/standby modes for 3dfx driver (#3336, Henrik
Harmsen)
3297. Xterm patch #119 (#3335, Thomas Dickey).
|