fix the hang some more, hopefully final

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e8e1b5..22f1ed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.9:
 *04/04/14:
+  * Half revert a bit of the below, since it broke click-to-focus (Simon)
+    -> adds back the grab, but as an async one
+    Window.cc
   * Hopefully fix the "stange" hang on restart (Simon)
     - remove big sync-ed grab on all Button1 events
     - Also tidy and fix tab moving
diff --git a/src/Window.cc b/src/Window.cc
index b7913c1..acb2565 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.278 2004/04/14 15:17:20 rathnor Exp $
+// $Id: Window.cc,v 1.279 2004/04/14 15:40:57 rathnor Exp $
 
 #include "Window.hh"
 
@@ -974,6 +974,10 @@ void FluxboxWindow::associateClientWindow(bool use_attrs, int x, int y, unsigned
 
 void FluxboxWindow::grabButtons() {
 
+    // needed for click to focus
+    XGrabButton(display, Button1, AnyModifier, 
+                frame().window().window(), True, ButtonPressMask,
+                GrabModeAsync, GrabModeAsync, None, None);                
     XUngrabButton(display, Button1, Mod1Mask|Mod2Mask|Mod3Mask, frame().window().window());
 
     if (Fluxbox::instance()->useMod1()) {