indentation and removed some debug code
This commit is contained in:
parent
5957d88157
commit
3d20c78714
1 changed files with 75 additions and 93 deletions
20
src/Keys.cc
20
src/Keys.cc
|
@ -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"
|
||||||
|
@ -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,10 +307,6 @@ 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);
|
||||||
|
|
Loading…
Reference in a new issue