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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.98 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.111 by sasha, Fri Aug 17 22:01:33 2007 UTC

 rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
 {
   dTermDisplay;
   dTermGC;
-  if (color < 0 || color == Color_bg)
+  if (color == Color_bg || color == Color_transparent)
     XClearArea (disp, d, x, y, w, h, false);
-  else
+  else if (color >= 0)
     {
 #if XFT
       XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
 #else
       XSetForeground (disp, gc, term->pix_colors[color]);
     p.slant = rxvt_fontprop::roman;
     return p;
   }
-  bool load (const rxvt_fontprop &prop)
+  bool load (const rxvt_fontprop &prop, bool force_prop)
   {
     width = 1; height = 1;
     ascent = 1; descent = 0;
     set_name (strdup ("built-in support font"));
               *chrs = cc->c2;
               rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
                                 ? f1
                                 : (*fs)[fs->find_font (cc->c2)];
-              f2->draw (d, x, y, chrs, width, fg, -1);
+              f2->draw (d, x, y, chrs, width, fg, Color_none);
             }
         }
 #endif
       else
         switch (t)
   void clear ();
   rxvt_fontprop properties ();
-  bool load (const rxvt_fontprop &prop);
+  bool load (const rxvt_fontprop &prop, bool force_prop);
   bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
   void draw (rxvt_drawable &d, int x, int y,
              const text_t *text, int len,
              int fg, int bg);
   bool slow; // wether this is a proportional font or has other funny characteristics
   XFontStruct *f;
-  codeset cs;
   bool enc2b, encm;
   char *get_property (XFontStruct *f, Atom property, const char *repl) const;
   bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
   bool set_properties (rxvt_fontprop &p, XFontStruct *f);
       return false;
     }
 }
 bool
-rxvt_font_x11::load (const rxvt_fontprop &prop)
+rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
 {
   dTermDisplay;
   clear ();
   char field_str[64]; // enough for 128 bits
   // first morph the font if required
-  if (prop.weight != rxvt_fontprop::unset
+  if (force_prop)
-      || prop.slant != rxvt_fontprop::unset)
     {
       char fname[1024];
       if (name[0] != '-')
         {
   void clear ();
   rxvt_fontprop properties ();
-  bool load (const rxvt_fontprop &prop);
+  bool load (const rxvt_fontprop &prop, bool force_prop);
   void draw (rxvt_drawable &d, int x, int y,
              const text_t *text, int len,
              int fg, int bg);
   return p;
 }
 bool
-rxvt_font_xft::load (const rxvt_fontprop &prop)
+rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
 {
   dTermDisplay;
   clear ();
       && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
           && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
     FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
   if (prop.weight != rxvt_fontprop::unset
-      && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
+      && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
     FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
   if (prop.slant != rxvt_fontprop::unset
-      && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
+      && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
     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)
   dTermGC;
   int w = term->fwidth * len;
   int h = term->fheight;
+  /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
+   * 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 = 0
+  bool buffered = true
-#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
+#ifdef FORCE_UNBUFFERED_XFT
-                  || !term->am_transparent        // we aren't transparent
+                  && bg >= 0
-                  || term->am_pixmap_trans        // we have a pixmap
 #endif
-                  || bg >= 0;                     // we don't use a transparent bg
+                  ;
   // cut trailing spaces
   while (len && text [len - 1] == ' ')
     len--;
   int x_ = buffered ? 0 : x;
   if (buffered)
     {
       if (ep != enc)
         {
           rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
+          bool back_rendered = false;
-#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
+#ifdef HAVE_BG_PIXMAP
-          if (bg < 0 && term->am_pixmap_trans)
+          if (term->bgPixmap.pixmap && (bg < 0 || term->pix_colors[bg].c.color.alpha < 0x0ff00))
-            XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);
-          else if (bg < 0 && term->bgPixmap.pixmap)
             {
+              if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w
+                  && term->bgPixmap.pmap_height >= y + term->window_vt_y+h)
+                {
+                  XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
+                             x + term->window_vt_x, y + term->window_vt_y,
+                             w, h, 0, 0);
+                }
+              else
+                {
-              XGCValues gcv;
+                  XGCValues gcv;
-              gcv.fill_style  = FillTiled;
+                  gcv.fill_style  = FillTiled;
-              gcv.tile        = term->pixmap;
+                  gcv.tile        = term->bgPixmap.pixmap;
-              gcv.ts_x_origin = -x;
+                  gcv.ts_x_origin = -x;
-              gcv.ts_y_origin = -y;
+                  gcv.ts_y_origin = -y;
+#if 0
-              GC gc2 = XCreateGC (disp, d2,
+                  GC gc2 = XCreateGC (disp, d2,
-                                  GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
+                                      GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
-                                  &gcv);
+                                      &gcv);
+#endif
+                  XChangeGC (disp, gc,
+                             GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
+                             &gcv);
-              XFillRectangle (disp, d2, gc2, 0, 0, w, h);
+                  XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h);
+                  gcv.fill_style = FillSolid;
+                  XChangeGC (disp, gc, GCFillStyle, &gcv);
-              XFreeGC (disp, gc2);
+                  /* XFreeGC (disp, gc2); */
+                }
+              if (bg > 0)
+                {
+                  Picture dst = XftDrawPicture(d2);
+                  if (dst != 0)
+                    {
+                      Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
+                      XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
+                    }
+                }
+              back_rendered = true;
             }
-          else
 #endif
+          if(bg > 0 && !back_rendered)
             XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
           XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
           XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
         }
 void
 rxvt_fontset::clear ()
 {
   prop.width = prop.height = prop.ascent = prop.weight = prop.slant
     = rxvt_fontprop::unset;
+  force_prop = false;
   for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
     FONT_UNREF (*i);
   for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
   if (fonts[i]->loaded)
     return true;
   fonts[i]->loaded = true;
-  if (!fonts[i]->load (prop))
+  if (!fonts[i]->load (prop, force_prop))
     {
       fonts[i]->cs = CS_UNKNOWN;
       return false;
     }

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.98 by root, Mon Feb 20 22:42:00 2006 UTC vs. Revision 1.111 by sasha, Fri Aug 17 22:01:33 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.98 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.111 by sasha, Fri Aug 17 22:01:33 2007 UTC