[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.297 by ayin, Sun Aug 26 16:55:58 2007 UTC

  *****************************************************************************
  * PROTOTYPES
  *****************************************************************************
  */
 // main.C
-RETSIGTYPE       rxvt_Child_signal                (int sig) NOTHROW;
-RETSIGTYPE       rxvt_Exit_signal                 (int sig) NOTHROW;
-void             rxvt_clean_exit                  () NOTHROW;
 void           * rxvt_malloc                      (size_t size);
 void           * rxvt_calloc                      (size_t number, size_t size);
 void           * rxvt_realloc                     (void *ptr, size_t size);
 // misc.C
 # define KEEP_SCROLLCOLOR 1
 #else
 # undef KEEP_SCROLLCOLOR
 #endif
+#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
+# define HAVE_BG_PIXMAP 1/* to simplify further usage */
+struct  bgPixmap_t {
+  enum {
+    geometrySet     = (1UL<<0),
+    propScale       = (1UL<<1),
+    geometryFlags   = (geometrySet|propScale),
+    tintSet         = (1UL<<8),
+    tintNeeded      = (1UL<<9),
+    tintWholesome   = (1UL<<10),
+    tintServerSide  = (1UL<<11),
+    tintFlags       = (tintSet|tintServerSide|tintNeeded|tintWholesome),
+    blurNeeded      = (1UL<<12),
+    isTransparent   = (1UL<<16),
+    isInvalid       = (1UL<<17)
+  };
+  unsigned long flags;
+  enum {
+    transpPmapTiled = (1UL<<0),
+    transpPmapTinted = tintNeeded,
+    transpPmapBlured = blurNeeded,
+    transpTransformations = (tintNeeded|blurNeeded)
+  }; /* this flags are returned by make_transparency_pixmap if called */
-#ifdef XPM_BACKGROUND
+# ifdef  XPM_BACKGROUND
-typedef struct {
+#  ifdef HAVE_AFTERIMAGE
-  short w, h, x, y;
+  ASImage *original_asim;
-  bool auto_resize ;
+  bool render_asim (ASImage *background, ARGB32 background_tint);
+#  endif
+  enum { defaultScale = 100, defaultAlign = 50 };
+  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 */
+  void unset_geometry () { flags = flags & ~geometryFlags; };
+  bool set_geometry (const char *geom);
+  void set_defaultGeometry ()
+  {
+    h_scale = v_scale = defaultScale;
+    h_align = v_align = defaultAlign;
+    flags |= geometrySet;
+  };
+  bool set_file (const char *file);
+# endif /* XPM_BACKGROUND */
+  rxvt_term *target;
+  bool set_target (rxvt_term *new_target);
+# ifdef ENABLE_TRANSPARENCY
+  int         root_depth; /* obtained when target is set */
+  Pixmap      root_pixmap; /* current root pixmap set */
+  rxvt_color  tint;
+  int         shade;
+  int         h_blurRadius, v_blurRadius;
+  bool set_transparent ();
+  bool set_blur_radius (const char *geom);
+  bool set_tint (rxvt_color &new_tint);
+  bool unset_tint ();
+  bool set_shade (const char *shade_str);
+  bool set_root_pixmap ();
+  unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */
+# endif
+  double invalid_since;
   Pixmap pixmap;
-} bgPixmap_t;
+  unsigned int pmap_width, pmap_height;
+  unsigned int pmap_depth;
+  bool window_size_sensitive ();
+  bool need_client_side_rendering ();
+  void apply ();
+  bool render ();
+  void invalidate () {
+    if (!(flags & isInvalid))
+      {
+        flags |= isInvalid;
+        invalid_since = NOW;
+      }
+  };
+};
+#else
+# undef HAVE_BG_PIXMAP
 #endif
 /*
  * the 'essential' information for reporting Mouse Events
  * pared down from XButtonEvent
 #endif
 #ifdef KEEP_SCROLLCOLOR
   Color_scroll,
   Color_trough,
 #endif
-#if TINTING
+#if ENABLE_TRANSPARENCY
   Color_tint,
 #endif
 #if OFF_FOCUS_FADING
   Color_fade,
 #endif
 #define PrivMode_LFNL		(1UL<<19)
 /* too annoying to implement X11 highlight tracking */
 /* #define PrivMode_MouseX11Track       (1LU<<20) */
 #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11)
-#define PrivMode(test,bit)              \
-    if (test)                           \
-        priv_modes |= (bit);            \
-    else                                \
-        priv_modes &= ~(bit)
 #ifdef ALLOW_132_MODE
 # define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
 #else
 # define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
   struct mbstate  mbstate;              // current input multibyte state
   unsigned char   want_refresh:1,
 #ifdef ENABLE_TRANSPARENCY
                   want_full_refresh:1,	/* awaiting full screen refresh      */
-                  am_transparent:1,	/* is a transparent term             */
-                  am_pixmap_trans:1, 	/* transparency w/known root pixmap  */
 #endif
                   current_screen:1,	/* primary or secondary              */
                   num_scr_allow:1,
                   bypass_keystate:1,
 #ifdef CURSOR_BLINK
 #endif
   struct mouse_event MEvent;
   XComposeStatus  compose;
   ttymode_t       tio;
   row_col_t       oldcursor;
-#ifdef XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
   bgPixmap_t      bgPixmap;
-  struct ASVisual  *asv;
+#endif
+#ifdef HAVE_AFTERIMAGE
+  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;
 #if ENABLE_TRANSPARENCY || ENABLE_PERL
   void rootwin_cb (XEvent &xev);
   xevent_watcher rootwin_ev;
 #endif
-#if ENABLE_TRANSPARENCY
+#ifdef HAVE_BG_PIXMAP
-  int check_our_parents ();
+  int update_background ();
-  void check_our_parents_cb (time_watcher &w);
+  void update_background_cb (time_watcher &w);
-  time_watcher check_our_parents_ev;
+  time_watcher update_background_ev;
 #endif
   void x_cb (XEvent &xev);
   void flush ();
   xevent_watcher termwin_ev;
   {
     if (set)
       options[opt >> 3] |= (1 << (opt & 7));
     else
       options[opt >> 3] &= ~(1 << (opt & 7));
+  }
+  void PrivMode (int set, unsigned bit) NOTHROW
+  {
+    if (set)
+      priv_modes |= bit;
+    else
+      priv_modes &= ~bit;
   }
   void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
   void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
   int scr_scroll_text (int row1, int row2, int count) NOTHROW;
   void get_options (int argc, const char *const *argv);
   int parse_keysym (const char *str, const char *arg);
   void get_xdefaults (FILE *stream, const char *name);
   void extract_resources ();
   // xpm.C
-  int scale_pixmap (const char *geom);
+  void get_window_origin (int &x, int &y);
-  void resize_pixmap ();
+  Pixmap get_pixmap_property (int prop_id);
-  Pixmap set_bgPixmap (const char *file);
 };
-/*
- *****************************************************************************
- * PROTOTYPES
- *****************************************************************************
- */
-#ifdef PROTOTYPES
-# define __PROTO(p)     p
-#else
-# define __PROTO(p)     ()
-#endif
 #endif                          /* _RXVT_H_ */

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.281 by ayin, Thu Aug 2 15:01:30 2007 UTC vs. Revision 1.297 by ayin, Sun Aug 26 16:55:58 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.281 by ayin, Thu Aug 2 15:01:30 2007 UTC vs.
Revision 1.297 by ayin, Sun Aug 26 16:55:58 2007 UTC