Mercurial > kinput2.yaz
comparison lib/imlib/imattr.c @ 10:d1e9297afff9
imported patch 12_kinput2-v3.1-linespace.patch
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Mon, 08 Mar 2010 20:07:06 +0900 |
parents | 1f9e9cb00c6c |
children |
comparison
equal
deleted
inserted
replaced
9:1f9e9cb00c6c | 10:d1e9297afff9 |
---|---|
177 setBackground, getBackground }, | 177 setBackground, getBackground }, |
178 { XNBackgroundPixmap, TYPE_CARD32, OP_C|OP_S|OP_G, | 178 { XNBackgroundPixmap, TYPE_CARD32, OP_C|OP_S|OP_G, |
179 setBgPixmap, getBgPixmap }, | 179 setBgPixmap, getBgPixmap }, |
180 { XNFontSet, TYPE_XFONTSET, OP_C|OP_S|OP_G, | 180 { XNFontSet, TYPE_XFONTSET, OP_C|OP_S|OP_G, |
181 setFontSet, getFontSet }, | 181 setFontSet, getFontSet }, |
182 { XNLineSpace, TYPE_CARD16, OP_C|OP_S|OP_G, /* should be TYPE_INT16 */ | 182 { XNLineSpace, TYPE_CARD32, OP_C|OP_S|OP_G, /* should be TYPE_INT32 */ |
183 setLineSpace, getLineSpace }, | 183 setLineSpace, getLineSpace }, |
184 { XNCursor, TYPE_CARD32, OP_C|OP_S|OP_G, | 184 { XNCursor, TYPE_CARD32, OP_C|OP_S|OP_G, |
185 setCursor, getCursor }, | 185 setCursor, getCursor }, |
186 { XNSeparatorofNestedList, TYPE_SEPARATOR, OP_G, | 186 { XNSeparatorofNestedList, TYPE_SEPARATOR, OP_G, |
187 NULL, NULL }, | 187 NULL, NULL }, |
830 IMPSAttributes *ap; | 830 IMPSAttributes *ap; |
831 int line_space; | 831 int line_space; |
832 | 832 |
833 TRACE(("imlib:setLineSpace()\n")); | 833 TRACE(("imlib:setLineSpace()\n")); |
834 | 834 |
835 CHECK_ICATTR_SIZE(2, IMBadSomething); | 835 CHECK_ICATTR_SIZE(4, IMBadSomething); |
836 | 836 |
837 if ((ap = getPSPtr(icp, nest)) == NULL) { | 837 if ((ap = getPSPtr(icp, nest)) == NULL) { |
838 unnestedError(icp); | 838 unnestedError(icp); |
839 return -1; | 839 return -1; |
840 } | 840 } |
841 | 841 |
842 line_space = getI16(value, order); /* ??? linespacing is 'int' */ | 842 line_space = getC32(value, order); /* ??? linespacing is 'int' */ |
843 TRACE(("\tline space: %d\n", line_space)); | 843 TRACE(("\tline space: %d\n", line_space)); |
844 | 844 |
845 if (!(ap->set_mask & ATTR_MASK_LINESPACE) || | 845 if (!(ap->set_mask & ATTR_MASK_LINESPACE) || |
846 line_space != ap->line_space) { | 846 line_space != ap->line_space) { |
847 ap->change_mask |= ATTR_MASK_LINESPACE; | 847 ap->change_mask |= ATTR_MASK_LINESPACE; |