sync with OpenBSD -current

This commit is contained in:
purplerain 2024-07-25 20:49:18 +00:00
parent a34e492c6b
commit acb2a22980
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
86 changed files with 12131 additions and 4602 deletions

View file

@ -1,7 +1,7 @@
/* $XTermId: fontutils.h,v 1.142 2022/10/23 14:47:45 tom Exp $ */
/* $XTermId: fontutils.h,v 1.147 2024/07/11 08:16:39 tom Exp $ */
/*
* Copyright 1998-2021,2022 by Thomas E. Dickey
* Copyright 1998-2022,2024 by Thomas E. Dickey
*
* All Rights Reserved
*
@ -123,13 +123,21 @@ extern char *xtermSpecialFont (XTermDraw * /* params */);
? ((font)->known_missing[(Char)(ch)] > 1) \
: ((FontIsIncomplete(font) && xtermMissingChar(ch, font)) \
|| ForceBoxChars(screen, ch)))
extern void xtermDrawBoxChar (XTermDraw * /* params */, unsigned /* ch */, GC /* gc */, int /* x */, int /* y */, int /* cols */, Bool /* xftords */);
#else
#define IsXtermMissingChar(screen, ch, font) False
#endif
extern void xtermDrawBoxChar (XTermDraw * /* params */, unsigned /* ch */, GC /* gc */, int /* x */, int /* y */, int /* cols */, Bool /* xftords */);
#if OPT_BOX_CHARS || OPT_REPORT_FONTS
#define XTermFontsRef(fontList, which) \
(((which) != fNorm && \
((fontList)[(which)].fs == NULL || \
(fontList)[(which)].fs->per_char == NULL) && \
((fontList)[fNorm].fs != NULL && \
(fontList)[fNorm].fs->per_char != NULL)) \
? &((fontList)[fNorm]) \
: &((fontList)[(which)]))
extern Bool xtermMissingChar (unsigned /* ch */, XTermFonts */* font */);
#endif
@ -142,7 +150,10 @@ extern Bool xtermLoadWideFonts (XtermWidget /* w */, Bool /* nullOk */);
extern void xtermSaveVTFonts (XtermWidget /* xw */);
#endif
/* checks for internal charset codes */
#define xtermIsDecTechnical(ch) ((ch) >= XTERM_PUA && (ch) <= XTERM_PUA + 6)
#define xtermIsDecGraphic(ch) ((ch) > 0 && (ch) < 32)
#define xtermIsInternalCs(ch) (xtermIsDecGraphic(ch) || xtermIsDecTechnical(ch))
#if OPT_RENDERFONT
extern Boolean maybeXftCache(XtermWidget /* xw */, XftFont * /* font */);