M src/Window.hh → src/Window.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.hh,v 1.35 2002/10/22 14:41:13 fluxgen Exp $
+// $Id: Window.hh,v 1.36 2002/11/15 12:14:39 fluxgen Exp $
 
 #ifndef	 WINDOW_HH
 #define	 WINDOW_HH
@@ -46,6 +46,7 @@ 
 #define PropMwmHintsElements	3
 
 class Tab;
+
 
 /**
 	Creates the window frame and handles any window event for it
@@ -232,19 +233,18 @@ private:
 	// state and hint signals
 	WinSubject m_hintsig, m_statesig, m_workspacesig;
 
-	BImageControl *image_ctrl; //image control for rendering
+	BImageControl *image_ctrl; /// image control for rendering
 	
-	// got from WM_CLASS
-	std::string m_instance_name;
-	std::string m_class_name;
+	std::string m_instance_name; /// instance name from WM_CLASS
+	std::string m_class_name; /// class name from WM_CLASS
 	
 	//Window state
 	bool moving, resizing, shaded, maximized, visible, iconic, transient,
 		focused, stuck, modal, send_focus_message, managed;
 
-	BScreen *screen;
+	BScreen *screen; /// screen on which this window exist
 	BTimer timer;
-	Display *display;
+	Display *display; /// display connection (obsolete by BaseDisplay singleton)
 	BaseDisplay::BlackboxAttributes blackbox_attrib;
 
 	Time lastButtonPressTime;

M src/Workspace.hh → src/Workspace.hh

@@ -25,16 +25,18 @@ 
 #ifndef	 WORKSPACE_HH
 #define	 WORKSPACE_HH
 
+
 #include "Clientmenu.hh"
-#include "Window.hh"
 #include "NotCopyable.hh"
 
 #include <X11/Xlib.h>
+
 #include <string>
 #include <vector>
 #include <list>
 
 class BScreen;
+class FluxboxWindow;
 
 /**
 	Handles a single workspace
@@ -68,14 +70,10 @@ FluxboxWindow *getLastFocusedWindow() { return lastfocus; }
 
 	const BScreen *getScreen() const { return screen; }	
 	const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; }	
-	Clientmenu *menu() { return &m_clientmenu; }
-	/**
-		@return client menu 
-	*/
-	inline const Clientmenu *menu() const { return &m_clientmenu; }
-	/**
-		@return name of this workspace
-	*/
+	Clientmenu &menu() { return m_clientmenu; }
+	///	client menu 
+	inline const Clientmenu &menu() const { return m_clientmenu; }
+	///	name of this workspace
 	inline const std::string &name() const { return m_name; }
 	/**
 		@return the number of this workspace, note: obsolete, should be in BScreen