ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.71 by root, Sat Jun 18 10:02:35 2005 UTC vs.
Revision 1.74 by root, Tue Dec 6 15:41:26 2005 UTC

… …
851 851
852 XCharStruct g; 852 XCharStruct g;
853 int dir_ret, asc_ret, des_ret; 853 int dir_ret, asc_ret, des_ret;
854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
855 855
856 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 856 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
857 857
858 if (width < g.width) width = g.width; 858 if (width < g.width) width = g.width;
859 } 859 }
860 860
861 if (cs == CS_UNKNOWN) 861 if (cs == CS_UNKNOWN)
… …
936 return true; 936 return true;
937 937
938 // check character against base font bounding box 938 // check character against base font bounding box
939 int w = xcs->width; 939 int w = xcs->width;
940 int wcw = wcwidth (unicode); 940 int wcw = wcwidth (unicode);
941 if (wcw > 0) w /= wcw; 941 if (wcw > 0) w = (w + wcw - 1) / wcw;
942 942
943 careful = w > prop->width; 943 careful = w > prop->width;
944 if (careful && w > prop->width * MAX_OVERLAP >> 2) 944 if (careful && w > prop->width * MAX_OVERLAP >> 2)
945 return false; 945 return false;
946 946
… …
1154 1154
1155 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1155 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1156 1156
1157 XftUnlockFace (f); 1157 XftUnlockFace (f);
1158 1158
1159 int glheight = height;
1160
1159 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1161 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1160 { 1162 {
1161 FcChar16 ch = *t; 1163 FcChar16 ch = *t;
1162 1164
1163 if (cs != CS_UNICODE 1165 if (cs != CS_UNICODE
… …
1171 continue; 1173 continue;
1172 1174
1173 XGlyphInfo g; 1175 XGlyphInfo g;
1174 XftTextExtents16 (disp, f, &ch, 1, &g); 1176 XftTextExtents16 (disp, f, &ch, 1, &g);
1175 1177
1178 g.width -= g.x;
1179
1176 int wcw = wcwidth (ch); 1180 int wcw = wcwidth (ch);
1177 if (wcw > 0) g.width = g.width / wcw; 1181 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1178 1182
1179 if (width < g.width) width = g.width; 1183 if (width < g.width ) width = g.width;
1180 if (height < g.height) height = g.height; 1184 if (height < g.height ) height = g.height;
1185 if (glheight < g.height - g.y) glheight = g.height - g.y;
1186 }
1187
1188 if (!width)
1189 {
1190 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1191
1192 XftFontClose (disp, f);
1193 f = 0;
1194
1195 success = false;
1196 break;
1181 } 1197 }
1182 1198
1183 if (prop.height == rxvt_fontprop::unset 1199 if (prop.height == rxvt_fontprop::unset
1184 || height <= prop.height 1200 || (height <= prop.height && glheight <= prop.height)
1185 || height <= 2 1201 || height <= 2
1186 || !scalable) 1202 || !scalable)
1187 break; 1203 break;
1188 1204
1189 if (ftheight) 1205 if (ftheight)
… …
1196 ftheight -= height - prop.height; 1212 ftheight -= height - prop.height;
1197 } 1213 }
1198 else 1214 else
1199 ftheight = prop.height - 1; 1215 ftheight = prop.height - 1;
1200 1216
1201 XftFontClose (disp, f); 1217 XftFontClose (disp, f);
1202 FcPatternDel (match, FC_PIXEL_SIZE); 1218 FcPatternDel (match, FC_PIXEL_SIZE);
1203 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1219 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1204 } 1220 }
1205 1221
1206 FcPatternDestroy (match); 1222 FcPatternDestroy (match);
1207 1223
1208#if 0 // do it per-character 1224#if 0 // do it per-character
… …
1230 // check character against base font bounding box 1246 // check character against base font bounding box
1231 FcChar32 ch = unicode; 1247 FcChar32 ch = unicode;
1232 XGlyphInfo g; 1248 XGlyphInfo g;
1233 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1249 XftTextExtents32 (DISPLAY, f, &ch, 1, &g);
1234 1250
1235 int w = g.width; 1251 int w = g.width - g.x;
1236 int wcw = wcwidth (unicode); 1252 int wcw = wcwidth (unicode);
1237 if (wcw > 0) w /= wcw; 1253 if (wcw > 0) w = (w + wcw - 1) / wcw;
1238 1254
1239 careful = w > prop->width; 1255 careful = w > prop->width;
1240 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1256 if (careful && w > prop->width * MAX_OVERLAP >> 2)
1241 return false; 1257 return false;
1242 1258
… …
1307#endif 1323#endif
1308 1324
1309///////////////////////////////////////////////////////////////////////////// 1325/////////////////////////////////////////////////////////////////////////////
1310 1326
1311rxvt_fontset::rxvt_fontset (rxvt_t r) 1327rxvt_fontset::rxvt_fontset (rxvt_t r)
1312: r (r), fontdesc (0) 1328: fontdesc (0), r (r)
1313{ 1329{
1314 clear (); 1330 clear ();
1315} 1331}
1316 1332
1317rxvt_fontset::~rxvt_fontset () 1333rxvt_fontset::~rxvt_fontset ()

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines