From 1445e9c6c6f9b643d316c402a2b9fcc4fe78d3c6 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sat, 2 Jun 2007 22:06:44 +0000 Subject: [PATCH] (FONT_WIDTH): Report max width, not average. (FONT_MAX_WIDTH): Remove. (FONT_AVG_WIDTH): New macro. --- src/w32term.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/w32term.h b/src/w32term.h index 52b6d9c9427..6eb7988b485 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -28,15 +28,15 @@ Boston, MA 02110-1301, USA. */ #define WHITE_PIX_DEFAULT(f) PALETTERGB(255,255,255) #define FONT_WIDTH(f) \ - ((f)->bdf ? (f)->bdf->width : (f)->tm.tmAveCharWidth) + ((f)->bdf ? (f)->bdf->width : (f)->tm.tmMaxCharWidth) #define FONT_HEIGHT(f) \ ((f)->bdf ? (f)->bdf->height : (f)->tm.tmHeight) #define FONT_BASE(f) \ ((f)->bdf ? (f)->bdf->ury : (f)->tm.tmAscent) #define FONT_DESCENT(f) \ ((f)->bdf ? -((f)->bdf->lly) : (f)->tm.tmDescent) -#define FONT_MAX_WIDTH(f) \ - ((f)->bdf ? (f)->bdf->width : (f)->tm.tmMaxCharWidth) +#define FONT_AVG_WIDTH(f) \ + ((f)->bdf ? (f)->bdf->width : (f)->tm.tmAveCharWidth) #define CP_DEFAULT 1004 /* Special pseudo-codepages. */ -- 2.39.5