--- deliantra/Deliantra-Client/Client.xs	2006/04/19 23:37:48	1.54
+++ deliantra/Deliantra-Client/Client.xs	2006/04/23 04:41:33	1.59
@@ -35,11 +35,15 @@
  typedef   signed int   int32_t;
 #endif
 
+#include "glext.h"
+
 #define FOW_DARKNESS 32
 
 #define MAP_EXTEND_X  32
 #define MAP_EXTEND_Y 512
 
+#define MIN_FONT_HEIGHT 8 * PANGO_SCALE
+
 typedef Mix_Chunk *CFClient__MixChunk;
 typedef Mix_Music *CFClient__MixMusic;
 
@@ -64,14 +68,18 @@
   /* use a random scale factor to account for unknown descenders, 0.8 works
    * reasonably well with bitstream vera
    */
-  PangoFontDescription *font = pango_context_get_font_description (context);
+  PangoFontDescription *font = pango_layout_get_font_description (self->pl);
 
   int height = self->base_height * (PANGO_SCALE * 8 / 10);
 
+  if (height < MIN_FONT_HEIGHT)
+    height = MIN_FONT_HEIGHT;
+
   if (pango_font_description_get_size (font) != height)
     {
+      font = pango_font_description_copy (font);
       pango_font_description_set_absolute_size (font, height);
-      pango_layout_context_changed (self->pl);
+      pango_layout_set_font_description (self->pl, font);
     }
 }
 
@@ -241,6 +249,19 @@
       }
 }
 
+static void
+music_finished ()
+{
+  SDL_UserEvent ev;
+
+  ev.type  = SDL_USEREVENT;
+  ev.code  = 0;
+  ev.data1 = 0;
+  ev.data2 = 0;
+
+  SDL_PushEvent ((SDL_Event *)&ev);
+}
+
 MODULE = CFClient	PACKAGE = CFClient
 
 PROTOTYPES: ENABLE
@@ -465,6 +486,8 @@
 
 int
 Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
+  	POSTCALL:
+        Mix_HookMusicFinished (music_finished);
 
 void
 Mix_CloseAudio ()
@@ -506,6 +529,7 @@
         FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
         PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
 	FcPatternDestroy (pattern);
+        pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
         pango_context_set_font_description (context, font);
 }
 
@@ -617,6 +641,9 @@
         RETVAL->base_height = base_height;
         RETVAL->pl = pango_layout_new (context);
         pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
+        pango_layout_set_font_description (RETVAL->pl,
+          pango_font_description_copy (
+            pango_context_get_font_description (context)));
 	OUTPUT:
         RETVAL
 
@@ -935,11 +962,11 @@
 }
 
 SV *
-mapmap (CFClient::Map self, int w, int h)
+mapmap (CFClient::Map self, int x0, int y0, int w, int h)
 	CODE:
 {
-	int x0, x1, x;
-	int y0, y1, y;
+	int x1, x;
+	int y1, y;
         int z;
 	SV *map_sv = newSV (w * h * sizeof (uint32_t));
         uint32_t *map = (uint32_t *)SvPVX (map_sv);
@@ -947,8 +974,8 @@
         SvPOK_only (map_sv);
         SvCUR_set (map_sv, w * h * sizeof (uint32_t));
 
-        x0 = self->x - w / 2; x1 = x0 + w;
-        y0 = self->y - h / 2; y1 = y0 + h;
+        x0 += self->x; x1 = x0 + w;
+        y0 += self->y; y1 = y0 + h;
 
         for (y = y0; y < y1; y++)
           {
@@ -1098,7 +1125,7 @@
         *data++ = h >> 8; *data++ = h;
 
         // we need to do this 'cause we don't keep an absolute coord system for rows
-        // TODO: treat rows as we treat 
+        // TODO: treat rows as we treat columns
         map_get_row (self, y0 + self->y - self->oy);//D
         map_get_row (self, y0 + self->y - self->oy + h - 1);//D
 
@@ -1172,7 +1199,7 @@
         h = *data++ << 8; h |= *data++;
 
         // we need to do this 'cause we don't keep an absolute coord system for rows
-        // TODO: treat rows as we treat 
+        // TODO: treat rows as we treat columns
         map_get_row (self, y0 + self->y - self->oy);//D
         map_get_row (self, y0 + self->y - self->oy + h - 1);//D
 
@@ -1310,6 +1337,12 @@
 	const_iv (GL_REPEAT),
 	const_iv (GL_NEAREST),
 	const_iv (GL_LINEAR),
+        const_iv (GL_NEAREST_MIPMAP_NEAREST),
+        const_iv (GL_LINEAR_MIPMAP_NEAREST),
+        const_iv (GL_NEAREST_MIPMAP_LINEAR),
+        const_iv (GL_LINEAR_MIPMAP_LINEAR),
+        const_iv (GL_GENERATE_MIPMAP),
+	const_iv (GL_LINEAR),
 	const_iv (GL_MODULATE),
 	const_iv (GL_REPLACE),
 	const_iv (GL_COLOR_BUFFER_BIT),
@@ -1321,6 +1354,7 @@
 	const_iv (GL_CONSTANT_BORDER),
 	const_iv (GL_LINES),
 	const_iv (GL_QUADS),
+	const_iv (GL_LINE_LOOP),
 	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
         const_iv (GL_FASTEST),
 #	undef const_iv