aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-03-23 15:14:45 (GMT)
committerfluxgen <fluxgen>2002-03-23 15:14:45 (GMT)
commit8daa080d11a6bf9e6ed208563e738a02c9eb6cf8 (patch)
tree4d9f68180a4bc0f1574f03b48897233b43791899 /src/Screen.hh
parente133cf83a332a72ca42be5e223834d4e6aa0a2e8 (diff)
downloadfluxbox_pavel-8daa080d11a6bf9e6ed208563e738a02c9eb6cf8.zip
fluxbox_pavel-8daa080d11a6bf9e6ed208563e738a02c9eb6cf8.tar.bz2
some signed/unsigned stuff
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 5201eb7..9c3c39b 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.24 2002/03/19 14:30:42 fluxgen Exp $ 25// $Id: Screen.hh,v 1.25 2002/03/23 15:14:45 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -111,7 +111,7 @@ public:
111 111
112 inline Toolbar *getToolbar(void) { return toolbar; } 112 inline Toolbar *getToolbar(void) { return toolbar; }
113 113
114 inline Workspace *getWorkspace(int w) { return workspacesList[w]; } 114 inline Workspace *getWorkspace(unsigned int w) { return ( w < workspacesList.size() ? workspacesList[w] : 0); }
115 inline Workspace *getCurrentWorkspace(void) { return current_workspace; } 115 inline Workspace *getCurrentWorkspace(void) { return current_workspace; }
116 116
117 inline Workspacemenu *getWorkspacemenu(void) { return workspacemenu; } 117 inline Workspacemenu *getWorkspacemenu(void) { return workspacemenu; }
@@ -121,10 +121,10 @@ public:
121 inline const unsigned int getFrameWidth(void) const { return theme->getFrameWidth(); } 121 inline const unsigned int getFrameWidth(void) const { return theme->getFrameWidth(); }
122 inline const unsigned int getBorderWidth(void) const { return theme->getBorderWidth(); } 122 inline const unsigned int getBorderWidth(void) const { return theme->getBorderWidth(); }
123 inline const unsigned int getBorderWidth2x(void) const { return theme->getBorderWidth()*2; } 123 inline const unsigned int getBorderWidth2x(void) const { return theme->getBorderWidth()*2; }
124 inline const int getCurrentWorkspaceID() { return current_workspace->getWorkspaceID(); } 124 inline const unsigned int getCurrentWorkspaceID() const { return current_workspace->getWorkspaceID(); }
125 125
126 typedef std::vector<FluxboxWindow *> Icons; 126 typedef std::vector<FluxboxWindow *> Icons;
127 inline const int getCount(void) { return workspacesList.size(); } 127 inline const unsigned int getCount(void) { return workspacesList.size(); }
128 inline const int getIconCount(void) { return iconList.size(); } 128 inline const int getIconCount(void) { return iconList.size(); }
129 inline Icons &getIconList(void) { return iconList; } 129 inline Icons &getIconList(void) { return iconList; }
130 130
@@ -191,7 +191,7 @@ public:
191 inline Theme::MenuStyle *getMenuStyle(void) { return &theme->getMenuStyle(); } 191 inline Theme::MenuStyle *getMenuStyle(void) { return &theme->getMenuStyle(); }
192 inline Theme::ToolbarStyle *getToolbarStyle(void) { return &theme->getToolbarStyle(); } 192 inline Theme::ToolbarStyle *getToolbarStyle(void) { return &theme->getToolbarStyle(); }
193 193
194 FluxboxWindow *getIcon(int); 194 FluxboxWindow *getIcon(unsigned int index);
195 195
196 int addWorkspace(void); 196 int addWorkspace(void);
197 int removeLastWorkspace(void); 197 int removeLastWorkspace(void);
@@ -209,12 +209,11 @@ public:
209 void removeNetizen(Window); 209 void removeNetizen(Window);
210 void addIcon(FluxboxWindow *); 210 void addIcon(FluxboxWindow *);
211 void removeIcon(FluxboxWindow *); 211 void removeIcon(FluxboxWindow *);
212 void getNameOfWorkspace(int, char **); 212 void getNameOfWorkspace(unsigned int workspace, char **name);
213 void changeWorkspaceID(int); 213 void changeWorkspaceID(unsigned int);
214 void sendToWorkspace(int); 214 void sendToWorkspace(unsigned int workspace, bool changeworkspace=true);
215 void sendToWorkspace(int, bool);
216 void raiseWindows(Window *, int); 215 void raiseWindows(Window *, int);
217 void reassociateWindow(FluxboxWindow *, int, Bool); 216 void reassociateWindow(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky);
218 void prevFocus(int = 0); 217 void prevFocus(int = 0);
219 void nextFocus(int = 0); 218 void nextFocus(int = 0);
220 void raiseFocus(void); 219 void raiseFocus(void);