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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.154 by sf-exg, Sun Mar 28 22:02:52 2010 UTC vs.
Revision 1.155 by root, Tue Mar 30 23:00:35 2010 UTC

           text_t chrs[2];
           chrs [1] = NOCHAR;
           *chrs = cc->c1;
-          rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
+          rxvt_font *f1 = fs->get (cc->c1);
           f1->draw (d, x, y, chrs, width, fg, bg);
           if (cc->c2 != NOCHAR)
             {
               bool careful;
               // prefer font of first character, for no good reasons
               *chrs = cc->c2;
               rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
                                 ? f1
-                                : (*fs)[fs->find_font (cc->c2)];
+                                : fs->get (cc->c2);
               f2->draw (d, x, y, chrs, width, fg, Color_none);
             }
         }
 #endif
   return -1;
 }
 int
-rxvt_fontset::find_font (unicode_t unicode)
+rxvt_fontset::find_font_ (unicode_t unicode)
 {
   if (unicode >= 1<<20)
     return 0;
   unicode_t hi = unicode >> 8;
     }
   return i;
 }
+int
+rxvt_fontset::find_font (unicode_t unicode)
+{
+  return min<int> (fontCount, find_font_ (unicode));
+}

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