external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dwtm/WmResource.c: Stop printing garbage when XmeRenderTableGetDefaultFont() fails.

Browse source
This commit is contained in:
Jon Trulson 2018-07-02 14:44:58 -06:00
parent dc7807b13b
commit a7ec1c6182
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cde/programs/dtwm/WmResource.c
View file

@ -4482,11 +4482,18 @@ MakeAppearanceResources (WmScreenData *pSD, AppearanceData *pAData, Boolean make
if (! XmeRenderTableGetDefaultFont(pAData->fontList, &(pAData->font)))
{
sprintf((char *)wmGD.tmpBuffer, ((char *)GETMESSAGE(62, 23, "failed to load font: %.100s\0")), (char*) pAData->fontList);
Warning((char *)wmGD.tmpBuffer);
#if 0
/* This always prints garbage on failure, which seems to
* always happen at least 1-3 times on startup.
*/
sprintf((char *)wmGD.tmpBuffer,
((char *)GETMESSAGE(62, 23, "failed to load font: %.100s\0")), (char*) pAData->fontList);
#endif
Warning("XmeRenderTableGetDefaultFont() failed, trying a fixed font");
#if defined(CSRG_BASED) || defined(__linux__)
/* HACK to try get _some_ font anyway (fontList seems to end up as an empty list on
* some modern systems; investigate) */
/* HACK to try get _some_ font anyway (fontList seems to end
* up as an empty list on some modern systems; investigate) */
pAData->font = XLoadQueryFont(wmGD.display, "fixed");
if (pAData->font == NULL)
{