diff options
author | rathnor <rathnor> | 2004-04-14 15:40:57 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-04-14 15:40:57 (GMT) |
commit | cf2b24b645008ee2efdc14391baad793f8a49f5f (patch) | |
tree | a8d44940959e604af8d3db82140b3ffb2e9d6bb9 | |
parent | 0b8592b203c5da0fee069801e8413a5cc7c2eb64 (diff) | |
download | fluxbox-cf2b24b645008ee2efdc14391baad793f8a49f5f.zip fluxbox-cf2b24b645008ee2efdc14391baad793f8a49f5f.tar.bz2 |
fix the hang some more, hopefully final
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/Window.cc | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -1,6 +1,9 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.9: | 2 | Changes for 0.9.9: |
3 | *04/04/14: | 3 | *04/04/14: |
4 | * Half revert a bit of the below, since it broke click-to-focus (Simon) | ||
5 | -> adds back the grab, but as an async one | ||
6 | Window.cc | ||
4 | * Hopefully fix the "stange" hang on restart (Simon) | 7 | * Hopefully fix the "stange" hang on restart (Simon) |
5 | - remove big sync-ed grab on all Button1 events | 8 | - remove big sync-ed grab on all Button1 events |
6 | - Also tidy and fix tab moving | 9 | - 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 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.cc,v 1.278 2004/04/14 15:17:20 rathnor Exp $ | 25 | // $Id: Window.cc,v 1.279 2004/04/14 15:40:57 rathnor Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -974,6 +974,10 @@ void FluxboxWindow::associateClientWindow(bool use_attrs, int x, int y, unsigned | |||
974 | 974 | ||
975 | void FluxboxWindow::grabButtons() { | 975 | void FluxboxWindow::grabButtons() { |
976 | 976 | ||
977 | // needed for click to focus | ||
978 | XGrabButton(display, Button1, AnyModifier, | ||
979 | frame().window().window(), True, ButtonPressMask, | ||
980 | GrabModeAsync, GrabModeAsync, None, None); | ||
977 | XUngrabButton(display, Button1, Mod1Mask|Mod2Mask|Mod3Mask, frame().window().window()); | 981 | XUngrabButton(display, Button1, Mod1Mask|Mod2Mask|Mod3Mask, frame().window().window()); |
978 | 982 | ||
979 | if (Fluxbox::instance()->useMod1()) { | 983 | if (Fluxbox::instance()->useMod1()) { |