--- deliantra/Deliantra-Client/Client.xs	2006/05/23 18:54:37	1.93
+++ deliantra/Deliantra-Client/Client.xs	2006/05/23 18:57:35	1.94
@@ -488,23 +488,14 @@
 void
 SDL_GL_SwapBuffers ()
 
+char *
+SDL_GetKeyName (int sym)
+
 void
 SDL_PollEvent ()
 	PPCODE:
 {
 	SDL_Event ev;
-        int i;
-        static int modifier;
-        static int modkey[] = {
-          SDLK_RSHIFT, KMOD_RSHIFT,
-          SDLK_LSHIFT, KMOD_LSHIFT,
-          SDLK_RCTRL,  KMOD_RCTRL,
-          SDLK_LCTRL,  KMOD_LCTRL,
-          SDLK_RALT,   KMOD_RALT,
-          SDLK_LALT,   KMOD_LALT,
-          SDLK_RMETA,  KMOD_RMETA,
-          SDLK_LMETA,  KMOD_LMETA,
-        };
 
         while (SDL_PollEvent (&ev))
           {
@@ -515,17 +506,6 @@
               {
                 case SDL_KEYDOWN:
                 case SDL_KEYUP:
-
-                  for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
-                    if (modkey [i * 2] == ev.key.keysym.sym)
-                      {
-                        if (ev.type == SDL_KEYDOWN)
-                          modifier |=  modkey [i * 2 + 1];
-                        else
-                          modifier &= ~modkey [i * 2 + 1];
-                        break;
-                      }
-                
                   hv_store (hv, "state",   5, newSViv (ev.key.state), 0);
                   hv_store (hv, "sym",     3, newSViv (ev.key.keysym.sym), 0);
                   hv_store (hv, "mod",     3, newSViv (ev.key.keysym.mod), 0);
@@ -538,7 +518,7 @@
                   break;
 
                 case SDL_MOUSEMOTION:
-                  hv_store (hv, "mod",    3, newSViv (modifier), 0);
+                  hv_store (hv, "mod",    3, newSViv (SDL_GetModState ()), 0);
 
                   hv_store (hv, "state",  5, newSViv (ev.motion.state), 0);
                   hv_store (hv, "x",      1, newSViv (ev.motion.x), 0);
@@ -549,7 +529,7 @@
 
                 case SDL_MOUSEBUTTONDOWN:
                 case SDL_MOUSEBUTTONUP:
-                  hv_store (hv, "mod",    3, newSViv (modifier), 0);
+                  hv_store (hv, "mod",    3, newSViv (SDL_GetModState ()), 0);
 
                   hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
                   hv_store (hv, "state",  5, newSViv (ev.button.state), 0);