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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.146 by ayin, Sat Jan 26 14:24:43 2008 UTC vs.
Revision 1.150 by root, Sun Mar 29 13:36:03 2009 UTC

 : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
 {
 }
 void
-rxvt_font::set_name (char *name)
+rxvt_font::set_name (char *name_)
 {
-  if (this->name == name)
+  if (name == name_)
     return;
-  if (this->name) free (this->name); // let the compiler optimize
+  if (name) free (name); // let the compiler optimize
-  this->name = name;
+  name = name_;
 }
 void
 rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
 {
     FcPatternAddInteger (p, FC_SLANT, prop.slant);
 #if 0 // clipping unfortunately destroys our precious double-width-characters
   // clip width, we can't do better, or can we?
   if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
-    FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
+    FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
 #endif
   if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
     FcPatternAddBool (p, FC_MINSPACE, 1);
   dTermGC;
   int w = term->fwidth * len;
   int h = term->fheight;
-  /*
-   * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
-   * good idea from the perspective of packaging for wide variety of user configs.
-   */
   bool buffered = bg >= Color_transparent
-    && term->option (Opt_buffered);
+                  && term->option (Opt_buffered);
   // cut trailing spaces
   while (len && text [len - 1] == ' ')
     len--;

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