alloc colors only when needed, and free them properly on destruction

[chaz/openbox] / otk / property.cc

diff --git a/otk/property.cc b/otk/property.cc
index a0404f683b66fd712c079a601b0dd65a03e0cdcd..03f0d6b6bcb41fc912fc356072f34c983fc8519c 100644 (file)
--- a/otk/property.cc
+++ b/otk/property.cc
@@ -1,19 +1,16 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "config.h"
 
 #include "property.hh"
 #include "display.hh"
 
 extern "C" {
 #include <X11/Xatom.h>
-
-#include <assert.h>
 }
 
 #include <algorithm>
+#include <cassert>
 
 namespace otk {
 
@@ -64,6 +61,8 @@ void Property::initialize()
   atoms.net_workarea = create("_NET_WORKAREA");
   atoms.net_supporting_wm_check = create("_NET_SUPPORTING_WM_CHECK");
 //  atoms.net_virtual_roots = create("_NET_VIRTUAL_ROOTS");
+  atoms.net_desktop_layout = create("_NET_DESKTOP_LAYOUT");
+  atoms.net_showing_desktop = create("_NET_SHOWING_DESKTOP");
 
   atoms.net_close_window = create("_NET_CLOSE_WINDOW");
   atoms.net_wm_moveresize = create("_NET_WM_MOVERESIZE");
@@ -136,6 +135,7 @@ void Property::initialize()
     create("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
 
   atoms.openbox_premax = create("_OPENBOX_PREMAX");
+  atoms.openbox_active_window = create("_OPENBOX_ACTIVE_WINDOW");
 }
 
 void Property::set(Window win, Atom atom, Atom type, unsigned char* data,