ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.290 by sasha, Thu Aug 9 22:08:21 2007 UTC vs.
Revision 1.294 by sasha, Fri Aug 17 22:01:33 2007 UTC

… …
173#endif 173#endif
174 174
175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY) 175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
176# define HAVE_BG_PIXMAP 1/* to simplify further usage */ 176# define HAVE_BG_PIXMAP 1/* to simplify further usage */
177struct bgPixmap_t { 177struct bgPixmap_t {
178# define bgPmap_geometrySet (1UL<<0)
179# define bgPmap_propScale (1UL<<1)
180# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_propScale)
181 178
182# define bgPmap_Transparent (1UL<<16) 179 enum {
180 geometrySet = (1UL<<0),
181 propScale = (1UL<<1),
182 geometryFlags = (geometrySet|propScale),
183
184 tintSet = (1UL<<8),
185 tintNeeded = (1UL<<9),
186 tintServerSide = (1UL<<10),
187 tintFlags = (tintSet|tintServerSide|tintNeeded),
188 blurNeeded = (1UL<<11),
189
190 isTransparent = (1UL<<16),
191 isInvalid = (1UL<<17)
192 };
193
183 unsigned long flags; 194 unsigned long flags;
195
196 enum {
197 transpPmapTiled = (1UL<<0),
198 transpPmapTinted = tintNeeded,
199 transpPmapBlured = blurNeeded,
200 transpTransformations = (tintNeeded|blurNeeded)
201 }; /* this flags are returned by make_transparency_pixmap if called */
184 202
185# ifdef XPM_BACKGROUND 203# ifdef XPM_BACKGROUND
186# ifdef HAVE_AFTERIMAGE 204# ifdef HAVE_AFTERIMAGE
187 ASImage *original_asim; 205 ASImage *original_asim;
188 bool render_asim (ASImage *background, ARGB32 background_tint); 206 bool render_asim (ASImage *background, ARGB32 background_tint);
189# endif 207# endif
190 208
191#define bgPmap_defaultScale 100 209 enum { defaultScale = 100, defaultAlign = 50 };
192#define bgPmap_defaultAlign 50 210
193 unsigned int h_scale, v_scale;/* percents of the window size */ 211 unsigned int h_scale, v_scale;/* percents of the window size */
194 int h_align, v_align; /* percents of the window size: 212 int h_align, v_align; /* percents of the window size:
195 0 - left align, 50 - center, 100 - right */ 213 0 - left align, 50 - center, 100 - right */
214 void unset_geometry () { flags = flags & ~geometryFlags; };
196 bool handle_geometry (const char *geom); 215 bool set_geometry (const char *geom);
197 void set_defaultGeometry () 216 void set_defaultGeometry ()
198 { 217 {
199 h_scale = v_scale = bgPmap_defaultScale; 218 h_scale = v_scale = defaultScale;
200 h_align = v_align = bgPmap_defaultAlign; 219 h_align = v_align = defaultAlign;
201 flags |= bgPmap_geometrySet; 220 flags |= geometrySet;
202 }; 221 };
203 222
223 bool set_file (const char *file);
204# endif /* XPM_BACKGROUND */ 224# endif /* XPM_BACKGROUND */
205 225
206 rxvt_term *target; 226 rxvt_term *target;
207 bool set_target (rxvt_term *new_target); 227 bool set_target (rxvt_term *new_target);
208 228
209# ifdef ENABLE_TRANSPARENCY 229# ifdef ENABLE_TRANSPARENCY
210 int root_depth; /* obtained when target is set */ 230 int root_depth; /* obtained when target is set */
211 Pixmap root_pixmap; /* current root pixmap set */ 231 Pixmap root_pixmap; /* current root pixmap set */
232 rxvt_color tint;
233 int shade;
234 int h_blurRadius, v_blurRadius;
235
212 bool make_transparency_pixmap (); 236 bool set_transparent ();
237 bool set_blur_radius (const char *geom);
238 bool set_tint (rxvt_color &new_tint);
239 bool unset_tint ();
240 bool set_shade (const char *shade_str);
241 bool set_root_pixmap ();
242
243 unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */
213# endif 244# endif
245 double invalid_since;
214 246
215 Pixmap pixmap; 247 Pixmap pixmap;
216 unsigned int pmap_width, pmap_height; 248 unsigned int pmap_width, pmap_height;
217 unsigned int pmap_depth; 249 unsigned int pmap_depth;
218 250
219 bool window_size_sensitive (); 251 bool window_size_sensitive ();
220 void apply_background (); 252 bool need_client_side_rendering ();
221 253 void apply ();
254 bool render ();
255 void invalidate () {
256 if (!(flags & isInvalid))
257 {
258 flags |= isInvalid;
259 invalid_since = NOW;
260 }
261 };
222}; 262};
223#else 263#else
224# undef HAVE_BG_PIXMAP 264# undef HAVE_BG_PIXMAP
225#endif 265#endif
226 266
… …
931 struct mbstate mbstate; // current input multibyte state 971 struct mbstate mbstate; // current input multibyte state
932 972
933 unsigned char want_refresh:1, 973 unsigned char want_refresh:1,
934#ifdef ENABLE_TRANSPARENCY 974#ifdef ENABLE_TRANSPARENCY
935 want_full_refresh:1, /* awaiting full screen refresh */ 975 want_full_refresh:1, /* awaiting full screen refresh */
936 am_transparent:1, /* is a transparent term */
937 am_pixmap_trans:1, /* transparency w/known root pixmap */
938#endif 976#endif
939 current_screen:1, /* primary or secondary */ 977 current_screen:1, /* primary or secondary */
940 num_scr_allow:1, 978 num_scr_allow:1,
941 bypass_keystate:1, 979 bypass_keystate:1,
942#ifdef CURSOR_BLINK 980#ifdef CURSOR_BLINK
… …
1125 1163
1126#if ENABLE_TRANSPARENCY || ENABLE_PERL 1164#if ENABLE_TRANSPARENCY || ENABLE_PERL
1127 void rootwin_cb (XEvent &xev); 1165 void rootwin_cb (XEvent &xev);
1128 xevent_watcher rootwin_ev; 1166 xevent_watcher rootwin_ev;
1129#endif 1167#endif
1130#if ENABLE_TRANSPARENCY 1168#ifdef HAVE_BG_PIXMAP
1131 int check_our_parents (); 1169 int update_background ();
1132 void check_our_parents_cb (time_watcher &w); 1170 void update_background_cb (time_watcher &w);
1133 time_watcher check_our_parents_ev; 1171 time_watcher update_background_ev;
1134#endif 1172#endif
1135 1173
1136 void x_cb (XEvent &xev); 1174 void x_cb (XEvent &xev);
1137 void flush (); 1175 void flush ();
1138 xevent_watcher termwin_ev; 1176 xevent_watcher termwin_ev;
… …
1474 void get_options (int argc, const char *const *argv); 1512 void get_options (int argc, const char *const *argv);
1475 int parse_keysym (const char *str, const char *arg); 1513 int parse_keysym (const char *str, const char *arg);
1476 void get_xdefaults (FILE *stream, const char *name); 1514 void get_xdefaults (FILE *stream, const char *name);
1477 void extract_resources (); 1515 void extract_resources ();
1478 // xpm.C 1516 // xpm.C
1479//int scale_pixmap (const char *geom);
1480 void resize_pixmap ();
1481 void set_bgPixmap (const char *file);
1482 void get_window_origin (int &x, int &y); 1517 void get_window_origin (int &x, int &y);
1483 Pixmap get_pixmap_property (int prop_id); 1518 Pixmap get_pixmap_property (int prop_id);
1484}; 1519};
1485 1520
1486/* 1521/*

Diff Legend

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