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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.483 by sf-exg, Thu May 24 16:19:26 2012 UTC vs.
Revision 1.484 by sf-exg, Fri May 25 08:27:47 2012 UTC

   defaultAlign = centerAlign,
 };
 struct rxvt_image
 {
+  int id;
+  unsigned short alpha;
   uint8_t flags;
   unsigned int h_scale, v_scale; /* percents of the window size */
   int h_align, v_align;          /* percents of the window size:
                                     0 - left align, 50 - center, 100 - right */
 #  ifdef HAVE_PIXBUF
-  GdkPixbuf *pixbuf;
+  auto_ptr<GdkPixbuf> pixbuf;
-  ~rxvt_image ()
-  {
-    if (pixbuf)
-      g_object_unref (pixbuf);
-  }
   int width ()
   {
     return gdk_pixbuf_get_width (pixbuf);
   }
   {
     return gdk_pixbuf_get_height (pixbuf);
   }
 #  endif
+  rxvt_image ();
+  bool set_file_geometry (const char *file);
   bool set_file (const char *file);
   bool set_geometry (const char *geom, bool update = false);
 };
 # endif
 #endif
   };
   uint8_t bg_flags;
 # ifdef BG_IMAGE_FROM_FILE
+  vector<rxvt_image> image_vec;
-  rxvt_image bg_image;
+  rxvt_image *new_image ()
+  {
+    image_vec.resize (image_vec.size () + 1);
+    return &image_vec.back ();
+  }
   void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
   bool render_image (rxvt_image &image);
+  void parse_image (int id, const char *type, const char *arg);
 # endif
 # ifdef ENABLE_TRANSPARENCY
   Pixmap      root_pixmap; /* current root pixmap set */
   rxvt_color  tint;

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