From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 30 Aug 2011 18:01:22 +0000 (+0300)
Subject: Remove modifier constants
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=762a1118c53b3b51db0fc440b303476b1bb43fc2;p=libs%2Fgui.git

Remove modifier constants
A new more flexible system will be implemented in the near future
---

diff --git a/source/input/keys.cpp b/source/input/keys.cpp
index 508c06f..38d9480 100644
--- a/source/input/keys.cpp
+++ b/source/input/keys.cpp
@@ -97,15 +97,6 @@ unsigned keymap[Msp::Input::N_KEYS_]=
 #endif
 };
 
-unsigned modmap[Msp::Input::N_MODS_]=
-{
-#ifndef WIN32
-	ShiftMask, ControlMask, Mod1Mask, Mod4Mask
-#else
-	1, 2, 4, 8
-#endif
-};
-
 }
 
 namespace Msp {
@@ -139,14 +130,5 @@ unsigned key_to_sys(unsigned key)
 	return keymap[key];
 }
 
-unsigned mod_from_sys(unsigned mod)
-{
-	unsigned result = 0;
-	for(unsigned i=0; i<N_MODS_; ++i)
-		if(mod&modmap[i])
-			result |= 1<<i;
-	return result;
-}
-
 } // namespace Input
 } // namespace Msp
diff --git a/source/input/keys.h b/source/input/keys.h
index 5727e68..3915aa2 100644
--- a/source/input/keys.h
+++ b/source/input/keys.h
@@ -139,20 +139,9 @@ enum
 	N_KEYS_ = 0x100
 };
 
-enum
-{
-	MOD_SHIFT = 1,
-	MOD_CONTROL = 2,
-	MOD_ALT = 4,
-	MOD_SUPER = 8,
-	N_MODS_ = 4
-};
-
 extern unsigned key_from_sys(unsigned);
 extern unsigned key_to_sys(unsigned);
 
-extern unsigned mod_from_sys(unsigned);
-
 } // namespace Input
 } // namespace Msp