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 508c06fb9d24b4a38bdd216b1231924d9a0f4e7b..38d94807b03fcc0d982f641a433f8aa98e4ae513 100644 (file)
--- 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 5727e685174265874831e0588ec27e24dda7642a..3915aa2fce8dd1ec4706ff78ae3c5554de4c9045 100644 (file)
--- 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