nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better setting of atoms. plugged memory leak.

Browse source
This commit is contained in:
Dana Jansens 2002-05-15 10:14:45 +00:00
parent c1bf229290
commit 788754fec3
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
util/bsetroot.cc
View file

@ -136,8 +136,6 @@ void bsetroot::setPixmapProperty(int screen, Pixmap pixmap) {
int format; int format;
unsigned long length, after; unsigned long length, after;
unsigned char *data; unsigned char *data;
int mode = PropModeAppend;
int emode = PropModeAppend;
const ScreenInfo *screen_info = getScreenInfo(screen); const ScreenInfo *screen_info = getScreenInfo(screen);
if (rootpmap_id == None) { if (rootpmap_id == None) {
@ -147,29 +145,22 @@ void bsetroot::setPixmapProperty(int screen, Pixmap pixmap) {
XGrabServer(getXDisplay()); XGrabServer(getXDisplay());
// Clear out the old pixmap? // Clear out the old pixmap
XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(), XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(),
rootpmap_id, 0L, 1L, False, AnyPropertyType, rootpmap_id, 0L, 1L, False, XA_PIXMAP,
&type, &format, &length, &after, &data); &type, &format, &length, &after, &data);
if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) { if (type == XA_PIXMAP && format == 32) {
XKillClient(getXDisplay(), *((Pixmap *) data)); XKillClient(getXDisplay(), *((Pixmap *) data));
XSync(getXDisplay(), False); XSync(getXDisplay(), False);
mode = PropModeReplace; XFree(data);
} }
// Clear out the old esetroot pixmap?
XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(),
esetroot_id, 0L, 1L, False, AnyPropertyType,
&type, &format, &length, &after, &data);
if ((type == XA_PIXMAP) && (format == 32) && (length == 1))
emode = PropModeReplace;
if (pixmap) { if (pixmap) {
XChangeProperty(getXDisplay(), screen_info->getRootWindow(), XChangeProperty(getXDisplay(), screen_info->getRootWindow(),
rootpmap_id, XA_PIXMAP, 32, mode, rootpmap_id, XA_PIXMAP, 32, PropModeReplace,
(unsigned char *) &pixmap, 1); (unsigned char *) &pixmap, 1);
XChangeProperty(getXDisplay(), screen_info->getRootWindow(), XChangeProperty(getXDisplay(), screen_info->getRootWindow(),
esetroot_id, XA_PIXMAP, 32, emode, esetroot_id, XA_PIXMAP, 32, PropModeReplace,
(unsigned char *) &pixmap, 1); (unsigned char *) &pixmap, 1);
} else { } else {
XDeleteProperty(getXDisplay(), screen_info->getRootWindow(), XDeleteProperty(getXDisplay(), screen_info->getRootWindow(),