don't let KeyRelease events propagate to windows

3 files changed, 9 insertions, 18 deletions

diff --git a/src/FbTk/EventHandler.hh b/src/FbTk/EventHandler.hh
index 39ea294..b78e344 100644
--- a/src/FbTk/EventHandler.hh
+++ b/src/FbTk/EventHandler.hh
@@ -56,7 +56,6 @@ public:
     virtual void leaveNotifyEvent(XCrossingEvent &) { }
     virtual void enterNotifyEvent(XCrossingEvent &) { }
 
-    virtual void notifyUngrabKeyboard() { }
     virtual void grabButtons() { }
 };
 
diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc
index 31d0293..ae52908 100644
--- a/src/FbTk/EventManager.cc
+++ b/src/FbTk/EventManager.cc
@@ -65,25 +65,14 @@ EventHandler *EventManager::find(Window win) {
     return m_eventhandlers[win];
 }
 
-bool EventManager::grabKeyboard(EventHandler &ev, Window win) {
-    if (m_grabbing_keyboard)
-        ungrabKeyboard();
-
+bool EventManager::grabKeyboard(Window win) {
     int ret = XGrabKeyboard(App::instance()->display(), win, False,
                             GrabModeAsync, GrabModeAsync, CurrentTime);
-
-    if (ret == Success) {
-        m_grabbing_keyboard = &ev;
-        return true;
-    }
-    return false;
+    return (ret == Success);
 }
 
 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) {
@@ -190,10 +179,14 @@ void EventManager::dispatch(Window win, XEvent &ev, bool parent) {
         evhand->exposeEvent(ev.xexpose);
     break;
     case EnterNotify:
-        evhand->enterNotifyEvent(ev.xcrossing);
+        if (ev.xcrossing.mode != NotifyGrab &&
+            ev.xcrossing.mode != NotifyUngrab)
+            evhand->enterNotifyEvent(ev.xcrossing);
     break;
     case LeaveNotify:
-        evhand->leaveNotifyEvent(ev.xcrossing);
+        if (ev.xcrossing.mode != NotifyGrab &&
+            ev.xcrossing.mode != NotifyUngrab)
+            evhand->leaveNotifyEvent(ev.xcrossing);
     break;
     default:
         evhand->handleEvent(ev);
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh
index 79a25ce..fdcfe9c 100644
--- a/src/FbTk/EventManager.hh
+++ b/src/FbTk/EventManager.hh
@@ -42,9 +42,8 @@ public:
     void add(EventHandler &ev, Window win) { registerEventHandler(ev, win); }
     void remove(Window win) { unregisterEventHandler(win); }
 
-    bool grabKeyboard(EventHandler &ev, Window win);
+    bool grabKeyboard(Window win);
     void ungrabKeyboard();
-    EventHandler *grabbingKeyboard() { return m_grabbing_keyboard; }
 
     EventHandler *find(Window win);