Avoid empty menu bar on Xaw with cairo

mituharu · mituharu · commit 82052afb24d2 · 2019-06-10T12:57:30.000+09:00
* lwlib/lwlib-utils.c (crxft_font_open_name) [USE_CAIRO]: Return NULL if
font extents are bogus.
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
@@ -192,6 +192,11 @@ crxft_font_open_name (Display *dpy, int screen, const char *name)
 	}
       FcPatternDestroy (pattern);
     }
+  if (pub && pub->height <= 0)
+    {
+      crxft_font_close (pub);
+      pub = NULL;
+    }
   return pub;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,11 @@ crxft_font_open_name (Display dpy, int screen, const char name)`
`192`	`192`	`}`
`193`	`193`	`FcPatternDestroy (pattern);`
`194`	`194`	`}`
	`195`	`+ if (pub && pub->height <= 0)`
	`196`	`+ {`
	`197`	`+ crxft_font_close (pub);`
	`198`	`+ pub = NULL;`
	`199`	`+ }`
`195`	`200`	`return pub;`
`196`	`201`	`}`
`197`	`202`