--- deliantra/Deliantra-Client/Client.xs	2006/05/23 17:30:18	1.92
+++ deliantra/Deliantra-Client/Client.xs	2006/05/23 18:54:37	1.93
@@ -493,6 +493,18 @@
 	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))
           {
@@ -503,6 +515,17 @@
               {
                 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);
@@ -515,6 +538,8 @@
                   break;
 
                 case SDL_MOUSEMOTION:
+                  hv_store (hv, "mod",    3, newSViv (modifier), 0);
+
                   hv_store (hv, "state",  5, newSViv (ev.motion.state), 0);
                   hv_store (hv, "x",      1, newSViv (ev.motion.x), 0);
                   hv_store (hv, "y",      1, newSViv (ev.motion.y), 0);
@@ -524,6 +549,8 @@
 
                 case SDL_MOUSEBUTTONDOWN:
                 case SDL_MOUSEBUTTONUP:
+                  hv_store (hv, "mod",    3, newSViv (modifier), 0);
+
                   hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
                   hv_store (hv, "state",  5, newSViv (ev.button.state), 0);
                   hv_store (hv, "x",      1, newSViv (ev.button.x), 0);