gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Make CTRL+Wheel less intrusive

Browse Source 
This patch only calls XGrabButton for CTRL+Button4 and CTRL+Button5.
This leaves CTRL+Button1-3 to the application.

This then removes the functionality of moving a window between
workspaces with CTRL+Button1 and CTRL+Button3
This commit is contained in:
Johann Haarhoff
2010-03-14 22:19:13 +02:00
committed by Carlos R. Mafra
parent 744ccb85d2
commit 0db4d7885b
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/window.c
View File

@@ -2573,11 +2573,22 @@ void wWindowResetMouseGrabs(WWindow * wwin)
wHackedGrabButton(AnyButton, MOD_MASK, wwin->client_win, wHackedGrabButton(AnyButton, MOD_MASK, wwin->client_win,
True, ButtonPressMask | ButtonReleaseMask, True, ButtonPressMask | ButtonReleaseMask,
GrabModeSync, GrabModeAsync, None, None); GrabModeSync, GrabModeAsync, None, None);
// for CTRL + Wheel to Scroll Horiz, we have to grab CTRL as well
wHackedGrabButton(AnyButton, ControlMask, wwin->client_win, /* for CTRL+Wheel to Scroll Horiz, we have to grab CTRL as well
* 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, True, ButtonPressMask | ButtonReleaseMask,
GrabModeSync, GrabModeAsync, None, None); GrabModeSync, GrabModeAsync, None, None);
wHackedGrabButton(AnyButton, MOD_MASK | ControlMask, wwin->client_win, 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, True, ButtonPressMask | ButtonReleaseMask,
GrabModeSync, GrabModeAsync, None, None); GrabModeSync, GrabModeAsync, None, None);
} }
@@ -2896,18 +2907,6 @@ static void frameMouseDown(WObjDescriptor *desc, XEvent *event)
wRaiseFrame(wwin->frame->core); wRaiseFrame(wwin->frame->core);
if (event->xbutton.state & ControlMask) { if (event->xbutton.state & ControlMask) {
if (event->xbutton.button == Button1) {
if (wwin->screen_ptr->current_workspace > 0) {
wWindowChangeWorkspace(wwin,wwin->screen_ptr->current_workspace - 1);
wWorkspaceRelativeChange(wwin->screen_ptr,-1);
}
}
if (event->xbutton.button == Button3) {
if (wwin->screen_ptr->current_workspace < (wwin->screen_ptr->workspace_count - 1) ) {
wWindowChangeWorkspace(wwin,wwin->screen_ptr->current_workspace + 1);
wWorkspaceRelativeChange(wwin->screen_ptr,1);
}
}
if (event->xbutton.button == Button4) { if (event->xbutton.button == Button4) {
new_width = wwin->client.width - resize_width_increment; new_width = wwin->client.width - resize_width_increment;
wWindowConstrainSize(wwin, &new_width, &wwin->client.height); wWindowConstrainSize(wwin, &new_width, &wwin->client.height);