aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-15 12:00:46 (GMT)
committerfluxgen <fluxgen>2003-05-15 12:00:46 (GMT)
commit988392b1eb89deaddfddfcb37a15e8f55d58bb70 (patch)
tree493d69abd418722498d1b53982653eae1d4a37e6 /src/Screen.hh
parentcbce8634dde14fd7000fde92e86f4bd4bf3525c2 (diff)
downloadfluxbox_pavel-988392b1eb89deaddfddfcb37a15e8f55d58bb70.zip
fluxbox_pavel-988392b1eb89deaddfddfcb37a15e8f55d58bb70.tar.bz2
minor cleaning in BScreen interface
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 72647a6..a5a9672 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.96 2003/05/13 21:12:17 fluxgen Exp $ 25// $Id: Screen.hh,v 1.97 2003/05/15 12:00:44 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -106,8 +106,8 @@ public:
106 inline bool &doSlitAutoHide() { return *resource.slit_auto_hide; } 106 inline bool &doSlitAutoHide() { return *resource.slit_auto_hide; }
107 inline const bool &doSlitAutoHide() const { return *resource.slit_auto_hide; } 107 inline const bool &doSlitAutoHide() const { return *resource.slit_auto_hide; }
108 108
109 inline Slit *getSlit() { return m_slit.get(); } 109 inline Slit *slit() { return m_slit.get(); }
110 inline const Slit *getSlit() const { return m_slit.get(); } 110 inline const Slit *slit() const { return m_slit.get(); }
111 111
112 inline Slit::Placement getSlitPlacement() const { return *resource.slit_placement; } 112 inline Slit::Placement getSlitPlacement() const { return *resource.slit_placement; }
113 inline Slit::Direction getSlitDirection() const { return *resource.slit_direction; } 113 inline Slit::Direction getSlitDirection() const { return *resource.slit_direction; }
@@ -119,31 +119,31 @@ public:
119 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; } 119 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; }
120 inline void saveSlitOnHead(unsigned int h) { resource.slit_on_head = h; } 120 inline void saveSlitOnHead(unsigned int h) { resource.slit_on_head = h; }
121 121
122 inline const Toolbar *getToolbar() const { return m_toolbarhandler->getToolbar(); } 122 inline const Toolbar *toolbar() const { return m_toolbarhandler->getToolbar(); }
123 inline Toolbar *getToolbar() { return m_toolbarhandler->getToolbar(); } 123 inline Toolbar *toolbar() { return m_toolbarhandler->getToolbar(); }
124 124
125 inline const ToolbarHandler &getToolbarHandler() const { return *m_toolbarhandler; } 125 inline const ToolbarHandler &toolbarHandler() const { return *m_toolbarhandler; }
126 inline ToolbarHandler &getToolbarHandler() { return *m_toolbarhandler; } 126 inline ToolbarHandler &toolbarHandler() { return *m_toolbarhandler; }
127 127
128 inline Workspace *getWorkspace(unsigned int w) { return ( w < workspacesList.size() ? workspacesList[w] : 0); } 128 inline Workspace *getWorkspace(unsigned int w) { return ( w < workspacesList.size() ? workspacesList[w] : 0); }
129 inline Workspace *getCurrentWorkspace() { return current_workspace; } 129 inline Workspace *currentWorkspace() { return current_workspace; }
130 130
131 const FbTk::Menu *getWorkspacemenu() const { return workspacemenu.get(); } 131 const FbTk::Menu *getWorkspacemenu() const { return workspacemenu.get(); }
132 FbTk::Menu *getWorkspacemenu() { return workspacemenu.get(); } 132 FbTk::Menu *getWorkspacemenu() { return workspacemenu.get(); }
133 133
134 unsigned int getCurrentWorkspaceID() const; 134 unsigned int currentWorkspaceID() const;
135 Pixmap rootPixmap() const; 135 Pixmap rootPixmap() const;
136 /* 136 /*
137 maximum screen surface 137 maximum screen surface
138 */ 138 */
139 unsigned int getMaxLeft() const; 139 unsigned int maxLeft() const;
140 unsigned int getMaxRight() const; 140 unsigned int maxRight() const;
141 unsigned int getMaxTop() const; 141 unsigned int maxTop() const;
142 unsigned int getMaxBottom() const; 142 unsigned int maxBottom() const;
143 143
144 inline unsigned int getWidth() const { return rootWindow().width(); } 144 inline unsigned int width() const { return rootWindow().width(); }
145 inline unsigned int getHeight() const { return rootWindow().height(); } 145 inline unsigned int height() const { return rootWindow().height(); }
146 inline unsigned int getScreenNumber() const { return rootWindow().screenNumber(); } 146 inline unsigned int screenNumber() const { return rootWindow().screenNumber(); }
147 typedef std::vector<FluxboxWindow *> Icons; 147 typedef std::vector<FluxboxWindow *> Icons;
148 typedef std::list<WinClient *> FocusedWindows; 148 typedef std::list<WinClient *> FocusedWindows;
149 149