[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.40 by pcg, Mon Mar 15 00:08:11 2004 UTC

   bool load (const rxvt_fontprop &prop)
   {
     width = 1; height = 1;
     ascent = 1; descent = 0;
+    set_name ("built-in pseudofont");
     return true;
   }
-  bool has_codepoint (uint32_t unicode)
+  bool has_codepoint (unicode_t unicode)
   {
     if (unicode <= 0x001f)
       return true;
     if (unicode >= 0x0080 && unicode <= 0x009f)
   XSetForeground (d.display->display, GC, r->PixColors[fg]);
   while (len--)
     {
+#if ENABLE_COMBINING
+      compose_char *cc;
+#endif
       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))
+#if ENABLE_COMBINING
-        {
+      else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
-          const compose_char &cc = rxvt_composite[t];
-          (void)0; //D ADD pseudo handling here
-        }
+        {
+          rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
+          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)];
+              f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
+            }
+        }
+#endif
       else
         switch (t)
           {
             case ZERO_WIDTH_CHAR:
               break;
   rxvt_fontprop properties ();
   bool load (const rxvt_fontprop &prop);
-  bool has_codepoint (uint32_t unicode);
+  bool has_codepoint (unicode_t unicode);
   void draw (rxvt_drawable &d, int x, int y,
              const text_t *text, int len,
              int fg, int bg);
       f = 0;
     }
 }
 bool
-rxvt_font_x11::has_codepoint (uint32_t unicode)
+rxvt_font_x11::has_codepoint (unicode_t unicode)
 {
   uint32_t ch = FROM_UNICODE (cs, unicode);
   if (ch == NOCHAR)
     return false;
   void draw (rxvt_drawable &d, int x, int y,
              const text_t *text, int len,
              int fg, int bg);
-  bool has_codepoint (uint32_t unicode);
+  bool has_codepoint (unicode_t unicode);
 protected:
   XftFont *f;
 };
   return true;
 }
 bool
-rxvt_font_xft::has_codepoint (uint32_t unicode)
+rxvt_font_xft::has_codepoint (unicode_t unicode)
 {
   return XftCharExists (DISPLAY, f, unicode);
 }
 void
       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;
   return true;
 }
 int
-rxvt_fontset::find_font (uint32_t unicode)
+rxvt_fontset::find_font (unicode_t unicode)
 {
   for (unsigned int i = 0; i < fonts.size (); i++)
     {
       rxvt_font *f = fonts[i];

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.35 by pcg, Thu Mar 4 20:09:01 2004 UTC vs. Revision 1.40 by pcg, Mon Mar 15 00:08:11 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.35 by pcg, Thu Mar 4 20:09:01 2004 UTC vs.
Revision 1.40 by pcg, Mon Mar 15 00:08:11 2004 UTC