summaryrefslogtreecommitdiff
path: root/src/Workspace.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Workspace.hh')
-rw-r--r--src/Workspace.hh32
1 files changed, 14 insertions, 18 deletions
diff --git a/src/Workspace.hh b/src/Workspace.hh
index bb7db8f..5862e50 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -1,5 +1,5 @@
1// Workspace.hh for Fluxbox 1// Workspace.hh for Fluxbox
2// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org) 2// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
3// 3//
4// Workspace.hh for Blackbox - an X11 Window manager 4// Workspace.hh for Blackbox - an X11 Window manager
5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@@ -52,9 +52,8 @@ public:
52 ~Workspace(); 52 ~Workspace();
53 53
54 void setLastFocusedWindow(FluxboxWindow *w); 54 void setLastFocusedWindow(FluxboxWindow *w);
55 /** 55
56 Set workspace name 56 /// Set workspace name
57 */
58 void setName(const std::string &name); 57 void setName(const std::string &name);
59 void showAll(); 58 void showAll();
60 void hideAll(); 59 void hideAll();
@@ -66,11 +65,13 @@ public:
66 int addWindow(FluxboxWindow &win, bool place = false); 65 int addWindow(FluxboxWindow &win, bool place = false);
67 int removeWindow(FluxboxWindow *win); 66 int removeWindow(FluxboxWindow *win);
68 void removeWindow(WinClient &client); 67 void removeWindow(WinClient &client);
69 BScreen &screen() { return m_screen; }
70 FluxboxWindow *getLastFocusedWindow() { return lastfocus; }
71 68
69 BScreen &screen() { return m_screen; }
72 const BScreen &screen() const { return m_screen; } 70 const BScreen &screen() const { return m_screen; }
73 const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; } 71
72 FluxboxWindow *lastFocusedWindow() { return m_lastfocus; }
73 const FluxboxWindow *lastFocusedWindow() const { return m_lastfocus; }
74
74 FbTk::Menu &menu() { return m_clientmenu; } 75 FbTk::Menu &menu() { return m_clientmenu; }
75 inline const FbTk::Menu &menu() const { return m_clientmenu; } 76 inline const FbTk::Menu &menu() const { return m_clientmenu; }
76 /// name of this workspace 77 /// name of this workspace
@@ -79,18 +80,13 @@ public:
79 @return the number of this workspace, note: obsolete, should be in BScreen 80 @return the number of this workspace, note: obsolete, should be in BScreen
80 */ 81 */
81 inline unsigned int workspaceID() const { return m_id; } 82 inline unsigned int workspaceID() const { return m_id; }
82 /** 83
83 @param id the window id number 84 const Windows &windowList() const { return m_windowlist; }
84 @return window that match the id, else 0 85 Windows &windowList() { return m_windowlist; }
85 */
86 FluxboxWindow *getWindow(unsigned int id);
87 const FluxboxWindow *getWindow(unsigned int id) const;
88 const Windows &getWindowList() const { return m_windowlist; }
89 Windows &getWindowList() { return m_windowlist; }
90 86
91 bool isCurrent() const; 87 bool isCurrent() const;
92 bool isLastWindow(FluxboxWindow *window) const; 88 bool isLastWindow(FluxboxWindow *window) const;
93 int getCount() const; 89 int numberOfWindows() const;
94 void checkGrouping(FluxboxWindow &win); 90 void checkGrouping(FluxboxWindow &win);
95 static bool loadGroups(const std::string &filename); 91 static bool loadGroups(const std::string &filename);
96protected: 92protected:
@@ -100,7 +96,7 @@ private:
100 void updateClientmenu(); 96 void updateClientmenu();
101 97
102 BScreen &m_screen; 98 BScreen &m_screen;
103 FluxboxWindow *lastfocus; 99 FluxboxWindow *m_lastfocus;
104 FbTk::Menu m_clientmenu; 100 FbTk::Menu m_clientmenu;
105 101
106 typedef std::list<FluxboxWindow *> WindowStack; 102 typedef std::list<FluxboxWindow *> WindowStack;
@@ -114,7 +110,7 @@ private:
114 110
115 std::string m_name; ///< name of this workspace 111 std::string m_name; ///< name of this workspace
116 unsigned int m_id; ///< id, obsolete, this should be in BScreen 112 unsigned int m_id; ///< id, obsolete, this should be in BScreen
117 int cascade_x, cascade_y; 113 int m_cascade_x, m_cascade_y;
118}; 114};
119 115
120 116