mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Let unneeded wallpaper resources be freed after image

Browse Source 
was drawn to rootpmap
This commit is contained in:
Sanel Zukan 2007-11-14 14:45:59 +00:00
parent dbe560d3a5
commit 9efcf193ef
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
eiconman/Wallpaper.cpp
View File

@ -40,19 +40,10 @@
tmp |= (((int)b >> (-bshift)) & bmask); tmp |= (((int)b >> (-bshift)) & bmask);
Pixmap create_xpixmap(Fl_Image* img, XImage* xim, Pixmap pix) { Pixmap create_xpixmap(Fl_Image* img, XImage*& xim, Pixmap pix) {
if(!img) if(!img)
return 0; return 0;
if(xim) {
if(xim->data) {
delete [] xim->data;
xim->data = 0;
}
XDestroyImage(xim);
xim = 0;
}
if(pix) if(pix)
XFreePixmap(fl_display, pix); XFreePixmap(fl_display, pix);
@ -107,16 +98,7 @@ Pixmap create_xpixmap(Fl_Image* img, XImage* xim, Pixmap pix) {
else if(fl_visual->depth > 8) else if(fl_visual->depth > 8)
bitmap_pad = 16; bitmap_pad = 16;
else { else {
EWARNING(ESTRLOC ": Visual %i not supported\n", xim->bits_per_pixel); EWARNING(ESTRLOC ": Visual %i not supported\n", fl_visual->depth);
if(xim) {
if(xim->data) {
delete [] xim->data;
xim->data = 0;
}
XDestroyImage(xim);
xim = 0;
}
return 0; return 0;
} }
@ -372,16 +354,10 @@ bool create_tile(Fl_Image* orig, Fl_RGB_Image*& copied, int X, int Y, int W, int
} }
Wallpaper::Wallpaper(int X, int Y, int W, int H) : Wallpaper::Wallpaper(int X, int Y, int W, int H) :
Fl_Box(X, Y, W, H, 0), rootpmap_image(NULL), rootpmap_pixmap(0), tiled(false) { Fl_Box(X, Y, W, H, 0), rootpmap_pixmap(0), tiled(false) {
} }
Wallpaper::~Wallpaper() { Wallpaper::~Wallpaper() {
if(rootpmap_image) {
if(rootpmap_image->data)
delete [] rootpmap_image->data;
XDestroyImage(rootpmap_image);
}
if(rootpmap_pixmap) if(rootpmap_pixmap)
XFreePixmap(fl_display, rootpmap_pixmap); XFreePixmap(fl_display, rootpmap_pixmap);
} }
@ -429,8 +405,17 @@ void Wallpaper::set_rootpmap(void) {
if(!image()) if(!image())
return; return;
XImage* rootpmap_image = 0;
rootpmap_pixmap = create_xpixmap(image(), rootpmap_image, rootpmap_pixmap); rootpmap_pixmap = create_xpixmap(image(), rootpmap_image, rootpmap_pixmap);
if(rootpmap_image) {
/*
* XDestroyImage function calls frees both the image structure and the
* data pointed to by the image structure.
*/
XDestroyImage(rootpmap_image);
}
if(!rootpmap_pixmap) if(!rootpmap_pixmap)
return; return;

1
eiconman/Wallpaper.h
View File

@ -23,7 +23,6 @@
*/ */
class Wallpaper : public Fl_Box { class Wallpaper : public Fl_Box {
private: private:
XImage* rootpmap_image;
Pixmap rootpmap_pixmap; Pixmap rootpmap_pixmap;
bool tiled; bool tiled;
void set_rootpmap(void); void set_rootpmap(void);

2
eiconman/eiconman.conf
View File

@ -2,7 +2,7 @@
Color = 458855680 Color = 458855680
WallpaperUse = 1 WallpaperUse = 1
WallpaperMode = 1 WallpaperMode = 1
Wallpaper = /home/sanel/wallpapers/janablack_02_1024.jpg Wallpaper = /home/sanelz/walls/Something_Beautiful_by_mirrorkills.jpg
[Icons] [Icons]
Label Background = 827223040 Label Background = 827223040