better gcc3 compat. using ostrstream again. and using namespace std;

[chaz/openbox] / src / Workspace.h

diff --git a/src/Workspace.h b/src/Workspace.h
index 12d4dfc2c3ee9cd2d06d88dc9905b078d8127378..01b520ad5a1844fe97212efa7e1df3bdd0508684 100644 (file)
--- a/src/Workspace.h
+++ b/src/Workspace.h
@@ -26,12 +26,13 @@
 #include <X11/Xlib.h>
 
 #include "LinkedList.h"
-#include "Geometry.h"
 
 class BScreen;
 class Clientmenu;
 class Workspace;
 class OpenboxWindow;
+class Size;
+class Rect;
 
 class Workspace {
 private:
@@ -44,10 +45,12 @@ private:
   char *name;
   int id, cascade_x, cascade_y;
 
+  OpenboxWindow *_focused;
 
 protected:
   void placeWindow(OpenboxWindow &);
   Point *bestFitPlacement(const Size &win_size, const Rect &space);
+  Point *underMousePlacement(const Size &win_size, const Rect &space);
   Point *rowSmartPlacement(const Size &win_size, const Rect &space);
   Point *colSmartPlacement(const Size &win_size, const Rect &space);
   Point *const cascadePlacement(const OpenboxWindow &window, const Rect &space);
@@ -57,26 +60,19 @@ public:
   ~Workspace(void);
 
   inline BScreen &getScreen(void) { return screen; }
-
   inline OpenboxWindow *getLastFocusedWindow(void) { return lastfocus; }
-  
   inline Clientmenu *getMenu(void) { return clientmenu; }
-
   inline const char *getName(void) const { return name; }
-
   inline const int &getWorkspaceID(void) const { return id; }
-  
   inline void setLastFocusedWindow(OpenboxWindow *w) { lastfocus = w; }
-
+  inline OpenboxWindow *focusedWindow() { return _focused; }
+  void focusWindow(OpenboxWindow *win);
   OpenboxWindow *getWindow(int);
-
   Bool isCurrent(void);
   Bool isLastWindow(OpenboxWindow *);
-  
   const int addWindow(OpenboxWindow *, Bool = False);
   const int removeWindow(OpenboxWindow *);
   const int getCount(void);
-
   void showAll(void);
   void hideAll(void);
   void removeAll(void);