#include <map>
#include <string>
+#include "otk/timer.hh"
+#include "otk/property.hh"
#include "openbox.hh"
-#include "configuration.hh"
+#include "otk/configuration.hh"
#include "timer.hh"
-#include "xatom.hh"
#define AttribShaded (1l << 0)
#define AttribMaxHoriz (1l << 1)
class BlackboxWindow;
class BWindowGroup;
-class Blackbox : public Openbox, public TimeoutHandler, public TimerQueueManager {
+class Blackbox : public Openbox {
private:
struct BCursor {
Cursor session, move, ll_angle, lr_angle, ul_angle, ur_angle;
std::string style_file;
int colors_per_channel;
- ::timeval auto_raise_delay;
+ timeval auto_raise_delay;
unsigned long cache_life, cache_max;
std::string titlebar_layout;
unsigned int mod_mask; // modifier mask used for window-mouse interaction
BScreen *active_screen;
BlackboxWindow *focused_window, *changing_window;
- BTimer *timer;
- Configuration config;
- XAtom *xatom;
+ otk::OBTimer *timer;
+ otk::Configuration config;
+ otk::OBProperty *xatom;
bool no_focus, reconfigure_wait;
Time last_time;
void removeWindowSearch(Window window);
void removeGroupSearch(Window window);
- inline XAtom *getXAtom(void) { return xatom; }
+ inline otk::OBProperty *getXAtom(void) { return xatom; }
inline BlackboxWindow *getFocusedWindow(void) { return focused_window; }
inline BlackboxWindow *getChangingWindow(void) { return changing_window; }
- inline Configuration *getConfig() { return &config; }
+ inline otk::Configuration *getConfig() { return &config; }
inline const Time &getDoubleClickInterval(void) const
{ return resource.double_click_interval; }
inline const Time &getLastTime(void) const { return last_time; }
inline std::string getTitlebarLayout(void) const
{ return resource.titlebar_layout; }
- inline const ::timeval &getAutoRaiseDelay(void) const
+ inline const timeval &getAutoRaiseDelay(void) const
{ return resource.auto_raise_delay; }
inline unsigned long getCacheLife(void) const
virtual bool handleSignal(int sig);
- virtual void timeout(void);
+ static void timeout(Blackbox *t);
enum { B_AmericanDate = 1, B_EuropeanDate };
-
- virtual void addTimer(BTimer *timer);
- virtual void removeTimer(BTimer *timer);
};
}