Updated keygrabbing constants
This commit is contained in:
parent
c4bedc7c29
commit
bc53e48abb
1 changed files with 42 additions and 42 deletions
|
@ -785,50 +785,50 @@ void Fluxbox::process_event(XEvent *e) {
|
||||||
if (actionstr)
|
if (actionstr)
|
||||||
cerr<<"KeyAction("<<actionstr<<")"<<endl;
|
cerr<<"KeyAction("<<actionstr<<")"<<endl;
|
||||||
#endif
|
#endif
|
||||||
if (action==Keys::lastKeygrab) //if action not found end case
|
if (action==Keys::LASTKEYGRAB) //if action not found end case
|
||||||
break;
|
break;
|
||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case Keys::grabWorkspace1:
|
case Keys::WORKSPACE1:
|
||||||
screen->changeWorkspaceID(0);
|
screen->changeWorkspaceID(0);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace2:
|
case Keys::WORKSPACE2:
|
||||||
screen->changeWorkspaceID(1);
|
screen->changeWorkspaceID(1);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace3:
|
case Keys::WORKSPACE3:
|
||||||
screen->changeWorkspaceID(2);
|
screen->changeWorkspaceID(2);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace4:
|
case Keys::WORKSPACE4:
|
||||||
screen->changeWorkspaceID(3);
|
screen->changeWorkspaceID(3);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace5:
|
case Keys::WORKSPACE5:
|
||||||
screen->changeWorkspaceID(4);
|
screen->changeWorkspaceID(4);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace6:
|
case Keys::WORKSPACE6:
|
||||||
screen->changeWorkspaceID(5);
|
screen->changeWorkspaceID(5);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace7:
|
case Keys::WORKSPACE7:
|
||||||
screen->changeWorkspaceID(6);
|
screen->changeWorkspaceID(6);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace8:
|
case Keys::WORKSPACE8:
|
||||||
screen->changeWorkspaceID(7);
|
screen->changeWorkspaceID(7);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace9:
|
case Keys::WORKSPACE9:
|
||||||
screen->changeWorkspaceID(8);
|
screen->changeWorkspaceID(8);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace10:
|
case Keys::WORKSPACE10:
|
||||||
screen->changeWorkspaceID(9);
|
screen->changeWorkspaceID(9);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace11:
|
case Keys::WORKSPACE11:
|
||||||
screen->changeWorkspaceID(10);
|
screen->changeWorkspaceID(10);
|
||||||
break;
|
break;
|
||||||
case Keys::grabWorkspace12:
|
case Keys::WORKSPACE12:
|
||||||
screen->changeWorkspaceID(11);
|
screen->changeWorkspaceID(11);
|
||||||
break;
|
break;
|
||||||
case Keys::grabNextWorkspace:
|
case Keys::NEXTWORKSPACE:
|
||||||
screen->nextWorkspace();
|
screen->nextWorkspace();
|
||||||
break;
|
break;
|
||||||
case Keys::grabPrevWorkspace:
|
case Keys::PREVWORKSPACE:
|
||||||
screen->prevWorkspace();
|
screen->prevWorkspace();
|
||||||
break;
|
break;
|
||||||
/*case Keys::grabUpWorkspace:
|
/*case Keys::grabUpWorkspace:
|
||||||
|
@ -840,15 +840,15 @@ void Fluxbox::process_event(XEvent *e) {
|
||||||
case Keys::grabRightWorkspace:
|
case Keys::grabRightWorkspace:
|
||||||
break;
|
break;
|
||||||
*/
|
*/
|
||||||
case Keys::grabKillWindow: //kill the current window
|
case Keys::KILLWINDOW: //kill the current window
|
||||||
break;
|
break;
|
||||||
case Keys::grabNextWindow: //activate next window
|
case Keys::NEXTWINDOW: //activate next window
|
||||||
screen->nextFocus();
|
screen->nextFocus();
|
||||||
break;
|
break;
|
||||||
case Keys::grabPrevWindow: //activate prev window
|
case Keys::PREVWINDOW: //activate prev window
|
||||||
screen->prevFocus();
|
screen->prevFocus();
|
||||||
break;
|
break;
|
||||||
case Keys::grabNextTab:
|
case Keys::NEXTTAB:
|
||||||
if (focused_window && focused_window->getTab()) {
|
if (focused_window && focused_window->getTab()) {
|
||||||
Tab *tab = focused_window->getTab();
|
Tab *tab = focused_window->getTab();
|
||||||
if (tab->next()) {
|
if (tab->next()) {
|
||||||
|
@ -862,7 +862,7 @@ void Fluxbox::process_event(XEvent *e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Keys::grabPrevTab:
|
case Keys::PREVTAB:
|
||||||
if (focused_window && focused_window->getTab()) {
|
if (focused_window && focused_window->getTab()) {
|
||||||
Tab *tab = focused_window->getTab();
|
Tab *tab = focused_window->getTab();
|
||||||
if (tab->prev()) {
|
if (tab->prev()) {
|
||||||
|
@ -876,7 +876,7 @@ void Fluxbox::process_event(XEvent *e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Keys::grabExecute: //execute command on keypress
|
case Keys::EXECUTE: //execute command on keypress
|
||||||
{
|
{
|
||||||
#ifndef __EMX__
|
#ifndef __EMX__
|
||||||
char displaystring[MAXPATHLEN];
|
char displaystring[MAXPATHLEN];
|
||||||
|
@ -1005,28 +1005,28 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case Keys::grabIconify:
|
case Keys::ICONIFY:
|
||||||
focused_window->iconify();
|
focused_window->iconify();
|
||||||
break;
|
break;
|
||||||
case Keys::grabRaise:
|
case Keys::RAISE:
|
||||||
focused_window->getScreen()->getWorkspace(focused_window->getWorkspaceNumber())->raiseWindow(focused_window);
|
focused_window->getScreen()->getWorkspace(focused_window->getWorkspaceNumber())->raiseWindow(focused_window);
|
||||||
break;
|
break;
|
||||||
case Keys::grabLower:
|
case Keys::LOWER:
|
||||||
XLowerWindow(getXDisplay(), focused_window->getFrameWindow());
|
XLowerWindow(getXDisplay(), focused_window->getFrameWindow());
|
||||||
break;
|
break;
|
||||||
case Keys::grabClose:
|
case Keys::CLOSE:
|
||||||
focused_window->close();
|
focused_window->close();
|
||||||
break;
|
break;
|
||||||
case Keys::grabShade:
|
case Keys::SHADE:
|
||||||
focused_window->shade();
|
focused_window->shade();
|
||||||
break;
|
break;
|
||||||
case Keys::grabMaximize:
|
case Keys::MAXIMIZE:
|
||||||
focused_window->maximize(0);
|
focused_window->maximize(0);
|
||||||
break;
|
break;
|
||||||
case Keys::grabStick:
|
case Keys::STICK:
|
||||||
focused_window->stick();
|
focused_window->stick();
|
||||||
break;
|
break;
|
||||||
case Keys::grabVertMax:
|
case Keys::VERTMAX:
|
||||||
//!!TODO: fix this
|
//!!TODO: fix this
|
||||||
if (focused_window->isResizable()) {
|
if (focused_window->isResizable()) {
|
||||||
int w = focused_window->getWidth();
|
int w = focused_window->getWidth();
|
||||||
|
@ -1036,7 +1036,7 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
|
||||||
focused_window->configure(x, y, w, focused_window->getHeight());
|
focused_window->configure(x, y, w, focused_window->getHeight());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Keys::grabHorizMax:
|
case Keys::HORIZMAX:
|
||||||
//!!TODO: fix this
|
//!!TODO: fix this
|
||||||
if (focused_window->isResizable()) {
|
if (focused_window->isResizable()) {
|
||||||
int h = focused_window->getHeight();
|
int h = focused_window->getHeight();
|
||||||
|
@ -1046,65 +1046,65 @@ void Fluxbox::doWindowAction(Keys::KeyAction action) {
|
||||||
focused_window->configure(x, y, focused_window->getWidth(), h);
|
focused_window->configure(x, y, focused_window->getWidth(), h);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Keys::grabNudgeRight:
|
case Keys::NUDGERIGHT:
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame()+1, focused_window->getYFrame(),
|
focused_window->getXFrame()+1, focused_window->getYFrame(),
|
||||||
focused_window->getWidth(), focused_window->getHeight());
|
focused_window->getWidth(), focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabNudgeLeft:
|
case Keys::NUDGELEFT:
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame()-1, focused_window->getYFrame(),
|
focused_window->getXFrame()-1, focused_window->getYFrame(),
|
||||||
focused_window->getWidth(), focused_window->getHeight());
|
focused_window->getWidth(), focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabNudgeUp:
|
case Keys::NUDGEUP:
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame(), focused_window->getYFrame()-1,
|
focused_window->getXFrame(), focused_window->getYFrame()-1,
|
||||||
focused_window->getWidth(), focused_window->getHeight());
|
focused_window->getWidth(), focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabNudgeDown:
|
case Keys::NUDGEDOWN:
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame(), focused_window->getYFrame()+1,
|
focused_window->getXFrame(), focused_window->getYFrame()+1,
|
||||||
focused_window->getWidth(), focused_window->getHeight());
|
focused_window->getWidth(), focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabBigNudgeRight:
|
case Keys::BIGNUDGERIGHT:
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame()+10, focused_window->getYFrame(),
|
focused_window->getXFrame()+10, focused_window->getYFrame(),
|
||||||
focused_window->getWidth(), focused_window->getHeight());
|
focused_window->getWidth(), focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabBigNudgeLeft:
|
case Keys::BIGNUDGELEFT:
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame()-10, focused_window->getYFrame(),
|
focused_window->getXFrame()-10, focused_window->getYFrame(),
|
||||||
focused_window->getWidth(), focused_window->getHeight());
|
focused_window->getWidth(), focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabBigNudgeUp:
|
case Keys::BIGNUDGEUP:
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame(), focused_window->getYFrame()-10,
|
focused_window->getXFrame(), focused_window->getYFrame()-10,
|
||||||
focused_window->getWidth(), focused_window->getHeight());
|
focused_window->getWidth(), focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabBigNudgeDown:
|
case Keys::BIGNUDGEDOWN:
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame(), focused_window->getYFrame()+10,
|
focused_window->getXFrame(), focused_window->getYFrame()+10,
|
||||||
focused_window->getWidth(), focused_window->getHeight());
|
focused_window->getWidth(), focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabHorizInc:
|
case Keys::HORIZINC:
|
||||||
if (focused_window->isResizable())
|
if (focused_window->isResizable())
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame(), focused_window->getYFrame(),
|
focused_window->getXFrame(), focused_window->getYFrame(),
|
||||||
focused_window->getWidth()+10, focused_window->getHeight());
|
focused_window->getWidth()+10, focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabVertInc:
|
case Keys::VERTINC:
|
||||||
if (focused_window->isResizable())
|
if (focused_window->isResizable())
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame(), focused_window->getYFrame(),
|
focused_window->getXFrame(), focused_window->getYFrame(),
|
||||||
focused_window->getWidth(), focused_window->getHeight()+10);
|
focused_window->getWidth(), focused_window->getHeight()+10);
|
||||||
break;
|
break;
|
||||||
case Keys::grabHorizDec:
|
case Keys::HORIZDEC:
|
||||||
if (focused_window->isResizable())
|
if (focused_window->isResizable())
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame(), focused_window->getYFrame(),
|
focused_window->getXFrame(), focused_window->getYFrame(),
|
||||||
focused_window->getWidth()-10, focused_window->getHeight());
|
focused_window->getWidth()-10, focused_window->getHeight());
|
||||||
break;
|
break;
|
||||||
case Keys::grabVertDec:
|
case Keys::VERTDEC:
|
||||||
if (focused_window->isResizable())
|
if (focused_window->isResizable())
|
||||||
focused_window->configure(
|
focused_window->configure(
|
||||||
focused_window->getXFrame(), focused_window->getYFrame(),
|
focused_window->getXFrame(), focused_window->getYFrame(),
|
||||||
|
|
Loading…
Reference in a new issue