better setting of atoms. plugged memory leak.

[chaz/openbox] / util / bsetroot.cc

diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 39d8b2c7b968eea895a67eb7b91e10870fa573dd..918a31fe2c936c8ec9da2731dea823308a089ca0 100644 (file)
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -107,8 +107,8 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
     usage(2);
   }
 
-  img_ctrl = new BImageControl*[getNumberOfScreens()];
-  for (unsigned int s = 0; s < getNumberOfScreens(); ++s)
+  img_ctrl = new BImageControl*[numberOfScreens()];
+  for (unsigned int s = 0, n = numberOfScreens(); s < n; ++s)
     img_ctrl[s] = new BImageControl(*this, *getScreenInfo(s), true);
 
   if (sol && fore) solid();
@@ -123,7 +123,7 @@ bsetroot::~bsetroot(void) {
 
   XKillClient(getXDisplay(), AllTemporary);
 
-  std::for_each(img_ctrl, img_ctrl + getNumberOfScreens(), PointerAssassin());
+  std::for_each(img_ctrl, img_ctrl + numberOfScreens(), PointerAssassin());
 
   delete [] img_ctrl;
 }
@@ -136,40 +136,31 @@ void bsetroot::setPixmapProperty(int screen, Pixmap pixmap) {
   int format;
   unsigned long length, after;
   unsigned char *data;
-  int mode = PropModeAppend;
-  int emode = PropModeAppend;
   const ScreenInfo *screen_info = getScreenInfo(screen);
 
   if (rootpmap_id == None) {
-    rootpmap_id = XInternAtom(getXDisplay(), "_XROOTPMAP_ID", True);
-    esetroot_id = XInternAtom(getXDisplay(), "ESETROOT_PMAP_ID", True);
+    rootpmap_id = XInternAtom(getXDisplay(), "_XROOTPMAP_ID", False);
+    esetroot_id = XInternAtom(getXDisplay(), "ESETROOT_PMAP_ID", False);
   }
 
   XGrabServer(getXDisplay());
 
-  // Clear out the old pixmap?
+  // Clear out the old pixmap
   XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(),
-                     rootpmap_id, 0L, 1L, False, AnyPropertyType,
+                     rootpmap_id, 0L, 1L, False, XA_PIXMAP,
                      &type, &format, &length, &after, &data);
-  if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) {
+  if (type == XA_PIXMAP && format == 32) {
     XKillClient(getXDisplay(), *((Pixmap *) data));
     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) {
     XChangeProperty(getXDisplay(), screen_info->getRootWindow(),
-        rootpmap_id, XA_PIXMAP, 32, mode,
+        rootpmap_id, XA_PIXMAP, 32, PropModeReplace,
         (unsigned char *) &pixmap, 1);
     XChangeProperty(getXDisplay(), screen_info->getRootWindow(),
-        esetroot_id, XA_PIXMAP, 32, emode,
+        esetroot_id, XA_PIXMAP, 32, PropModeReplace,
         (unsigned char *) &pixmap, 1);
   } else {
     XDeleteProperty(getXDisplay(), screen_info->getRootWindow(),
@@ -201,7 +192,7 @@ Pixmap bsetroot::duplicatePixmap(int screen, Pixmap pixmap,
 
 
 void bsetroot::solid(void) {
-  for (unsigned int screen = 0; screen < getNumberOfScreens(); screen++) {
+  for (unsigned int screen = 0, n = numberOfScreens(); screen < n; screen++) {
     BColor c;
 
     img_ctrl[screen]->parseColor(&c, fore);
@@ -234,8 +225,9 @@ void bsetroot::modula(int x, int y) {
   long pattern;
 
   unsigned int screen, i;
+  unsigned int n = numberOfScreens();
 
-  for (pattern = 0, screen = 0; screen < getNumberOfScreens(); screen++) {
+  for (pattern = 0, screen = 0; screen < n; screen++) {
     for (i = 0; i < 16; i++) {
       pattern <<= 1;
       if ((i % x) == 0)
@@ -300,7 +292,7 @@ void bsetroot::modula(int x, int y) {
 
 
 void bsetroot::gradient(void) {
-  for (unsigned int screen = 0; screen < getNumberOfScreens(); screen++) {
+  for (unsigned int screen = 0, n = numberOfScreens(); screen < n; screen++) {
     BTexture texture;
     img_ctrl[screen]->parseTexture(&texture, grad);
     img_ctrl[screen]->parseColor(texture.getColor(), fore);