Commit ead9d0cb6203c4582e9233abe86565504316488f
2012-02-15T11:49:10
Move include path from X11/extensions/ to xkbcommon/ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
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
diff --git a/include/Makefile.am b/include/Makefile.am
index f487fa7..b929cf9 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-nobase_include_HEADERS = X11/extensions/XKBcommon.h
+nobase_include_HEADERS = xkbcommon/xkbcommon.h
diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
deleted file mode 100644
index b353759..0000000
--- a/include/X11/extensions/XKBcommon.h
+++ /dev/null
@@ -1,841 +0,0 @@
-/*
-Copyright 1985, 1987, 1990, 1998 The Open Group
-Copyright 2008 Dan Nicholson
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the authors or their
-institutions shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization from the authors.
-*/
-
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-
-#ifndef _XKBCOMMON_H_
-#define _XKBCOMMON_H_
-
-#include <stdint.h>
-#include <stdio.h>
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/XKB.h>
-
-#ifndef X_PROTOCOL
-typedef unsigned char KeyCode;
-#endif
-
-/* Duplicate the modifier mask defines so libxkcommon can be used
- * without X.h */
-#define XKB_COMMON_SHIFT_MASK (1<<0)
-#define XKB_COMMON_LOCK_MASK (1<<1)
-#define XKB_COMMON_CONTROL_MASK (1<<2)
-#define XKB_COMMON_MOD1_MASK (1<<3)
-#define XKB_COMMON_MOD2_MASK (1<<4)
-#define XKB_COMMON_MOD3_MASK (1<<5)
-#define XKB_COMMON_MOD4_MASK (1<<6)
-#define XKB_COMMON_MOD5_MASK (1<<7)
-
-
-struct xkb_rule_names {
- const char * rules;
- const char * model;
- const char * layout;
- const char * variant;
- const char * options;
-};
-
-struct xkb_any_action {
- uint8_t type;
- uint8_t data[7];
-};
-
-struct xkb_mod_action {
- uint8_t type;
- uint8_t flags;
- uint8_t mask;
- uint8_t real_mods;
- uint16_t vmods;
-};
-
-struct xkb_group_action {
- uint8_t type;
- uint8_t flags;
- int16_t group;
-};
-
-struct xkb_iso_action {
- uint8_t type;
- uint8_t flags;
- uint8_t mask;
- uint8_t real_mods;
- uint8_t group;
- uint8_t affect;
- uint16_t vmods;
-};
-
-struct xkb_controls_action {
- uint8_t type;
- uint8_t flags;
- uint32_t ctrls;
-};
-
-struct xkb_device_button_action {
- uint8_t type;
- uint8_t flags;
- uint8_t count;
- uint8_t button;
- uint8_t device;
-};
-
-struct xkb_device_valuator_action {
- uint8_t type;
- uint8_t device;
- uint8_t v1_what;
- uint8_t v1_index;
- uint8_t v1_value;
- uint8_t v2_what;
- uint8_t v2_index;
- uint8_t v2_value;
-};
-
-struct xkb_pointer_default_action {
- uint8_t type;
- uint8_t flags;
- uint8_t affect;
- uint8_t value;
-};
-
-struct xkb_switch_screen_action {
- uint8_t type;
- uint8_t flags;
- uint8_t screen;
-};
-
-struct xkb_redirect_key_action {
- uint8_t type;
- uint8_t new_key;
- uint8_t mods_mask;
- uint8_t mods;
- uint16_t vmods_mask;
- uint16_t vmods;
-};
-
-struct xkb_pointer_action {
- uint8_t type;
- uint8_t flags;
- uint16_t x;
- uint16_t y;
-};
-
-struct xkb_message_action {
- uint8_t type;
- uint8_t flags;
- uint8_t message[6];
-};
-
-struct xkb_pointer_button_action {
- uint8_t type;
- uint8_t flags;
- uint8_t count;
- uint8_t button;
-};
-
-union xkb_action {
- struct xkb_any_action any;
- struct xkb_mod_action mods;
- struct xkb_group_action group;
- struct xkb_iso_action iso;
- struct xkb_controls_action ctrls;
- struct xkb_device_button_action devbtn;
- struct xkb_device_valuator_action devval;
- struct xkb_pointer_default_action dflt;
- struct xkb_switch_screen_action screen;
- struct xkb_redirect_key_action redirect; /* XXX wholly unnecessary? */
- struct xkb_pointer_action ptr; /* XXX delete for DeviceValuator */
- struct xkb_pointer_button_action btn; /* XXX delete for DeviceBtn */
- struct xkb_message_action msg; /* XXX just delete */
- unsigned char type;
-};
-
-struct xkb_mods {
- uint32_t mask; /* effective mods */
- uint32_t vmods;
- uint8_t real_mods;
-};
-
-struct xkb_kt_map_entry {
- int active;
- uint16_t level;
- struct xkb_mods mods;
-};
-
-struct xkb_key_type {
- struct xkb_mods mods;
- uint16_t num_levels;
- unsigned char map_count;
- struct xkb_kt_map_entry * map;
- struct xkb_mods * preserve;
- uint32_t name;
- uint32_t *level_names;
-};
-
-struct xkb_sym_interpret {
- uint32_t sym;
- unsigned char flags;
- unsigned char match;
- uint8_t mods; /* XXX real or virt? */
- uint32_t virtual_mod;
- struct xkb_any_action act;
-};
-
-struct xkb_compat_map {
- struct xkb_sym_interpret * sym_interpret;
- struct xkb_mods groups[XkbNumKbdGroups];
- unsigned short num_si;
- unsigned short size_si;
-};
-
-struct xkb_sym_map {
- unsigned char kt_index[XkbNumKbdGroups];
- unsigned char group_info;
- unsigned char width;
- unsigned short offset;
-};
-
-#define XkbNumGroups(g) ((g)&0x0f)
-#define XkbOutOfRangeGroupInfo(g) ((g)&0xf0)
-#define XkbOutOfRangeGroupAction(g) ((g)&0xc0)
-#define XkbOutOfRangeGroupNumber(g) (((g)&0x30)>>4)
-#define XkbSetGroupInfo(g,w,n) (((w)&0xc0)|(((n)&3)<<4)|((g)&0x0f))
-#define XkbSetNumGroups(g,n) (((g)&0xf0)|((n)&0x0f))
-
-struct xkb_client_map {
- unsigned char size_types;
- unsigned char num_types;
- struct xkb_key_type * types;
-
- unsigned short size_syms;
- unsigned short num_syms;
- uint32_t *syms;
- struct xkb_sym_map * key_sym_map;
-
- unsigned char *modmap;
-};
-
-#define XkbCMKeyGroupInfo(m,k) ((m)->key_sym_map[k].group_info)
-#define XkbCMKeyNumGroups(m,k) (XkbNumGroups((m)->key_sym_map[k].group_info))
-#define XkbCMKeyGroupWidth(m,k,g) (XkbCMKeyType(m,k,g)->num_levels)
-#define XkbCMKeyGroupsWidth(m,k) ((m)->key_sym_map[k].width)
-#define XkbCMKeyTypeIndex(m,k,g) ((m)->key_sym_map[k].kt_index[g&0x3])
-#define XkbCMKeyType(m,k,g) (&(m)->types[XkbCMKeyTypeIndex(m,k,g)])
-#define XkbCMKeyNumSyms(m,k) (XkbCMKeyGroupsWidth(m,k)*XkbCMKeyNumGroups(m,k))
-#define XkbCMKeySymsOffset(m,k) ((m)->key_sym_map[k].offset)
-#define XkbCMKeySymsPtr(m,k) (&(m)->syms[XkbCMKeySymsOffset(m,k)])
-
-struct xkb_behavior {
- unsigned char type;
- unsigned char data;
-};
-
-struct xkb_server_map {
- unsigned short num_acts;
- unsigned short size_acts;
-
-#if defined(__cplusplus) || defined(c_plusplus)
- /* explicit is a C++ reserved word */
- unsigned char * c_explicit;
-#else
- unsigned char * explicit;
-#endif
-
- union xkb_action *acts;
- struct xkb_behavior *behaviors;
- unsigned short *key_acts;
- unsigned char *explicits;
- uint32_t vmods[XkbNumVirtualMods];
- uint32_t *vmodmap;
-};
-
-#define XkbSMKeyActionsPtr(m,k) (&(m)->acts[(m)->key_acts[k]])
-
-struct xkb_indicator_map {
- unsigned char flags;
- unsigned char which_groups;
- unsigned char groups;
- unsigned char which_mods;
- struct xkb_mods mods;
- unsigned int ctrls;
-};
-
-struct xkb_indicator {
- unsigned long phys_indicators;
- struct xkb_indicator_map maps[XkbNumIndicators];
-};
-
-struct xkb_key_name {
- char name[XkbKeyNameLength];
-};
-
-struct xkb_key_alias {
- char real[XkbKeyNameLength];
- char alias[XkbKeyNameLength];
-};
-
-struct xkb_names {
- uint32_t keycodes;
- uint32_t geometry;
- uint32_t symbols;
- uint32_t types;
- uint32_t compat;
- uint32_t vmods[XkbNumVirtualMods];
- uint32_t indicators[XkbNumIndicators];
- uint32_t groups[XkbNumKbdGroups];
- struct xkb_key_name * keys;
- struct xkb_key_alias * key_aliases;
- uint32_t *radio_groups;
- uint32_t phys_symbols;
-
- unsigned char num_keys;
- unsigned char num_key_aliases;
- unsigned short num_rg;
-};
-
-struct xkb_property {
- char *name;
- char *value;
-};
-
-struct xkb_color {
- unsigned int pixel;
- char * spec;
-};
-
-struct xkb_point {
- short x;
- short y;
-};
-
-struct xkb_bounds {
- short x1,y1;
- short x2,y2;
-};
-
-struct xkb_outline {
- unsigned short num_points;
- unsigned short sz_points;
- unsigned short corner_radius;
- struct xkb_point * points;
-};
-
-struct xkb_shape {
- uint32_t name;
- unsigned short num_outlines;
- unsigned short sz_outlines;
- struct xkb_outline * outlines;
- struct xkb_outline * approx;
- struct xkb_outline * primary;
- struct xkb_bounds bounds;
-};
-
-struct xkb_shape_doodad {
- uint32_t name;
- unsigned char type;
- unsigned char priority;
- short top;
- short left;
- short angle;
- unsigned short color_ndx;
- unsigned short shape_ndx;
-};
-#define XkbShapeDoodadColor(g,d) (&(g)->colors[(d)->color_ndx])
-#define XkbShapeDoodadShape(g,d) (&(g)->shapes[(d)->shape_ndx])
-#define XkbSetShapeDoodadColor(g,d,c) ((d)->color_ndx= (c)-&(g)->colors[0])
-#define XkbSetShapeDoodadShape(g,d,s) ((d)->shape_ndx= (s)-&(g)->shapes[0])
-
-struct xkb_text_doodad {
- uint32_t name;
- unsigned char type;
- unsigned char priority;
- short top;
- short left;
- short angle;
- short width;
- short height;
- unsigned short color_ndx;
- char * text;
- char * font;
-};
-#define XkbTextDoodadColor(g,d) (&(g)->colors[(d)->color_ndx])
-#define XkbSetTextDoodadColor(g,d,c) ((d)->color_ndx= (c)-&(g)->colors[0])
-
-struct xkb_indicator_doodad {
- uint32_t name;
- unsigned char type;
- unsigned char priority;
- short top;
- short left;
- short angle;
- unsigned short shape_ndx;
- unsigned short on_color_ndx;
- unsigned short off_color_ndx;
-};
-#define XkbIndicatorDoodadShape(g,d) (&(g)->shapes[(d)->shape_ndx])
-#define XkbIndicatorDoodadOnColor(g,d) (&(g)->colors[(d)->on_color_ndx])
-#define XkbIndicatorDoodadOffColor(g,d) (&(g)->colors[(d)->off_color_ndx])
-#define XkbSetIndicatorDoodadOnColor(g,d,c) \
- ((d)->on_color_ndx= (c)-&(g)->colors[0])
-#define XkbSetIndicatorDoodadOffColor(g,d,c) \
- ((d)->off_color_ndx= (c)-&(g)->colors[0])
-#define XkbSetIndicatorDoodadShape(g,d,s) \
- ((d)->shape_ndx= (s)-&(g)->shapes[0])
-
-struct xkb_logo_doodad {
- uint32_t name;
- unsigned char type;
- unsigned char priority;
- short top;
- short left;
- short angle;
- unsigned short color_ndx;
- unsigned short shape_ndx;
- char * logo_name;
-};
-#define XkbLogoDoodadColor(g,d) (&(g)->colors[(d)->color_ndx])
-#define XkbLogoDoodadShape(g,d) (&(g)->shapes[(d)->shape_ndx])
-#define XkbSetLogoDoodadColor(g,d,c) ((d)->color_ndx= (c)-&(g)->colors[0])
-#define XkbSetLogoDoodadShape(g,d,s) ((d)->shape_ndx= (s)-&(g)->shapes[0])
-
-struct xkb_any_doodad {
- uint32_t name;
- unsigned char type;
- unsigned char priority;
- short top;
- short left;
- short angle;
-};
-
-union xkb_doodad {
- struct xkb_any_doodad any;
- struct xkb_shape_doodad shape;
- struct xkb_text_doodad text;
- struct xkb_indicator_doodad indicator;
- struct xkb_logo_doodad logo;
-};
-
-#define XkbUnknownDoodad 0
-#define XkbOutlineDoodad 1
-#define XkbSolidDoodad 2
-#define XkbTextDoodad 3
-#define XkbIndicatorDoodad 4
-#define XkbLogoDoodad 5
-
-struct xkb_key {
- struct xkb_key_name name;
- short gap;
- unsigned char shape_ndx;
- unsigned char color_ndx;
-};
-#define XkbKeyShape(g,k) (&(g)->shapes[(k)->shape_ndx])
-#define XkbKeyColor(g,k) (&(g)->colors[(k)->color_ndx])
-#define XkbSetKeyShape(g,k,s) ((k)->shape_ndx= (s)-&(g)->shapes[0])
-#define XkbSetKeyColor(g,k,c) ((k)->color_ndx= (c)-&(g)->colors[0])
-
-struct xkb_row {
- short top;
- short left;
- unsigned short num_keys;
- unsigned short sz_keys;
- int vertical;
- struct xkb_key * keys;
- struct xkb_bounds bounds;
-};
-
-struct xkb_section {
- uint32_t name;
- unsigned char priority;
- short top;
- short left;
- unsigned short width;
- unsigned short height;
- short angle;
- unsigned short num_rows;
- unsigned short num_doodads;
- unsigned short num_overlays;
- unsigned short sz_rows;
- unsigned short sz_doodads;
- unsigned short sz_overlays;
- struct xkb_row * rows;
- union xkb_doodad * doodads;
- struct xkb_bounds bounds;
- struct xkb_overlay *overlays;
-};
-
-struct xkb_overlay_key {
- struct xkb_key_name over;
- struct xkb_key_name under;
-};
-
-struct xkb_overlay_row {
- unsigned short row_under;
- unsigned short num_keys;
- unsigned short sz_keys;
- struct xkb_overlay_key * keys;
-};
-
-struct xkb_overlay {
- uint32_t name;
- struct xkb_section * section_under;
- unsigned short num_rows;
- unsigned short sz_rows;
- struct xkb_overlay_row * rows;
- struct xkb_bounds * bounds;
-};
-
-struct xkb_geometry {
- uint32_t name;
- unsigned short width_mm;
- unsigned short height_mm;
- char * label_font;
- struct xkb_color * label_color;
- struct xkb_color * base_color;
- unsigned short sz_properties;
- unsigned short sz_colors;
- unsigned short sz_shapes;
- unsigned short sz_sections;
- unsigned short sz_doodads;
- unsigned short sz_key_aliases;
- unsigned short num_properties;
- unsigned short num_colors;
- unsigned short num_shapes;
- unsigned short num_sections;
- unsigned short num_doodads;
- unsigned short num_key_aliases;
- struct xkb_property * properties;
- struct xkb_color * colors;
- struct xkb_shape * shapes;
- struct xkb_section * sections;
- union xkb_doodad * doodads;
- struct xkb_key_alias * key_aliases;
-};
-#define XkbGeomColorIndex(g,c) ((int)((c)-&(g)->colors[0]))
-
-#define XkbGeomPropertiesMask (1<<0)
-#define XkbGeomColorsMask (1<<1)
-#define XkbGeomShapesMask (1<<2)
-#define XkbGeomSectionsMask (1<<3)
-#define XkbGeomDoodadsMask (1<<4)
-#define XkbGeomKeyAliasesMask (1<<5)
-#define XkbGeomAllMask (0x3f)
-
-struct xkb_geometry_sizes {
- unsigned int which;
- unsigned short num_properties;
- unsigned short num_colors;
- unsigned short num_shapes;
- unsigned short num_sections;
- unsigned short num_doodads;
- unsigned short num_key_aliases;
-};
-
-struct xkb_controls {
- unsigned char mk_dflt_btn;
- unsigned char num_groups;
- unsigned char groups_wrap;
- struct xkb_mods internal;
- struct xkb_mods ignore_lock;
- unsigned int enabled_ctrls;
- unsigned short repeat_delay;
- unsigned short repeat_interval;
- unsigned short slow_keys_delay;
- unsigned short debounce_delay;
- unsigned short mk_delay;
- unsigned short mk_interval;
- unsigned short mk_time_to_max;
- unsigned short mk_max_speed;
- short mk_curve;
- unsigned short ax_options;
- unsigned short ax_timeout;
- unsigned short axt_opts_mask;
- unsigned short axt_opts_values;
- unsigned int axt_ctrls_mask;
- unsigned int axt_ctrls_values;
- unsigned char per_key_repeat[XkbPerKeyBitArraySize];
-};
-
-/* Common keyboard description structure */
-struct xkb_desc {
- unsigned int defined;
- unsigned short flags;
- unsigned short device_spec;
- KeyCode min_key_code;
- KeyCode max_key_code;
-
- struct xkb_controls * ctrls;
- struct xkb_server_map * server;
- struct xkb_client_map * map;
- struct xkb_indicator * indicators;
- struct xkb_names * names;
- struct xkb_compat_map * compat;
- struct xkb_geometry * geom;
-};
-
-#define XkbKeyKeyTypeIndex(d,k,g) (XkbCMKeyTypeIndex((d)->map,k,g))
-#define XkbKeyKeyType(d,k,g) (XkbCMKeyType((d)->map,k,g))
-#define XkbKeyGroupWidth(d,k,g) (XkbCMKeyGroupWidth((d)->map,k,g))
-#define XkbKeyGroupsWidth(d,k) (XkbCMKeyGroupsWidth((d)->map,k))
-#define XkbKeyGroupInfo(d,k) (XkbCMKeyGroupInfo((d)->map,(k)))
-#define XkbKeyNumGroups(d,k) (XkbCMKeyNumGroups((d)->map,(k)))
-#define XkbKeyNumSyms(d,k) (XkbCMKeyNumSyms((d)->map,(k)))
-#define XkbKeySymsPtr(d,k) (XkbCMKeySymsPtr((d)->map,(k)))
-#define XkbKeySym(d,k,n) (XkbKeySymsPtr(d,k)[n])
-#define XkbKeySymEntry(d,k,sl,g) \
- (XkbKeySym(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))))
-#define XkbKeyAction(d,k,n) \
- (XkbKeyHasActions(d,k)?&XkbKeyActionsPtr(d,k)[n]:NULL)
-#define XkbKeyActionEntry(d,k,sl,g) \
- (XkbKeyHasActions(d,k)?\
- XkbKeyAction(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))):NULL)
-
-#define XkbKeyHasActions(d,k) ((d)->server->key_acts[k]!=0)
-#define XkbKeyNumActions(d,k) (XkbKeyHasActions(d,k)?XkbKeyNumSyms(d,k):1)
-#define XkbKeyActionsPtr(d,k) (XkbSMKeyActionsPtr((d)->server,k))
-#define XkbKeycodeInRange(d,k) (((k)>=(d)->min_key_code)&&\
- ((k)<=(d)->max_key_code))
-#define XkbNumKeys(d) ((d)->max_key_code-(d)->min_key_code+1)
-
-struct xkb_map_changes {
- unsigned short changed;
- KeyCode min_key_code;
- KeyCode max_key_code;
- unsigned char first_type;
- unsigned char num_types;
- KeyCode first_key_sym;
- unsigned char num_key_syms;
- KeyCode first_key_act;
- unsigned char num_key_acts;
- KeyCode first_key_behavior;
- unsigned char num_key_behaviors;
- KeyCode first_key_explicit;
- unsigned char num_key_explicit;
- KeyCode first_modmap_key;
- unsigned char num_modmap_keys;
- KeyCode first_vmodmap_key;
- unsigned char num_vmodmap_keys;
- unsigned char pad;
- unsigned short vmods;
-};
-
-struct xkb_controls_changes {
- unsigned int changed_ctrls;
- unsigned int enabled_ctrls_changes;
- int num_groups_changed;
-};
-
-struct xkb_indicator_changes {
- unsigned int state_changes;
- unsigned int map_changes;
-};
-
-struct xkb_name_changes {
- unsigned int changed;
- unsigned char first_type;
- unsigned char num_types;
- unsigned char first_lvl;
- unsigned char num_lvls;
- unsigned char num_aliases;
- unsigned char num_rg;
- unsigned char first_key;
- unsigned char num_keys;
- unsigned short changed_vmods;
- unsigned long changed_indicators;
- unsigned char changed_groups;
-};
-
-struct xkb_compat_changes {
- unsigned char changed_groups;
- unsigned short first_si;
- unsigned short num_si;
-};
-
-struct xkb_changes {
- unsigned short device_spec;
- unsigned short state_changes;
- struct xkb_map_changes map;
- struct xkb_controls_changes ctrls;
- struct xkb_indicator_changes indicators;
- struct xkb_name_changes names;
- struct xkb_compat_changes compat;
-};
-
-struct xkb_component_names {
- char * keymap;
- char * keycodes;
- char * types;
- char * compat;
- char * symbols;
- char * geometry;
-};
-
-struct xkb_component_name {
- unsigned short flags;
- char * name;
-};
-
-struct xkb_component_list {
- int num_keymaps;
- int num_keycodes;
- int num_types;
- int num_compat;
- int num_symbols;
- int num_geometry;
- struct xkb_component_name * keymaps;
- struct xkb_component_name * keycodes;
- struct xkb_component_name * types;
- struct xkb_component_name * compat;
- struct xkb_component_name * symbols;
- struct xkb_component_name * geometry;
-};
-
-struct xkb_state {
- unsigned char group; /* base + latched + locked */
- /* FIXME: Why are base + latched short and not char?? */
- unsigned short base_group; /* physically ... down? */
- unsigned short latched_group;
- unsigned char locked_group;
-
- unsigned char mods; /* base + latched + locked */
- unsigned char base_mods; /* physically down */
- unsigned char latched_mods;
- unsigned char locked_mods;
-
- unsigned char compat_state; /* mods + group for core state */
-
- /* grab mods = all depressed and latched mods, _not_ locked mods */
- unsigned char grab_mods; /* grab mods minus internal mods */
- unsigned char compat_grab_mods; /* grab mods + group for core state,
- but not locked groups if
- IgnoreGroupLocks set */
-
- /* effective mods = all mods (depressed, latched, locked) */
- unsigned char lookup_mods; /* effective mods minus internal mods */
- unsigned char compat_lookup_mods; /* effective mods + group */
-
- unsigned short ptr_buttons; /* core pointer buttons */
-};
-
-#define XkbStateFieldFromRec(s) XkbBuildCoreState((s)->lookup_mods,(s)->group)
-#define XkbGrabStateFromRec(s) XkbBuildCoreState((s)->grab_mods,(s)->group)
-
-#define XkbNumGroups(g) ((g)&0x0f)
-#define XkbOutOfRangeGroupInfo(g) ((g)&0xf0)
-#define XkbOutOfRangeGroupAction(g) ((g)&0xc0)
-#define XkbOutOfRangeGroupNumber(g) (((g)&0x30)>>4)
-#define XkbSetNumGroups(g,n) (((g)&0xf0)|((n)&0x0f))
-
-_XFUNCPROTOBEGIN
-
-typedef uint32_t (*InternAtomFuncPtr)(const char *val);
-typedef const char *(*GetAtomValueFuncPtr)(uint32_t atom);
-
-_X_EXPORT extern void
-xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value);
-
-_X_EXPORT extern uint32_t
-xkb_intern_atom(const char *name);
-
-_X_EXPORT extern struct xkb_desc *
-xkb_compile_keymap_from_rules(const struct xkb_rule_names *rules);
-
-_X_EXPORT extern struct xkb_desc *
-xkb_compile_keymap_from_components(const struct xkb_component_names * ktcsg);
-
-_X_EXPORT extern struct xkb_desc *
-xkb_compile_keymap_from_file(FILE *inputFile, const char *mapName);
-
-_X_EXPORT extern struct xkb_desc *
-xkb_compile_keymap_from_string(const char *string, const char *mapName);
-
-_X_EXPORT extern void
-xkb_free_keymap(struct xkb_desc *xkb);
-
-_X_EXPORT extern struct xkb_component_list *
-xkb_list_components(struct xkb_component_names * ptrns, int *maxMatch);
-
-/*
- * Canonicalises component names by prepending the relevant component from
- * 'old' to the one in 'names' when the latter has a leading '+' or '|', and
- * by replacing a '%' with the relevant component, e.g.:
- *
- * names old output
- * ------------------------------------------
- * +bar foo foo+bar
- * |quux baz baz|quux
- * foo+%|baz bar foo+bar|baz
- *
- * If a component in names needs to be modified, the existing value will be
- * free()d, and a new one allocated with malloc().
- */
-_X_EXPORT extern void
-xkb_canonicalise_components(struct xkb_component_names * names,
- const struct xkb_component_names * old);
-
-/*
- * Converts a keysym to a string; will return unknown Unicode codepoints
- * as "Ua1b2", and other unknown keysyms as "0xabcd1234".
- *
- * This is uint32_t rather than KeySym, as KeySym changes size between
- * client and server (no, really).
- */
-_X_EXPORT extern void
-xkb_keysym_to_string(uint32_t ks, char *buffer, size_t size);
-
-/*
- * See xkb_keysym_to_string comments: this function will accept any string
- * from that function.
- */
-_X_EXPORT extern uint32_t
-xkb_string_to_keysym(const char *s);
-
-_XFUNCPROTOEND
-
-#endif /* _XKBCOMMON_H_ */
diff --git a/include/xkbcommon/xkbcommon.h b/include/xkbcommon/xkbcommon.h
new file mode 100644
index 0000000..b353759
--- /dev/null
+++ b/include/xkbcommon/xkbcommon.h
@@ -0,0 +1,841 @@
+/*
+Copyright 1985, 1987, 1990, 1998 The Open Group
+Copyright 2008 Dan Nicholson
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+*/
+
+/************************************************************
+Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+
+#ifndef _XKBCOMMON_H_
+#define _XKBCOMMON_H_
+
+#include <stdint.h>
+#include <stdio.h>
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/XKB.h>
+
+#ifndef X_PROTOCOL
+typedef unsigned char KeyCode;
+#endif
+
+/* Duplicate the modifier mask defines so libxkcommon can be used
+ * without X.h */
+#define XKB_COMMON_SHIFT_MASK (1<<0)
+#define XKB_COMMON_LOCK_MASK (1<<1)
+#define XKB_COMMON_CONTROL_MASK (1<<2)
+#define XKB_COMMON_MOD1_MASK (1<<3)
+#define XKB_COMMON_MOD2_MASK (1<<4)
+#define XKB_COMMON_MOD3_MASK (1<<5)
+#define XKB_COMMON_MOD4_MASK (1<<6)
+#define XKB_COMMON_MOD5_MASK (1<<7)
+
+
+struct xkb_rule_names {
+ const char * rules;
+ const char * model;
+ const char * layout;
+ const char * variant;
+ const char * options;
+};
+
+struct xkb_any_action {
+ uint8_t type;
+ uint8_t data[7];
+};
+
+struct xkb_mod_action {
+ uint8_t type;
+ uint8_t flags;
+ uint8_t mask;
+ uint8_t real_mods;
+ uint16_t vmods;
+};
+
+struct xkb_group_action {
+ uint8_t type;
+ uint8_t flags;
+ int16_t group;
+};
+
+struct xkb_iso_action {
+ uint8_t type;
+ uint8_t flags;
+ uint8_t mask;
+ uint8_t real_mods;
+ uint8_t group;
+ uint8_t affect;
+ uint16_t vmods;
+};
+
+struct xkb_controls_action {
+ uint8_t type;
+ uint8_t flags;
+ uint32_t ctrls;
+};
+
+struct xkb_device_button_action {
+ uint8_t type;
+ uint8_t flags;
+ uint8_t count;
+ uint8_t button;
+ uint8_t device;
+};
+
+struct xkb_device_valuator_action {
+ uint8_t type;
+ uint8_t device;
+ uint8_t v1_what;
+ uint8_t v1_index;
+ uint8_t v1_value;
+ uint8_t v2_what;
+ uint8_t v2_index;
+ uint8_t v2_value;
+};
+
+struct xkb_pointer_default_action {
+ uint8_t type;
+ uint8_t flags;
+ uint8_t affect;
+ uint8_t value;
+};
+
+struct xkb_switch_screen_action {
+ uint8_t type;
+ uint8_t flags;
+ uint8_t screen;
+};
+
+struct xkb_redirect_key_action {
+ uint8_t type;
+ uint8_t new_key;
+ uint8_t mods_mask;
+ uint8_t mods;
+ uint16_t vmods_mask;
+ uint16_t vmods;
+};
+
+struct xkb_pointer_action {
+ uint8_t type;
+ uint8_t flags;
+ uint16_t x;
+ uint16_t y;
+};
+
+struct xkb_message_action {
+ uint8_t type;
+ uint8_t flags;
+ uint8_t message[6];
+};
+
+struct xkb_pointer_button_action {
+ uint8_t type;
+ uint8_t flags;
+ uint8_t count;
+ uint8_t button;
+};
+
+union xkb_action {
+ struct xkb_any_action any;
+ struct xkb_mod_action mods;
+ struct xkb_group_action group;
+ struct xkb_iso_action iso;
+ struct xkb_controls_action ctrls;
+ struct xkb_device_button_action devbtn;
+ struct xkb_device_valuator_action devval;
+ struct xkb_pointer_default_action dflt;
+ struct xkb_switch_screen_action screen;
+ struct xkb_redirect_key_action redirect; /* XXX wholly unnecessary? */
+ struct xkb_pointer_action ptr; /* XXX delete for DeviceValuator */
+ struct xkb_pointer_button_action btn; /* XXX delete for DeviceBtn */
+ struct xkb_message_action msg; /* XXX just delete */
+ unsigned char type;
+};
+
+struct xkb_mods {
+ uint32_t mask; /* effective mods */
+ uint32_t vmods;
+ uint8_t real_mods;
+};
+
+struct xkb_kt_map_entry {
+ int active;
+ uint16_t level;
+ struct xkb_mods mods;
+};
+
+struct xkb_key_type {
+ struct xkb_mods mods;
+ uint16_t num_levels;
+ unsigned char map_count;
+ struct xkb_kt_map_entry * map;
+ struct xkb_mods * preserve;
+ uint32_t name;
+ uint32_t *level_names;
+};
+
+struct xkb_sym_interpret {
+ uint32_t sym;
+ unsigned char flags;
+ unsigned char match;
+ uint8_t mods; /* XXX real or virt? */
+ uint32_t virtual_mod;
+ struct xkb_any_action act;
+};
+
+struct xkb_compat_map {
+ struct xkb_sym_interpret * sym_interpret;
+ struct xkb_mods groups[XkbNumKbdGroups];
+ unsigned short num_si;
+ unsigned short size_si;
+};
+
+struct xkb_sym_map {
+ unsigned char kt_index[XkbNumKbdGroups];
+ unsigned char group_info;
+ unsigned char width;
+ unsigned short offset;
+};
+
+#define XkbNumGroups(g) ((g)&0x0f)
+#define XkbOutOfRangeGroupInfo(g) ((g)&0xf0)
+#define XkbOutOfRangeGroupAction(g) ((g)&0xc0)
+#define XkbOutOfRangeGroupNumber(g) (((g)&0x30)>>4)
+#define XkbSetGroupInfo(g,w,n) (((w)&0xc0)|(((n)&3)<<4)|((g)&0x0f))
+#define XkbSetNumGroups(g,n) (((g)&0xf0)|((n)&0x0f))
+
+struct xkb_client_map {
+ unsigned char size_types;
+ unsigned char num_types;
+ struct xkb_key_type * types;
+
+ unsigned short size_syms;
+ unsigned short num_syms;
+ uint32_t *syms;
+ struct xkb_sym_map * key_sym_map;
+
+ unsigned char *modmap;
+};
+
+#define XkbCMKeyGroupInfo(m,k) ((m)->key_sym_map[k].group_info)
+#define XkbCMKeyNumGroups(m,k) (XkbNumGroups((m)->key_sym_map[k].group_info))
+#define XkbCMKeyGroupWidth(m,k,g) (XkbCMKeyType(m,k,g)->num_levels)
+#define XkbCMKeyGroupsWidth(m,k) ((m)->key_sym_map[k].width)
+#define XkbCMKeyTypeIndex(m,k,g) ((m)->key_sym_map[k].kt_index[g&0x3])
+#define XkbCMKeyType(m,k,g) (&(m)->types[XkbCMKeyTypeIndex(m,k,g)])
+#define XkbCMKeyNumSyms(m,k) (XkbCMKeyGroupsWidth(m,k)*XkbCMKeyNumGroups(m,k))
+#define XkbCMKeySymsOffset(m,k) ((m)->key_sym_map[k].offset)
+#define XkbCMKeySymsPtr(m,k) (&(m)->syms[XkbCMKeySymsOffset(m,k)])
+
+struct xkb_behavior {
+ unsigned char type;
+ unsigned char data;
+};
+
+struct xkb_server_map {
+ unsigned short num_acts;
+ unsigned short size_acts;
+
+#if defined(__cplusplus) || defined(c_plusplus)
+ /* explicit is a C++ reserved word */
+ unsigned char * c_explicit;
+#else
+ unsigned char * explicit;
+#endif
+
+ union xkb_action *acts;
+ struct xkb_behavior *behaviors;
+ unsigned short *key_acts;
+ unsigned char *explicits;
+ uint32_t vmods[XkbNumVirtualMods];
+ uint32_t *vmodmap;
+};
+
+#define XkbSMKeyActionsPtr(m,k) (&(m)->acts[(m)->key_acts[k]])
+
+struct xkb_indicator_map {
+ unsigned char flags;
+ unsigned char which_groups;
+ unsigned char groups;
+ unsigned char which_mods;
+ struct xkb_mods mods;
+ unsigned int ctrls;
+};
+
+struct xkb_indicator {
+ unsigned long phys_indicators;
+ struct xkb_indicator_map maps[XkbNumIndicators];
+};
+
+struct xkb_key_name {
+ char name[XkbKeyNameLength];
+};
+
+struct xkb_key_alias {
+ char real[XkbKeyNameLength];
+ char alias[XkbKeyNameLength];
+};
+
+struct xkb_names {
+ uint32_t keycodes;
+ uint32_t geometry;
+ uint32_t symbols;
+ uint32_t types;
+ uint32_t compat;
+ uint32_t vmods[XkbNumVirtualMods];
+ uint32_t indicators[XkbNumIndicators];
+ uint32_t groups[XkbNumKbdGroups];
+ struct xkb_key_name * keys;
+ struct xkb_key_alias * key_aliases;
+ uint32_t *radio_groups;
+ uint32_t phys_symbols;
+
+ unsigned char num_keys;
+ unsigned char num_key_aliases;
+ unsigned short num_rg;
+};
+
+struct xkb_property {
+ char *name;
+ char *value;
+};
+
+struct xkb_color {
+ unsigned int pixel;
+ char * spec;
+};
+
+struct xkb_point {
+ short x;
+ short y;
+};
+
+struct xkb_bounds {
+ short x1,y1;
+ short x2,y2;
+};
+
+struct xkb_outline {
+ unsigned short num_points;
+ unsigned short sz_points;
+ unsigned short corner_radius;
+ struct xkb_point * points;
+};
+
+struct xkb_shape {
+ uint32_t name;
+ unsigned short num_outlines;
+ unsigned short sz_outlines;
+ struct xkb_outline * outlines;
+ struct xkb_outline * approx;
+ struct xkb_outline * primary;
+ struct xkb_bounds bounds;
+};
+
+struct xkb_shape_doodad {
+ uint32_t name;
+ unsigned char type;
+ unsigned char priority;
+ short top;
+ short left;
+ short angle;
+ unsigned short color_ndx;
+ unsigned short shape_ndx;
+};
+#define XkbShapeDoodadColor(g,d) (&(g)->colors[(d)->color_ndx])
+#define XkbShapeDoodadShape(g,d) (&(g)->shapes[(d)->shape_ndx])
+#define XkbSetShapeDoodadColor(g,d,c) ((d)->color_ndx= (c)-&(g)->colors[0])
+#define XkbSetShapeDoodadShape(g,d,s) ((d)->shape_ndx= (s)-&(g)->shapes[0])
+
+struct xkb_text_doodad {
+ uint32_t name;
+ unsigned char type;
+ unsigned char priority;
+ short top;
+ short left;
+ short angle;
+ short width;
+ short height;
+ unsigned short color_ndx;
+ char * text;
+ char * font;
+};
+#define XkbTextDoodadColor(g,d) (&(g)->colors[(d)->color_ndx])
+#define XkbSetTextDoodadColor(g,d,c) ((d)->color_ndx= (c)-&(g)->colors[0])
+
+struct xkb_indicator_doodad {
+ uint32_t name;
+ unsigned char type;
+ unsigned char priority;
+ short top;
+ short left;
+ short angle;
+ unsigned short shape_ndx;
+ unsigned short on_color_ndx;
+ unsigned short off_color_ndx;
+};
+#define XkbIndicatorDoodadShape(g,d) (&(g)->shapes[(d)->shape_ndx])
+#define XkbIndicatorDoodadOnColor(g,d) (&(g)->colors[(d)->on_color_ndx])
+#define XkbIndicatorDoodadOffColor(g,d) (&(g)->colors[(d)->off_color_ndx])
+#define XkbSetIndicatorDoodadOnColor(g,d,c) \
+ ((d)->on_color_ndx= (c)-&(g)->colors[0])
+#define XkbSetIndicatorDoodadOffColor(g,d,c) \
+ ((d)->off_color_ndx= (c)-&(g)->colors[0])
+#define XkbSetIndicatorDoodadShape(g,d,s) \
+ ((d)->shape_ndx= (s)-&(g)->shapes[0])
+
+struct xkb_logo_doodad {
+ uint32_t name;
+ unsigned char type;
+ unsigned char priority;
+ short top;
+ short left;
+ short angle;
+ unsigned short color_ndx;
+ unsigned short shape_ndx;
+ char * logo_name;
+};
+#define XkbLogoDoodadColor(g,d) (&(g)->colors[(d)->color_ndx])
+#define XkbLogoDoodadShape(g,d) (&(g)->shapes[(d)->shape_ndx])
+#define XkbSetLogoDoodadColor(g,d,c) ((d)->color_ndx= (c)-&(g)->colors[0])
+#define XkbSetLogoDoodadShape(g,d,s) ((d)->shape_ndx= (s)-&(g)->shapes[0])
+
+struct xkb_any_doodad {
+ uint32_t name;
+ unsigned char type;
+ unsigned char priority;
+ short top;
+ short left;
+ short angle;
+};
+
+union xkb_doodad {
+ struct xkb_any_doodad any;
+ struct xkb_shape_doodad shape;
+ struct xkb_text_doodad text;
+ struct xkb_indicator_doodad indicator;
+ struct xkb_logo_doodad logo;
+};
+
+#define XkbUnknownDoodad 0
+#define XkbOutlineDoodad 1
+#define XkbSolidDoodad 2
+#define XkbTextDoodad 3
+#define XkbIndicatorDoodad 4
+#define XkbLogoDoodad 5
+
+struct xkb_key {
+ struct xkb_key_name name;
+ short gap;
+ unsigned char shape_ndx;
+ unsigned char color_ndx;
+};
+#define XkbKeyShape(g,k) (&(g)->shapes[(k)->shape_ndx])
+#define XkbKeyColor(g,k) (&(g)->colors[(k)->color_ndx])
+#define XkbSetKeyShape(g,k,s) ((k)->shape_ndx= (s)-&(g)->shapes[0])
+#define XkbSetKeyColor(g,k,c) ((k)->color_ndx= (c)-&(g)->colors[0])
+
+struct xkb_row {
+ short top;
+ short left;
+ unsigned short num_keys;
+ unsigned short sz_keys;
+ int vertical;
+ struct xkb_key * keys;
+ struct xkb_bounds bounds;
+};
+
+struct xkb_section {
+ uint32_t name;
+ unsigned char priority;
+ short top;
+ short left;
+ unsigned short width;
+ unsigned short height;
+ short angle;
+ unsigned short num_rows;
+ unsigned short num_doodads;
+ unsigned short num_overlays;
+ unsigned short sz_rows;
+ unsigned short sz_doodads;
+ unsigned short sz_overlays;
+ struct xkb_row * rows;
+ union xkb_doodad * doodads;
+ struct xkb_bounds bounds;
+ struct xkb_overlay *overlays;
+};
+
+struct xkb_overlay_key {
+ struct xkb_key_name over;
+ struct xkb_key_name under;
+};
+
+struct xkb_overlay_row {
+ unsigned short row_under;
+ unsigned short num_keys;
+ unsigned short sz_keys;
+ struct xkb_overlay_key * keys;
+};
+
+struct xkb_overlay {
+ uint32_t name;
+ struct xkb_section * section_under;
+ unsigned short num_rows;
+ unsigned short sz_rows;
+ struct xkb_overlay_row * rows;
+ struct xkb_bounds * bounds;
+};
+
+struct xkb_geometry {
+ uint32_t name;
+ unsigned short width_mm;
+ unsigned short height_mm;
+ char * label_font;
+ struct xkb_color * label_color;
+ struct xkb_color * base_color;
+ unsigned short sz_properties;
+ unsigned short sz_colors;
+ unsigned short sz_shapes;
+ unsigned short sz_sections;
+ unsigned short sz_doodads;
+ unsigned short sz_key_aliases;
+ unsigned short num_properties;
+ unsigned short num_colors;
+ unsigned short num_shapes;
+ unsigned short num_sections;
+ unsigned short num_doodads;
+ unsigned short num_key_aliases;
+ struct xkb_property * properties;
+ struct xkb_color * colors;
+ struct xkb_shape * shapes;
+ struct xkb_section * sections;
+ union xkb_doodad * doodads;
+ struct xkb_key_alias * key_aliases;
+};
+#define XkbGeomColorIndex(g,c) ((int)((c)-&(g)->colors[0]))
+
+#define XkbGeomPropertiesMask (1<<0)
+#define XkbGeomColorsMask (1<<1)
+#define XkbGeomShapesMask (1<<2)
+#define XkbGeomSectionsMask (1<<3)
+#define XkbGeomDoodadsMask (1<<4)
+#define XkbGeomKeyAliasesMask (1<<5)
+#define XkbGeomAllMask (0x3f)
+
+struct xkb_geometry_sizes {
+ unsigned int which;
+ unsigned short num_properties;
+ unsigned short num_colors;
+ unsigned short num_shapes;
+ unsigned short num_sections;
+ unsigned short num_doodads;
+ unsigned short num_key_aliases;
+};
+
+struct xkb_controls {
+ unsigned char mk_dflt_btn;
+ unsigned char num_groups;
+ unsigned char groups_wrap;
+ struct xkb_mods internal;
+ struct xkb_mods ignore_lock;
+ unsigned int enabled_ctrls;
+ unsigned short repeat_delay;
+ unsigned short repeat_interval;
+ unsigned short slow_keys_delay;
+ unsigned short debounce_delay;
+ unsigned short mk_delay;
+ unsigned short mk_interval;
+ unsigned short mk_time_to_max;
+ unsigned short mk_max_speed;
+ short mk_curve;
+ unsigned short ax_options;
+ unsigned short ax_timeout;
+ unsigned short axt_opts_mask;
+ unsigned short axt_opts_values;
+ unsigned int axt_ctrls_mask;
+ unsigned int axt_ctrls_values;
+ unsigned char per_key_repeat[XkbPerKeyBitArraySize];
+};
+
+/* Common keyboard description structure */
+struct xkb_desc {
+ unsigned int defined;
+ unsigned short flags;
+ unsigned short device_spec;
+ KeyCode min_key_code;
+ KeyCode max_key_code;
+
+ struct xkb_controls * ctrls;
+ struct xkb_server_map * server;
+ struct xkb_client_map * map;
+ struct xkb_indicator * indicators;
+ struct xkb_names * names;
+ struct xkb_compat_map * compat;
+ struct xkb_geometry * geom;
+};
+
+#define XkbKeyKeyTypeIndex(d,k,g) (XkbCMKeyTypeIndex((d)->map,k,g))
+#define XkbKeyKeyType(d,k,g) (XkbCMKeyType((d)->map,k,g))
+#define XkbKeyGroupWidth(d,k,g) (XkbCMKeyGroupWidth((d)->map,k,g))
+#define XkbKeyGroupsWidth(d,k) (XkbCMKeyGroupsWidth((d)->map,k))
+#define XkbKeyGroupInfo(d,k) (XkbCMKeyGroupInfo((d)->map,(k)))
+#define XkbKeyNumGroups(d,k) (XkbCMKeyNumGroups((d)->map,(k)))
+#define XkbKeyNumSyms(d,k) (XkbCMKeyNumSyms((d)->map,(k)))
+#define XkbKeySymsPtr(d,k) (XkbCMKeySymsPtr((d)->map,(k)))
+#define XkbKeySym(d,k,n) (XkbKeySymsPtr(d,k)[n])
+#define XkbKeySymEntry(d,k,sl,g) \
+ (XkbKeySym(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))))
+#define XkbKeyAction(d,k,n) \
+ (XkbKeyHasActions(d,k)?&XkbKeyActionsPtr(d,k)[n]:NULL)
+#define XkbKeyActionEntry(d,k,sl,g) \
+ (XkbKeyHasActions(d,k)?\
+ XkbKeyAction(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))):NULL)
+
+#define XkbKeyHasActions(d,k) ((d)->server->key_acts[k]!=0)
+#define XkbKeyNumActions(d,k) (XkbKeyHasActions(d,k)?XkbKeyNumSyms(d,k):1)
+#define XkbKeyActionsPtr(d,k) (XkbSMKeyActionsPtr((d)->server,k))
+#define XkbKeycodeInRange(d,k) (((k)>=(d)->min_key_code)&&\
+ ((k)<=(d)->max_key_code))
+#define XkbNumKeys(d) ((d)->max_key_code-(d)->min_key_code+1)
+
+struct xkb_map_changes {
+ unsigned short changed;
+ KeyCode min_key_code;
+ KeyCode max_key_code;
+ unsigned char first_type;
+ unsigned char num_types;
+ KeyCode first_key_sym;
+ unsigned char num_key_syms;
+ KeyCode first_key_act;
+ unsigned char num_key_acts;
+ KeyCode first_key_behavior;
+ unsigned char num_key_behaviors;
+ KeyCode first_key_explicit;
+ unsigned char num_key_explicit;
+ KeyCode first_modmap_key;
+ unsigned char num_modmap_keys;
+ KeyCode first_vmodmap_key;
+ unsigned char num_vmodmap_keys;
+ unsigned char pad;
+ unsigned short vmods;
+};
+
+struct xkb_controls_changes {
+ unsigned int changed_ctrls;
+ unsigned int enabled_ctrls_changes;
+ int num_groups_changed;
+};
+
+struct xkb_indicator_changes {
+ unsigned int state_changes;
+ unsigned int map_changes;
+};
+
+struct xkb_name_changes {
+ unsigned int changed;
+ unsigned char first_type;
+ unsigned char num_types;
+ unsigned char first_lvl;
+ unsigned char num_lvls;
+ unsigned char num_aliases;
+ unsigned char num_rg;
+ unsigned char first_key;
+ unsigned char num_keys;
+ unsigned short changed_vmods;
+ unsigned long changed_indicators;
+ unsigned char changed_groups;
+};
+
+struct xkb_compat_changes {
+ unsigned char changed_groups;
+ unsigned short first_si;
+ unsigned short num_si;
+};
+
+struct xkb_changes {
+ unsigned short device_spec;
+ unsigned short state_changes;
+ struct xkb_map_changes map;
+ struct xkb_controls_changes ctrls;
+ struct xkb_indicator_changes indicators;
+ struct xkb_name_changes names;
+ struct xkb_compat_changes compat;
+};
+
+struct xkb_component_names {
+ char * keymap;
+ char * keycodes;
+ char * types;
+ char * compat;
+ char * symbols;
+ char * geometry;
+};
+
+struct xkb_component_name {
+ unsigned short flags;
+ char * name;
+};
+
+struct xkb_component_list {
+ int num_keymaps;
+ int num_keycodes;
+ int num_types;
+ int num_compat;
+ int num_symbols;
+ int num_geometry;
+ struct xkb_component_name * keymaps;
+ struct xkb_component_name * keycodes;
+ struct xkb_component_name * types;
+ struct xkb_component_name * compat;
+ struct xkb_component_name * symbols;
+ struct xkb_component_name * geometry;
+};
+
+struct xkb_state {
+ unsigned char group; /* base + latched + locked */
+ /* FIXME: Why are base + latched short and not char?? */
+ unsigned short base_group; /* physically ... down? */
+ unsigned short latched_group;
+ unsigned char locked_group;
+
+ unsigned char mods; /* base + latched + locked */
+ unsigned char base_mods; /* physically down */
+ unsigned char latched_mods;
+ unsigned char locked_mods;
+
+ unsigned char compat_state; /* mods + group for core state */
+
+ /* grab mods = all depressed and latched mods, _not_ locked mods */
+ unsigned char grab_mods; /* grab mods minus internal mods */
+ unsigned char compat_grab_mods; /* grab mods + group for core state,
+ but not locked groups if
+ IgnoreGroupLocks set */
+
+ /* effective mods = all mods (depressed, latched, locked) */
+ unsigned char lookup_mods; /* effective mods minus internal mods */
+ unsigned char compat_lookup_mods; /* effective mods + group */
+
+ unsigned short ptr_buttons; /* core pointer buttons */
+};
+
+#define XkbStateFieldFromRec(s) XkbBuildCoreState((s)->lookup_mods,(s)->group)
+#define XkbGrabStateFromRec(s) XkbBuildCoreState((s)->grab_mods,(s)->group)
+
+#define XkbNumGroups(g) ((g)&0x0f)
+#define XkbOutOfRangeGroupInfo(g) ((g)&0xf0)
+#define XkbOutOfRangeGroupAction(g) ((g)&0xc0)
+#define XkbOutOfRangeGroupNumber(g) (((g)&0x30)>>4)
+#define XkbSetNumGroups(g,n) (((g)&0xf0)|((n)&0x0f))
+
+_XFUNCPROTOBEGIN
+
+typedef uint32_t (*InternAtomFuncPtr)(const char *val);
+typedef const char *(*GetAtomValueFuncPtr)(uint32_t atom);
+
+_X_EXPORT extern void
+xkb_init_atoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value);
+
+_X_EXPORT extern uint32_t
+xkb_intern_atom(const char *name);
+
+_X_EXPORT extern struct xkb_desc *
+xkb_compile_keymap_from_rules(const struct xkb_rule_names *rules);
+
+_X_EXPORT extern struct xkb_desc *
+xkb_compile_keymap_from_components(const struct xkb_component_names * ktcsg);
+
+_X_EXPORT extern struct xkb_desc *
+xkb_compile_keymap_from_file(FILE *inputFile, const char *mapName);
+
+_X_EXPORT extern struct xkb_desc *
+xkb_compile_keymap_from_string(const char *string, const char *mapName);
+
+_X_EXPORT extern void
+xkb_free_keymap(struct xkb_desc *xkb);
+
+_X_EXPORT extern struct xkb_component_list *
+xkb_list_components(struct xkb_component_names * ptrns, int *maxMatch);
+
+/*
+ * Canonicalises component names by prepending the relevant component from
+ * 'old' to the one in 'names' when the latter has a leading '+' or '|', and
+ * by replacing a '%' with the relevant component, e.g.:
+ *
+ * names old output
+ * ------------------------------------------
+ * +bar foo foo+bar
+ * |quux baz baz|quux
+ * foo+%|baz bar foo+bar|baz
+ *
+ * If a component in names needs to be modified, the existing value will be
+ * free()d, and a new one allocated with malloc().
+ */
+_X_EXPORT extern void
+xkb_canonicalise_components(struct xkb_component_names * names,
+ const struct xkb_component_names * old);
+
+/*
+ * Converts a keysym to a string; will return unknown Unicode codepoints
+ * as "Ua1b2", and other unknown keysyms as "0xabcd1234".
+ *
+ * This is uint32_t rather than KeySym, as KeySym changes size between
+ * client and server (no, really).
+ */
+_X_EXPORT extern void
+xkb_keysym_to_string(uint32_t ks, char *buffer, size_t size);
+
+/*
+ * See xkb_keysym_to_string comments: this function will accept any string
+ * from that function.
+ */
+_X_EXPORT extern uint32_t
+xkb_string_to_keysym(const char *s);
+
+_XFUNCPROTOEND
+
+#endif /* _XKBCOMMON_H_ */
diff --git a/src/alloc.c b/src/alloc.c
index a1b4d01..c6ac8a8 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include "xkballoc.h"
#include "xkbgeom.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
#include <X11/extensions/XKB.h>
diff --git a/src/atom.c b/src/atom.c
index 51352bb..82548c2 100644
--- a/src/atom.c
+++ b/src/atom.c
@@ -74,7 +74,7 @@ SOFTWARE.
#include <config.h>
#endif
#include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
#define InitialTableSize 100
diff --git a/src/galloc.c b/src/galloc.c
index 4aed144..a6d7d7a 100644
--- a/src/galloc.c
+++ b/src/galloc.c
@@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include "xkbgeom.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
#include <X11/extensions/XKB.h>
diff --git a/src/geom.c b/src/geom.c
index f2a29d1..6dd610f 100644
--- a/src/geom.c
+++ b/src/geom.c
@@ -29,7 +29,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include "xkbgeom.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
#ifndef MINSHORT
diff --git a/src/keysym.c b/src/keysym.c
index 9fd3764..5ff1313 100644
--- a/src/keysym.c
+++ b/src/keysym.c
@@ -31,7 +31,7 @@ authorization from the authors.
#include <X11/X.h>
#include <X11/keysymdef.h>
#include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include <stdlib.h>
#include <string.h>
diff --git a/src/malloc.c b/src/malloc.c
index 3a9d773..9c985c3 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -25,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
#include "xkballoc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
int
diff --git a/src/maprules.c b/src/maprules.c
index 183010c..3fab183 100644
--- a/src/maprules.c
+++ b/src/maprules.c
@@ -28,7 +28,7 @@
#include <config.h>
#endif
#include "xkbrules.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
#ifdef HAVE_DIX_CONFIG_H
diff --git a/src/misc.c b/src/misc.c
index 370d012..4a8fd2c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -30,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkballoc.h"
#include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
#include <X11/keysym.h>
diff --git a/src/text.c b/src/text.c
index 1f82979..c913ff3 100644
--- a/src/text.c
+++ b/src/text.c
@@ -28,7 +28,7 @@
#include <config.h>
#endif
#include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
#include <stdio.h>
#include <string.h>
diff --git a/src/xkb.c b/src/xkb.c
index 7294d79..a8c9caa 100644
--- a/src/xkb.c
+++ b/src/xkb.c
@@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#endif
#include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
static char *
diff --git a/src/xkballoc.h b/src/xkballoc.h
index 4210559..784b0ec 100644
--- a/src/xkballoc.h
+++ b/src/xkballoc.h
@@ -29,7 +29,7 @@ authorization from the authors.
#include <X11/X.h>
#include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
extern int
XkbcAllocCompatMap(struct xkb_desc * xkb, unsigned which, unsigned nSI);
diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index e2f677f..3772a88 100644
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -36,7 +36,7 @@
#include "utils.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
extern char *scanFile;
diff --git a/src/xkbcomp/xkbpath.c b/src/xkbcomp/xkbpath.c
index 6b7bf21..c1a0f01 100644
--- a/src/xkbcomp/xkbpath.c
+++ b/src/xkbcomp/xkbpath.c
@@ -28,7 +28,7 @@
#include "utils.h"
#include <stdlib.h>
#include "xkbpath.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
#ifndef DFLT_XKB_CONFIG_ROOT
diff --git a/src/xkbgeom.h b/src/xkbgeom.h
index 1e42830..d0efcb7 100644
--- a/src/xkbgeom.h
+++ b/src/xkbgeom.h
@@ -29,7 +29,7 @@ authorization from the authors.
#include <X11/X.h>
#include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
extern void
XkbcFreeGeometry(struct xkb_geometry * geom, unsigned which, Bool freeMap);
diff --git a/src/xkbmisc.h b/src/xkbmisc.h
index 2e384f7..6600d52 100644
--- a/src/xkbmisc.h
+++ b/src/xkbmisc.h
@@ -29,7 +29,7 @@ authorization from the authors.
#include <X11/X.h>
#include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
/***====================================================================***/
diff --git a/src/xkbrules.h b/src/xkbrules.h
index ce3e1a3..c9082f5 100644
--- a/src/xkbrules.h
+++ b/src/xkbrules.h
@@ -30,7 +30,7 @@ authorization from the authors.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
/* From filecommon */
diff --git a/test/canonicalise.c b/test/canonicalise.c
index 7ec81d2..975c358 100644
--- a/test/canonicalise.c
+++ b/test/canonicalise.c
@@ -23,7 +23,7 @@
* Author: Daniel Stone <daniel@fooishbar.org>
*/
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/test/filecomp.c b/test/filecomp.c
index d256d72..57fa846 100644
--- a/test/filecomp.c
+++ b/test/filecomp.c
@@ -30,7 +30,7 @@ authorization from the authors.
#include <errno.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "xkbcomp/utils.h"
static char buffer[8192];
diff --git a/test/namescomp.c b/test/namescomp.c
index 5f531cc..df3a686 100644
--- a/test/namescomp.c
+++ b/test/namescomp.c
@@ -28,7 +28,7 @@ authorization from the authors.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "xkbcomp/utils.h"
int main(int argc, char *argv[])
diff --git a/test/rulescomp.c b/test/rulescomp.c
index 39e1a2d..5ae3e3c 100644
--- a/test/rulescomp.c
+++ b/test/rulescomp.c
@@ -28,7 +28,7 @@ authorization from the authors.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include "xkbcomp/utils.h"
int main(int argc, char *argv[])
diff --git a/test/xkey.c b/test/xkey.c
index 78baedd..00e0929 100644
--- a/test/xkey.c
+++ b/test/xkey.c
@@ -1,5 +1,5 @@
#include "xkbmisc.h"
-#include "X11/extensions/XKBcommon.h"
+#include "xkbcommon/xkbcommon.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>