provide the strut for the frame's size instead of an area rect

[chaz/openbox] / otk / eventdispatcher.cc

diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc
index 07164f0b03599bfc35b73e690686b0adefc3b84b..9e40947d019ed3d36009e75db678ba21b74c592e 100644 (file)
--- a/otk/eventdispatcher.cc
+++ b/otk/eventdispatcher.cc
@@ -10,36 +10,36 @@
 
 namespace otk {
 
-OtkEventDispatcher::OtkEventDispatcher()
+EventDispatcher::EventDispatcher()
   : _fallback(0), _master(0)
 {
 }
 
-OtkEventDispatcher::~OtkEventDispatcher()
+EventDispatcher::~EventDispatcher()
 {
 }
 
-void OtkEventDispatcher::clearAllHandlers(void)
+void EventDispatcher::clearAllHandlers(void)
 {
   _map.clear();
 }
 
-void OtkEventDispatcher::registerHandler(Window id, OtkEventHandler *handler)
+void EventDispatcher::registerHandler(Window id, EventHandler *handler)
 {
-  _map.insert(std::pair<Window, OtkEventHandler*>(id, handler));
+  _map.insert(std::pair<Window, EventHandler*>(id, handler));
 }
 
-void OtkEventDispatcher::clearHandler(Window id)
+void EventDispatcher::clearHandler(Window id)
 {
   _map.erase(id);
 }
 
-void OtkEventDispatcher::dispatchEvents(void)
+void EventDispatcher::dispatchEvents(void)
 {
   XEvent e;
 
-  while (XPending(OBDisplay::display)) {
-    XNextEvent(OBDisplay::display, &e);
+  while (XPending(**display)) {
+    XNextEvent(**display, &e);
 
 #if 0//defined(DEBUG)
     printf("Event %d window %lx\n", e.type, e.xany.window);
@@ -71,17 +71,17 @@ void OtkEventDispatcher::dispatchEvents(void)
       case ButtonPress:
       case ButtonRelease:
         _lasttime = e.xbutton.time;
-        e.xbutton.state &= ~(LockMask | OBDisplay::numLockMask() |
-                             OBDisplay::scrollLockMask());
+        e.xbutton.state &= ~(LockMask | display->numLockMask() |
+                             display->scrollLockMask());
         break;
       case KeyPress:
-        e.xkey.state &= ~(LockMask | OBDisplay::numLockMask() |
-                          OBDisplay::scrollLockMask());
+        e.xkey.state &= ~(LockMask | display->numLockMask() |
+                          display->scrollLockMask());
         break;
       case MotionNotify:
         _lasttime = e.xmotion.time;
-        e.xmotion.state &= ~(LockMask | OBDisplay::numLockMask() |
-                             OBDisplay::scrollLockMask());
+        e.xmotion.state &= ~(LockMask | display->numLockMask() |
+                             display->scrollLockMask());
         break;
       case PropertyNotify:
         _lasttime = e.xproperty.time;
@@ -97,8 +97,15 @@ void OtkEventDispatcher::dispatchEvents(void)
   }
 }
 
-void OtkEventDispatcher::dispatchFocus(const XEvent &e)
+void EventDispatcher::dispatchFocus(const XEvent &e)
 {
+  // ignore focus changes from grabs
+  if (e.xfocus.mode == NotifyGrab) // ||
+      // From Metacity, from WindowMaker, ignore all funky pointer root events
+      // its commented out cuz I don't think we need this at all. If problems
+      // arise we can look into it
+      //e.xfocus.detail > NotifyNonlinearVirtual)
+    return;
   
   if (e.type == FocusIn) {
     //printf("Got FocusIn!\n");
@@ -113,7 +120,7 @@ void OtkEventDispatcher::dispatchFocus(const XEvent &e)
     // FocusOut events just make us look for FocusIn events. They are ignored
     // otherwise.
     XEvent fi;
-    if (XCheckTypedEvent(OBDisplay::display, FocusIn, &fi)) {
+    if (XCheckTypedEvent(**display, FocusIn, &fi)) {
       //printf("Found FocusIn\n");
       dispatchFocus(fi);
       // dont unfocus the window we just focused!
@@ -126,10 +133,10 @@ void OtkEventDispatcher::dispatchFocus(const XEvent &e)
   }
 }
 
-void OtkEventDispatcher::dispatch(Window win, const XEvent &e)
+void EventDispatcher::dispatch(Window win, const XEvent &e)
 {
-  OtkEventHandler *handler = 0;
-  OtkEventMap::iterator it;
+  EventHandler *handler = 0;
+  EventMap::iterator it;
 
   // master gets everything first
   if (_master)
@@ -154,7 +161,7 @@ void OtkEventDispatcher::dispatch(Window win, const XEvent &e)
     xwc.sibling = e.xconfigurerequest.above;
     xwc.stack_mode = e.xconfigurerequest.detail;
       
-    XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
+    XConfigureWindow(**display, e.xconfigurerequest.window,
                      e.xconfigurerequest.value_mask, &xwc);
   } else {
     // grab a falback if it exists
@@ -165,9 +172,9 @@ void OtkEventDispatcher::dispatch(Window win, const XEvent &e)
     handler->handle(e);
 }
 
-OtkEventHandler *OtkEventDispatcher::findHandler(Window win)
+EventHandler *EventDispatcher::findHandler(Window win)
 {
-  OtkEventMap::iterator it = _map.find(win);
+  EventMap::iterator it = _map.find(win);
   if (it != _map.end())
     return it->second;
   return 0;