summaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 4ee147c..d4cdb3b 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.111 2003/06/24 16:29:54 fluxgen Exp $ 25// $Id: Screen.hh,v 1.112 2003/06/25 05:46:21 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -45,8 +45,6 @@
45#include <memory> 45#include <memory>
46 46
47class Netizen; 47class Netizen;
48class Toolbar;
49class ToolbarHandler;
50class FbWinFrameTheme; 48class FbWinFrameTheme;
51class RootTheme; 49class RootTheme;
52class WinButtonTheme; 50class WinButtonTheme;
@@ -65,7 +63,7 @@ class FbWindow;
65 63
66/// Handles screen connection, screen clients and workspaces 64/// Handles screen connection, screen clients and workspaces
67/** 65/**
68 Create a toolbar and workspaces, handles switching between workspaces and windows 66 Create workspaces, handles switching between workspaces and windows
69 */ 67 */
70class BScreen : private FbTk::NotCopyable { 68class BScreen : private FbTk::NotCopyable {
71public: 69public:
@@ -97,8 +95,6 @@ public:
97 inline FbTk::ImageControl &imageControl() { return *m_image_control.get(); } 95 inline FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
98 const FbTk::Menu * const getRootmenu() const { return m_rootmenu.get(); } 96 const FbTk::Menu * const getRootmenu() const { return m_rootmenu.get(); }
99 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); } 97 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); }
100 const FbTk::Menu &toolbarModemenu() const;
101 FbTk::Menu &toolbarModemenu();
102 98
103 inline const std::string &getRootCommand() const { return *resource.rootcommand; } 99 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
104 inline Fluxbox::FocusModel getFocusModel() const { return *resource.focus_model; } 100 inline Fluxbox::FocusModel getFocusModel() const { return *resource.focus_model; }
@@ -106,12 +102,6 @@ public:
106 inline Slit *slit() { return m_slit.get(); } 102 inline Slit *slit() { return m_slit.get(); }
107 inline const Slit *slit() const { return m_slit.get(); } 103 inline const Slit *slit() const { return m_slit.get(); }
108 104
109 const Toolbar *toolbar() const;
110 Toolbar *toolbar();
111
112 inline const ToolbarHandler &toolbarHandler() const { return *m_toolbarhandler; }
113 inline ToolbarHandler &toolbarHandler() { return *m_toolbarhandler; }
114
115 inline Workspace *getWorkspace(unsigned int w) { return ( w < m_workspaces_list.size() ? m_workspaces_list[w] : 0); } 105 inline Workspace *getWorkspace(unsigned int w) { return ( w < m_workspaces_list.size() ? m_workspaces_list[w] : 0); }
116 inline Workspace *currentWorkspace() { return m_current_workspace; } 106 inline Workspace *currentWorkspace() { return m_current_workspace; }
117 107
@@ -266,7 +256,7 @@ public:
266 FluxboxWindow* useAutoGroupWindow(); 256 FluxboxWindow* useAutoGroupWindow();
267 257
268 /// updates root window size and resizes/reconfigures screen clients 258 /// updates root window size and resizes/reconfigures screen clients
269 /// that depends on screen size (toolbar, slit) 259 /// that depends on screen size (slit)
270 /// (and maximized windows?) 260 /// (and maximized windows?)
271 void updateSize(); 261 void updateSize();
272 262
@@ -427,8 +417,6 @@ private:
427 const std::string m_name, m_altname; 417 const std::string m_name, m_altname;
428 FbTk::ResourceManager &m_resource_manager; 418 FbTk::ResourceManager &m_resource_manager;
429 419
430 std::auto_ptr<ToolbarHandler> m_toolbarhandler;
431
432 bool m_xinerama_avail; 420 bool m_xinerama_avail;
433 int m_xinerama_num_heads; 421 int m_xinerama_num_heads;
434 422