merged changes from pre-devel

1 files changed, 16 insertions, 15 deletions

diff --git a/src/AttentionNoticeHandler.cc b/src/AttentionNoticeHandler.cc
index 10a087c..3f28695 100644
--- a/src/AttentionNoticeHandler.cc
+++ b/src/AttentionNoticeHandler.cc
@@ -23,7 +23,7 @@
 
 #include "AttentionNoticeHandler.hh"
 
-#include "WinClient.hh"
+#include "Window.hh"
 #include "Screen.hh"
 #include "STLUtil.hh"
 
@@ -34,16 +34,15 @@
 namespace {
 class ToggleFrameFocusCmd: public FbTk::Command {
 public:
-    ToggleFrameFocusCmd(WinClient &client):
+    ToggleFrameFocusCmd(Focusable &client):
         m_client(client),
         m_state(false) {}
     void execute() {
         m_state ^= true;
-        m_client.fbwindow()->setLabelButtonFocus(m_client, m_state);
-        m_client.fbwindow()->setAttentionState(m_state);
+        m_client.setAttentionState(m_state);
     }
 private:
-    WinClient& m_client;
+    Focusable &m_client;
     bool m_state;
 };
 
@@ -54,9 +53,9 @@ AttentionNoticeHandler::~AttentionNoticeHandler() {
     STLUtil::destroyAndClearSecond(m_attentions);
 }
 
-void AttentionNoticeHandler::addAttention(WinClient &client) {
+void AttentionNoticeHandler::addAttention(Focusable &client) {
     // no need to add already active client
-    if (client.fbwindow()->isFocused() && &client.fbwindow()->winClient() == &client)
+    if (client.isFocused())
         return;
 
     // Already have a notice for it?
@@ -104,22 +103,24 @@ void AttentionNoticeHandler::addAttention(WinClient &client) {
 void AttentionNoticeHandler::update(FbTk::Subject *subj) {
 
     // we need to be able to get the window
-    if (typeid(*subj) != typeid(WinClient::WinClientSubj))
+    if (!subj || typeid(*subj) != typeid(Focusable::FocusSubject))
         return;
 
     // all signals results in destruction of the notice
 
-    WinClient::WinClientSubj *winsubj = 
-        static_cast<WinClient::WinClientSubj *>(subj);
-    delete m_attentions[&winsubj->winClient()];
-    m_attentions.erase(&winsubj->winClient());
+    Focusable::FocusSubject *winsubj = 
+        static_cast<Focusable::FocusSubject *>(subj);
+    delete m_attentions[&winsubj->win()];
+    m_attentions.erase(&winsubj->win());
+    winsubj->win().setAttentionState(false);
 
     // update _NET_WM_STATE atom
-    FluxboxWindow *fbwin = winsubj->winClient().fbwindow();
-    if (fbwin && winsubj != &winsubj->winClient().dieSig())
+    FluxboxWindow *fbwin = winsubj->win().fbwindow();
+    if (fbwin && winsubj != &winsubj->win().dieSig())
         fbwin->stateSig().notify();
+
 }
 
-bool AttentionNoticeHandler::isDemandingAttention(WinClient &client) {
+bool AttentionNoticeHandler::isDemandingAttention(Focusable &client) {
     return m_attentions.find(&client) != m_attentions.end();
 }