From: pcg <pcg>
Date: Fri, 5 Mar 2004 05:52:02 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=adad4bdab4fc5846009351a39bf9dd940e38c6ca;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/defaultfont.C b/src/defaultfont.C
index 9c848ee4..3603320c 100644
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -354,9 +354,17 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
         }
       else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
         {
-          (*fs)[fs->find_font (cc->c1)]->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
+          rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
+          f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
           if (cc->c2 != NOCHAR)
-            (*fs)[fs->find_font (cc->c2)]->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
+            {
+              // prefer font of first character, for no good reasons
+              rxvt_font *f2 = f1->has_codepoint (cc->c2)
+                              ? f1
+                              : (*fs)[fs->find_font (cc->c2)];
+
+              f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
+            }
         }
       else
         switch (t)