equal
deleted
inserted
replaced
636 /*fprintf(stderr,"LoadFont: %s\n", fontSpec); */ |
636 /*fprintf(stderr,"LoadFont: %s\n", fontSpec); */ |
637 xfont = XLoadQueryFont(display, fontSpec); |
637 xfont = XLoadQueryFont(display, fontSpec); |
638 |
638 |
639 /* XXX: sometimes XLoadQueryFont returns a bogus font structure */ |
639 /* XXX: sometimes XLoadQueryFont returns a bogus font structure */ |
640 /* with negative ascent. */ |
640 /* with negative ascent. */ |
641 if (xfont == (Font) NULL || xfont->ascent < 0) { |
641 if (xfont == NULL || xfont->ascent < 0) { |
642 if (xfont != NULL) { |
642 if (xfont != NULL) { |
643 XFreeFont(display, xfont); |
643 XFreeFont(display, xfont); |
644 } |
644 } |
645 if (foundry != anyfoundry) { /* Use ptr comparison here, not strcmp */ |
645 if (foundry != anyfoundry) { /* Use ptr comparison here, not strcmp */ |
646 /* Try any other foundry before messing with the sizes */ |
646 /* Try any other foundry before messing with the sizes */ |