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

Comparing rxvt-unicode/src/rxvtfont.h (file contents):
Revision 1.24 by ayin, Thu Oct 18 09:11:43 2007 UTC vs.
Revision 1.31 by sf-exg, Wed Mar 31 13:14:50 2010 UTC

 #include "rxvtutil.h"
 #include "rxvttoolkit.h"
 struct rxvt_term;
-struct rxvt_fontprop {
+struct rxvt_fontprop
+{
   enum {
     unset  = -1,
     medium = 100, bold = 200,
     roman  = 0, italic = 100,
   };
   int width, height, ascent;
   int weight, slant;
 };
-struct rxvt_font {
+struct rxvt_font
+{
   // managed by the fontset
   rxvt_term *term;
   void set_term (rxvt_term *term) { this->term = term; }
   char *name;
   codeset cs;
-  bool loaded; // wether we tried loading it before (not wether it's loaded)
+  bool loaded; // whether we tried loading it before (not whether it's loaded)
   // managed by the font object
   int ascent, descent,
       width, height;
-  void set_name (char *name);
+  void set_name (char *name_);
   rxvt_font ();
   virtual ~rxvt_font () { free (name); };
   virtual void clear () { };
 #define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
 struct rxvt_fallback_font;
-struct rxvt_fontset {
+struct rxvt_fontset
+{
   char *fontdesc;
+  enum { fontCount = 127 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
   rxvt_fontset (rxvt_term *term);
   ~rxvt_fontset ();
   bool populate (const char *desc);
   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
   {
-    return fonts[id & 0x7f];
+    return fonts[id & fontCount];
   }
 private:
   rxvt_term *term;
   rxvt_fontprop prop;

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