Imported Upstream version 20090110

[ion3.git] / ioncore / grab.c

diff --git a/ioncore/grab.c b/ioncore/grab.c
index d3bbcadf5172fc2cae2931fdab3a247b51776200..4963e8a763b8a967dbec88c4dbabda27b6297871 100644 (file)
--- a/ioncore/grab.c
+++ b/ioncore/grab.c
@@ -2,12 +2,12 @@
  * ion/ioncore/grab.c
  * 
  * Copyright (c) Lukas Schroeder 2002,
- *               Tuomo Valkonen 2003.
+ *               Tuomo Valkonen 2003-2009.
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
+ * 
+ * Alternatively, you may apply the Clarified Artistic License to this file,
+ * since Lukas' contributions were originally under that.
  */
 
 #include <stdlib.h>
@@ -117,8 +117,9 @@ void ioncore_grab_establish(WRegion *reg, GrabHandler *func,
         current_grab->eventmask=eventmask;
         current_grab->remove=FALSE;
         current_grab->cursor=IONCORE_CURSOR_DEFAULT;
-        current_grab->confine_to=region_root_of(reg);
+        current_grab->confine_to=None; /*region_root_of(reg);*/
         current_grab->sqid=last_sqid++;
+        watch_init(&current_grab->watch);
         do_grab_install(current_grab);
     }
 }