much nicer hardcoded bindings! :)

This commit is contained in:
Dana Jansens 2002-07-22 09:27:40 +00:00
parent c15287a822
commit 3a9f075274
2 changed files with 65 additions and 133 deletions

View file

@ -78,139 +78,51 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
::exit(1); ::exit(1);
} }
_actions.push_back(Action(Action::nextWorkspace, addAction(Action::nextWorkspace, ControlMask, "Tab");
XKeysymToKeycode(getXDisplay(), addAction(Action::prevWorkspace, ControlMask | ShiftMask, "Tab");
XStringToKeysym("Tab")), addAction(Action::nextWindow, Mod1Mask, "Tab");
ControlMask)); addAction(Action::prevWindow, Mod1Mask | ShiftMask, "Tab");
_actions.push_back(Action(Action::prevWorkspace, addAction(Action::toggleshade, Mod1Mask, "F5");
XKeysymToKeycode(getXDisplay(), addAction(Action::close, Mod1Mask, "F4");
XStringToKeysym("Tab")), addAction(Action::nextWindowOnAllWorkspaces, Mod1Mask | ControlMask, "Tab");
ControlMask | ShiftMask)); addAction(Action::prevWindowOnAllWorkspaces,
_actions.push_back(Action(Action::toggleshade, Mod1Mask | ShiftMask | ControlMask, "Tab");
XKeysymToKeycode(getXDisplay(), addAction(Action::raise, Mod1Mask, "Up");
XStringToKeysym("F5")), addAction(Action::lower, Mod1Mask, "Down");
Mod1Mask)); addAction(Action::moveWindowUp, Mod1Mask | ControlMask, "Up", 1);
_actions.push_back(Action(Action::close, addAction(Action::moveWindowDown, Mod1Mask | ControlMask, "Down", 1);
XKeysymToKeycode(getXDisplay(), addAction(Action::moveWindowLeft, Mod1Mask | ControlMask, "Left", 1);
XStringToKeysym("F4")), addAction(Action::moveWindowRight, Mod1Mask | ControlMask, "Right", 1);
Mod1Mask)); addAction(Action::resizeWindowHeight, ShiftMask | Mod1Mask | ControlMask,
_actions.push_back(Action(Action::nextWindow, "Up", -1);
XKeysymToKeycode(getXDisplay(), addAction(Action::resizeWindowHeight, ShiftMask | Mod1Mask | ControlMask,
XStringToKeysym("Tab")), "Down", 1);
Mod1Mask)); addAction(Action::resizeWindowWidth, ShiftMask | Mod1Mask | ControlMask,
_actions.push_back(Action(Action::prevWindow, "Left", -1);
XKeysymToKeycode(getXDisplay(), addAction(Action::resizeWindowWidth, ShiftMask | Mod1Mask | ControlMask,
XStringToKeysym("Tab")), "Right", 1);
Mod1Mask | ShiftMask)); addAction(Action::iconify, Mod1Mask | ControlMask, "I");
_actions.push_back(Action(Action::nextWindowOnAllWorkspaces, addAction(Action::toggleomnipresent, Mod1Mask | ControlMask, "O");
XKeysymToKeycode(getXDisplay(), addAction(Action::toggleMaximizeHorizontal, ShiftMask | Mod1Mask, "X");
XStringToKeysym("Tab")), addAction(Action::toggleMaximizeVertical, ShiftMask | ControlMask, "X");
Mod1Mask | ControlMask)); addAction(Action::toggleMaximizeFull, Mod1Mask | ControlMask, "X");
_actions.push_back(Action(Action::prevWindowOnAllWorkspaces, addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "1", 0);
XKeysymToKeycode(getXDisplay(), addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "2", 1);
XStringToKeysym("Tab")), addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "3", 2);
Mod1Mask | ShiftMask | ControlMask)); addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "4", 3);
_actions.push_back(Action(Action::raise, addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
XKeysymToKeycode(getXDisplay(), "1", 0);
XStringToKeysym("Up")), addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
Mod1Mask)); "2", 1);
_actions.push_back(Action(Action::lower, addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
XKeysymToKeycode(getXDisplay(), "3", 2);
XStringToKeysym("Down")), addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
Mod1Mask)); "4", 3);
_actions.push_back(Action(Action::moveWindowUp, addAction(Action::execute, Mod1Mask | ControlMask, "Escape",
XKeysymToKeycode(getXDisplay(), "sleep 1 && xset dpms force off");
XStringToKeysym("Up")), addAction(Action::execute, Mod1Mask, "space",
Mod1Mask | ControlMask, 1)); "rxvt");
_actions.push_back(Action(Action::moveWindowDown,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("Down")),
Mod1Mask | ControlMask, 1));
_actions.push_back(Action(Action::moveWindowLeft,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("Left")),
Mod1Mask | ControlMask, 1));
_actions.push_back(Action(Action::moveWindowRight,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("Right")),
Mod1Mask | ControlMask, 1));
_actions.push_back(Action(Action::resizeWindowHeight,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("Up")),
ShiftMask | Mod1Mask | ControlMask, -1));
_actions.push_back(Action(Action::resizeWindowHeight,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("Down")),
ShiftMask | Mod1Mask | ControlMask, 1));
_actions.push_back(Action(Action::resizeWindowWidth,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("Left")),
ShiftMask | Mod1Mask | ControlMask, -1));
_actions.push_back(Action(Action::resizeWindowWidth,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("Right")),
ShiftMask | Mod1Mask | ControlMask, 1));
_actions.push_back(Action(Action::iconify,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("I")),
Mod1Mask | ControlMask));
_actions.push_back(Action(Action::toggleomnipresent,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("O")),
Mod1Mask | ControlMask));
_actions.push_back(Action(Action::toggleMaximizeHorizontal,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("X")),
ShiftMask | Mod1Mask));
_actions.push_back(Action(Action::toggleMaximizeVertical,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("X")),
ShiftMask | ControlMask));
_actions.push_back(Action(Action::toggleMaximizeFull,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("X")),
Mod1Mask | ControlMask));
_actions.push_back(Action(Action::changeWorkspace,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("1")),
Mod1Mask | ControlMask, 0));
_actions.push_back(Action(Action::changeWorkspace,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("2")),
Mod1Mask | ControlMask, 1));
_actions.push_back(Action(Action::changeWorkspace,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("3")),
Mod1Mask | ControlMask, 2));
_actions.push_back(Action(Action::changeWorkspace,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("4")),
Mod1Mask | ControlMask, 3));
_actions.push_back(Action(Action::sendToWorkspace,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("1")),
Mod1Mask | ControlMask | ShiftMask, 0));
_actions.push_back(Action(Action::sendToWorkspace,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("2")),
Mod1Mask | ControlMask | ShiftMask, 1));
_actions.push_back(Action(Action::sendToWorkspace,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("3")),
Mod1Mask | ControlMask | ShiftMask, 2));
_actions.push_back(Action(Action::sendToWorkspace,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("4")),
Mod1Mask | ControlMask | ShiftMask, 3));
_actions.push_back(Action(Action::execute,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("Escape")),
Mod1Mask | ControlMask,
"sleep 1 && xset dpms force off"));
_actions.push_back(Action(Action::execute,
XKeysymToKeycode(getXDisplay(),
XStringToKeysym("space")),
Mod1Mask, "rxvt"));
activateGrabs(); activateGrabs();
} }
@ -284,3 +196,18 @@ XWindow *epist::findWindow(Window window) const {
return 0; return 0;
} }
void epist::addAction(Action::ActionType act, unsigned int modifiers,
string key, int number) {
_actions.push_back(Action(act, XKeysymToKeycode(getXDisplay(),
XStringToKeysym(key.c_str())),
modifiers, number));
}
void epist::addAction(Action::ActionType act, unsigned int modifiers,
string key, std::string str) {
_actions.push_back(Action(act, XKeysymToKeycode(getXDisplay(),
XStringToKeysym(key.c_str())),
modifiers, str));
}

View file

@ -57,6 +57,11 @@ private:
virtual bool handleSignal(int sig); virtual bool handleSignal(int sig);
void activateGrabs(); void activateGrabs();
void addAction(Action::ActionType act, unsigned int modifiers,
std::string key, int number = 0);
void addAction(Action::ActionType act, unsigned int modifiers,
std::string key, std::string str);
public: public:
epist(char **argv, char *display_name, char *rc_file); epist(char **argv, char *display_name, char *rc_file);
virtual ~epist(); virtual ~epist();