X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Feventdispatcher.hh;h=03f362993628cd7ed4367b68d1248b358d251e8b;hb=0dcbf985c11c850b30b2983e1e20cd8cf033f054;hp=caf33ad0817b454e0f52f9ec41897082e046b0f9;hpb=6062fe404ce5f2505494132d5454370d696625ca;p=chaz%2Fopenbox

diff --git a/otk/eventdispatcher.hh b/otk/eventdispatcher.hh
index caf33ad0..03f36299 100644
--- a/otk/eventdispatcher.hh
+++ b/otk/eventdispatcher.hh
@@ -1,3 +1,4 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __eventdispatcher
 #define __eventdispatcher
 
@@ -7,45 +8,43 @@
 
 namespace otk {
 
-typedef std::map<unsigned int, OtkEventHandler *> OtkEventMap;
+typedef std::map<unsigned int, EventHandler *> EventMap;
 
-class OtkEventDispatcher {
+class EventDispatcher {
 public:
 
-  OtkEventDispatcher();
-  virtual ~OtkEventDispatcher();
+  EventDispatcher();
+  virtual ~EventDispatcher();
 
   virtual void clearAllHandlers(void);
-  virtual void registerHandler(Window id, otk::OtkEventHandler *handler);
+  virtual void registerHandler(Window id, EventHandler *handler);
   virtual void clearHandler(Window id);
   virtual void dispatchEvents(void);
 
-  inline void setFallbackHandler(otk::OtkEventHandler *fallback)
+  inline void setFallbackHandler(EventHandler *fallback)
   { _fallback = fallback; }
-  otk::OtkEventHandler *getFallbackHandler(void) const { return _fallback; }
+  EventHandler *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(otk::OtkEventHandler *master)
+  inline void setMasterHandler(EventHandler *master)
   { _master = master; }
-  otk::OtkEventHandler *getMasterHandler(void) const { return _master; }
+  EventHandler *getMasterHandler(void) const { return _master; }
 
-  otk::OtkEventHandler *findHandler(Window win);
+  EventHandler *findHandler(Window win);
 
   inline Time lastTime() const { return _lasttime; }
   
 private:
-  OtkEventMap _map;
-  OtkEventHandler *_fallback;
-  OtkEventHandler *_master;
-  Window _focus;
-  XEvent _focus_e;
-  XEvent _crossing_e;
+  EventMap _map;
+  EventHandler *_fallback;
+  EventHandler *_master;
 
   //! The time at which the last XEvent with a time was received
   Time _lasttime;
 
   void dispatch(Window win, const XEvent &e);
+  void dispatchFocus(const XEvent &e);
 };
 
 }