summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Screen.hh27
1 files changed, 13 insertions, 14 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 051a002..b85a1b4 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.41 2002/08/04 15:55:13 fluxgen Exp $ 25// $Id: Screen.hh,v 1.42 2002/08/11 22:11:42 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -38,26 +38,25 @@
38#include "Workspacemenu.hh" 38#include "Workspacemenu.hh"
39#include "fluxbox.hh" 39#include "fluxbox.hh"
40 40
41#ifdef SLIT 41#ifdef SLIT
42# include "Slit.hh" 42#include "Slit.hh"
43#endif // SLIT 43#endif // SLIT
44 44
45
46#include <X11/Xlib.h> 45#include <X11/Xlib.h>
47#include <X11/Xresource.h> 46#include <X11/Xresource.h>
48 47
49#ifdef TIME_WITH_SYS_TIME 48#ifdef TIME_WITH_SYS_TIME
50# include <sys/time.h> 49#include <sys/time.h>
51# include <time.h> 50#include <time.h>
52#else // !TIME_WITH_SYS_TIME 51#else // !TIME_WITH_SYS_TIME
53# ifdef HAVE_SYS_TIME_H 52#ifdef HAVE_SYS_TIME_H
54# include <sys/time.h> 53#include <sys/time.h>
55# else // !HAVE_SYS_TIME_H 54#else // !HAVE_SYS_TIME_H
56# include <time.h> 55#include <time.h>
57# endif // HAVE_SYS_TIME_H 56#endif // HAVE_SYS_TIME_H
58#endif // TIME_WITH_SYS_TIME 57#endif // TIME_WITH_SYS_TIME
59 58
60#include <stdio.h> 59#include <cstdio>
61#include <string> 60#include <string>
62#include <list> 61#include <list>
63#include <vector> 62#include <vector>
@@ -216,7 +215,7 @@ public:
216 void removeNetizen(Window win); 215 void removeNetizen(Window win);
217 void addIcon(FluxboxWindow *win); 216 void addIcon(FluxboxWindow *win);
218 void removeIcon(FluxboxWindow *win); 217 void removeIcon(FluxboxWindow *win);
219 void getNameOfWorkspace(unsigned int workspace, char **name); 218 std::string getNameOfWorkspace(unsigned int workspace) const;
220 void changeWorkspaceID(unsigned int); 219 void changeWorkspaceID(unsigned int);
221 void sendToWorkspace(unsigned int workspace, FluxboxWindow *win=0, bool changeworkspace=true); 220 void sendToWorkspace(unsigned int workspace, FluxboxWindow *win=0, bool changeworkspace=true);
222 void raiseWindows(Window *workspace_stack, int num); 221 void raiseWindows(Window *workspace_stack, int num);