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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.511 by sf-exg, Sat Dec 29 14:23:35 2012 UTC vs.
Revision 1.513 by sf-exg, Sat Dec 29 18:12:53 2012 UTC

 /* ---------- */
   struct mouse_event MEvent;
   XComposeStatus  compose;
   static struct termios def_tio;
   row_col_t       oldcursor;
 #ifdef HAVE_BG_PIXMAP
   void bg_init ();
   void bg_destroy ();
-  enum {
-    BG_IS_VALID          = 1 << 0,
-    BG_IS_TRANSPARENT    = 1 << 1,
-    BG_NEEDS_REFRESH     = 1 << 2,
-    BG_INHIBIT_RENDER    = 1 << 3,
-  };
-  uint8_t bg_flags;
 # if BG_IMAGE_FROM_FILE
   rxvt_image fimage;
   void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
   bool render_image (rxvt_image &image);
 # if BG_IMAGE_FROM_ROOT
   rxvt_img *root_img;
   image_effects root_effects;
-  void bg_set_transparent ()
-  {
-    bg_flags |= BG_IS_TRANSPARENT;
-  }
   void bg_set_root_pixmap ();
   bool render_root_image ();
 # endif
   void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
   ev_tstamp bg_valid_since;
-  rxvt_img *bg_img;
   bool bg_window_size_sensitive ();
   bool bg_window_position_sensitive ();
   void bg_render ();
   void bg_invalidate ()
   {
-    bg_flags &= ~BG_IS_VALID;
+    bg_flags &= ~(BG_IS_VALID | BG_IS_TRANSPARENT);
   }
+#endif
+#ifdef HAVE_IMG
+  enum {
+    BG_IS_VALID          = 1 << 0,
+    BG_IS_TRANSPARENT    = 1 << 1,
+    BG_NEEDS_REFRESH     = 1 << 2,
+    BG_INHIBIT_RENDER    = 1 << 3,
+  };
+  uint8_t bg_flags;
+  rxvt_img *bg_img;
 #endif
 #if ENABLE_OVERLAY
   overlay_base ov;

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