aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh32
1 files changed, 14 insertions, 18 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index fe20625..7f1c43f 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,16 +22,16 @@
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.75 2003/12/03 00:29:39 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.76 2003/12/19 00:35:08 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
29 29
30#include "App.hh" 30#include "FbTk/App.hh"
31#include "Resource.hh" 31#include "FbTk/Resource.hh"
32#include "Timer.hh" 32#include "FbTk/Timer.hh"
33#include "Observer.hh" 33#include "FbTk/Observer.hh"
34#include "SignalHandler.hh" 34#include "FbTk/SignalHandler.hh"
35 35
36#include <X11/Xlib.h> 36#include <X11/Xlib.h>
37#include <X11/Xresource.h> 37#include <X11/Xresource.h>
@@ -97,9 +97,9 @@ public:
97 97
98 BScreen *searchScreen(Window w); 98 BScreen *searchScreen(Window w);
99 99
100 inline const Time &getDoubleClickInterval() const { return resource.double_click_interval; } 100 inline unsigned int getDoubleClickInterval() const { return *m_rc_double_click_interval; }
101 inline long getUpdateDelayTime() const { return resource.update_delay_time; } 101 inline unsigned int getUpdateDelayTime() const { return *m_rc_update_delay_time; }
102 inline const Time &getLastTime() const { return m_last_time; } 102 inline unsigned int getLastTime() const { return m_last_time; }
103 103
104 void addAtomHandler(AtomHandler *atomh); 104 void addAtomHandler(AtomHandler *atomh);
105 void removeAtomHandler(AtomHandler *atomh); 105 void removeAtomHandler(AtomHandler *atomh);
@@ -107,7 +107,7 @@ public:
107 /// obsolete 107 /// obsolete
108 enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENU, EMPTY}; 108 enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENU, EMPTY};
109 109
110 enum FocusModel { SLOPPYFOCUS=0, SEMISLOPPYFOCUS, CLICKTOFOCUS }; 110
111 111
112 inline const Bool getIgnoreBorder() const { return *m_rc_ignoreborder; } 112 inline const Bool getIgnoreBorder() const { return *m_rc_ignoreborder; }
113 113
@@ -188,7 +188,6 @@ public:
188 void timed_reconfigure(); 188 void timed_reconfigure();
189 189
190 bool isStartup() const { return m_starting; } 190 bool isStartup() const { return m_starting; }
191 enum { B_AMERICANDATE = 1, B_EUROPEANDATE };
192 191
193 typedef std::vector<Fluxbox::Titlebar> TitlebarList; 192 typedef std::vector<Fluxbox::Titlebar> TitlebarList;
194 /// @return whether the timestamps on the menu changed 193 /// @return whether the timestamps on the menu changed
@@ -225,11 +224,7 @@ private:
225 time_t timestamp; 224 time_t timestamp;
226 } MenuTimestamp; 225 } MenuTimestamp;
227 226
228 struct resource { 227
229 Time double_click_interval;
230 long update_delay_time;
231 } resource;
232
233 228
234 std::string getRcFilename(); 229 std::string getRcFilename();
235 void load_rc(); 230 void load_rc();
@@ -252,8 +247,10 @@ private:
252 FbTk::ResourceManager m_resourcemanager, &m_screen_rm; 247 FbTk::ResourceManager m_resourcemanager, &m_screen_rm;
253 248
254 //--- Resources 249 //--- Resources
250
255 FbTk::Resource<bool> m_rc_tabs, m_rc_ignoreborder; 251 FbTk::Resource<bool> m_rc_tabs, m_rc_ignoreborder;
256 FbTk::Resource<int> m_rc_colors_per_channel, m_rc_numlayers; 252 FbTk::Resource<int> m_rc_colors_per_channel, m_rc_numlayers,
253 m_rc_double_click_interval, m_rc_update_delay_time;
257 FbTk::Resource<std::string> m_rc_stylefile, 254 FbTk::Resource<std::string> m_rc_stylefile,
258 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, 255 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
259 m_rc_groupfile; 256 m_rc_groupfile;
@@ -278,7 +275,6 @@ private:
278 ScreenList m_screen_list; 275 ScreenList m_screen_list;
279 276
280 WinClient *m_focused_window; 277 WinClient *m_focused_window;
281 FbTk::Timer m_timer;
282 278
283 typedef struct RedirectEvent { 279 typedef struct RedirectEvent {
284 BScreen *screen; 280 BScreen *screen;