aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2005-07-04 18:18:32 (GMT)
committerfluxgen <fluxgen>2005-07-04 18:18:32 (GMT)
commit1727656e0a36cd9095e173dfa43200ed14c178d1 (patch)
tree200a048b9f7ed888047fb0a4fd82660c349087c6 /src/Screen.hh
parent9049dd33d31ccc03dd3f130681eb481d2b3ff0e6 (diff)
downloadfluxbox_pavel-1727656e0a36cd9095e173dfa43200ed14c178d1.zip
fluxbox_pavel-1727656e0a36cd9095e173dfa43200ed14c178d1.tar.bz2
cleaning, change getCount to numberOfWorkspace
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index abebd02..d5de5bc 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -125,17 +125,15 @@ public:
125 inline const std::string &windowMenuFilename() const { return *resource.windowmenufile; } 125 inline const std::string &windowMenuFilename() const { return *resource.windowmenufile; }
126 inline FbTk::ImageControl &imageControl() { return *m_image_control.get(); } 126 inline FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
127 // menus 127 // menus
128 const FbTk::Menu &getRootmenu() const { return *m_rootmenu.get(); } 128 const FbTk::Menu &rootMenu() const { return *m_rootmenu.get(); }
129 FbTk::Menu &getRootmenu() { return *m_rootmenu.get(); } 129 FbTk::Menu &rootMenu() { return *m_rootmenu.get(); }
130 const FbTk::Menu &configMenu() const { return *m_configmenu.get(); } 130 const FbTk::Menu &configMenu() const { return *m_configmenu.get(); }
131 FbTk::Menu &configMenu() { return *m_configmenu.get(); } 131 FbTk::Menu &configMenu() { return *m_configmenu.get(); }
132 const FbTk::Menu &windowMenu() const { return *m_windowmenu.get(); } 132 const FbTk::Menu &windowMenu() const { return *m_windowmenu.get(); }
133 FbTk::Menu &windowMenu() { return *m_windowmenu.get(); } 133 FbTk::Menu &windowMenu() { return *m_windowmenu.get(); }
134
135 ExtraMenus &extraWindowMenus() { return m_extramenus; } 134 ExtraMenus &extraWindowMenus() { return m_extramenus; }
136 const ExtraMenus &extraWindowMenus() const { return m_extramenus; } 135 const ExtraMenus &extraWindowMenus() const { return m_extramenus; }
137 136
138 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
139 inline ResizeModel getResizeModel() const { return *resource.resize_model; } 137 inline ResizeModel getResizeModel() const { return *resource.resize_model; }
140 inline FocusModel getFocusModel() const { return *resource.focus_model; } 138 inline FocusModel getFocusModel() const { return *resource.focus_model; }
141 inline FollowModel getFollowModel() const { return *resource.follow_model; } 139 inline FollowModel getFollowModel() const { return *resource.follow_model; }
@@ -147,8 +145,8 @@ public:
147 inline Workspace *currentWorkspace() { return m_current_workspace; } 145 inline Workspace *currentWorkspace() { return m_current_workspace; }
148 inline const Workspace *currentWorkspace() const { return m_current_workspace; } 146 inline const Workspace *currentWorkspace() const { return m_current_workspace; }
149 147
150 const FbTk::Menu &getWorkspacemenu() const { return *m_workspacemenu.get(); } 148 const FbTk::Menu &workspaceMenu() const { return *m_workspacemenu.get(); }
151 FbTk::Menu &getWorkspacemenu() { return *m_workspacemenu.get(); } 149 FbTk::Menu &workspaceMenu() { return *m_workspacemenu.get(); }
152 150
153 151
154 unsigned int currentWorkspaceID() const; 152 unsigned int currentWorkspaceID() const;
@@ -169,11 +167,10 @@ public:
169 inline int screenNumber() const { return rootWindow().screenNumber(); } 167 inline int screenNumber() const { return rootWindow().screenNumber(); }
170 168
171 /// @return number of workspaces 169 /// @return number of workspaces
172 inline unsigned int getCount() const { return m_workspaces_list.size(); } 170 unsigned int numberOfWorkspaces() const { return m_workspaces_list.size(); }
173 /// @return number of icons 171
174 inline unsigned int getIconCount() const { return m_icon_list.size(); } 172 inline const Icons &iconList() const { return m_icon_list; }
175 inline const Icons &getIconList() const { return m_icon_list; } 173 inline Icons &iconList() { return m_icon_list; }
176 inline Icons &getIconList() { return m_icon_list; }
177 inline const FocusedWindows &getFocusedList() const { return focused_list; } 174 inline const FocusedWindows &getFocusedList() const { return focused_list; }
178 inline FocusedWindows &getFocusedList() { return focused_list; } 175 inline FocusedWindows &getFocusedList() { return focused_list; }
179 WinClient *getLastFocusedWindow(int workspace = -1); 176 WinClient *getLastFocusedWindow(int workspace = -1);
@@ -215,9 +212,6 @@ public:
215 /// hide all windowmenus except the given one (if given) 212 /// hide all windowmenus except the given one (if given)
216 void hideWindowMenus(const FluxboxWindow* except= 0); 213 void hideWindowMenus(const FluxboxWindow* except= 0);
217 214
218 /// @return the resource value of number of workspace
219 inline int getNumberOfWorkspaces() const { return *resource.workspaces; }
220
221 inline PlacementPolicy getPlacementPolicy() const { return *resource.placement_policy; } 215 inline PlacementPolicy getPlacementPolicy() const { return *resource.placement_policy; }
222 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } 216 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; }
223 inline RowDirection getRowPlacementDirection() const { return *resource.row_direction; } 217 inline RowDirection getRowPlacementDirection() const { return *resource.row_direction; }