X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=3a7ff36982898fee3d18e8f1dc3013afc8fdb8e4;hb=f305e7f18dd9745e99518da7ca70183c3084a991;hp=bb5088e92447e23d9b1da283e90e1f835247a51a;hpb=17b0266979137ad957a701c7093a14841a8c2091;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index bb5088e9..3a7ff369 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1,8 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "actions.hh"
 #include "openbox.hh"
@@ -13,7 +11,7 @@
 #include "bindings.hh"
 #include "otk/display.hh"
 
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 
 namespace ob {
@@ -44,6 +42,7 @@ void Actions::insertPress(const XButtonEvent &e)
     _posqueue[i] = _posqueue[i-1];
   }
   _posqueue[0] = a;
+  a->win = e.window;
   a->button = e.button;
   a->pos = otk::Point(e.x_root, e.y_root);
 
@@ -276,6 +275,8 @@ void Actions::motionHandler(const XMotionEvent &e)
 
   if (!e.same_screen) return; // this just gets stupid
 
+  if (e.window != _posqueue[0]->win) return;
+  
   MouseContext::MC context;
   EventHandler *h = openbox->findHandler(e.window);
   Frame *f = dynamic_cast<Frame*>(h);
@@ -289,7 +290,7 @@ void Actions::motionHandler(const XMotionEvent &e)
     return; // not a valid mouse context
 
   int x_root = e.x_root, y_root = e.y_root;
-  
+
   // compress changes to a window into a single change
   XEvent ce;
   while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {