fix \'s

[chaz/openbox] / otk / eventdispatcher.hh

diff --git a/otk/eventdispatcher.hh b/otk/eventdispatcher.hh
index 9f7fb8656f5febebb7c8e3758d63010af88cb44f..c62e24b925c19e3d6a19ea48b3c5c54e446cca33 100644 (file)
--- a/otk/eventdispatcher.hh
+++ b/otk/eventdispatcher.hh
@@ -16,21 +16,23 @@ public:
   virtual ~OtkEventDispatcher();
 
   virtual void clearAllHandlers(void);
-  virtual void registerHandler(Window id, OtkEventHandler *handler);
+  virtual void registerHandler(Window id, otk::OtkEventHandler *handler);
   virtual void clearHandler(Window id);
   virtual void dispatchEvents(void);
 
-  inline void setFallbackHandler(OtkEventHandler *fallback)
+  inline void setFallbackHandler(otk::OtkEventHandler *fallback)
   { _fallback = fallback; }
-  OtkEventHandler *getFallbackHandler(void) const { return _fallback; }
+  otk::OtkEventHandler *getFallbackHandler(void) const { return _fallback; }
 
   //! Sets an event handler that gets all events for all handlers after
   //! any specific handlers have received them
-  inline void setMasterHandler(OtkEventHandler *master)
+  inline void setMasterHandler(otk::OtkEventHandler *master)
   { _master = master; }
-  OtkEventHandler *getMasterHandler(void) const { return _master; }
+  otk::OtkEventHandler *getMasterHandler(void) const { return _master; }
 
-  OtkEventHandler *findHandler(Window win);
+  otk::OtkEventHandler *findHandler(Window win);
+
+  inline Time lastTime() const { return _lasttime; }
   
 private:
   OtkEventMap _map;
@@ -38,7 +40,10 @@ private:
   OtkEventHandler *_master;
 
   //! The time at which the last XEvent with a time was received
-  Time _lasttime; // XXX: store this! also provide an accessor!
+  Time _lasttime;
+
+  void dispatch(Window win, const XEvent &e);
+  void dispatchFocus(const XEvent &e);
 };
 
 }