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.511 by sf-exg, Sat Dec 29 14:23:35 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
1192 rxvt_image fimage; 1201 rxvt_image fimage;
1193 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1202 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1194 bool render_image (rxvt_image &image); 1203 bool render_image (rxvt_image &image);
1195# endif 1204# endif
1196 1205
1197# if ENABLE_TRANSPARENCY 1206# if BG_IMAGE_FROM_ROOT
1198 rxvt_img *root_img; 1207 rxvt_img *root_img;
1199 image_effects root_effects; 1208 image_effects root_effects;
1200 1209
1201 void bg_set_transparent () 1210 void bg_set_transparent ()
1202 { 1211 {
1281 void vt_select_input () const NOTHROW 1290 void vt_select_input () const NOTHROW
1282 { 1291 {
1283 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1292 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1284 } 1293 }
1285 1294
1286#if ENABLE_TRANSPARENCY || ENABLE_PERL 1295#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1287 void rootwin_cb (XEvent &xev); 1296 void rootwin_cb (XEvent &xev);
1288 xevent_watcher rootwin_ev; 1297 xevent_watcher rootwin_ev;
1289#endif 1298#endif
1290#ifdef HAVE_BG_PIXMAP 1299#ifdef HAVE_BG_PIXMAP
1291 void update_background (); 1300 void update_background ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines