comparison lib/WcharDisp.c @ 14:5a32b68b627d

imported patch 17_kinput2-v3.1-jisx0212.diff
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 08 Mar 2010 20:38:16 +0900
parents 92745d501b9a
children
comparison
equal deleted inserted replaced
13:eda83436b27e 14:5a32b68b627d
759 static FontMapping jpDefaultMapping = { { False, False, True, False } }; 759 static FontMapping jpDefaultMapping = { { False, False, True, False } };
760 760
761 #define JPFONT_ASCII "-Misc-Fixed-Medium-R-*--14-*-*-*-C-*-ISO8859-1" 761 #define JPFONT_ASCII "-Misc-Fixed-Medium-R-*--14-*-*-*-C-*-ISO8859-1"
762 #define JPFONT_KANJI "-Misc-Fixed-Medium-R-*--14-*-*-*-C-*-JISX0208.1983-0" 762 #define JPFONT_KANJI "-Misc-Fixed-Medium-R-*--14-*-*-*-C-*-JISX0208.1983-0"
763 #define JPFONT_KANA "-Misc-Fixed-Medium-R-*--14-*-*-*-C-*-JISX0201.1976-0" 763 #define JPFONT_KANA "-Misc-Fixed-Medium-R-*--14-*-*-*-C-*-JISX0201.1976-0"
764 #define JPFONT_HOJO "-*-Fixed-Medium-R-*--14-*-*-*-C-*-JISX0212.1990-0"
764 765
765 static XtResource jpresources[] = { 766 static XtResource jpresources[] = {
766 /* only override superclass's default */ 767 /* only override superclass's default */
767 #define offset(field) XtOffset(JpWcharDisplayObject, wcharDisplay.field) 768 #define offset(field) XtOffset(JpWcharDisplayObject, wcharDisplay.field)
768 { XtNfont, XtCFont, XtRFontStruct, sizeof (XFontStruct *), 769 { XtNfont, XtCFont, XtRFontStruct, sizeof (XFontStruct *),
769 offset(defaultfonts[0]), XtRString, JPFONT_ASCII }, 770 offset(defaultfonts[0]), XtRString, JPFONT_ASCII },
770 { XtNkanjiFont, XtCKanjiFont, XtRFontStruct, sizeof (XFontStruct *), 771 { XtNkanjiFont, XtCKanjiFont, XtRFontStruct, sizeof (XFontStruct *),
771 offset(defaultfonts[1]), XtRString, JPFONT_KANJI }, 772 offset(defaultfonts[1]), XtRString, JPFONT_KANJI },
772 { XtNkanaFont, XtCKanaFont, XtRFontStruct, sizeof (XFontStruct *), 773 { XtNkanaFont, XtCKanaFont, XtRFontStruct, sizeof (XFontStruct *),
773 offset(defaultfonts[2]), XtRString, JPFONT_KANA }, 774 offset(defaultfonts[2]), XtRString, JPFONT_KANA },
774 { XtNfontG3, "Not.used", XtRFontStruct, sizeof (XFontStruct *), 775 { XtNhojoFont, XtCHojoFont, XtRFontStruct, sizeof (XFontStruct *),
775 offset(defaultfonts[3]), XtRImmediate, (XtPointer)NULL }, 776 offset(defaultfonts[3]), XtRString, JPFONT_HOJO },
776 { XtNfontMapping, XtCFontMapping, XtRFontMapping, sizeof (FontMapping), 777 { XtNfontMapping, XtCFontMapping, XtRFontMapping, sizeof (FontMapping),
777 offset(defaultmapping), XtRFontMapping, (XtPointer)&jpDefaultMapping }, 778 offset(defaultmapping), XtRFontMapping, (XtPointer)&jpDefaultMapping },
778 #undef offset 779 #undef offset
779 }; 780 };
780 781
784 { "JISX0208.1990-0", G1LCharSet }, 785 { "JISX0208.1990-0", G1LCharSet },
785 { "JISX0208.1983-0", G1LCharSet }, 786 { "JISX0208.1983-0", G1LCharSet },
786 { "JISX0208.1978-0", G1LCharSet }, 787 { "JISX0208.1978-0", G1LCharSet },
787 { "JISX0208.1983-1", G1RCharSet }, 788 { "JISX0208.1983-1", G1RCharSet },
788 { "JISX0208.1978-1", G1RCharSet }, 789 { "JISX0208.1978-1", G1RCharSet },
790 { "JISX0212.1990-0", G3LCharSet },
789 #ifdef ALLOW_LOWERCASE_CHARSET_NAME 791 #ifdef ALLOW_LOWERCASE_CHARSET_NAME
790 { "iso8859-1", G0LCharSet }, /* my preference */ 792 { "iso8859-1", G0LCharSet }, /* my preference */
791 { "jisx0201.1976-0", G0LCharSet | G2RCharSet }, 793 { "jisx0201.1976-0", G0LCharSet | G2RCharSet },
792 { "jisx0208.1990-0", G1LCharSet }, 794 { "jisx0208.1990-0", G1LCharSet },
793 { "jisx0208.1983-0", G1LCharSet }, 795 { "jisx0208.1983-0", G1LCharSet },
794 { "jisx0208.1978-0", G1LCharSet }, 796 { "jisx0208.1978-0", G1LCharSet },
795 { "jisx0208.1983-1", G1RCharSet }, 797 { "jisx0208.1983-1", G1RCharSet },
796 { "jisx0208.1978-1", G1RCharSet }, 798 { "jisx0208.1978-1", G1RCharSet },
799 { "jisx0212.1990-0", G3LCharSet },
797 #endif 800 #endif
798 }; 801 };
799 802
800 JpWcharDisplayClassRec jpWcharDisplayClassRec = { 803 JpWcharDisplayClassRec jpWcharDisplayClassRec = {
801 { /* object fields */ 804 { /* object fields */