From 65b24e74eaa5c9052bb1d91d83255eb8f8ccb03e Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Sun, 25 Nov 2018 02:44:33 -0500
Subject: [PATCH] Center any glyphs narrower than the cell (i.e. in
 proportional fonts).

---
 sdl1/pdcdisp.c | 10 ++++++++++
 sdl2/pdcdisp.c | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/sdl1/pdcdisp.c b/sdl1/pdcdisp.c
index 7ea75ec7..292652ee 100644
--- a/sdl1/pdcdisp.c
+++ b/sdl1/pdcdisp.c
@@ -203,12 +203,16 @@ void PDC_gotoyx(int row, int col)
     pdc_font = TTF_RenderUNICODE_Blended(pdc_ttffont, chstr, pdc_color[foregr]);
     if (pdc_font)
     {
+        int center = pdc_fwidth > pdc_font->w ?
+                    (pdc_fwidth - pdc_font->w) >> 1 : 0;
         dest.h = src.h;
         dest.w = src.w;
         src.x = 0;
         src.y = pdc_fheight - src.h;
         SDL_FillRect(pdc_screen, &dest, pdc_mapped[backgr]);
+        dest.x += center;
         SDL_BlitSurface(pdc_font, &src, pdc_screen, &dest);
+        dest.x -= center;
         SDL_FreeSurface(pdc_font);
         pdc_font = NULL;
     }
@@ -441,7 +445,13 @@ void _new_packet(attr_t attr, int lineno, int x, int len, const chtype *srcp)
             }
 
             if (pdc_font)
+            {
+                int center = pdc_fwidth > pdc_font->w ?
+                    (pdc_fwidth - pdc_font->w) >> 1 : 0;
+                dest.x += center;
                 SDL_BlitSurface(pdc_font, &src, pdc_screen, &dest);
+                dest.x -= center;
+            }
         }
 #else
         src.x = (ch & 0xff) % 32 * pdc_fwidth;
diff --git a/sdl2/pdcdisp.c b/sdl2/pdcdisp.c
index 07425d10..c0a3a0bb 100644
--- a/sdl2/pdcdisp.c
+++ b/sdl2/pdcdisp.c
@@ -203,12 +203,16 @@ void PDC_gotoyx(int row, int col)
     pdc_font = TTF_RenderUNICODE_Blended(pdc_ttffont, chstr, pdc_color[foregr]);
     if (pdc_font)
     {
+        int center = pdc_fwidth > pdc_font->w ?
+                    (pdc_fwidth - pdc_font->w) >> 1 : 0;
         dest.h = src.h;
         dest.w = src.w;
         src.x = 0;
         src.y = pdc_fheight - src.h;
         SDL_FillRect(pdc_screen, &dest, pdc_mapped[backgr]);
+        dest.x += center;
         SDL_BlitSurface(pdc_font, &src, pdc_screen, &dest);
+        dest.x -= center;
         SDL_FreeSurface(pdc_font);
         pdc_font = NULL;
     }
@@ -441,7 +445,13 @@ void _new_packet(attr_t attr, int lineno, int x, int len, const chtype *srcp)
             }
 
             if (pdc_font)
+            {
+                int center = pdc_fwidth > pdc_font->w ?
+                    (pdc_fwidth - pdc_font->w) >> 1 : 0;
+                dest.x += center;
                 SDL_BlitSurface(pdc_font, &src, pdc_screen, &dest);
+                dest.x -= center;
+            }
         }
 #else
         src.x = (ch & 0xff) % 32 * pdc_fwidth;