add rendercolor class, with a cache of gcs for the colors

[chaz/openbox] / otk / appwidget.cc

diff --git a/otk/appwidget.cc b/otk/appwidget.cc
index 7541d427b8c389bfa8a35a8c601b84c807938594..5b1225f758127ef872bfe5bdb975a76f0901b5cb 100644 (file)
--- a/otk/appwidget.cc
+++ b/otk/appwidget.cc
@@ -6,6 +6,7 @@
 
 #include "appwidget.hh"
 #include "application.hh"
+#include "property.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -20,14 +21,11 @@ AppWidget::AppWidget(Application *app, Direction direction,
 {
   assert(app);
 
-  _wm_protocols = XInternAtom(Display::display, "WM_PROTOCOLS", false);
-  _wm_delete = XInternAtom(Display::display, "WM_DELETE_WINDOW", false);
-
   // set WM Protocols on the window
   Atom protocols[2];
-  protocols[0] = _wm_protocols;
-  protocols[1] = _wm_delete;
-  XSetWMProtocols(Display::display, window(), protocols, 2);
+  protocols[0] = Property::atoms.wm_protocols;
+  protocols[1] = Property::atoms.wm_delete_window;
+  XSetWMProtocols(**display, window(), protocols, 2);
 }
 
 AppWidget::~AppWidget()
@@ -51,8 +49,8 @@ void AppWidget::hide(void)
 void AppWidget::clientMessageHandler(const XClientMessageEvent &e)
 {
   EventHandler::clientMessageHandler(e);
-  if (e.message_type == _wm_protocols &&
-      static_cast<Atom>(e.data.l[0]) == _wm_delete)
+  if (e.message_type == Property::atoms.wm_protocols &&
+      static_cast<Atom>(e.data.l[0]) == Property::atoms.wm_delete_window)
     hide();
 }