From 4ddc2a5a0a88f17697687b0bf47f1cad963f46ca Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 26 Apr 2010 13:56:37 -0400 Subject: [PATCH] Don't grab Ctrl+Wheel if ResizeIncrement is 0 I personally cannot stand stealing Ctrl+Wheel for resizing windows, so I turned it off. But wmaker is still preventing Ctrl+Wheel from reaching apps, which is certainly not the behavior I desire. --- src/window.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/window.c b/src/window.c index 2379c136..f33514d0 100644 --- a/src/window.c +++ b/src/window.c @@ -2525,19 +2525,21 @@ void wWindowResetMouseGrabs(WWindow * wwin) * but we only grab it for Button4 and Button 5 since a lot of apps * use CTRL+Button1-3 for app related functionality */ - wHackedGrabButton(Button4, ControlMask, wwin->client_win, - True, ButtonPressMask | ButtonReleaseMask, - GrabModeSync, GrabModeAsync, None, None); - wHackedGrabButton(Button5, ControlMask, wwin->client_win, - True, ButtonPressMask | ButtonReleaseMask, - GrabModeSync, GrabModeAsync, None, None); + if (wPreferences.resize_increment > 0) { + wHackedGrabButton(Button4, ControlMask, wwin->client_win, + True, ButtonPressMask | ButtonReleaseMask, + GrabModeSync, GrabModeAsync, None, None); + wHackedGrabButton(Button5, ControlMask, wwin->client_win, + True, ButtonPressMask | ButtonReleaseMask, + GrabModeSync, GrabModeAsync, None, None); - wHackedGrabButton(Button4, MOD_MASK | ControlMask, wwin->client_win, - True, ButtonPressMask | ButtonReleaseMask, - GrabModeSync, GrabModeAsync, None, None); - wHackedGrabButton(Button5, MOD_MASK | ControlMask, wwin->client_win, - True, ButtonPressMask | ButtonReleaseMask, - GrabModeSync, GrabModeAsync, None, None); + wHackedGrabButton(Button4, MOD_MASK | ControlMask, wwin->client_win, + True, ButtonPressMask | ButtonReleaseMask, + GrabModeSync, GrabModeAsync, None, None); + wHackedGrabButton(Button5, MOD_MASK | ControlMask, wwin->client_win, + True, ButtonPressMask | ButtonReleaseMask, + GrabModeSync, GrabModeAsync, None, None); + } } if (!wwin->flags.focused && !WFLAGP(wwin, no_focusable)