nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed ScreenInfo

Browse source
This commit is contained in:
fluxgen 2003-05-13 14:06:45 +00:00
parent 56af958aa5
commit ff5f444666
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile.am
View file

@ -64,7 +64,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
RootTheme.hh RootTheme.cc \ RootTheme.hh RootTheme.cc \
FbRootWindow.hh FbRootWindow.cc \ FbRootWindow.hh FbRootWindow.cc \
Screen.cc Screen.hh \ Screen.cc Screen.hh \
ScreenInfo.hh ScreenInfo.cc \
Slit.cc Slit.hh \ Slit.cc Slit.hh \
TextButton.hh TextButton.cc \ TextButton.hh TextButton.cc \
Toolbar.cc Toolbar.hh \ Toolbar.cc Toolbar.hh \

3
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // 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" #include "Screen.hh"
@ -494,7 +494,6 @@ BScreen::ScreenResource::ScreenResource(ResourceManager &rm,
BScreen::BScreen(ResourceManager &rm, BScreen::BScreen(ResourceManager &rm,
const string &screenname, const string &altscreenname, const string &screenname, const string &altscreenname,
int scrn, int num_layers) : int scrn, int num_layers) :
ScreenInfo(scrn),
m_clientlist_sig(*this), // client signal m_clientlist_sig(*this), // client signal
m_workspacecount_sig(*this), // workspace count signal m_workspacecount_sig(*this), // workspace count signal
m_workspacenames_sig(*this), // workspace names signal m_workspacenames_sig(*this), // workspace names signal

8
src/Screen.hh
View file

@ -22,18 +22,18 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // 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 #ifndef SCREEN_HH
#define SCREEN_HH #define SCREEN_HH
#include "ScreenInfo.hh"
#include "Resource.hh" #include "Resource.hh"
#include "Subject.hh" #include "Subject.hh"
#include "MultLayers.hh" #include "MultLayers.hh"
#include "ToolbarHandler.hh" #include "ToolbarHandler.hh"
#include "Slit.hh" #include "Slit.hh"
#include "FbRootWindow.hh" #include "FbRootWindow.hh"
#include "NotCopyable.hh"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
@ -64,7 +64,7 @@ class XLayerItem;
/** /**
Create a toolbar and workspaces, handles switching between workspaces and windows Create a toolbar and workspaces, handles switching between workspaces and windows
*/ */
class BScreen : public ScreenInfo { class BScreen : private FbTk::NotCopyable {
public: public:
typedef std::vector<Workspace *> Workspaces; typedef std::vector<Workspace *> Workspaces;
typedef std::vector<std::string> WorkspaceNames; typedef std::vector<std::string> WorkspaceNames;
@ -142,7 +142,7 @@ public:
inline unsigned int getWidth() const { return rootWindow().width(); } inline unsigned int getWidth() const { return rootWindow().width(); }
inline unsigned int getHeight() const { return rootWindow().height(); } inline unsigned int getHeight() const { return rootWindow().height(); }
inline unsigned int getScreenNumber() const { return rootWindow().screenNumber(); }
typedef std::vector<FluxboxWindow *> Icons; typedef std::vector<FluxboxWindow *> Icons;
typedef std::list<WinClient *> FocusedWindows; typedef std::list<WinClient *> FocusedWindows;