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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.35 by pcg, Thu Mar 4 20:09:01 2004 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC

   XSetForeground (d.display->display, GC, r->PixColors[fg]);
   while (len--)
     {
+      compose_char *cc;
       text_t t = *text++;
       // is it in our linedrawing table?
       if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
         {
             }
           gcv.line_width = 0;
           XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
         }
-      else if (IS_COMPOSE (t))
+      else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
+        {
+          rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
+          f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
+          if (cc->c2 != NOCHAR)
-        {
+            {
-          const compose_char &cc = rxvt_composite[t];
+              // prefer font of first character, for no good reasons
-          (void)0; //D ADD pseudo handling here
+              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)
           {
             case ZERO_WIDTH_CHAR:
       f = new rxvt_font_x11;
     }
   else
     f = new rxvt_font_x11;
+  f->fs = this;
   f->set_term (r);
   f->set_name (strdup (name));
   f->cs = cs;
   f->loaded = false;

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