gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-03-20 18:33:31 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: add new button and wheel mouse actions

Browse Source 
This patch is adding atomic mouse actions to mouse buttons to:
-focus on previous or next window
-move to previous or next workspace

and adding wheel action to
-switch between windows

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
David Maciejak
2014-09-11 07:19:12 +07:00
committed by Carlos R. Mafra
parent 39f6130a28
commit f40095ac9e
3 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/event.c
View File

@@ -702,8 +702,38 @@ static void handleExpose(XEvent * event)
}
}
static void executeButtonAction(WScreen * scr, XEvent * event, int action)
static void executeWheelAction(WScreen *scr, XEvent *event, int action)
{
WWindow *wwin;
Bool next_direction;
if (event->xbutton.button == Button5 || event->xbutton.button == Button6)
next_direction = False;
else
next_direction = True;
switch (action) {
case WA_SWITCH_WORKSPACES:
if (next_direction)
wWorkspaceRelativeChange(scr, 1);
else
wWorkspaceRelativeChange(scr, -1);
break;
case WA_SWITCH_WINDOWS:
wwin = scr->focused_window;
if (next_direction)
wWindowFocusNext(wwin, True);
else
wWindowFocusPrev(wwin, True);
break;
}
}
static void executeButtonAction(WScreen *scr, XEvent *event, int action)
{
WWindow *wwin;
switch (action) {
case WA_SELECT_WINDOWS:
wUnselectWindows(scr);
@@ -728,7 +758,19 @@ static void executeButtonAction(WScreen * scr, XEvent * event, int action)
event->xbutton.window = scr->switch_menu->frame->core->window;
}
break;
default:
case WA_MOVE_PREVWORKSPACE:
wWorkspaceRelativeChange(scr, -1);
break;
case WA_MOVE_NEXTWORKSPACE:
wWorkspaceRelativeChange(scr, 1);
break;
case WA_MOVE_PREVWINDOW:
wwin = scr->focused_window;
wWindowFocusPrev(wwin, True);
break;
case WA_MOVE_NEXTWINDOW:
wwin = scr->focused_window;
wWindowFocusNext(wwin, True);
break;
}
}
@@ -757,13 +799,13 @@ static void handleButtonPress(XEvent * event)
}else if (event->xbutton.button == Button9 && wPreferences.mouse_button9 != WA_NONE) {
executeButtonAction(scr, event, wPreferences.mouse_button9);
} else if (event->xbutton.button == Button4 && wPreferences.mouse_wheel_scroll != WA_NONE) {
wWorkspaceRelativeChange(scr, 1);
executeWheelAction(scr, event, wPreferences.mouse_wheel_scroll);
} else if (event->xbutton.button == Button5 && wPreferences.mouse_wheel_scroll != WA_NONE) {
wWorkspaceRelativeChange(scr, -1);
executeWheelAction(scr, event, wPreferences.mouse_wheel_scroll);
} else if (event->xbutton.button == Button6 && wPreferences.mouse_wheel_tilt != WA_NONE) {
wWorkspaceRelativeChange(scr, -1);
executeWheelAction(scr, event, wPreferences.mouse_wheel_tilt);
} else if (event->xbutton.button == Button7 && wPreferences.mouse_wheel_tilt != WA_NONE) {
wWorkspaceRelativeChange(scr, 1);
executeWheelAction(scr, event, wPreferences.mouse_wheel_tilt);
}
}