aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh25
1 files changed, 9 insertions, 16 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 95be304..17228e9 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -1,6 +1,6 @@
1// fluxbox.hh for fluxbox 1// fluxbox.hh for Fluxbox Window Manager
2// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) 2// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3 3//
4// blackbox.hh for Blackbox - an X11 Window manager 4// blackbox.hh for Blackbox - an X11 Window manager
5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
6// 6//
@@ -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 25// $Id: fluxbox.hh,v 1.6 2002/01/11 09:18:58 fluxgen Exp $
26 26
27#ifndef _FLUXBOX_HH_ 27#ifndef _FLUXBOX_HH_
28#define _FLUXBOX_HH_ 28#define _FLUXBOX_HH_
@@ -94,7 +94,6 @@ public:
94 static Fluxbox *instance(int m_argc=0, char **m_argv=0, char *dpy_name=0, char *rc=0); 94 static Fluxbox *instance(int m_argc=0, char **m_argv=0, char *dpy_name=0, char *rc=0);
95 95
96 inline bool useTabs() const { return resource.tabs; } 96 inline bool useTabs() const { return resource.tabs; }
97// inline TabType &getTabType() { return resource.tabtype; }
98 inline bool useIconBar() const { return resource.iconbar; } 97 inline bool useIconBar() const { return resource.iconbar; }
99 inline void saveTabs(bool value) { resource.tabs = value; } 98 inline void saveTabs(bool value) { resource.tabs = value; }
100 inline void saveIconBar(bool value) { resource.iconbar = value; } 99 inline void saveIconBar(bool value) { resource.iconbar = value; }
@@ -123,14 +122,13 @@ public:
123 Toolbar *searchToolbar(Window); 122 Toolbar *searchToolbar(Window);
124 Tab *searchTab(Window); 123 Tab *searchTab(Window);
125 124
126 enum Titlebar{Shade=0, Minimize, Maximize, Close, Stick, Menu, Empty}; 125 enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENU, EMPTY};
127 126
128 inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return titlebar.right; } 127 inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return titlebar.right; }
129 inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return titlebar.left; } 128 inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return titlebar.left; }
130 inline const char *getStyleFilename(void) const 129 inline const char *getStyleFilename(void) const
131 { return resource.style_file; } 130 { return resource.style_file; }
132 inline const char *getRootCommand() const 131
133 { return resource.root_cmd; }
134 inline const char *getMenuFilename(void) const 132 inline const char *getMenuFilename(void) const
135 { return resource.menu_file; } 133 { return resource.menu_file; }
136 134
@@ -144,9 +142,6 @@ public:
144 { return resource.cache_life; } 142 { return resource.cache_life; }
145 inline const unsigned long &getCacheMax(void) const 143 inline const unsigned long &getCacheMax(void) const
146 { return resource.cache_max; } 144 { return resource.cache_max; }
147 inline const unsigned int &getTabWidth(void) const { return resource.tabwidth; }
148 inline const unsigned int &getTabHeight(void) const { return resource.tabheight; }
149
150 145
151 inline void maskWindowEvents(Window w, FluxboxWindow *bw) 146 inline void maskWindowEvents(Window w, FluxboxWindow *bw)
152 { masked = w; masked_window = bw; } 147 { masked = w; masked_window = bw; }
@@ -155,6 +150,7 @@ public:
155 void setFocusedWindow(FluxboxWindow *w); 150 void setFocusedWindow(FluxboxWindow *w);
156 void shutdown(void); 151 void shutdown(void);
157 void load_rc(BScreen *); 152 void load_rc(BScreen *);
153 void loadRootCommand(BScreen *);
158 void loadTitlebar(); 154 void loadTitlebar();
159 void saveStyleFilename(const char *); 155 void saveStyleFilename(const char *);
160 void saveMenuFilename(const char *); 156 void saveMenuFilename(const char *);
@@ -188,7 +184,7 @@ public:
188 184
189#ifndef HAVE_STRFTIME 185#ifndef HAVE_STRFTIME
190 186
191 enum { B_AmericanDate = 1, B_EuropeanDate }; 187 enum { B_AMERICANDATE = 1, B_EUROPEANDATE };
192#endif // HAVE_STRFTIME 188#endif // HAVE_STRFTIME
193 189
194 template <class Z> 190 template <class Z>
@@ -215,13 +211,11 @@ private:
215 struct resource { 211 struct resource {
216 Time double_click_interval; 212 Time double_click_interval;
217 213
218 char *menu_file, *style_file, *titlebar_file, *keys_file, *root_cmd; 214 char *menu_file, *style_file, *titlebar_file, *keys_file;
219 int colors_per_channel; 215 int colors_per_channel;
220 timeval auto_raise_delay; 216 timeval auto_raise_delay;
221 unsigned long cache_life, cache_max; 217 unsigned long cache_life, cache_max;
222 bool tabs, iconbar; 218 bool tabs, iconbar;
223 //TabType tabtype;
224 unsigned int tabwidth, tabheight;
225 } resource; 219 } resource;
226 220
227 struct titlebar_t { 221 struct titlebar_t {
@@ -268,7 +262,6 @@ private:
268 char *rc_file, **argv; 262 char *rc_file, **argv;
269 int argc; 263 int argc;
270 Keys *key; 264 Keys *key;
271 char *expandFilename(char *filename);
272 void doWindowAction(Keys::KeyAction action); 265 void doWindowAction(Keys::KeyAction action);
273protected: 266protected:
274 Fluxbox(int, char **, char * = 0, char * = 0); 267 Fluxbox(int, char **, char * = 0, char * = 0);