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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.281 by ayin, Thu Aug 2 15:01:30 2007 UTC vs.
Revision 1.282 by sasha, Fri Aug 3 05:33:04 2007 UTC

 # define KEEP_SCROLLCOLOR 1
 #else
 # undef KEEP_SCROLLCOLOR
 #endif
-#ifdef XPM_BACKGROUND
+#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
 typedef struct {
+#ifdef  XPM_BACKGROUND
+  ASImage  *original_asim;
   short w, h, x, y;
-  bool auto_resize ;
+  bool auto_resize;
+#endif
   Pixmap pixmap;
+  unsigned int pmap_width, pmap_height;
+  unsigned int pmap_depth;
 } bgPixmap_t;
 #endif
 /*
  * the 'essential' information for reporting Mouse Events
 #endif
   struct mouse_event MEvent;
   XComposeStatus  compose;
   ttymode_t       tio;
   row_col_t       oldcursor;
+#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
+  bgPixmap_t      bgPixmap;
+#endif
 #ifdef XPM_BACKGROUND
-  bgPixmap_t      bgPixmap;
   struct ASVisual  *asv;
   ASImageManager *asimman;
-  ASImage        *original_asim;
-  struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
 #endif
 #if ENABLE_OVERLAY
   int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
   text_t **ov_text;
   void get_xdefaults (FILE *stream, const char *name);
   void extract_resources ();
   // xpm.C
   int scale_pixmap (const char *geom);
   void resize_pixmap ();
-  Pixmap set_bgPixmap (const char *file);
+  void set_bgPixmap (const char *file);
 };
 /*
  *****************************************************************************
  * PROTOTYPES

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