aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-01-10 12:51:21 (GMT)
committerfluxgen <fluxgen>2002-01-10 12:51:21 (GMT)
commitef911eda201ec9b449705f999b60bf3332ee4fdf (patch)
treeaed052d69b64029167185dac826e36f0eee602c9 /src/fluxbox.hh
parentadd890ad213be267e0efae7ae8c958e1f2614efb (diff)
downloadfluxbox_pavel-ef911eda201ec9b449705f999b60bf3332ee4fdf.zip
fluxbox_pavel-ef911eda201ec9b449705f999b60bf3332ee4fdf.tar.bz2
moved rootcommand to screen loading and added loadRootCommand
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 4e10bad..68219d0 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.4 2002/01/09 14:11:20 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.5 2002/01/10 12:51:21 fluxgen Exp $
26 26
27#ifndef _FLUXBOX_HH_ 27#ifndef _FLUXBOX_HH_
28#define _FLUXBOX_HH_ 28#define _FLUXBOX_HH_
@@ -128,8 +128,7 @@ public:
128 inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return titlebar.left; } 128 inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return titlebar.left; }
129 inline const char *getStyleFilename(void) const 129 inline const char *getStyleFilename(void) const
130 { return resource.style_file; } 130 { return resource.style_file; }
131 inline const char *getRootCommand() const 131
132 { return resource.root_cmd; }
133 inline const char *getMenuFilename(void) const 132 inline const char *getMenuFilename(void) const
134 { return resource.menu_file; } 133 { return resource.menu_file; }
135 134
@@ -151,6 +150,7 @@ public:
151 void setFocusedWindow(FluxboxWindow *w); 150 void setFocusedWindow(FluxboxWindow *w);
152 void shutdown(void); 151 void shutdown(void);
153 void load_rc(BScreen *); 152 void load_rc(BScreen *);
153 void loadRootCommand(BScreen *);
154 void loadTitlebar(); 154 void loadTitlebar();
155 void saveStyleFilename(const char *); 155 void saveStyleFilename(const char *);
156 void saveMenuFilename(const char *); 156 void saveMenuFilename(const char *);
@@ -211,7 +211,7 @@ private:
211 struct resource { 211 struct resource {
212 Time double_click_interval; 212 Time double_click_interval;
213 213
214 char *menu_file, *style_file, *titlebar_file, *keys_file, *root_cmd; 214 char *menu_file, *style_file, *titlebar_file, *keys_file;
215 int colors_per_channel; 215 int colors_per_channel;
216 timeval auto_raise_delay; 216 timeval auto_raise_delay;
217 unsigned long cache_life, cache_max; 217 unsigned long cache_life, cache_max;