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

indentation and removed some debug code

Browse source
This commit is contained in:
fluxgen 2002-01-21 01:48:47 +00:00
parent 5957d88157
commit 3d20c78714
1 changed files with 75 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
src/Keys.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
//$Id: Keys.cc,v 1.8 2002/01/10 14:24:09 fluxgen Exp $ //$Id: Keys.cc,v 1.9 2002/01/21 01:48:47 fluxgen Exp $
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
@ -76,53 +76,53 @@
using namespace std; using namespace std;
Keys::t_actionstr Keys::m_actionlist[] = { Keys::t_actionstr Keys::m_actionlist[] = {
{"Minimize", ICONIFY}, {"Minimize", ICONIFY},
{"Raise", RAISE}, {"Raise", RAISE},
{"Lower", LOWER}, {"Lower", LOWER},
{"Close", CLOSE}, {"Close", CLOSE},
{"AbortKeychain", ABORTKEYCHAIN}, {"AbortKeychain", ABORTKEYCHAIN},
{"Workspace1", WORKSPACE1}, {"Workspace1", WORKSPACE1},
{"Workspace2", WORKSPACE2}, {"Workspace2", WORKSPACE2},
{"Workspace3", WORKSPACE3}, {"Workspace3", WORKSPACE3},
{"Workspace4", WORKSPACE4}, {"Workspace4", WORKSPACE4},
{"Workspace5", WORKSPACE5}, {"Workspace5", WORKSPACE5},
{"Workspace6", WORKSPACE6}, {"Workspace6", WORKSPACE6},
{"Workspace7", WORKSPACE7}, {"Workspace7", WORKSPACE7},
{"Workspace8", WORKSPACE8}, {"Workspace8", WORKSPACE8},
{"Workspace9", WORKSPACE9}, {"Workspace9", WORKSPACE9},
{"Workspace10", WORKSPACE10}, {"Workspace10", WORKSPACE10},
{"Workspace11", WORKSPACE11}, {"Workspace11", WORKSPACE11},
{"Workspace12", WORKSPACE12}, {"Workspace12", WORKSPACE12},
{"NextWorkspace", NEXTWORKSPACE}, {"NextWorkspace", NEXTWORKSPACE},
{"PrevWorkspace", PREVWORKSPACE}, {"PrevWorkspace", PREVWORKSPACE},
{"LeftWorkspace", LEFTWORKSPACE}, {"LeftWorkspace", LEFTWORKSPACE},
{"RightWorkspace", RIGHTWORKSPACE}, {"RightWorkspace", RIGHTWORKSPACE},
{"KillWindow", KILLWINDOW}, {"KillWindow", KILLWINDOW},
{"NextWindow", NEXTWINDOW}, {"NextWindow", NEXTWINDOW},
{"PrevWindow", PREVWINDOW}, {"PrevWindow", PREVWINDOW},
{"NextTab", NEXTTAB}, {"NextTab", NEXTTAB},
{"PrevTab", PREVTAB}, {"PrevTab", PREVTAB},
{"ShadeWindow", SHADE}, {"ShadeWindow", SHADE},
{"MaximizeWindow", MAXIMIZE}, {"MaximizeWindow", MAXIMIZE},
{"StickWindow", STICK}, {"StickWindow", STICK},
{"ExecCommand", EXECUTE}, {"ExecCommand", EXECUTE},
{"MaximizeVertical", VERTMAX}, {"MaximizeVertical", VERTMAX},
{"MaximizeHorizontal", HORIZMAX}, {"MaximizeHorizontal", HORIZMAX},
{"NudgeRight", NUDGERIGHT}, {"NudgeRight", NUDGERIGHT},
{"NudgeLeft", NUDGELEFT}, {"NudgeLeft", NUDGELEFT},
{"NudgeUp", NUDGEUP}, {"NudgeUp", NUDGEUP},
{"NudgeDown", NUDGEDOWN}, {"NudgeDown", NUDGEDOWN},
{"BigNudgeRight", BIGNUDGERIGHT}, {"BigNudgeRight", BIGNUDGERIGHT},
{"BigNudgeLeft", BIGNUDGELEFT}, {"BigNudgeLeft", BIGNUDGELEFT},
{"BigNudgeUp", BIGNUDGEUP}, {"BigNudgeUp", BIGNUDGEUP},
{"BigNudgeDown", BIGNUDGEDOWN}, {"BigNudgeDown", BIGNUDGEDOWN},
{"HorizontalIncrement", HORIZINC}, {"HorizontalIncrement", HORIZINC},
{"VerticalIncrement", VERTINC}, {"VerticalIncrement", VERTINC},
{"HorizontalDecrement", HORIZDEC}, {"HorizontalDecrement", HORIZDEC},
{"VerticalDecrement", VERTDEC}, {"VerticalDecrement", VERTDEC},
{"ToggleDecor", TOGGLEDECOR}, {"ToggleDecor", TOGGLEDECOR},
{0, LASTKEYGRAB} {0, LASTKEYGRAB}
}; };
Keys::Keys(Display *display, char *filename): Keys::Keys(Display *display, char *filename):
m_abortkey(0), m_abortkey(0),
@ -278,17 +278,6 @@ bool Keys::load(char *filename) {
if (!mergeTree(current_key)) if (!mergeTree(current_key))
cerr<<"Keys: Failed to merge keytree!"<<endl; cerr<<"Keys: Failed to merge keytree!"<<endl;
#ifdef DEBUG
if (m_actionlist[i].action == Keys::EXECUTE) {
cerr<<"line:"<<line<<endl;
cerr<<"buffer:"<<const_cast<char *>(StringUtil::strcasestr(linebuffer.get(),
getActionStr(Keys::EXECUTE)) + strlen(getActionStr(Keys::EXECUTE)))<<endl;
cerr<<"command:"<<last_key->execcommand<<endl;
}
#endif
//clear keypointers now that we have them in m_keylist //clear keypointers now that we have them in m_keylist
delete current_key; delete current_key;
current_key = 0; current_key = 0;
@ -309,9 +298,6 @@ bool Keys::load(char *filename) {
} }
} }
#ifdef DEBUG
showTree(); //who keybinding tree
#endif
return true; return true;
} }
@ -321,52 +307,48 @@ bool Keys::load(char *filename) {
//---------------------------------------- //----------------------------------------
void Keys::grabKey(unsigned int key, unsigned int mod) { void Keys::grabKey(unsigned int key, unsigned int mod) {
#ifdef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): keycode "<<key<<" mod "<<hex<<mod<<dec<<endl;
#endif
for (int screen=0; screen<ScreenCount(m_display); screen++) { for (int screen=0; screen<ScreenCount(m_display); screen++) {
Window root = RootWindow(m_display, screen); Window root = RootWindow(m_display, screen);
XGrabKey(m_display, key, mod, XGrabKey(m_display, key, mod,
root, True, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
// Grab with numlock, capslock and scrlock // Grab with numlock, capslock and scrlock
//numlock //numlock
XGrabKey(m_display, key, mod|Mod2Mask, XGrabKey(m_display, key, mod|Mod2Mask,
root, True, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
//scrolllock //scrolllock
XGrabKey(m_display, key, mod|Mod5Mask, XGrabKey(m_display, key, mod|Mod5Mask,
root, True, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
//capslock //capslock
XGrabKey(m_display, key, mod|LockMask, XGrabKey(m_display, key, mod|LockMask,
root, True, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
//capslock+numlock //capslock+numlock
XGrabKey(m_display, key, mod|LockMask|Mod2Mask, XGrabKey(m_display, key, mod|LockMask|Mod2Mask,
root, True, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
//capslock+scrolllock //capslock+scrolllock
XGrabKey(m_display, key, mod|LockMask|Mod5Mask, XGrabKey(m_display, key, mod|LockMask|Mod5Mask,
root, True, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
//capslock+numlock+scrolllock //capslock+numlock+scrolllock
XGrabKey(m_display, key, mod|Mod2Mask|Mod5Mask|LockMask, XGrabKey(m_display, key, mod|Mod2Mask|Mod5Mask|LockMask,
root, True, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
//numlock+scrollLock //numlock+scrollLock
XGrabKey(m_display, key, mod|Mod2Mask|Mod5Mask, XGrabKey(m_display, key, mod|Mod2Mask|Mod5Mask,
root, True, root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
} }
@ -387,14 +369,14 @@ unsigned int Keys::getModifier(const char *modstr) {
return (strcasecmp(string, modstr) == 0 && mask !=0); return (strcasecmp(string, modstr) == 0 && mask !=0);
} }
} modlist[] = { } modlist[] = {
{"SHIFT", ShiftMask}, {"SHIFT", ShiftMask},
{"CONTROL", ControlMask}, {"CONTROL", ControlMask},
{"MOD1", Mod1Mask}, {"MOD1", Mod1Mask},
{"MOD2", Mod2Mask}, {"MOD2", Mod2Mask},
{"MOD3", Mod3Mask}, {"MOD3", Mod3Mask},
{"MOD4", Mod4Mask}, {"MOD4", Mod4Mask},
{"MOD5", Mod5Mask}, {"MOD5", Mod5Mask},
{0, 0} {0, 0}
}; };
for (unsigned int i=0; modlist[i].string!=0; i++) { for (unsigned int i=0; modlist[i].string!=0; i++) {
@ -413,7 +395,7 @@ unsigned int Keys::getKey(const char *keystr) {
if (!keystr) if (!keystr)
return 0; return 0;
return XKeysymToKeycode(m_display, return XKeysymToKeycode(m_display,
XStringToKeysym(keystr)); XStringToKeysym(keystr));
} }
//--------- getAction ----------------- //--------- getAction -----------------