toggleDecorations!

3 files changed, 17 insertions, 8 deletions

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 1bd7ad5d..31a90233 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -121,11 +121,11 @@ void screen::processEvent(const XEvent &e) {
     // root window
     if (e.xproperty.atom == _xatom->getAtom(XAtom::net_number_of_desktops))
       updateNumDesktops();
-    if (e.xproperty.atom == _xatom->getAtom(XAtom::net_current_desktop))
+    else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_current_desktop))
       updateActiveDesktop();
-    if (e.xproperty.atom == _xatom->getAtom(XAtom::net_active_window))
+    else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_active_window))
       updateActiveWindow();
-    if (e.xproperty.atom == _xatom->getAtom(XAtom::net_client_list)) {
+    else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_client_list)) {
       // catch any window unmaps first
       XEvent ev;
       if (XCheckTypedWindowEvent(_epist->getXDisplay(), e.xany.window,
diff --git a/util/epist/window.cc b/util/epist/window.cc
index 1e8bc227..85429719 100644
--- a/util/epist/window.cc
+++ b/util/epist/window.cc
@@ -36,6 +36,13 @@ using std::dec;
 #include "window.hh"
 #include "../../src/XAtom.hh"
 
+  // defined by black/openbox
+const unsigned long XWindow::PropBlackboxAttributesElements;
+const unsigned long XWindow::AttribDecoration;
+const unsigned long XWindow::DecorNone;
+const unsigned long XWindow::DecorNormal;
+
+
 XWindow::XWindow(epist *epist, screen *screen, Window window)
   : _epist(epist), _screen(screen), _xatom(epist->xatom()), _window(window) {
 
@@ -203,8 +210,10 @@ void XWindow::processEvent(const XEvent &e) {
   case PropertyNotify:
     if (e.xproperty.atom == XA_WM_NORMAL_HINTS)
       updateNormalHints();
-    if (e.xproperty.atom == XA_WM_HINTS)
+    else if (e.xproperty.atom == XA_WM_HINTS)
       updateWMHints();
+    else if (e.xproperty.atom == _xatom->getAtom(XAtom::blackbox_attributes))
+      updateBlackboxAttributes();
     else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_wm_state))
       updateState();
     else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_wm_desktop))
diff --git a/util/epist/window.hh b/util/epist/window.hh
index f80bcb3d..ad00739f 100644
--- a/util/epist/window.hh
+++ b/util/epist/window.hh
@@ -47,10 +47,10 @@ public:
 
 private:
   // defined by black/openbox
-  static const unsigned int PropBlackboxAttributesElements = 9;
-  static const unsigned int AttribDecoration = 1 << 6;
-  static const unsigned int DecorNone = 0;
-  static const unsigned int DecorNormal = 2;
+  static const unsigned long PropBlackboxAttributesElements = 9;
+  static const unsigned long AttribDecoration = 1 << 6;
+  static const unsigned long DecorNone = 0;
+  static const unsigned long DecorNormal = 2;
 
   epist  *_epist;
   screen *_screen;