3 files changed, 28 insertions, 5 deletions

diff --git a/src/FbTk/EventHandler.hh b/src/FbTk/EventHandler.hh
index 3d2e545..45c7a2a 100644
--- a/src/FbTk/EventHandler.hh
+++ b/src/FbTk/EventHandler.hh
@@ -54,11 +54,11 @@ public:
     virtual void exposeEvent(XExposeEvent &) { }
     virtual void motionNotifyEvent(XMotionEvent &) { }
     virtual void keyPressEvent(XKeyEvent &) { }
-#ifdef NOT_USED
     virtual void keyReleaseEvent(XKeyEvent &) { }
-#endif
     virtual void leaveNotifyEvent(XCrossingEvent &) { }
     virtual void enterNotifyEvent(XCrossingEvent &) { }
+
+    virtual void notifyUngrabKeyboard() { }
 };
 
 } // end namespace FbTk
diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc
index 02259ac..fd26950 100644
--- a/src/FbTk/EventManager.cc
+++ b/src/FbTk/EventManager.cc
@@ -66,6 +66,26 @@ EventHandler *EventManager::find(Window win) {
     return m_eventhandlers[win];
 }
 
+bool EventManager::grabKeyboard(EventHandler &ev, Window win) {
+    if (m_grabbing_keyboard)
+        ungrabKeyboard();
+
+    int ret = XGrabKeyboard(App::instance()->display(), win, False,
+                            GrabModeAsync, GrabModeAsync, CurrentTime);
+
+    if (ret == Success) {
+        m_grabbing_keyboard = &ev;
+        return true;
+    }
+    return false;
+}
+
+void EventManager::ungrabKeyboard() {
+    XUngrabKeyboard(App::instance()->display(), CurrentTime);
+    if (m_grabbing_keyboard)
+        m_grabbing_keyboard->notifyUngrabKeyboard();
+    m_grabbing_keyboard = 0;
+}
 
 Window EventManager::getEventWindow(XEvent &ev) {
     // we only have cases for events that differ from xany
@@ -156,9 +176,7 @@ void EventManager::dispatch(Window win, XEvent &ev, bool parent) {
         evhand->keyPressEvent(ev.xkey);
     break;
     case KeyRelease:
-#ifdef NOT_USED
         evhand->keyReleaseEvent(ev.xkey);
-#endif
     break;
     case ButtonPress:
         evhand->buttonPressEvent(ev.xbutton);
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh
index 5bbaa00..149649b 100644
--- a/src/FbTk/EventManager.hh
+++ b/src/FbTk/EventManager.hh
@@ -43,6 +43,10 @@ public:
     void add(EventHandler &ev, Window win) { registerEventHandler(ev, win); }
     void remove(Window win) { unregisterEventHandler(win); }
 
+    bool grabKeyboard(EventHandler &ev, Window win);
+    void ungrabKeyboard();
+    EventHandler *grabbingKeyboard() { return m_grabbing_keyboard; }
+
     EventHandler *find(Window win);
 
     // Some events have the parent window as the xany.window
@@ -53,13 +57,14 @@ public:
     void unregisterEventHandler(Window win);
 
 private:
-    EventManager() { }
+    EventManager(): m_grabbing_keyboard(0) { }
     ~EventManager();
     void dispatch(Window win, XEvent &event, bool parent = false);
 
     typedef std::map<Window, EventHandler *> EventHandlerMap;
     EventHandlerMap m_eventhandlers;
     EventHandlerMap m_parent;
+    EventHandler *m_grabbing_keyboard;
 };
 
 } //end namespace FbTk