diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-05-06 20:59:13 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-05-10 11:00:46 (GMT) |
commit | ff49160b120edd8d9396f10dab5a97bace8724ec (patch) | |
tree | 5bbaa94fe731615501e113d66e79033beae5b331 /src | |
parent | 6a0280aa4d8b468617a7dd5f7a6523d0422364e8 (diff) | |
download | fluxbox_paul-ff49160b120edd8d9396f10dab5a97bace8724ec.zip fluxbox_paul-ff49160b120edd8d9396f10dab5a97bace8724ec.tar.bz2 |
Convert FluxboxWindow::hintSig to FbTk::Signal
Diffstat (limited to 'src')
-rw-r--r-- | src/Window.cc | 3 | ||||
-rw-r--r-- | src/Window.hh | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc index 11d46bc..b3c0698 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -259,7 +259,6 @@ int FluxboxWindow::s_num_grabs = 0; | |||
259 | FluxboxWindow::FluxboxWindow(WinClient &client): | 259 | FluxboxWindow::FluxboxWindow(WinClient &client): |
260 | Focusable(client.screen(), this), | 260 | Focusable(client.screen(), this), |
261 | oplock(false), | 261 | oplock(false), |
262 | m_hintsig(*this), | ||
263 | m_creation_time(0), | 262 | m_creation_time(0), |
264 | moving(false), resizing(false), | 263 | moving(false), resizing(false), |
265 | m_initialized(false), | 264 | m_initialized(false), |
@@ -2087,7 +2086,7 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) { | |||
2087 | client.updateWMHints(); | 2086 | client.updateWMHints(); |
2088 | titleSig().emit(title().logical(), *this); | 2087 | titleSig().emit(title().logical(), *this); |
2089 | // nothing uses this yet | 2088 | // nothing uses this yet |
2090 | // hintSig().notify(); // notify listeners | 2089 | // hintSig().emit(*this); |
2091 | break; | 2090 | break; |
2092 | 2091 | ||
2093 | case XA_WM_ICON_NAME: | 2092 | case XA_WM_ICON_NAME: |
diff --git a/src/Window.hh b/src/Window.hh index 73b6338..966631d 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -460,8 +460,7 @@ public: | |||
460 | */ | 460 | */ |
461 | FbTk::Signal<FluxboxWindow &> &stateSig() { return m_statesig; } | 461 | FbTk::Signal<FluxboxWindow &> &stateSig() { return m_statesig; } |
462 | FbTk::Signal<FluxboxWindow &> &layerSig() { return m_layersig; } | 462 | FbTk::Signal<FluxboxWindow &> &layerSig() { return m_layersig; } |
463 | FbTk::Subject &hintSig() { return m_hintsig; } | 463 | FbTk::Signal<FluxboxWindow &> &hintSig() { return m_hintsig; } |
464 | const FbTk::Subject &hintSig() const { return m_hintsig; } | ||
465 | FbTk::Signal<FluxboxWindow &> &workspaceSig() { return m_workspacesig; } | 464 | FbTk::Signal<FluxboxWindow &> &workspaceSig() { return m_workspacesig; } |
466 | /** @} */ // end group signals | 465 | /** @} */ // end group signals |
467 | 466 | ||
@@ -538,8 +537,7 @@ private: | |||
538 | 537 | ||
539 | 538 | ||
540 | // state and hint signals | 539 | // state and hint signals |
541 | WinSubject m_hintsig; | 540 | FbTk::Signal<FluxboxWindow &> m_workspacesig, m_statesig, m_layersig, m_hintsig; |
542 | FbTk::Signal<FluxboxWindow &> m_workspacesig, m_statesig, m_layersig; | ||
543 | 541 | ||
544 | time_t m_creation_time; | 542 | time_t m_creation_time; |
545 | 543 | ||