From 44891333a1b2a28f93181243e1e051766826a079 Mon Sep 17 00:00:00 2001 From: Jude Melton-Houghton Date: Sat, 19 Jun 2021 15:27:01 +0000 Subject: [PATCH] Improve x11 font compatibility --- x11/pdcscrn.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/x11/pdcscrn.c b/x11/pdcscrn.c index be1dd36b..0ded07c7 100644 --- a/x11/pdcscrn.c +++ b/x11/pdcscrn.c @@ -503,22 +503,23 @@ int PDC_scr_open(void) /* Check application resource values here */ - pdc_fwidth = pdc_app_data.normalFont->max_bounds.rbearing - - pdc_app_data.normalFont->min_bounds.lbearing; + pdc_fwidth = pdc_app_data.normalFont->max_bounds.width; - pdc_fascent = pdc_app_data.normalFont->max_bounds.ascent; - pdc_fdescent = pdc_app_data.normalFont->max_bounds.descent; + pdc_fascent = pdc_app_data.normalFont->ascent; + pdc_fdescent = pdc_app_data.normalFont->descent; pdc_fheight = pdc_fascent + pdc_fdescent; /* Check that the italic font and normal fonts are the same size */ - italic_font_valid = pdc_fwidth == - pdc_app_data.italicFont->max_bounds.rbearing - - pdc_app_data.italicFont->min_bounds.lbearing; + italic_font_valid = + pdc_fwidth == pdc_app_data.italicFont->max_bounds.width && + pdc_fheight == + pdc_app_data.italicFont->ascent + pdc_app_data.italicFont->descent; - bold_font_valid = pdc_fwidth == - pdc_app_data.boldFont->max_bounds.rbearing - - pdc_app_data.boldFont->min_bounds.lbearing; + bold_font_valid = + pdc_fwidth == pdc_app_data.boldFont->max_bounds.width && + pdc_fheight == + pdc_app_data.boldFont->ascent + pdc_app_data.boldFont->descent; /* Calculate size of display window */