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.500 by root, Tue Jun 5 19:32:29 2012 UTC vs.
Revision 1.507 by sf-exg, Mon Jun 11 14:45:53 2012 UTC

… …
45 45
46#include "feature.h" 46#include "feature.h"
47 47
48#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
49# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
50#endif 51#endif
51 52
52#if ENABLE_PERL 53#if ENABLE_PERL
53# define ENABLE_FRILLS 1 54# define ENABLE_FRILLS 1
54# define ENABLE_COMBINING 1 55# define ENABLE_COMBINING 1
… …
242 bool set_blur (const char *geom); 243 bool set_blur (const char *geom);
243}; 244};
244 245
245# if BG_IMAGE_FROM_FILE 246# if BG_IMAGE_FROM_FILE
246enum { 247enum {
247 IM_IS_SET = 1 << 0,
248 IM_IS_SIZE_SENSITIVE = 1 << 1, 248 IM_IS_SIZE_SENSITIVE = 1 << 1,
249 IM_KEEP_ASPECT = 1 << 2, 249 IM_KEEP_ASPECT = 1 << 2,
250 IM_ROOT_ALIGN = 1 << 3, 250 IM_ROOT_ALIGN = 1 << 3,
251 IM_TILE = 1 << 4, 251 IM_TILE = 1 << 4,
252 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE, 252 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
… …
273 return (!(flags & IM_TILE) 273 return (!(flags & IM_TILE)
274 || h_scale || v_scale 274 || h_scale || v_scale
275 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align))); 275 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
276 } 276 }
277 277
278# if HAVE_PIXBUF 278 rxvt_img *img;
279 GdkPixbuf *pixbuf;
280 279
281 void destroy () 280 void destroy ()
282 { 281 {
283 if (pixbuf) 282 delete img;
284 g_object_unref (pixbuf);
285 } 283 }
286 284
287 int width ()
288 {
289 return gdk_pixbuf_get_width (pixbuf);
290 }
291 int height ()
292 {
293 return gdk_pixbuf_get_height (pixbuf);
294 }
295# endif
296
297 rxvt_image (); 285 rxvt_image ();
298 bool set_file_geometry (const char *file); 286 void set_file_geometry (rxvt_screen *s, const char *file);
299 bool set_file (const char *file); 287 void set_file (rxvt_screen *s, const char *file);
300 bool set_geometry (const char *geom, bool update = false); 288 bool set_geometry (const char *geom, bool update = false);
301}; 289};
302# endif 290# endif
303#endif 291#endif
304 292
… …
1192 enum { 1180 enum {
1193 BG_IS_VALID = 1 << 0, 1181 BG_IS_VALID = 1 << 0,
1194 1182
1195 BG_IS_TRANSPARENT = 1 << 1, 1183 BG_IS_TRANSPARENT = 1 << 1,
1196 BG_NEEDS_REFRESH = 1 << 2, 1184 BG_NEEDS_REFRESH = 1 << 2,
1185 BG_INHIBIT_RENDER = 1 << 3,
1197 }; 1186 };
1198 1187
1199 uint8_t bg_flags; 1188 uint8_t bg_flags;
1200 1189
1201# if BG_IMAGE_FROM_FILE 1190# if BG_IMAGE_FROM_FILE
1202 vector<rxvt_image> image_vec;
1203 rxvt_image *new_image () 1191 rxvt_image fimage;
1204 {
1205 image_vec.resize (image_vec.size () + 1);
1206 return &image_vec.back ();
1207 }
1208 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1192 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1209 bool render_image (rxvt_image &image); 1193 bool render_image (rxvt_image &image);
1210 void parse_image (int id, const char *type, const char *arg);
1211# endif 1194# endif
1212 1195
1213# if ENABLE_TRANSPARENCY 1196# if ENABLE_TRANSPARENCY
1214 Pixmap root_pixmap; /* current root pixmap set */ 1197 rxvt_img *root_img;
1215 image_effects root_effects; 1198 image_effects root_effects;
1216 1199
1217 void bg_set_transparent () 1200 void bg_set_transparent ()
1218 { 1201 {
1219 bg_flags |= BG_IS_TRANSPARENT; 1202 bg_flags |= BG_IS_TRANSPARENT;
1220 } 1203 }
1221 void bg_set_root_pixmap (); 1204 void bg_set_root_pixmap ();
1222 bool render_root_image (); 1205 bool render_root_image ();
1223# endif 1206# endif
1224 1207
1225 bool blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius);
1226 bool tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade);
1227 void tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade); 1208 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1228 1209
1229 ev_tstamp bg_valid_since; 1210 ev_tstamp bg_valid_since;
1230 1211
1231 Pixmap bg_pixmap; 1212 rxvt_img *bg_img;
1232 unsigned int bg_pmap_width, bg_pmap_height;
1233 1213
1234 int target_x;
1235 int target_y;
1236 bool bg_set_position (int x, int y);
1237 bool bg_window_size_sensitive (); 1214 bool bg_window_size_sensitive ();
1238 bool bg_window_position_sensitive (); 1215 bool bg_window_position_sensitive ();
1239 1216
1240 bool bg_render (); 1217 void bg_render ();
1241 void bg_invalidate () 1218 void bg_invalidate ()
1242 { 1219 {
1243 bg_flags &= ~BG_IS_VALID; 1220 bg_flags &= ~BG_IS_VALID;
1244 } 1221 }
1245#endif
1246#if HAVE_PIXBUF
1247 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1248 int src_x, int src_y, int dst_x, int dst_y,
1249 unsigned int width, unsigned int height, bool argb);
1250#endif 1222#endif
1251 1223
1252#if ENABLE_OVERLAY 1224#if ENABLE_OVERLAY
1253 overlay_base ov; 1225 overlay_base ov;
1254 1226
… …
1296#if ENABLE_FRILLS || ISO_14755 1268#if ENABLE_FRILLS || ISO_14755
1297 // ISO 14755 entry support 1269 // ISO 14755 entry support
1298 unicode_t iso14755buf; 1270 unicode_t iso14755buf;
1299 void commit_iso14755 (); 1271 void commit_iso14755 ();
1300# if ISO_14755 1272# if ISO_14755
1301 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1273 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1302 void iso14755_54 (int x, int y); 1274 void iso14755_54 (int x, int y);
1303# endif 1275# endif
1304#endif 1276#endif
1305 1277
1306 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1278 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;

Diff Legend

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