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

Comparing rxvt-unicode/src/rxvtimg.h (file contents):
Revision 1.28 by root, Sat Jun 9 11:13:14 2012 UTC vs.
Revision 1.30 by root, Sun Jun 10 10:29:26 2012 UTC

1#ifndef IMG_H 1#ifndef IMG_H
2#define IMG_H 2#define IMG_H
3 3
4#if HAVE_BG_PIXMAP && BG_IMAGE_FROM_FILE && ENABLE_TRANSPARENCY && HAVE_PIXBUF 4#if HAVE_BG_PIXMAP
5 #define HAVE_IMG 1 5 #define HAVE_IMG 1
6#endif 6#endif
7 7
8#if HAVE_IMG 8#if HAVE_IMG
9 9
… …
11 11
12#include <X11/extensions/Xrender.h> 12#include <X11/extensions/Xrender.h>
13 13
14class rxvt_img 14class rxvt_img
15{ 15{
16 void alloc ();
17 void destroy (); 16 void destroy ();
18 Picture src_picture (); 17 Picture src_picture ();
19 18
20public: 19public:
21 // *could* also hold the Pixmap itself 20 // *could* also hold the Pixmap itself
… …
37 int x, y, w, h, repeat; 36 int x, y, w, h, repeat;
38 XRenderPictFormat *format; 37 XRenderPictFormat *format;
39 38
40 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal); 39 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
41 rxvt_img (const rxvt_img &img); 40 rxvt_img (const rxvt_img &img);
41 void alloc ();
42 42
43# if HAVE_PIXBUF
43 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf 44 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
44 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf 45 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
46# endif
45 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap 47 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
46 48
47 ~rxvt_img (); 49 ~rxvt_img ();
48 50
49 Pixmap steal () 51 Pixmap steal ()

Diff Legend

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