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.69 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.73 by root, Mon Nov 28 19:35:04 2005 UTC

… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "rxvtutil.h"
… …
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;
1181 } 1186 }
1182 1187
1183 if (prop.height == rxvt_fontprop::unset 1188 if (prop.height == rxvt_fontprop::unset
1184 || height <= prop.height 1189 || (height <= prop.height && glheight <= prop.height)
1185 || height <= 2 1190 || height <= 2
1186 || !scalable) 1191 || !scalable)
1187 break; 1192 break;
1188 1193
1189 if (ftheight) 1194 if (ftheight)
… …
1230 // check character against base font bounding box 1235 // check character against base font bounding box
1231 FcChar32 ch = unicode; 1236 FcChar32 ch = unicode;
1232 XGlyphInfo g; 1237 XGlyphInfo g;
1233 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1238 XftTextExtents32 (DISPLAY, f, &ch, 1, &g);
1234 1239
1235 int w = g.width; 1240 int w = g.width - g.x;
1236 int wcw = wcwidth (unicode); 1241 int wcw = wcwidth (unicode);
1237 if (wcw > 0) w /= wcw; 1242 if (wcw > 0) w = (w + wcw - 1) / wcw;
1238 1243
1239 careful = w > prop->width; 1244 careful = w > prop->width;
1240 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1245 if (careful && w > prop->width * MAX_OVERLAP >> 2)
1241 return false; 1246 return false;
1242 1247
… …
1254 1259
1255 XGlyphInfo extents; 1260 XGlyphInfo extents;
1256 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1261 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32));
1257 FcChar32 *ep = enc; 1262 FcChar32 *ep = enc;
1258 int ewidth = 0; 1263 int ewidth = 0;
1259 int xoff = 0;
1260 1264
1261 while (len) 1265 while (len)
1262 { 1266 {
1263 int cwidth = r->TermWin.fwidth; 1267 int cwidth = r->TermWin.fwidth;
1264 FcChar32 fc = *text++; len--; 1268 FcChar32 fc = *text++; len--;
1265 FT_UInt gl;
1266 1269
1267 while (len && *text == NOCHAR) 1270 while (len && *text == NOCHAR)
1268 text++, len--, cwidth += r->TermWin.fwidth; 1271 text++, len--, cwidth += r->TermWin.fwidth;
1269 1272
1270 gl = XftCharIndex (d.display->display, f, fc);
1271 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1272
1273 if (extents.xOff != cwidth && ep != enc)
1274 {
1275 if (xoff > ewidth) xoff = ewidth;
1276 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1277 x + (ewidth - xoff >> 1),
1278 y + base, enc, ep - enc);
1279 x += ewidth;
1280
1281 ep = enc;
1282 ewidth = 0;
1283 xoff = 0;
1284 }
1285
1286 if (fc == ' ' && ep == enc) // skip leading spaces 1273 if (fc == ' ' && ep == enc) // skip leading spaces
1287 {
1288 x += cwidth; 1274 x += cwidth;
1289 continue;
1290 }
1291
1292 else 1275 else
1293 { 1276 {
1277 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1278 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1279
1280 if (extents.xOff != cwidth)
1281 {
1282 if (ewidth)
1283 {
1284 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1285 x, y + base, enc, ep - enc);
1286 x += ewidth;
1287
1288 ep = enc;
1289 ewidth = 0;
1290 }
1291
1292 if (extents.xOff > cwidth)
1293 extents.xOff = cwidth;
1294
1295 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1296 x + (cwidth - extents.xOff >> 1),
1297 y + base, &gl, 1);
1298 x += cwidth;
1299 }
1300 else
1301 {
1294 *ep++ = gl; 1302 *ep++ = gl;
1295 ewidth += cwidth; 1303 ewidth += cwidth;
1296 xoff += extents.xOff; 1304 }
1297 } 1305 }
1298 } 1306 }
1299 1307
1300 if (ep != enc) 1308 if (ep != enc)
1301 {
1302 if (xoff > ewidth) xoff = ewidth;
1303 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1309 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1304 x + (ewidth - xoff >> 1),
1305 y + base, enc, ep - enc); 1310 x, y + base, enc, ep - enc);
1306 }
1307} 1311}
1308#endif 1312#endif
1309 1313
1310///////////////////////////////////////////////////////////////////////////// 1314/////////////////////////////////////////////////////////////////////////////
1311 1315
1312rxvt_fontset::rxvt_fontset (rxvt_t r) 1316rxvt_fontset::rxvt_fontset (rxvt_t r)
1313: r (r), fontdesc (0) 1317: fontdesc (0), r (r)
1314{ 1318{
1315 clear (); 1319 clear ();
1316} 1320}
1317 1321
1318rxvt_fontset::~rxvt_fontset () 1322rxvt_fontset::~rxvt_fontset ()

Diff Legend

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