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.510 by root, Fri Nov 30 07:02:12 2012 UTC vs.
Revision 1.512 by sf-exg, Sat Dec 29 15:59:51 2012 UTC

… …
75 75
76#if HAVE_PIXBUF 76#if HAVE_PIXBUF
77# include <gdk-pixbuf/gdk-pixbuf.h> 77# include <gdk-pixbuf/gdk-pixbuf.h>
78#endif 78#endif
79 79
80#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
81# define HAVE_BG_PIXMAP 1 81# define HAVE_BG_PIXMAP 1
82#endif
83
84#if HAVE_BG_PIXMAP
85# if HAVE_PIXBUF
86# define BG_IMAGE_FROM_FILE 1
87# endif
88# if ENABLE_TRANSPARENCY
89# define BG_IMAGE_FROM_ROOT 1
90# endif
82#endif 91#endif
83 92
84#include <ecb.h> 93#include <ecb.h>
85#include "encoding.h" 94#include "encoding.h"
86#include "rxvtutil.h" 95#include "rxvtutil.h"
… …
580#endif 589#endif
581 Color_scroll, 590 Color_scroll,
582#ifdef RXVT_SCROLLBAR 591#ifdef RXVT_SCROLLBAR
583 Color_trough, 592 Color_trough,
584#endif 593#endif
585#if ENABLE_TRANSPARENCY 594#if BG_IMAGE_FROM_ROOT
586 Color_tint, 595 Color_tint,
587#endif 596#endif
588#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
589 Color_fade, 598 Color_fade,
590#endif 599#endif
… …
1172/* ---------- */ 1181/* ---------- */
1173 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1174 XComposeStatus compose; 1183 XComposeStatus compose;
1175 static struct termios def_tio; 1184 static struct termios def_tio;
1176 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1177#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1178 void bg_init (); 1188 void bg_init ();
1179 void bg_destroy (); 1189 void bg_destroy ();
1180
1181 enum {
1182 BG_IS_VALID = 1 << 0,
1183
1184 BG_IS_TRANSPARENT = 1 << 1,
1185 BG_NEEDS_REFRESH = 1 << 2,
1186 BG_INHIBIT_RENDER = 1 << 3,
1187 };
1188
1189 uint8_t bg_flags;
1190 1190
1191# if BG_IMAGE_FROM_FILE 1191# if BG_IMAGE_FROM_FILE
1192 rxvt_image fimage; 1192 rxvt_image fimage;
1193 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1193 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1194 bool render_image (rxvt_image &image); 1194 bool render_image (rxvt_image &image);
1195# endif 1195# endif
1196 1196
1197# if ENABLE_TRANSPARENCY 1197# if BG_IMAGE_FROM_ROOT
1198 rxvt_img *root_img; 1198 rxvt_img *root_img;
1199 image_effects root_effects; 1199 image_effects root_effects;
1200 1200
1201 void bg_set_transparent () 1201 void bg_set_transparent ()
1202 { 1202 {
… …
1208 1208
1209 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade); 1209 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1210 1210
1211 ev_tstamp bg_valid_since; 1211 ev_tstamp bg_valid_since;
1212 1212
1213 rxvt_img *bg_img;
1214
1215 bool bg_window_size_sensitive (); 1213 bool bg_window_size_sensitive ();
1216 bool bg_window_position_sensitive (); 1214 bool bg_window_position_sensitive ();
1217 1215
1218 void bg_render (); 1216 void bg_render ();
1219 void bg_invalidate () 1217 void bg_invalidate ()
1220 { 1218 {
1221 bg_flags &= ~BG_IS_VALID; 1219 bg_flags &= ~BG_IS_VALID;
1222 } 1220 }
1221#endif
1222
1223#ifdef HAVE_IMG
1224 enum {
1225 BG_IS_VALID = 1 << 0,
1226
1227 BG_IS_TRANSPARENT = 1 << 1,
1228 BG_NEEDS_REFRESH = 1 << 2,
1229 BG_INHIBIT_RENDER = 1 << 3,
1230 };
1231
1232 uint8_t bg_flags;
1233
1234 rxvt_img *bg_img;
1223#endif 1235#endif
1224 1236
1225#if ENABLE_OVERLAY 1237#if ENABLE_OVERLAY
1226 overlay_base ov; 1238 overlay_base ov;
1227 1239
… …
1281 void vt_select_input () const NOTHROW 1293 void vt_select_input () const NOTHROW
1282 { 1294 {
1283 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1295 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1284 } 1296 }
1285 1297
1286#if ENABLE_TRANSPARENCY || ENABLE_PERL 1298#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1287 void rootwin_cb (XEvent &xev); 1299 void rootwin_cb (XEvent &xev);
1288 xevent_watcher rootwin_ev; 1300 xevent_watcher rootwin_ev;
1289#endif 1301#endif
1290#ifdef HAVE_BG_PIXMAP 1302#ifdef HAVE_BG_PIXMAP
1291 void update_background (); 1303 void update_background ();

Diff Legend

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