nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make it real easy to change the modifier key used for mouse bindings

Browse source
This commit is contained in:
Dana Jansens 2002-07-22 08:49:50 +00:00
parent fd90355381
commit b73ff84f6f
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Window.cc
View file

@ -59,6 +59,11 @@ extern "C" {
using std::string; using std::string;
// change this to change what modifier keys openbox uses for mouse bindings
// for example: Mod1Mask | ControlMask
// or: ControlMask| ShiftMask
const unsigned int ModMask = Mod1Mask;
/* /*
* Initializes the class with default values/the window's set initial values. * Initializes the class with default values/the window's set initial values.
*/ */
@ -826,17 +831,17 @@ void BlackboxWindow::grabButtons(void) {
screen->allowScrollLock()); screen->allowScrollLock());
if (functions & Func_Move) if (functions & Func_Move)
blackbox->grabButton(Button1, Mod1Mask, frame.window, True, blackbox->grabButton(Button1, ModMask, frame.window, True,
ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
GrabModeAsync, frame.window, None, GrabModeAsync, frame.window, None,
screen->allowScrollLock()); screen->allowScrollLock());
if (functions & Func_Resize) if (functions & Func_Resize)
blackbox->grabButton(Button3, Mod1Mask, frame.window, True, blackbox->grabButton(Button3, ModMask, frame.window, True,
ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
GrabModeAsync, frame.window, None, GrabModeAsync, frame.window, None,
screen->allowScrollLock()); screen->allowScrollLock());
// alt+middle lowers the window // alt+middle lowers the window
blackbox->grabButton(Button2, Mod1Mask, frame.window, True, blackbox->grabButton(Button2, ModMask, frame.window, True,
ButtonReleaseMask, GrabModeAsync, GrabModeAsync, ButtonReleaseMask, GrabModeAsync, GrabModeAsync,
frame.window, None, frame.window, None,
screen->allowScrollLock()); screen->allowScrollLock());
@ -847,9 +852,9 @@ void BlackboxWindow::ungrabButtons(void) {
if ((! screen->isSloppyFocus()) || screen->doClickRaise()) if ((! screen->isSloppyFocus()) || screen->doClickRaise())
blackbox->ungrabButton(Button1, 0, frame.plate); blackbox->ungrabButton(Button1, 0, frame.plate);
blackbox->ungrabButton(Button1, Mod1Mask, frame.window); blackbox->ungrabButton(Button1, ModMask, frame.window);
blackbox->ungrabButton(Button2, Mod1Mask, frame.window); blackbox->ungrabButton(Button2, ModMask, frame.window);
blackbox->ungrabButton(Button3, Mod1Mask, frame.window); blackbox->ungrabButton(Button3, ModMask, frame.window);
} }
@ -2762,7 +2767,7 @@ void BlackboxWindow::buttonPressEvent(const XButtonEvent *be) {
if (frame.maximize_button == be->window && be->button <= 3) { if (frame.maximize_button == be->window && be->button <= 3) {
redrawMaximizeButton(True); redrawMaximizeButton(True);
} else if (be->button == 1 || (be->button == 3 && be->state == Mod1Mask)) { } else if (be->button == 1 || (be->button == 3 && be->state == ModMask)) {
if (! flags.focused) if (! flags.focused)
setInputFocus(); setInputFocus();
@ -2888,7 +2893,7 @@ void BlackboxWindow::buttonReleaseEvent(const XButtonEvent *re) {
} else if (flags.resizing) { } else if (flags.resizing) {
endResize(); endResize();
} else if (re->window == frame.window) { } else if (re->window == frame.window) {
if (re->button == 2 && re->state == Mod1Mask) if (re->button == 2 && re->state == ModMask)
XUngrabPointer(blackbox->getXDisplay(), CurrentTime); XUngrabPointer(blackbox->getXDisplay(), CurrentTime);
} }
} }
@ -3307,7 +3312,7 @@ void BlackboxWindow::motionNotifyEvent(const XMotionEvent *me) {
} else if ((functions & Func_Resize) && } else if ((functions & Func_Resize) &&
(me->state & Button1Mask && (me->window == frame.right_grip || (me->state & Button1Mask && (me->window == frame.right_grip ||
me->window == frame.left_grip)) || me->window == frame.left_grip)) ||
(me->state & Button3Mask && me->state & Mod1Mask && (me->state & Button3Mask && me->state & ModMask &&
me->window == frame.window)) { me->window == frame.window)) {
unsigned int zones = screen->getResizeZones(); unsigned int zones = screen->getResizeZones();
Corner corner; Corner corner;