summaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 73daa94..137d818 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.19 2002/05/17 11:07:36 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.20 2002/05/29 06:22:31 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -104,7 +104,7 @@ public:
104 inline const char *getStyleFilename(void) const { return m_rc_stylefile->c_str(); } 104 inline const char *getStyleFilename(void) const { return m_rc_stylefile->c_str(); }
105 105
106 inline const char *getMenuFilename(void) const { return m_rc_menufile->c_str(); } 106 inline const char *getMenuFilename(void) const { return m_rc_menufile->c_str(); }
107 107 inline const std::string &getSlitlistFilename(void) const { return *m_rc_slitlistfile; }
108 inline int getColorsPerChannel(void) const { return *m_rc_colors_per_channel; } 108 inline int getColorsPerChannel(void) const { return *m_rc_colors_per_channel; }
109 109
110 inline const timeval &getAutoRaiseDelay(void) const { return resource.auto_raise_delay; } 110 inline const timeval &getAutoRaiseDelay(void) const { return resource.auto_raise_delay; }
@@ -124,6 +124,7 @@ public:
124 void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); } 124 void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); }
125 void saveMenuFilename(const char *); 125 void saveMenuFilename(const char *);
126 void saveTitlebarFilename(const char *); 126 void saveTitlebarFilename(const char *);
127 void saveSlitlistFilename(const char *val) { m_rc_slitlistfile = (val == 0 ? "" : val); }
127 void saveMenuSearch(Window, Basemenu *); 128 void saveMenuSearch(Window, Basemenu *);
128 void saveWindowSearch(Window, FluxboxWindow *); 129 void saveWindowSearch(Window, FluxboxWindow *);
129 void saveToolbarSearch(Window, Toolbar *); 130 void saveToolbarSearch(Window, Toolbar *);
@@ -188,7 +189,7 @@ private:
188 Resource<bool> m_rc_tabs, m_rc_iconbar; 189 Resource<bool> m_rc_tabs, m_rc_iconbar;
189 Resource<int> m_rc_colors_per_channel; 190 Resource<int> m_rc_colors_per_channel;
190 Resource<std::string> m_rc_stylefile, 191 Resource<std::string> m_rc_stylefile,
191 m_rc_menufile, m_rc_keyfile; 192 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile;
192 193
193 Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right; 194 Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right;
194 Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; 195 Resource<unsigned int> m_rc_cache_life, m_rc_cache_max;
@@ -229,12 +230,14 @@ private:
229 char *rc_file, **argv; 230 char *rc_file, **argv;
230 int argc; 231 int argc;
231 Keys *key; 232 Keys *key;
233 std::string slitlist_path;
232 //default arguments for titlebar left and right 234 //default arguments for titlebar left and right
233 static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[]; 235 static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[];
234 236
235protected: 237protected:
236 Fluxbox(int, char **, char * = 0, char * = 0); 238 Fluxbox(int, char **, char * = 0, char * = 0);
237 char *getRcFilename(); 239 char *getRcFilename();
240 void getDefaultDataFilename(char *, std::string &);
238 void load_rc(void); 241 void load_rc(void);
239 242
240 void reload_rc(void); 243 void reload_rc(void);