[ViewVC] Diff of: cvs/rxvt-unicode/src/defaultfont.C

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.36 by pcg, Fri Mar 5 04:43:41 2004 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC

           gcv.line_width = 0;
           XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
         }
       else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
         {
+          rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
-          (*fs)[fs->find_font (cc->c1)]->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
+          f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
           if (cc->c2 != NOCHAR)
+            {
+              // prefer font of first character, for no good reasons
+              rxvt_font *f2 = f1->has_codepoint (cc->c2)
+                              ? f1
+                              : (*fs)[fs->find_font (cc->c2)];
-            (*fs)[fs->find_font (cc->c2)]->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
+              f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
+            }
         }
       else
         switch (t)
           {
             case ZERO_WIDTH_CHAR:

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines