X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fkeys.cpp;h=38d94807b03fcc0d982f641a433f8aa98e4ae513;hb=f608cc1e681e16e21325df56cb96d3f17a348e21;hp=082e02299b9c829f4458024147d8fe3d16b0f099;hpb=821cea8627597a5458c1cb02c0652384bb3431a4;p=libs%2Fgui.git

diff --git a/source/input/keys.cpp b/source/input/keys.cpp
index 082e022..38d9480 100644
--- a/source/input/keys.cpp
+++ b/source/input/keys.cpp
@@ -1,11 +1,11 @@
 #include <map>
+#include <stdexcept>
 #ifdef WIN32
 #include <windows.h>
 #else
 #include <X11/X.h>
 #include <X11/keysym.h>
 #endif
-#include <msp/core/except.h>
 #include "keys.h"
 
 using namespace std;
@@ -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 {
@@ -135,18 +126,9 @@ unsigned key_from_sys(unsigned code)
 unsigned key_to_sys(unsigned key)
 {
 	if(key>=N_KEYS_)
-		throw InvalidParameterValue("Key out of range");
+		throw invalid_argument("key_to_sys");
 	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