Changeset 2143
- Timestamp:
- 01/12/10 02:07:06 (3 years ago)
- Location:
- linux/X/rules
- Files:
-
- 2 modified
Legend:
- Unmodified
- Added
- Removed
-
linux/X/rules/base
r1879 r2143 24 24 // PC geometries - they have special geometry but symbols are mostly pc105 25 25 ! $pcgeometries = latitude 26 27 // TypeMatrix geometries 28 ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 26 29 27 30 // Layouts that provide further specializations for the OLPC … … 47 50 compalfl90 \ 48 51 compaqeak8 compaqik7 compaqik13 compaqik18 \ 52 creativedw7000 \ 49 53 cymotionlinux \ 50 54 dell dellm65 inspiron dellusbmm \ … … 102 106 ! $thinkpads = thinkpad thinkpad60 thinkpadz60 103 107 104 105 108 ! $dvoraklayouts = br ca de ee es fr gb no pl se us 106 109 … … 111 114 sun5 = sun(type5_euro) 112 115 sun6 = sun(type6_usb) 116 sun6euro = sun(type6tuv_usb) 113 117 pc98 = xfree98(pc98) 114 118 evdev = evdev … … 150 154 thinkpad60 = thinkpad(60) 151 155 thinkpadz60 = thinkpad(60) 156 $tmgeometries = typematrix(%m) 152 157 winbook = winbook(XP5) 153 158 pc98 = nec(pc98) … … 201 206 * tam INSCRIPT = pc+in(tam) 202 207 * tam UNI = pc+in(tam_unicode) 208 * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals) 203 209 * tam TAB = pc+in(tam_TAB) 204 210 * tam TSCII = pc+in(tam_TSCII) … … 208 214 * yu yz = pc+srp(latinyz) 209 215 * yu unicodeyz = pc+srp(latinunicodeyz) 216 * rs combiningkeys = pc+extras/rs(combiningkeys) 217 * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) 218 * us crd = pc+extras/us(crd) 219 * us intl-unicode = pc+extras/us(intl-unicode) 210 220 classmate us intl = pc+us(classmate-intl) 211 221 classmate us alt-intl = pc+us(classmate-alt-intl) … … 282 292 * tam(INSCRIPT) = pc+in(tam) 283 293 * tam(UNI) = pc+in(tam_unicode) 294 * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals) 284 295 * tam(TAB) = pc+in(tam_TAB) 285 296 * tam(TSCII) = pc+in(tam_TSCII) … … 289 300 * yu(yz) = pc+srp(latinyz) 290 301 * yu(unicodeyz) = pc+srp(latinunicodeyz) 302 * apl = pc+extras/apl 303 * rs(combiningkeys) = pc+extras/rs(combiningkeys) 304 * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) 305 * us(crd) = pc+extras/us(crd) 306 * us(intl-unicode) = pc+extras/us(intl-unicode) 291 307 ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2 292 308 ataritt * = xfree68_vndr/ataritt(us)+%l%(v) … … 301 317 sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) 302 318 sun6 * = sun_vndr/us(type6)+%l%(v) 319 sun6euro us = sun_vndr/us(type6) 320 sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic) 321 sun6euro * = sun_vndr/us(type6)+%l%(v) 303 322 pc98 nec_vndr/jp = nec_vndr/jp(pc98) 304 323 macintosh_old us = macintosh_vndr/us(oldmac) … … 385 404 * tam(INSCRIPT) = pc+in(tam) 386 405 * tam(UNI) = pc+in(tam_unicode) 406 * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals) 387 407 * tam(TAB) = pc+in(tam_TAB) 388 408 * tam(TSCII) = pc+in(tam_TSCII) … … 392 412 * yu(yz) = pc+srp(latinyz) 393 413 * yu(unicodeyz) = pc+srp(latinunicodeyz) 414 * apl = pc+extras/apl%(v[1]) 415 * rs(combiningkeys) = pc+extras/rs(combiningkeys) 416 * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) 417 * us(crd) = pc+extras/us(crd) 418 * us(intl-unicode) = pc+extras/us(intl-unicode) 394 419 ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) 395 420 amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) 396 sun4 * = latin+sun_vndr/us( sun4)+%l[1]%(v[1])397 sun5 * = latin+sun_vndr/us( sun5)+%l[1]%(v[1])421 sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) 422 sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1]) 398 423 macintosh_old us = macintosh_vndr/us(oldmac) 399 424 macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) … … 446 471 * tam INSCRIPT = pc+in(tam) 447 472 * tam UNI = pc+in(tam_unicode) 473 * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals) 448 474 * tam TAB = pc+in(tam_TAB) 449 475 * tam TSCII = pc+in(tam_TSCII) … … 453 479 * yu yz = pc+srp(latinyz) 454 480 * yu unicodeyz = pc+srp(latinunicodeyz) 481 * rs combiningkeys = pc+extras/rs(combiningkeys) 482 * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) 483 * us crd = pc+extras/us(crd) 484 * us intl-unicode = pc+extras/us(intl-unicode) 455 485 456 486 ! layout[2] = symbols … … 524 554 tam(INSCRIPT) = +in(tam):2 525 555 tam(UNI) = +in(tam_unicode):2 556 tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2 526 557 tam(TAB) = +in(tam_TAB):2 527 558 tam(TSCII) = +in(tam_TSCII):2 … … 531 562 yu(yz) = +srp(latinyz):2 532 563 yu(unicodeyz) = +srp(latinunicodeyz):2 564 apl = +extras/apl%(v[2]):2 565 rs(combiningkeys) = +extras/rs(combiningkeys):2 566 us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 567 us(crd) = +extras/us(crd):2 568 us(intl-unicode) = +extras/us(intl-unicode):2 533 569 * = +%l[2]%(v[2]):2 534 570 … … 603 639 tam(INSCRIPT) = +in(tam):3 604 640 tam(UNI) = +in(tam_unicode):3 641 tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3 605 642 tam(TAB) = +in(tam_TAB):3 606 643 tam(TSCII) = +in(tam_TSCII):3 … … 610 647 yu(yz) = +srp(latinyz):3 611 648 yu(unicodeyz) = +srp(latinunicodeyz):3 649 apl = +extras/apl%(v[3]):3 650 rs(combiningkeys) = +extras/rs(combiningkeys):3 651 us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 652 us(crd) = +extras/us(crd):3 653 us(intl-unicode) = +extras/us(intl-unicode):3 612 654 * = +%l[3]%(v[3]):3 613 655 … … 682 724 tam(INSCRIPT) = +in(tam):4 683 725 tam(UNI) = +in(tam_unicode):4 726 tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4 684 727 tam(TAB) = +in(tam_TAB):4 685 728 tam(TSCII) = +in(tam_TSCII):4 … … 689 732 yu(yz) = +srp(latinyz):4 690 733 yu(unicodeyz) = +srp(latinunicodeyz):4 734 apl = +extras/apl%(v[4]):4 735 rs(combiningkeys) = +extras/rs(combiningkeys):4 736 us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 737 us(crd) = +extras/us(crd):4 738 us(intl-unicode) = +extras/us(intl-unicode):4 691 739 * = +%l[4]%(v[4]):4 692 740 … … 734 782 tam INSCRIPT = +in(tam):2 735 783 tam UNI = +in(tam_unicode):2 784 tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):2 736 785 tam TAB = +in(tam_TAB):2 737 786 tam TSCII = +in(tam_TSCII):2 … … 741 790 yu yz = +srp(latinyz):2 742 791 yu unicodeyz = +srp(latinunicodeyz):2 792 rs combiningkeys = +extras/rs(combiningkeys):2 793 us alt-intl-unicode = +extras/us(alt-intl-unicode):2 794 us crd = +extras/us(crd):2 795 us intl-unicode = +extras/us(intl-unicode):2 743 796 744 797 ! layout[3] variant[3] = symbols … … 785 838 tam INSCRIPT = +in(tam):3 786 839 tam UNI = +in(tam_unicode):3 840 tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):3 787 841 tam TAB = +in(tam_TAB):3 788 842 tam TSCII = +in(tam_TSCII):3 … … 792 846 yu yz = +srp(latinyz):3 793 847 yu unicodeyz = +srp(latinunicodeyz):3 848 rs combiningkeys = +extras/rs(combiningkeys):3 849 us alt-intl-unicode = +extras/us(alt-intl-unicode):3 850 us crd = +extras/us(crd):3 851 us intl-unicode = +extras/us(intl-unicode):3 794 852 795 853 ! layout[4] variant[4] = symbols … … 836 894 tam INSCRIPT = +in(tam):4 837 895 tam UNI = +in(tam_unicode):4 896 tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):4 838 897 tam TAB = +in(tam_TAB):4 839 898 tam TSCII = +in(tam_TSCII):4 … … 843 902 yu yz = +srp(latinyz):4 844 903 yu unicodeyz = +srp(latinunicodeyz):4 904 rs combiningkeys = +extras/rs(combiningkeys):4 905 us alt-intl-unicode = +extras/us(alt-intl-unicode):4 906 us crd = +extras/us(crd):4 907 us intl-unicode = +extras/us(intl-unicode):4 845 908 846 909 ! model = symbols … … 993 1056 lv3:enter_switch = +level3(enter_switch) 994 1057 caps:capslock = +capslock(capslock) 1058 caps:numlock = +capslock(numlock) 995 1059 caps:shiftlock = +capslock(shiftlock) 996 1060 caps:swapescape = +capslock(swapescape) 997 1061 caps:escape = +capslock(escape) 998 1062 caps:backspace = +capslock(backspace) 1063 caps:super = +capslock(super) 1064 caps:hyper = +capslock(hyper) 1065 caps:none = +capslock(none) 999 1066 ctrl:nocaps = +ctrl(nocaps) 1000 1067 ctrl:swapcaps = +ctrl(swapcaps) -
linux/X/rules/evdev
r1879 r2143 24 24 // PC geometries - they have special geometry but symbols are mostly pc105 25 25 ! $pcgeometries = latitude 26 27 // TypeMatrix geometries 28 ! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 26 29 27 30 // Layouts that provide further specializations for the OLPC … … 47 50 compalfl90 \ 48 51 compaqeak8 compaqik7 compaqik13 compaqik18 \ 52 creativedw7000 \ 49 53 cymotionlinux \ 50 54 dell dellm65 inspiron dellusbmm \ … … 102 106 ! $thinkpads = thinkpad thinkpad60 thinkpadz60 103 107 104 105 108 ! $dvoraklayouts = br ca de ee es fr gb no pl se us 106 109 … … 139 142 thinkpad60 = thinkpad(60) 140 143 thinkpadz60 = thinkpad(60) 144 $tmgeometries = typematrix(%m) 141 145 winbook = winbook(XP5) 142 146 pc98 = nec(pc98) … … 190 194 * tam INSCRIPT = pc+in(tam) 191 195 * tam UNI = pc+in(tam_unicode) 196 * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals) 192 197 * tam TAB = pc+in(tam_TAB) 193 198 * tam TSCII = pc+in(tam_TSCII) … … 197 202 * yu yz = pc+srp(latinyz) 198 203 * yu unicodeyz = pc+srp(latinunicodeyz) 204 * rs combiningkeys = pc+extras/rs(combiningkeys) 205 * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) 206 * us crd = pc+extras/us(crd) 207 * us intl-unicode = pc+extras/us(intl-unicode) 199 208 classmate us intl = pc+us(classmate-intl) 200 209 classmate us alt-intl = pc+us(classmate-alt-intl) … … 271 280 * tam(INSCRIPT) = pc+in(tam) 272 281 * tam(UNI) = pc+in(tam_unicode) 282 * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals) 273 283 * tam(TAB) = pc+in(tam_TAB) 274 284 * tam(TSCII) = pc+in(tam_TSCII) … … 278 288 * yu(yz) = pc+srp(latinyz) 279 289 * yu(unicodeyz) = pc+srp(latinunicodeyz) 290 * apl = pc+extras/apl 291 * rs(combiningkeys) = pc+extras/rs(combiningkeys) 292 * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) 293 * us(crd) = pc+extras/us(crd) 294 * us(intl-unicode) = pc+extras/us(intl-unicode) 280 295 ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2 281 296 ataritt * = xfree68_vndr/ataritt(us)+%l%(v) … … 290 305 sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) 291 306 sun6 * = sun_vndr/us(type6)+%l%(v) 307 sun6euro us = sun_vndr/us(type6) 308 sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic) 309 sun6euro * = sun_vndr/us(type6)+%l%(v) 292 310 pc98 nec_vndr/jp = nec_vndr/jp(pc98) 293 311 macintosh_old us = macintosh_vndr/us(oldmac) … … 374 392 * tam(INSCRIPT) = pc+in(tam) 375 393 * tam(UNI) = pc+in(tam_unicode) 394 * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals) 376 395 * tam(TAB) = pc+in(tam_TAB) 377 396 * tam(TSCII) = pc+in(tam_TSCII) … … 381 400 * yu(yz) = pc+srp(latinyz) 382 401 * yu(unicodeyz) = pc+srp(latinunicodeyz) 402 * apl = pc+extras/apl%(v[1]) 403 * rs(combiningkeys) = pc+extras/rs(combiningkeys) 404 * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) 405 * us(crd) = pc+extras/us(crd) 406 * us(intl-unicode) = pc+extras/us(intl-unicode) 383 407 ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) 384 408 amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) 385 sun4 * = latin+sun_vndr/us( sun4)+%l[1]%(v[1])386 sun5 * = latin+sun_vndr/us( sun5)+%l[1]%(v[1])409 sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) 410 sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1]) 387 411 macintosh_old us = macintosh_vndr/us(oldmac) 388 412 macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) … … 435 459 * tam INSCRIPT = pc+in(tam) 436 460 * tam UNI = pc+in(tam_unicode) 461 * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals) 437 462 * tam TAB = pc+in(tam_TAB) 438 463 * tam TSCII = pc+in(tam_TSCII) … … 442 467 * yu yz = pc+srp(latinyz) 443 468 * yu unicodeyz = pc+srp(latinunicodeyz) 469 * rs combiningkeys = pc+extras/rs(combiningkeys) 470 * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) 471 * us crd = pc+extras/us(crd) 472 * us intl-unicode = pc+extras/us(intl-unicode) 444 473 445 474 ! layout[2] = symbols … … 513 542 tam(INSCRIPT) = +in(tam):2 514 543 tam(UNI) = +in(tam_unicode):2 544 tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2 515 545 tam(TAB) = +in(tam_TAB):2 516 546 tam(TSCII) = +in(tam_TSCII):2 … … 520 550 yu(yz) = +srp(latinyz):2 521 551 yu(unicodeyz) = +srp(latinunicodeyz):2 552 apl = +extras/apl%(v[2]):2 553 rs(combiningkeys) = +extras/rs(combiningkeys):2 554 us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 555 us(crd) = +extras/us(crd):2 556 us(intl-unicode) = +extras/us(intl-unicode):2 522 557 * = +%l[2]%(v[2]):2 523 558 … … 592 627 tam(INSCRIPT) = +in(tam):3 593 628 tam(UNI) = +in(tam_unicode):3 629 tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3 594 630 tam(TAB) = +in(tam_TAB):3 595 631 tam(TSCII) = +in(tam_TSCII):3 … … 599 635 yu(yz) = +srp(latinyz):3 600 636 yu(unicodeyz) = +srp(latinunicodeyz):3 637 apl = +extras/apl%(v[3]):3 638 rs(combiningkeys) = +extras/rs(combiningkeys):3 639 us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 640 us(crd) = +extras/us(crd):3 641 us(intl-unicode) = +extras/us(intl-unicode):3 601 642 * = +%l[3]%(v[3]):3 602 643 … … 671 712 tam(INSCRIPT) = +in(tam):4 672 713 tam(UNI) = +in(tam_unicode):4 714 tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4 673 715 tam(TAB) = +in(tam_TAB):4 674 716 tam(TSCII) = +in(tam_TSCII):4 … … 678 720 yu(yz) = +srp(latinyz):4 679 721 yu(unicodeyz) = +srp(latinunicodeyz):4 722 apl = +extras/apl%(v[4]):4 723 rs(combiningkeys) = +extras/rs(combiningkeys):4 724 us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 725 us(crd) = +extras/us(crd):4 726 us(intl-unicode) = +extras/us(intl-unicode):4 680 727 * = +%l[4]%(v[4]):4 681 728 … … 723 770 tam INSCRIPT = +in(tam):2 724 771 tam UNI = +in(tam_unicode):2 772 tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):2 725 773 tam TAB = +in(tam_TAB):2 726 774 tam TSCII = +in(tam_TSCII):2 … … 730 778 yu yz = +srp(latinyz):2 731 779 yu unicodeyz = +srp(latinunicodeyz):2 780 rs combiningkeys = +extras/rs(combiningkeys):2 781 us alt-intl-unicode = +extras/us(alt-intl-unicode):2 782 us crd = +extras/us(crd):2 783 us intl-unicode = +extras/us(intl-unicode):2 732 784 733 785 ! layout[3] variant[3] = symbols … … 774 826 tam INSCRIPT = +in(tam):3 775 827 tam UNI = +in(tam_unicode):3 828 tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):3 776 829 tam TAB = +in(tam_TAB):3 777 830 tam TSCII = +in(tam_TSCII):3 … … 781 834 yu yz = +srp(latinyz):3 782 835 yu unicodeyz = +srp(latinunicodeyz):3 836 rs combiningkeys = +extras/rs(combiningkeys):3 837 us alt-intl-unicode = +extras/us(alt-intl-unicode):3 838 us crd = +extras/us(crd):3 839 us intl-unicode = +extras/us(intl-unicode):3 783 840 784 841 ! layout[4] variant[4] = symbols … … 825 882 tam INSCRIPT = +in(tam):4 826 883 tam UNI = +in(tam_unicode):4 884 tam NUMERAL-KEYBOARD = +in(tam_keyboard_with_numerals):4 827 885 tam TAB = +in(tam_TAB):4 828 886 tam TSCII = +in(tam_TSCII):4 … … 832 890 yu yz = +srp(latinyz):4 833 891 yu unicodeyz = +srp(latinunicodeyz):4 892 rs combiningkeys = +extras/rs(combiningkeys):4 893 us alt-intl-unicode = +extras/us(alt-intl-unicode):4 894 us crd = +extras/us(crd):4 895 us intl-unicode = +extras/us(intl-unicode):4 834 896 835 897 ! model = symbols … … 935 997 lv3:enter_switch = +level3(enter_switch) 936 998 caps:capslock = +capslock(capslock) 999 caps:numlock = +capslock(numlock) 937 1000 caps:shiftlock = +capslock(shiftlock) 938 1001 caps:swapescape = +capslock(swapescape) 939 1002 caps:escape = +capslock(escape) 940 1003 caps:backspace = +capslock(backspace) 1004 caps:super = +capslock(super) 1005 caps:hyper = +capslock(hyper) 1006 caps:none = +capslock(none) 941 1007 ctrl:nocaps = +ctrl(nocaps) 942 1008 ctrl:swapcaps = +ctrl(swapcaps)
