aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fluxbox.hh23
1 files changed, 17 insertions, 6 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index e92ce48..e877805 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.26 2002/08/14 23:01:05 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.27 2002/08/17 22:13:00 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -68,7 +68,8 @@
68 main class for the window manager. 68 main class for the window manager.
69 singleton type 69 singleton type
70*/ 70*/
71class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::SignalHandler::EventHandler, 71class Fluxbox : public BaseDisplay, public TimeoutHandler,
72 public FbTk::EventHandler<FbTk::SignalEvent>,
72 public FbAtoms { 73 public FbAtoms {
73public: 74public:
74 Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0); 75 Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0);
@@ -150,12 +151,18 @@ public:
150 void rereadMenu(); 151 void rereadMenu();
151 void checkMenu(); 152 void checkMenu();
152 153
153 /// handle any signal sent to the application 154 /// handle any system signal sent to the application
154 void handleSignal(int signum); 155 void handleEvent(FbTk::SignalEvent * const signum);
155 156
156 virtual void timeout(); 157 virtual void timeout();
158
159 inline const Cursor &getSessionCursor() const { return cursor.session; }
160 inline const Cursor &getMoveCursor() const { return cursor.move; }
161 inline const Cursor &getLowerLeftAngleCursor() const { return cursor.ll_angle; }
162 inline const Cursor &getLowerRightAngleCursor() const { return cursor.lr_angle; }
163
157 164
158#ifdef SLIT 165#ifdef SLIT
159 Slit *searchSlit(Window); 166 Slit *searchSlit(Window);
160 167
161 void saveSlitSearch(Window, Slit *); 168 void saveSlitSearch(Window, Slit *);
@@ -170,6 +177,10 @@ public:
170 typedef std::vector<Fluxbox::Titlebar> TitlebarList; 177 typedef std::vector<Fluxbox::Titlebar> TitlebarList;
171 178
172private: 179private:
180 struct cursor {
181 Cursor session, move, ll_angle, lr_angle;
182 } cursor;
183
173 void setupConfigFiles(); 184 void setupConfigFiles();
174 void handleButtonEvent(XButtonEvent &be); 185 void handleButtonEvent(XButtonEvent &be);
175 void handleUnmapNotify(XUnmapEvent &ue); 186 void handleUnmapNotify(XUnmapEvent &ue);
@@ -252,7 +263,7 @@ private:
252 void real_rereadMenu(); 263 void real_rereadMenu();
253 void real_reconfigure(); 264 void real_reconfigure();
254 265
255 virtual void process_event(XEvent *); 266 void handleEvent(XEvent *xe);
256 static Fluxbox *singleton; 267 static Fluxbox *singleton;
257 268
258}; 269};