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

Comparing rxvt-unicode/src/rxvtfont.h (file contents):
Revision 1.27 by root, Tue Mar 30 22:46:25 2010 UTC vs.
Revision 1.29 by root, Tue Mar 30 23:36:14 2010 UTC

 struct rxvt_fontset
 {
   char *fontdesc;
-  enum { fontCount = 127 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
+  enum { fontCount = 3 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
+  enum { Careful = fontCount + 1 };
   rxvt_fontset (rxvt_term *term);
   ~rxvt_fontset ();
   bool populate (const char *desc);
   int find_font (uint32_t unicode);
   int find_font (const char *name) const;
   bool realize_font (int i);
   // font-id's MUST fit into a signed 16 bit integer, and within 0..255
-  rxvt_font *operator [] (int id) const
+  rxvt_font *get (uint32_t unicode, int id = fontCount)
   {
-    return fonts[id & fontCount];
+    bool dummy;
+    id &= fontCount;
+    return fonts[id == fontCount ? find_font_idx (unicode, dummy) : id];
   }
 private:
   rxvt_term *term;
   rxvt_fontprop prop;
   vector<pagemap *> fmap;
   void clear ();
   rxvt_font *new_font (const char *name, codeset cs);
   void add_fonts (const char *desc);
+  int find_font_idx (uint32_t unicode, bool &careful); // same as find_font, but does not limit index
 };
 #endif /* _DEFAULTFONT_H_ */

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