aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 9683e5e..85f8d23 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.63 2002/07/23 17:11:59 fluxgen Exp $ 25// $Id: Window.cc,v 1.64 2002/08/02 12:58:37 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -758,7 +758,7 @@ void FluxboxWindow::grabButtons() {
758 frame.plate, True, ButtonPressMask, 758 frame.plate, True, ButtonPressMask,
759 GrabModeSync, GrabModeSync, None, None); 759 GrabModeSync, GrabModeSync, None, None);
760 XUngrabButton(display, Button1, Mod1Mask|Mod2Mask|Mod3Mask, frame.plate); 760 XUngrabButton(display, Button1, Mod1Mask|Mod2Mask|Mod3Mask, frame.plate);
761 761
762 762
763 XGrabButton(display, Button1, Mod1Mask, frame.window, True, 763 XGrabButton(display, Button1, Mod1Mask, frame.window, True,
764 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, 764 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
@@ -768,7 +768,7 @@ void FluxboxWindow::grabButtons() {
768 grabButton(display, Button1, frame.window, fluxbox->getMoveCursor()); 768 grabButton(display, Button1, frame.window, fluxbox->getMoveCursor());
769 769
770 XGrabButton(display, Button2, Mod1Mask, frame.window, True, 770 XGrabButton(display, Button2, Mod1Mask, frame.window, True,
771 ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None); 771 ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None);
772 772
773 XGrabButton(display, Button3, Mod1Mask, frame.window, True, 773 XGrabButton(display, Button3, Mod1Mask, frame.window, True,
774 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, 774 ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
@@ -2788,6 +2788,17 @@ void FluxboxWindow::mapNotifyEvent(XMapEvent *ne) {
2788 visible = true; 2788 visible = true;
2789 iconic = false; 2789 iconic = false;
2790 2790
2791 // Auto-group?
2792 if (!transient) {
2793 // Grab and clear the auto-group window
2794 FluxboxWindow* autoGroupWindow = screen->useAutoGroupWindow();
2795 if (autoGroupWindow) {
2796 Tab *groupTab = autoGroupWindow->getTab();
2797 if (groupTab)
2798 groupTab->addWindowToGroup(this);
2799 }
2800 }
2801
2791 fluxbox->ungrab(); 2802 fluxbox->ungrab();
2792 } 2803 }
2793} 2804}