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

added max functions so we can determine maximum workspace area. Creation of a FluxboxWindow is now handled in BScreen

Browse source
This commit is contained in:
fluxgen 2003-01-05 22:24:55 +00:00
parent 4060a219e6
commit 017f79e9fd
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Screen.hh
View file

@ -1,5 +1,5 @@
// Screen.hh for Fluxbox Window Manager // Screen.hh for Fluxbox Window Manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen at users.sourceforge.net) // Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
// //
// Screen.hh for Blackbox - an X11 Window manager // Screen.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
@ -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.hh,v 1.55 2002/12/13 20:16:17 fluxgen Exp $ // $Id: Screen.hh,v 1.56 2003/01/05 22:24:55 fluxgen Exp $
#ifndef SCREEN_HH #ifndef SCREEN_HH
#define SCREEN_HH #define SCREEN_HH
@ -95,8 +95,10 @@ public:
inline bool isSlitOnTop() const { return resource.slit_on_top; } inline bool isSlitOnTop() const { return resource.slit_on_top; }
inline bool doSlitAutoHide() const { return resource.slit_auto_hide; } inline bool doSlitAutoHide() const { return resource.slit_auto_hide; }
#ifdef SLIT
inline Slit *getSlit() { return m_slit.get(); } inline Slit *getSlit() { return m_slit.get(); }
inline const Slit *getSlit() const { return m_slit.get(); } inline const Slit *getSlit() const { return m_slit.get(); }
#endif // SLIT
inline int getSlitPlacement() const { return resource.slit_placement; } inline int getSlitPlacement() const { return resource.slit_placement; }
inline int getSlitDirection() const { return resource.slit_direction; } inline int getSlitDirection() const { return resource.slit_direction; }
inline void saveSlitPlacement(int p) { resource.slit_placement = p; } inline void saveSlitPlacement(int p) { resource.slit_placement = p; }
@ -123,6 +125,14 @@ public:
inline unsigned int getBorderWidth2x() const { return theme->getBorderWidth()*2; } inline unsigned int getBorderWidth2x() const { return theme->getBorderWidth()*2; }
inline unsigned int getCurrentWorkspaceID() const { return current_workspace->workspaceID(); } inline unsigned int getCurrentWorkspaceID() const { return current_workspace->workspaceID(); }
/*
maximum screen surface
*/
unsigned int getMaxLeft() const;
unsigned int getMaxRight() const;
unsigned int getMaxTop() const;
unsigned int getMaxBottom() const;
typedef std::vector<FluxboxWindow *> Icons; typedef std::vector<FluxboxWindow *> Icons;
/// @return number of workspaces /// @return number of workspaces
@ -210,6 +220,8 @@ public:
inline Theme::WindowStyle *getWindowStyle() { return &theme->getWindowStyle(); } inline Theme::WindowStyle *getWindowStyle() { return &theme->getWindowStyle(); }
inline Theme::MenuStyle *getMenuStyle() { return &theme->getMenuStyle(); } inline Theme::MenuStyle *getMenuStyle() { return &theme->getMenuStyle(); }
inline FbWinFrameTheme &winFrameTheme() { return m_windowtheme; }
inline const FbWinFrameTheme &winFrameTheme() const { return m_windowtheme; }
const Theme *getTheme() const { return theme; } const Theme *getTheme() const { return theme; }
FluxboxWindow *getIcon(unsigned int index); FluxboxWindow *getIcon(unsigned int index);
@ -262,6 +274,9 @@ public:
void updateNetizenConfigNotify(XEvent *); void updateNetizenConfigNotify(XEvent *);
void updateNetizenWindowRaise(Window); void updateNetizenWindowRaise(Window);
void updateNetizenWindowLower(Window); void updateNetizenWindowLower(Window);
/// create window frame for client window and attach it
FluxboxWindow *createWindow(Window clientwin);
void setupWindowActions(FluxboxWindow &win);
enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT, LEFTRIGHT, enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT, LEFTRIGHT,
RIGHTLEFT, TOPBOTTOM, BOTTOMTOP }; RIGHTLEFT, TOPBOTTOM, BOTTOMTOP };
@ -318,9 +333,9 @@ private:
Rootmenus rootmenuList; Rootmenus rootmenuList;
Netizens netizenList; Netizens netizenList;
Icons iconList; Icons iconList;
#ifdef SLIT
std::auto_ptr<Slit> m_slit; std::auto_ptr<Slit> m_slit;
#endif // SLIT
std::auto_ptr<Toolbar> m_toolbar; std::auto_ptr<Toolbar> m_toolbar;
Workspace *current_workspace; Workspace *current_workspace;
Workspacemenu *workspacemenu; Workspacemenu *workspacemenu;
@ -333,6 +348,8 @@ private:
Window auto_group_window; Window auto_group_window;
FbWinFrameTheme m_windowtheme;
struct ScreenResource { struct ScreenResource {
ScreenResource(ResourceManager &rm, const std::string &scrname, ScreenResource(ResourceManager &rm, const std::string &scrname,
const std::string &altscrname); const std::string &altscrname);