aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-10 22:45:08 (GMT)
committerfluxgen <fluxgen>2003-05-10 22:45:08 (GMT)
commit161be32b3a281eef35544cec40dc185dfadfb2d5 (patch)
treea2f126d694d666aff53581b7f4f3ac2f8272494e
parenta5e763ca726fc1461698a3c5b53ef56e9e4b0bd1 (diff)
downloadfluxbox-161be32b3a281eef35544cec40dc185dfadfb2d5.zip
fluxbox-161be32b3a281eef35544cec40dc185dfadfb2d5.tar.bz2
using FbRootWindow
-rw-r--r--src/Screen.hh23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index bb20b78..c87bfa8 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.91 2003/05/10 13:46:31 fluxgen Exp $ 25// $Id: Screen.hh,v 1.92 2003/05/10 22:45:08 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -33,6 +33,7 @@
33#include "MultLayers.hh" 33#include "MultLayers.hh"
34#include "ToolbarHandler.hh" 34#include "ToolbarHandler.hh"
35#include "Slit.hh" 35#include "Slit.hh"
36#include "FbRootWindow.hh"
36 37
37#include <X11/Xlib.h> 38#include <X11/Xlib.h>
38#include <X11/Xresource.h> 39#include <X11/Xresource.h>
@@ -139,6 +140,9 @@ public:
139 unsigned int getMaxTop() const; 140 unsigned int getMaxTop() const;
140 unsigned int getMaxBottom() const; 141 unsigned int getMaxBottom() const;
141 142
143 inline unsigned int getWidth() const { return rootWindow().width(); }
144 inline unsigned int getHeight() const { return rootWindow().height(); }
145
142 typedef std::vector<FluxboxWindow *> Icons; 146 typedef std::vector<FluxboxWindow *> Icons;
143 typedef std::list<WinClient *> FocusedWindows; 147 typedef std::list<WinClient *> FocusedWindows;
144 148
@@ -185,7 +189,7 @@ public:
185 inline int getToolbarLayerNum() const { return (*resource.toolbar_layernum).getNum(); } 189 inline int getToolbarLayerNum() const { return (*resource.toolbar_layernum).getNum(); }
186 190
187 191
188 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; } 192 inline void setRootColormapInstalled(bool r) { root_colormap_installed = r; }
189 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } 193 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; }
190 inline void saveFocusModel(Fluxbox::FocusModel model) { resource.focus_model = model; } 194 inline void saveFocusModel(Fluxbox::FocusModel model) { resource.focus_model = model; }
191 inline void saveWorkspaces(int w) { *resource.workspaces = w; } 195 inline void saveWorkspaces(int w) { *resource.workspaces = w; }
@@ -227,6 +231,8 @@ public:
227 inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); } 231 inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); }
228 inline const FbTk::MenuTheme *menuTheme() const { return m_menutheme.get(); } 232 inline const FbTk::MenuTheme *menuTheme() const { return m_menutheme.get(); }
229 inline const RootTheme &rootTheme() const { return *m_root_theme.get(); } 233 inline const RootTheme &rootTheme() const { return *m_root_theme.get(); }
234 FbRootWindow &rootWindow() { return m_root_window; }
235 const FbRootWindow &rootWindow() const { return m_root_window; }
230 236
231 FluxboxWindow *getIcon(unsigned int index); 237 FluxboxWindow *getIcon(unsigned int index);
232 FbTk::MultLayers &layerManager() { return m_layermanager; } 238 FbTk::MultLayers &layerManager() { return m_layermanager; }
@@ -299,14 +305,7 @@ public:
299 305
300 enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT, 306 enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT,
301 UNDERMOUSEPLACEMENT, LEFTRIGHT, RIGHTLEFT, TOPBOTTOM, BOTTOMTOP }; 307 UNDERMOUSEPLACEMENT, LEFTRIGHT, RIGHTLEFT, TOPBOTTOM, BOTTOMTOP };
302 enum { LEFTJUSTIFY = 1, RIGHTJUSTIFY, CENTERJUSTIFY }; 308
303
304 /// obsolete
305 enum { ROUNDBULLET = 1, TRIANGELBULLET, SQUAERBULLET, NOBULLET };
306 /// obsolete
307 enum { RESTART = 1, RESTARTOTHER, EXIT, SHUTDOWN, EXECUTE, RECONFIGURE,
308 WINDOWSHADE, WINDOWICONIFY, WINDOWMAXIMIZE, WINDOWCLOSE, WINDOWRAISE,
309 WINDOWLOWER, WINDOWSTICK, WINDOWKILL, SETSTYLE, WINDOWTAB};
310 // prevFocus/nextFocus option bits 309 // prevFocus/nextFocus option bits
311 enum { CYCLESKIPLOWERTABS = 0x01, CYCLESKIPSTUCK = 0x02, CYCLESKIPSHADED = 0x04, 310 enum { CYCLESKIPLOWERTABS = 0x01, CYCLESKIPSTUCK = 0x02, CYCLESKIPSHADED = 0x04,
312 CYCLELINEAR = 0x08, CYCLEDEFAULT = 0x00 }; 311 CYCLELINEAR = 0x08, CYCLEDEFAULT = 0x00 };
@@ -338,7 +337,7 @@ private:
338 337
339 FbTk::MultLayers m_layermanager; 338 FbTk::MultLayers m_layermanager;
340 339
341 Bool root_colormap_installed, managed, geom_visible, cycling_focus; 340 bool root_colormap_installed, managed, geom_visible, cycling_focus;
342 GC opGC; 341 GC opGC;
343 Pixmap geom_pixmap; 342 Pixmap geom_pixmap;
344 FbTk::FbWindow geom_window; 343 FbTk::FbWindow geom_window;
@@ -379,6 +378,8 @@ private:
379 std::auto_ptr<FbTk::MenuTheme> m_menutheme; 378 std::auto_ptr<FbTk::MenuTheme> m_menutheme;
380 std::auto_ptr<RootTheme> m_root_theme; 379 std::auto_ptr<RootTheme> m_root_theme;
381 380
381 FbRootWindow m_root_window;
382
382 struct ScreenResource { 383 struct ScreenResource {
383 ScreenResource(ResourceManager &rm, const std::string &scrname, 384 ScreenResource(ResourceManager &rm, const std::string &scrname,
384 const std::string &altscrname); 385 const std::string &altscrname);