diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-11-14 20:05:32 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-11-14 20:05:32 +0000 |
| commit | 81bdbc6691312aa6e471635f22087900fbd75183 (patch) | |
| tree | 3d6d34af970079f8ec3eeca7987b01412c50d75c /app/xterm/fontutils.h | |
| parent | 81ba6498d90fcd57f48c93269a2df870398f5d15 (diff) | |
Update to xterm 395. Tested by tb@, jsg@ and others.
Diffstat (limited to 'app/xterm/fontutils.h')
| -rw-r--r-- | app/xterm/fontutils.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app/xterm/fontutils.h b/app/xterm/fontutils.h index 24b4c7079..c77ae091e 100644 --- a/app/xterm/fontutils.h +++ b/app/xterm/fontutils.h @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.h,v 1.147 2024/07/11 08:16:39 tom Exp $ */ +/* $XTermId: fontutils.h,v 1.149 2024/09/01 22:40:13 tom Exp $ */ /* * Copyright 1998-2022,2024 by Thomas E. Dickey @@ -45,7 +45,7 @@ extern XTermFonts * getNormalFont (TScreen * /* screen */, int /* which */); extern const VTFontNames * defaultVTFontNames(XtermWidget /* xw */); extern const VTFontNames * xtermFontName (const char */* normal */); extern const char * whichFontEnum (VTFontEnum /* value */); -extern const char * whichFontList (XtermWidget /* xw */, VTFontList * /* value */); +extern const char * whichFontList (XtermWidget /* xw */, const VTFontList * /* value */); extern const char * whichFontList2(XtermWidget /* xw */, char ** /* value */); extern int lookupRelativeFontSize (XtermWidget /* xw */, int /* old */, int /* relative */); extern int xtermGetFont (const char * /* param */); @@ -120,9 +120,11 @@ extern char *xtermSpecialFont (XTermDraw * /* params */); #define IsXtermMissingChar(screen, ch, font) \ (CheckedKnownMissing(font, ch) \ - ? ((font)->known_missing[(Char)(ch)] > 1) \ - : ((FontIsIncomplete(font) && xtermMissingChar(ch, font)) \ - || ForceBoxChars(screen, ch))) + ? ( (font)->known_missing[(Char)(ch)] > 1) \ + : ( ( ( FontIsIncomplete(font) \ + || ( (ch) < MaxUChar && !IsLatin1(ch) ) ) \ + && xtermMissingChar(ch, font) ) \ + || ForceBoxChars(screen, ch) ) ) #else #define IsXtermMissingChar(screen, ch, font) False #endif @@ -159,7 +161,7 @@ extern void xtermSaveVTFonts (XtermWidget /* xw */); extern Boolean maybeXftCache(XtermWidget /* xw */, XftFont * /* font */); extern Bool xtermXftMissing (XtermWidget /* xw */, XTermXftFonts * /* fontData */, int /* fontNum */, XftFont * /* font */, unsigned /* wc */); extern XTermXftFonts *getMyXftFont (XtermWidget /* xw */, int /* which */, int /* fontnum */); -extern const char * whichXftFonts(XtermWidget /* xw */, XTermXftFonts * /* data */); +extern const char * whichXftFonts(XtermWidget /* xw */, const XTermXftFonts * /* data */); extern int findXftGlyph (XtermWidget /* xw */, XTermXftFonts * /* fontData */, unsigned /* wc */); extern XftFont *getXftFont (XtermWidget /* xw */, VTFontEnum /* which */, int /* fontnum */); extern void closeCachedXft (TScreen * /* screen */, XftFont * /* font */); |