aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 7bafead..00ab2e5 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -209,24 +209,25 @@ public:
209 @name Screen signals 209 @name Screen signals
210 */ 210 */
211 //@{ 211 //@{
212 typedef FbTk::Signal<void, BScreen&> ScreenSignal;
212 /// client list signal 213 /// client list signal
213 FbTk::Subject &clientListSig() { return m_clientlist_sig; } 214 FbTk::Subject &clientListSig() { return m_clientlist_sig; }
214 /// icon list sig 215 /// icon list sig
215 FbTk::Subject &iconListSig() { return m_iconlist_sig; } 216 FbTk::Subject &iconListSig() { return m_iconlist_sig; }
216 /// workspace count signal 217 /// workspace count signal
217 FbTk::Signal<void, BScreen&> &workspaceCountSig() { return m_workspacecount_sig; } 218 ScreenSignal &workspaceCountSig() { return m_workspacecount_sig; }
218 /// workspace names signal 219 /// workspace names signal
219 FbTk::Signal<void, BScreen&> &workspaceNamesSig() { return m_workspacenames_sig; } 220 ScreenSignal &workspaceNamesSig() { return m_workspacenames_sig; }
220 /// workspace area signal 221 /// workspace area signal
221 FbTk::Subject &workspaceAreaSig() { return m_workspace_area_sig; } 222 FbTk::Subject &workspaceAreaSig() { return m_workspace_area_sig; }
222 /// current workspace signal 223 /// current workspace signal
223 FbTk::Signal<void, BScreen&> &currentWorkspaceSig() { return m_currentworkspace_sig; } 224 ScreenSignal &currentWorkspaceSig() { return m_currentworkspace_sig; }
224 /// focused window signal 225 /// focused window signal
225 FbTk::Subject &focusedWindowSig() { return m_focusedwindow_sig; } 226 FbTk::Subject &focusedWindowSig() { return m_focusedwindow_sig; }
226 /// reconfigure signal 227 /// reconfigure signal
227 FbTk::Subject &reconfigureSig() { return m_reconfigure_sig; } 228 FbTk::Subject &reconfigureSig() { return m_reconfigure_sig; }
228 FbTk::Subject &resizeSig() { return m_resize_sig; } 229 FbTk::Subject &resizeSig() { return m_resize_sig; }
229 FbTk::Subject &bgChangeSig() { return m_bg_change_sig; } 230 ScreenSignal &bgChangeSig() { return m_bg_change_sig; }
230 //@} 231 //@}
231 232
232 /// called when the screen receives a signal from a subject 233 /// called when the screen receives a signal from a subject
@@ -494,16 +495,15 @@ private:
494 ScreenSubject 495 ScreenSubject
495 m_clientlist_sig, ///< client signal 496 m_clientlist_sig, ///< client signal
496 m_iconlist_sig, ///< notify if a window gets iconified/deiconified 497 m_iconlist_sig, ///< notify if a window gets iconified/deiconified
497
498 m_workspace_area_sig, ///< workspace area changed signal 498 m_workspace_area_sig, ///< workspace area changed signal
499 m_focusedwindow_sig, ///< focused window signal 499 m_focusedwindow_sig, ///< focused window signal
500 m_reconfigure_sig, ///< reconfigure signal 500 m_reconfigure_sig, ///< reconfigure signal
501 m_resize_sig, ///< resize signal 501 m_resize_sig; ///< resize signal
502 m_bg_change_sig; ///< background change signal
503 502
504 FbTk::Signal<void, BScreen&> m_workspacecount_sig; ///< workspace count signal 503 ScreenSignal m_bg_change_sig; ///< background change signal
505 FbTk::Signal<void, BScreen&> m_currentworkspace_sig; ///< current workspace signal 504 ScreenSignal m_workspacecount_sig; ///< workspace count signal
506 FbTk::Signal<void, BScreen&> m_workspacenames_sig; ///< workspace names signal 505 ScreenSignal m_currentworkspace_sig; ///< current workspace signal
506 ScreenSignal m_workspacenames_sig; ///< workspace names signal
507 507
508 FbTk::MultLayers m_layermanager; 508 FbTk::MultLayers m_layermanager;
509 509