aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-02-18 15:11:12 (GMT)
committerrathnor <rathnor>2003-02-18 15:11:12 (GMT)
commitb4ffe4fe21699c7123728aeeb99576a540b3694e (patch)
treef8a133be750f844f3c48f5a631fb8bf088544549 /src/fluxbox.hh
parentaa602770fbbd4e84154028d3181d275b81ea914d (diff)
downloadfluxbox_pavel-b4ffe4fe21699c7123728aeeb99576a540b3694e.zip
fluxbox_pavel-b4ffe4fe21699c7123728aeeb99576a540b3694e.tar.bz2
Added layer menus for windows, toolbar, and slit, plus associated
resources. Cleaned up some cruft from the previous layering setup.
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh31
1 files changed, 22 insertions, 9 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 827d869..84aac80 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.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: fluxbox.hh,v 1.42 2003/02/17 12:29:35 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.43 2003/02/18 15:11:12 rathnor Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -103,7 +103,7 @@ public:
103 103
104 /// obsolete 104 /// obsolete
105 enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENU, EMPTY}; 105 enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENU, EMPTY};
106 106
107 inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return *m_rc_titlebar_right; } 107 inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return *m_rc_titlebar_right; }
108 inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return *m_rc_titlebar_left; } 108 inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return *m_rc_titlebar_left; }
109 inline const std::string &getStyleFilename() const { return *m_rc_stylefile; } 109 inline const std::string &getStyleFilename() const { return *m_rc_stylefile; }
@@ -113,14 +113,26 @@ public:
113 inline int colorsPerChannel() const { return *m_rc_colors_per_channel; } 113 inline int colorsPerChannel() const { return *m_rc_colors_per_channel; }
114 inline int getNumberOfLayers() const { return *m_rc_numlayers; } 114 inline int getNumberOfLayers() const { return *m_rc_numlayers; }
115 115
116 // TODO there probably should be configurable 116 // class to store layer numbers (special Resource type)
117 inline int getDesktopLayer() const { return 12; } 117 class Layer {
118 inline int getBottomLayer() const { return 10; } 118 public:
119 inline int getNormalLayer() const { return 8; } 119 Layer(int i) : m_num(i) {};
120 inline int getTopLayer() const { return 6; } 120 const int getNum() const { return m_num; }
121 inline int getSlitLayer() const { return 4; } 121
122 inline int getAboveSlitLayer() const { return 2; } 122 Layer &operator=(int num) { m_num = num; return *this; }
123
124 private:
125 int m_num;
126 };
127
128 // TODO these probably should be configurable
123 inline int getMenuLayer() const { return 0; } 129 inline int getMenuLayer() const { return 0; }
130 inline int getAboveDockLayer() const { return 2; }
131 inline int getDockLayer() const { return 4; }
132 inline int getTopLayer() const { return 6; }
133 inline int getNormalLayer() const { return 8; }
134 inline int getBottomLayer() const { return 10; }
135 inline int getDesktopLayer() const { return 12; }
124 136
125 137
126 inline const timeval &getAutoRaiseDelay() const { return resource.auto_raise_delay; } 138 inline const timeval &getAutoRaiseDelay() const { return resource.auto_raise_delay; }
@@ -216,6 +228,7 @@ private:
216 Resource<std::string> m_rc_stylefile, 228 Resource<std::string> m_rc_stylefile,
217 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, 229 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
218 m_rc_groupfile; 230 m_rc_groupfile;
231
219 232
220 Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right; 233 Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right;
221 Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; 234 Resource<unsigned int> m_rc_cache_life, m_rc_cache_max;