diff options
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index 96a4d43..a237b36 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -213,7 +213,7 @@ public: | |||
213 | /// focused window signal | 213 | /// focused window signal |
214 | FbTk::Signal<BScreen&, FluxboxWindow*, WinClient*> &focusedWindowSig() { return m_focusedwindow_sig; } | 214 | FbTk::Signal<BScreen&, FluxboxWindow*, WinClient*> &focusedWindowSig() { return m_focusedwindow_sig; } |
215 | /// reconfigure signal | 215 | /// reconfigure signal |
216 | FbTk::Subject &reconfigureSig() { return m_reconfigure_sig; } | 216 | ScreenSignal &reconfigureSig() { return m_reconfigure_sig; } |
217 | ScreenSignal &resizeSig() { return m_resize_sig; } | 217 | ScreenSignal &resizeSig() { return m_resize_sig; } |
218 | ScreenSignal &bgChangeSig() { return m_bg_change_sig; } | 218 | ScreenSignal &bgChangeSig() { return m_bg_change_sig; } |
219 | //@} | 219 | //@} |
@@ -455,18 +455,6 @@ public: | |||
455 | /// when screen dies | 455 | /// when screen dies |
456 | void addManagedResource(FbTk::Resource_base *resource); | 456 | void addManagedResource(FbTk::Resource_base *resource); |
457 | 457 | ||
458 | /** | ||
459 | * Used to emit different signals for the screen | ||
460 | */ | ||
461 | class ScreenSubject:public FbTk::Subject { | ||
462 | public: | ||
463 | ScreenSubject(BScreen &scr):m_scr(scr) { } | ||
464 | const BScreen &screen() const { return m_scr; } | ||
465 | BScreen &screen() { return m_scr; } | ||
466 | private: | ||
467 | BScreen &m_scr; | ||
468 | }; | ||
469 | |||
470 | private: | 458 | private: |
471 | void setupConfigmenu(FbTk::Menu &menu); | 459 | void setupConfigmenu(FbTk::Menu &menu); |
472 | void renderGeomWindow(); | 460 | void renderGeomWindow(); |
@@ -476,8 +464,7 @@ private: | |||
476 | const Strut* availableWorkspaceArea(int head) const; | 464 | const Strut* availableWorkspaceArea(int head) const; |
477 | 465 | ||
478 | FbTk::SignalTracker m_tracker; | 466 | FbTk::SignalTracker m_tracker; |
479 | ScreenSubject m_reconfigure_sig; ///< reconfigure signal | 467 | ScreenSignal m_reconfigure_sig; ///< reconfigure signal |
480 | |||
481 | 468 | ||
482 | FbTk::Signal<BScreen&, FluxboxWindow*, WinClient*> m_focusedwindow_sig; ///< focused window signal | 469 | FbTk::Signal<BScreen&, FluxboxWindow*, WinClient*> m_focusedwindow_sig; ///< focused window signal |
483 | ScreenSignal m_resize_sig; ///< resize signal | 470 | ScreenSignal m_resize_sig; ///< resize signal |