From 7083cd088ac8938ea892477189f9e7627a5c7d4d Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Sat, 5 Jan 2002 12:01:16 +0000
Subject: Fixed modifier bug

---
 src/Keys.cc | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/Keys.cc b/src/Keys.cc
index 62404ef..59a8789 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -197,26 +197,21 @@ bool Keys::load(char *filename) {
 				if (keyarg==1) //first arg is modifier
 					mod = getModifier(val);					
 				else if (keyarg>1) {
-					
+
 					//keyarg=0;
-					key = getKey(val);
-					if (!key){ //if no keycode was found try the modifier
-						int tmpmod = getModifier(val);
-						if (tmpmod)
-							mod |= tmpmod; //add it to modifier
-							
-					} else if (!current_key) {
-									
-						current_key = new t_key(key, mod);
-						last_key = current_key;
-						
-					} else { 
-						
-						t_key *temp_key = new t_key(key, mod);
-						last_key->keylist.push_back(temp_key);
-						last_key = temp_key;
+					int tmpmod=getModifier(val);
+					if(tmpmod) mod|=tmpmod; //If it's a modifier
+					else{ 
+						key = getKey(val); // else get the key
+						if (!current_key) {
+							current_key = new t_key(key, mod);
+							last_key = current_key;
+						} else { 
+							t_key *temp_key = new t_key(key, mod);
+							last_key->keylist.push_back(temp_key);
+							last_key = temp_key;
+						}
 					}
-
 				}			
 
 			} else {
@@ -303,10 +298,10 @@ bool Keys::load(char *filename) {
 	return true;
 }
 
-//--------- grabKey ---------------
+//--------- grabKey ---------------------
 // Grabs a key with the modifier
 // and with numlock,capslock and scrollock
-//---------------------------------
+//----------------------------------------
 void Keys::grabKey(unsigned int key, unsigned int mod) {
 	
 	Fluxbox *fluxbox = Fluxbox::instance();	
-- 
cgit v0.11.2