X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.hh;h=f0e23c8f9ce4d68ee2789429bda842f9c94ce725;hb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;hp=b56445a4bbda18d3da599ebcabf09f505254d606;hpb=56d7b547ae156e17c8e03ada3b80468f5a0b2605;p=chaz%2Fopenbox

diff --git a/otk/eventdispatcher.hh b/otk/eventdispatcher.hh
index b56445a4..f0e23c8f 100644
--- a/otk/eventdispatcher.hh
+++ b/otk/eventdispatcher.hh
@@ -16,27 +16,33 @@ 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; }
+
+  otk::OtkEventHandler *findHandler(Window win);
   
 private:
   OtkEventMap _map;
   OtkEventHandler *_fallback;
   OtkEventHandler *_master;
+  Window _focus;
+  XEvent _focus_e;
 
   //! The time at which the last XEvent with a time was received
   Time _lasttime; // XXX: store this! also provide an accessor!
+
+  void dispatch(const XEvent &e);
 };
 
 }