M util/epist/screen.cc → util/epist/screen.cc

@@ -121,11 +121,11 @@ case PropertyNotify:
     // 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,

M util/epist/window.cc → util/epist/window.cc

@@ -36,6 +36,13 @@ #include "screen.hh"
 #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 @@ break;
   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))

M util/epist/window.hh → util/epist/window.hh

@@ -47,10 +47,10 @@ };
 
 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;