M src/Makefile.am → src/Makefile.am

@@ -64,7 +64,6 @@ Resource.hh Resource.cc \
 	RootTheme.hh RootTheme.cc \
 	FbRootWindow.hh FbRootWindow.cc \
 	Screen.cc Screen.hh \
-	ScreenInfo.hh ScreenInfo.cc \
 	Slit.cc Slit.hh \
 	TextButton.hh TextButton.cc \
 	Toolbar.cc Toolbar.hh \

M src/Screen.cc → src/Screen.cc

@@ -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: Screen.cc,v 1.162 2003/05/13 11:21:23 rathnor Exp $
+// $Id: Screen.cc,v 1.163 2003/05/13 14:03:27 fluxgen Exp $
 
 
 #include "Screen.hh"
@@ -494,7 +494,6 @@
 BScreen::BScreen(ResourceManager &rm,
                  const string &screenname, const string &altscreenname,
                  int scrn, int num_layers) : 
-    ScreenInfo(scrn),
     m_clientlist_sig(*this),  // client signal
     m_workspacecount_sig(*this), // workspace count signal
     m_workspacenames_sig(*this), // workspace names signal 

M src/Screen.hh → src/Screen.hh

@@ -22,18 +22,18 @@ // 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: Screen.hh,v 1.94 2003/05/12 04:28:46 fluxgen Exp $
+// $Id: Screen.hh,v 1.95 2003/05/13 14:02:48 fluxgen Exp $
 
 #ifndef	 SCREEN_HH
 #define	 SCREEN_HH
 
-#include "ScreenInfo.hh"
 #include "Resource.hh"
 #include "Subject.hh"
 #include "MultLayers.hh"
 #include "ToolbarHandler.hh"
 #include "Slit.hh"
 #include "FbRootWindow.hh"
+#include "NotCopyable.hh"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
@@ -64,7 +64,7 @@ /// Handles screen connection, screen clients and workspaces
 /**
  Create a toolbar and workspaces, handles switching between workspaces and windows
  */
-class BScreen : public ScreenInfo {
+class BScreen : private FbTk::NotCopyable {
 public:
     typedef std::vector<Workspace *> Workspaces;
     typedef std::vector<std::string> WorkspaceNames;
@@ -142,7 +142,7 @@ unsigned int getMaxBottom() const;
 
     inline unsigned int getWidth() const { return rootWindow().width(); }
     inline unsigned int getHeight() const { return rootWindow().height(); }
-
+    inline unsigned int getScreenNumber() const { return rootWindow().screenNumber(); }
     typedef std::vector<FluxboxWindow *> Icons;
     typedef std::list<WinClient *> FocusedWindows;