FbWindow add and remove

2 files changed, 16 insertions, 3 deletions

diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc
index 05d95c4..6d10b8d 100644
--- a/src/FbTk/EventManager.cc
+++ b/src/FbTk/EventManager.cc
@@ -19,9 +19,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: EventManager.cc,v 1.2 2002/12/01 13:42:14 rathnor Exp $
+// $Id: EventManager.cc,v 1.3 2002/12/03 17:06:49 fluxgen Exp $
 
 #include "EventManager.hh"
+#include "FbWindow.hh"
 
 #include <iostream>
 using namespace std;
@@ -41,7 +42,7 @@ EventManager::~EventManager() {
 void EventManager::handleEvent(XEvent &ev) {
     // find eventhandler for event window
     if (m_eventhandlers.find(ev.xany.window) == m_eventhandlers.end()) {
-        cerr<<"Can't find window="<<ev.xany.window<<endl;
+        //cerr<<"Can't find window="<<ev.xany.window<<endl;
         return;
     }
     EventHandler *evhand = m_eventhandlers[ev.xany.window];
@@ -81,6 +82,14 @@ void EventManager::handleEvent(XEvent &ev) {
     };
 }
 
+void EventManager::add(EventHandler &ev, const FbWindow &win) {
+    registerEventHandler(ev, win.window());
+}
+
+void EventManager::remove(const FbWindow &win) {
+    unregisterEventHandler(win.window());
+}
+
 void EventManager::registerEventHandler(EventHandler &ev, Window win) {
     m_eventhandlers[win] = &ev;
 }
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh
index 39883b3..7d67331 100644
--- a/src/FbTk/EventManager.hh
+++ b/src/FbTk/EventManager.hh
@@ -19,13 +19,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: EventManager.hh,v 1.3 2002/12/02 19:36:58 fluxgen Exp $
+// $Id: EventManager.hh,v 1.4 2002/12/03 17:05:45 fluxgen Exp $
 
 #include "EventHandler.hh"
 #include <map>
 
 namespace FbTk {
 
+class FbWindow;
+
 /**
    singleton mediator for EventHandlers
 */
@@ -34,6 +36,8 @@ public:
     static EventManager *instance();
         
     void handleEvent(XEvent &ev);
+    void add(EventHandler &ev, const FbWindow &win);
+    void remove(const FbWindow &win);
     void add(EventHandler &ev, Window win) { registerEventHandler(ev, win); }
     void remove(Window win) { unregisterEventHandler(win); }
     void registerEventHandler(EventHandler &ev, Window win);