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.18 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.19 by root, Thu Jun 7 08:36:09 2012 UTC

13 13
14class rxvt_img 14class rxvt_img
15{ 15{
16 void alloc (); 16 void alloc ();
17 void destroy (); 17 void destroy ();
18 Picture src_picture ();
18 19
19public: 20public:
21 // *could* also hold the Pixmap itself
22 struct pixref
23 {
24 int cnt;
25 int w, h;
26 bool ours; // false if we don't own the pixmap at all
27
28 pixref (int w, int h)
29 : cnt(1), w(w), h(h), ours(true)
30 {
31 }
32 };
33
20 rxvt_screen *s; 34 rxvt_screen *s;
21 Pixmap pm; 35 Pixmap pm;
22 int *refcnt; // shared refcnt 36 pixref *ref; // shared refcnt
23 int x, y, w, h, repeat; 37 int x, y, w, h, repeat;
24 XRenderPictFormat *format; 38 XRenderPictFormat *format;
25 39
26 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height); 40 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height);
27 rxvt_img (const rxvt_img &img); 41 rxvt_img (const rxvt_img &img);
30 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap 44 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
31 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf 45 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf
32 46
33 ~rxvt_img (); 47 ~rxvt_img ();
34 48
35 // TODO: steal should not do what it does, and this todo should be more specific
36 Pixmap steal () 49 Pixmap steal ()
37 { 50 {
38 Pixmap retval = pm; 51 ref->ours = false;
39 pm = None;
40 return retval; 52 return pm;
41 } 53 }
42 54
43 // inplace 55 // inplace
44 void move (int dx, int dy) 56 void move (int dx, int dy)
45 { 57 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines