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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.28 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC

   { CS_UNICODE,      "xft:FreeMono"                                },
   { CS_UNICODE,      "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1"   },
   { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1"         },
   { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1"         },
+#if UNICODE_3 && XFT
+  { CS_UNICODE,      "xft:Code2001"                                }, // contains many plane-1 characters
+#endif
   { CS_UNKNOWN, 0 }
 };
 /////////////////////////////////////////////////////////////////////////////
   bool has_codepoint (uint32_t unicode)
   {
     if (unicode <= 0x001f)
       return true;
     if (unicode >= 0x0080 && unicode <= 0x009f)
       return true;
     if (unicode >= 0x2500 && unicode <= 0x257f
         && linedraw_cmds[unicode - 0x2500])
+      return true;
+    if (IS_COMPOSE (unicode))
       return true;
     switch (unicode)
       {
         case ZERO_WIDTH_CHAR:
   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])
         {
           const char *p = linedraw_cmds[t - 0x2500];
-          int x0 = x, x1 = x + r->TermWin.fwidth  / 2, x2 = x + r->TermWin.fwidth  - 1;
+          int x0 = x, x1 = x + (r->TermWin.fwidth  - 1) / 2, x2 = x + r->TermWin.fwidth  - 1;
-          int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
+          int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
           XGCValues gcv;
           while (*p)
             {
                 }
             }
           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)];
+          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);
+            }
         }
       else
         switch (t)
           {
             case ZERO_WIDTH_CHAR:
 bool
 rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
 {
   int slashes = 0;
-  const char *comp[12];
+  const char *comp[13];
   for (const char *c = name; *c; c++)
     if (*c == '-')
       {
         comp[slashes++] = c + 1;
       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;

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.28 by pcg, Wed Mar 3 02:59:53 2004 UTC vs. Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.28 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.37 by pcg, Fri Mar 5 05:52:02 2004 UTC