aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-10-13 21:54:36 (GMT)
committerfluxgen <fluxgen>2002-10-13 21:54:36 (GMT)
commit6a7db7ac250a3d6ddde0b589aaead9af23d9381d (patch)
treea26fb8dbf49af1528e9a0fa186c2208fbaf462dd
parentabcad4617214d0b9376af7020779ee0917cb04bc (diff)
downloadfluxbox-6a7db7ac250a3d6ddde0b589aaead9af23d9381d.zip
fluxbox-6a7db7ac250a3d6ddde0b589aaead9af23d9381d.tar.bz2
fixed reconfigure grab bug
-rw-r--r--src/Window.cc19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/Window.cc b/src/Window.cc
index d60c907..438cfb4 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.87 2002/09/14 12:31:18 fluxgen Exp $ 25// $Id: Window.cc,v 1.88 2002/10/13 21:54:36 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -34,6 +34,10 @@
34#include "Windowmenu.hh" 34#include "Windowmenu.hh"
35#include "StringUtil.hh" 35#include "StringUtil.hh"
36 36
37#ifdef HAVE_CONFIG_H
38#include "config.h"
39#endif // HAVE_CONFIG_H
40
37#ifdef SLIT 41#ifdef SLIT
38#include "Slit.hh" 42#include "Slit.hh"
39#endif // SLIT 43#endif // SLIT
@@ -43,10 +47,6 @@
43#define _GNU_SOURCE 47#define _GNU_SOURCE
44#endif // _GNU_SOURCE 48#endif // _GNU_SOURCE
45 49
46#ifdef HAVE_CONFIG_H
47#include "../config.h"
48#endif // HAVE_CONFIG_H
49
50#include <X11/Xatom.h> 50#include <X11/Xatom.h>
51#include <X11/keysym.h> 51#include <X11/keysym.h>
52 52
@@ -1036,13 +1036,8 @@ void FluxboxWindow::reconfigure() {
1036 setFocusFlag(focused); 1036 setFocusFlag(focused);
1037 1037
1038 configure(frame.x, frame.y, frame.width, frame.height); 1038 configure(frame.x, frame.y, frame.width, frame.height);
1039 1039
1040 if (! (screen->isSloppyFocus() || screen->isSemiSloppyFocus())) { 1040 grabButtons();
1041 XGrabButton(display, Button1, AnyModifier, frame.plate, True, ButtonPressMask,
1042 GrabModeSync, GrabModeSync, None, None);
1043 XUngrabButton(display, Button1, Mod1Mask|Mod2Mask|Mod3Mask, frame.plate);
1044 } else
1045 XUngrabButton(display, Button1, AnyModifier, frame.plate);
1046 1041
1047 if (windowmenu) { 1042 if (windowmenu) {
1048 windowmenu->move(windowmenu->x(), frame.y + frame.title_h); 1043 windowmenu->move(windowmenu->x(), frame.y + frame.title_h);