--- rxvt-unicode/src/rxvtfont.C	2014/11/14 11:06:49	1.194
+++ rxvt-unicode/src/rxvtfont.C	2021/06/17 00:08:35	1.199
@@ -241,7 +241,7 @@
 #if XFT
       Picture dst;
 
-# ifdef HAVE_BG_PIXMAP
+# ifdef HAVE_IMG
       if (term->bg_img
           && !term->pix_colors[color].is_opaque ()
           && ((dst = XftDrawPicture (d))))
@@ -264,7 +264,8 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-struct rxvt_font_default : rxvt_font {
+struct rxvt_font_default : rxvt_font
+{
   struct rxvt_fontset *fs;
 
   rxvt_font_default (rxvt_fontset *fs)
@@ -476,6 +477,15 @@
             case NOCHAR:
               break;
 
+            /*
+             * If the base font does not support variation selectors, treat them as ZWC.
+             * a point could be made to do this for all wcwidth == 0 characters, but I
+             * decided against that until more data is available.
+             */
+            case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
+            case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
+              break;
+
             default:
               XDrawRectangle (disp, d, gc, x + 2, y + 2,
                               fwidth - 4, term->fheight - 4);
@@ -485,7 +495,8 @@
     }
 }
 
-struct rxvt_font_overflow : rxvt_font {
+struct rxvt_font_overflow : rxvt_font
+{
   struct rxvt_fontset *fs;
 
   rxvt_font_overflow (rxvt_fontset *fs)
@@ -541,7 +552,8 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-struct rxvt_font_x11 : rxvt_font {
+struct rxvt_font_x11 : rxvt_font
+{
   rxvt_font_x11 () { f = 0; }
 
   void clear ();
@@ -1126,8 +1138,12 @@
 
 #if XFT
 
-struct rxvt_font_xft : rxvt_font {
-  rxvt_font_xft () { f = 0; }
+struct rxvt_font_xft : rxvt_font
+{
+  rxvt_font_xft ()
+  {
+    f = 0;
+  }
 
   void clear ();
 
@@ -1412,7 +1428,7 @@
         {
           rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
 
-#ifdef HAVE_BG_PIXMAP
+#ifdef HAVE_IMG
           Picture dst = 0; // the only assignment is done conditionally in the following if condition
 
           if (term->bg_img
@@ -1608,7 +1624,7 @@
                 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
 
               desc++;
-              while (*desc <= ' ') desc++;
+              while (*desc <= ' ' && *desc) desc++;
             }
 
           end = strchr (desc, ',');
@@ -1736,6 +1752,7 @@
               // TODO: this is a real resource hog, xft takes ages(?)
 #if XFT && USE_SLOW_LOOKUP
               // grab the first xft font that seems suitable
+              // TOOD: should go first for cellchar (spacing 110) then mono, then else
               FcPattern *p = FcPatternCreate ();
 
               FcCharSet *s = FcCharSetCreate ();