--- deliantra/Deliantra-Client/Client.xs	2006/04/30 08:09:44	1.69
+++ deliantra/Deliantra-Client/Client.xs	2006/05/06 20:14:57	1.74
@@ -272,6 +272,19 @@
   SDL_PushEvent ((SDL_Event *)&ev);
 }
 
+static void
+channel_finished (int channel)
+{
+  SDL_UserEvent ev;
+
+  ev.type  = SDL_USEREVENT;
+  ev.code  = 1;
+  ev.data1 = (void *)(long)channel;
+  ev.data2 = 0;
+
+  SDL_PushEvent ((SDL_Event *)&ev);
+}
+
 MODULE = CFClient	PACKAGE = CFClient
 
 PROTOTYPES: ENABLE
@@ -459,6 +472,7 @@
           {
             HV *hv = newHV ();
             hv_store (hv, "type", 4, newSViv (ev.type), 0);
+
             switch (ev.type)
               {
                 case SDL_KEYDOWN:
@@ -488,6 +502,13 @@
                   hv_store (hv, "state",  5, newSViv (ev.button.state), 0);
                   hv_store (hv, "x",      1, newSViv (ev.button.x), 0);
                   hv_store (hv, "y",      1, newSViv (ev.button.y), 0);
+                  break;
+
+                case SDL_USEREVENT:
+                  hv_store (hv, "code",   4, newSViv (ev.user.code), 0);
+                  hv_store (hv, "data1",  5, newSViv ((IV)ev.user.data1), 0);
+                  hv_store (hv, "data2",  5, newSViv ((IV)ev.user.data2), 0);
+                  break;
               }
 
             XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
@@ -495,9 +516,10 @@
 }
 
 int
-Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
+Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
   	POSTCALL:
         Mix_HookMusicFinished (music_finished);
+        Mix_ChannelFinished (channel_finished);
 
 void
 Mix_CloseAudio ()
@@ -642,11 +664,11 @@
 MODULE = CFClient	PACKAGE = CFClient::Font
 
 CFClient::Font
-new_from_file (SV *class, char *path)
+new_from_file (SV *class, char *path, int id = 0)
 	CODE:
 {
         int count;
-        FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count);
+        FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
         RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
 	FcPatternDestroy (pattern);
 }
@@ -1462,7 +1484,7 @@
 void glColor (float r, float g, float b, float a = 1.0)
 	PROTOTYPE: @
         CODE:
-        glColor4f (r, g, b, a);
+        glColor4ub (r * 255., g * 255., b * 255., a * 255.);
 
 void glVertex (float x, float y, float z = 0.)
         CODE: