diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-05-26 20:25:38 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-05-26 20:25:38 +0000 |
| commit | 0305cbdc3ae8525c74b2bb9b23884035549e3407 (patch) | |
| tree | b7eafbfbc759adeed8731227bd7f6cedd3f5ed05 /src/blackbox.hh | |
| parent | 60b2990e397faccd6a2f4f1cf7f2285e45fb1876 (diff) | |
add Configuration class for generic configuration data load/save-ing.
use Configuration class throughout code. no longer save rc file on exit, save when any options are changed.
Diffstat (limited to 'src/blackbox.hh')
| -rw-r--r-- | src/blackbox.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/blackbox.hh b/src/blackbox.hh index 0545bcc8..e6193ae0 100644 --- a/src/blackbox.hh +++ b/src/blackbox.hh @@ -26,7 +26,6 @@ extern "C" { #include <X11/Xlib.h> -#include <X11/Xresource.h> #ifdef HAVE_STDIO_H # include <stdio.h> @@ -50,6 +49,7 @@ extern "C" { #include "i18n.hh" #include "BaseDisplay.hh" +#include "Configuration.hh" #include "Timer.hh" #define AttribShaded (1l << 0) @@ -144,6 +144,7 @@ private: BScreen *active_screen; BlackboxWindow *focused_window; BTimer *timer; + Configuration config; bool no_focus, reconfigure_wait, reread_menu_wait; Time last_time; @@ -195,7 +196,6 @@ private: void load_rc(void); void save_rc(void); - void reload_rc(void); void real_rereadMenu(void); void real_reconfigure(void); @@ -228,6 +228,7 @@ public: inline BlackboxWindow *getFocusedWindow(void) { return focused_window; } + inline Configuration *getConfig() { return &config; } inline const Time &getDoubleClickInterval(void) const { return resource.double_click_interval; } inline const Time &getLastTime(void) const { return last_time; } @@ -261,7 +262,6 @@ public: void setFocusedWindow(BlackboxWindow *w); void shutdown(void); - void load_rc(BScreen *screen); void saveStyleFilename(const std::string& filename); void addMenuTimestamp(const std::string& filename); void restart(const char *prog = 0); |