--- deliantra/Deliantra-Client/Client.xs	2007/07/12 17:56:50	1.194
+++ deliantra/Deliantra-Client/Client.xs	2007/07/15 21:42:02	1.198
@@ -665,13 +665,17 @@
 char *
 SDL_GetKeyName (int sym)
 
+int
+SDL_GetAppState ()
+
 void
-SDL_PollEvent ()
+poll_events ()
 	PPCODE:
 {
 	SDL_Event ev;
 
-        while (SDL_PollEvent (&ev))
+        SDL_PumpEvents ();
+        while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
           {
             HV *hv = newHV ();
             hv_store (hv, "type", 4, newSViv (ev.type), 0);
@@ -693,13 +697,31 @@
                   break;
 
                 case SDL_MOUSEMOTION:
-                  hv_store (hv, "mod",    3, newSViv (SDL_GetModState ()), 0);
+                  {
+                    int state = ev.motion.state;
+                    int x     = ev.motion.x;
+                    int y     = ev.motion.y;
+                    int xrel  = ev.motion.xrel;
+                    int yrel  = ev.motion.yrel;
+
+                    /* do simplistic event compression */
+                    while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
+                           && state == ev.motion.state)
+                      {
+                        xrel += ev.motion.xrel;
+                        yrel += ev.motion.yrel;
+                        x     = ev.motion.x;
+                        y     = ev.motion.y;
+                        SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
+                      }
 
-                  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);
-                  hv_store (hv, "xrel",   4, newSViv (ev.motion.xrel), 0);
-                  hv_store (hv, "yrel",   4, newSViv (ev.motion.yrel), 0);
+                    hv_store (hv, "mod",    3, newSViv (SDL_GetModState ()), 0);
+                    hv_store (hv, "state",  5, newSViv (state), 0);
+                    hv_store (hv, "x",      1, newSViv (x), 0);
+                    hv_store (hv, "y",      1, newSViv (y), 0);
+                    hv_store (hv, "xrel",   4, newSViv (xrel), 0);
+                    hv_store (hv, "yrel",   4, newSViv (yrel), 0);
+                  }
                   break;
 
                 case SDL_MOUSEBUTTONDOWN:
@@ -2168,6 +2190,13 @@
 	OUTPUT:
         RETVAL
 
+int
+fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
+	CODE:
+        RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
+	OUTPUT:
+        RETVAL
+
 MODULE = CFPlus	PACKAGE = CFPlus::OpenGL
 
 BOOT: