--- deliantra/Deliantra-Client/Client.xs	2007/12/28 20:59:14	1.253
+++ deliantra/Deliantra-Client/Client.xs	2008/05/20 20:29:47	1.260
@@ -48,11 +48,15 @@
 
 #include <pango/pango.h>
 
-#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
-# define pango_layout_get_line_readonly      pango_layout_get_line_readonly
-# define pango_layout_get_lines_readonly     pango_layout_get_lines_readonly
-# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
-# define pango_layout_iter_get_run_readonly  pango_layout_iter_get_run_readonly
+#ifndef PANGO_VERSION_CHECK
+# define PANGO_VERSION_CHECK(a,b,c) 0
+#endif
+
+#if !PANGO_VERSION_CHECK (1, 15, 2)
+# define pango_layout_get_line_readonly      pango_layout_get_line
+# define pango_layout_get_lines_readonly     pango_layout_get_lines
+# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
+# define pango_layout_iter_get_run_readonly  pango_layout_iter_get_run
 #endif
 
 #ifndef _WIN32
@@ -183,7 +187,7 @@
 layout_update_font (DC__Layout self)
 {
   /* use a random scale factor to account for unknown descenders, 0.8 works
-   * reasonably well with bitstream vera
+   * reasonably well with dejavu/bistream fonts
    */
   PangoFontDescription *font = self->font ? self->font : default_font;
 
@@ -671,7 +675,8 @@
         opengl_fontmap = pango_opengl_font_map_new ();
         pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
         opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
-#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
+        /*pango_context_set_font_description (opengl_context, default_font);*/
+#if PANGO_VERSION_CHECK (1, 15, 2)
         pango_context_set_language (opengl_context, pango_language_from_string ("en"));
         /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
 #endif
@@ -768,6 +773,9 @@
 int
 SDL_GetAppState ()
 
+int
+SDL_GetModState ()
+
 void
 poll_events ()
 	PPCODE:
@@ -910,10 +918,12 @@
 #endif
 }
 
-void
+int
 add_font (char *file)
 	CODE:
-        FcConfigAppFontAddFile (0, (const FcChar8 *)file);
+        RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
+	OUTPUT:
+        RETVAL
 
 void
 load_image_inline (SV *image_)
@@ -1333,7 +1343,7 @@
 	int line, x;
 
 	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
-#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
+#if !PANGO_VERSION_CHECK (1, 17, 3)
         /* pango bug: line is between 1..numlines, not 0..numlines-1 */
         --line;
 #endif
@@ -2284,20 +2294,35 @@
               }
           }
 
-        SvPOK_only (data_sv);
-        SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
-      	RETVAL = data_sv;
+        /* if size is w*h + 5 then no data has been found */       
+        if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
+          {
+            SvPOK_only (data_sv);
+            SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
+          }
+
+ 	RETVAL = data_sv;
 }
 	OUTPUT:
         RETVAL
 
 void
-set_rect (DC::Map self, int x0, int y0, uint8_t *data)
+set_rect (DC::Map self, int x0, int y0, SV *data_sv)
 	PPCODE:
 {
 	int x, y, z;
         int w, h;
         int x1, y1;
+        STRLEN len;
+        uint8_t *data, *end;
+
+        len = SvLEN (data_sv);
+        SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
+        data = SvPVbyte_nolen (data_sv);
+        end = data + len + 8;
+
+        if (len < 5)
+          XSRETURN_EMPTY;
 
         if (*data++ != 0)
           XSRETURN_EMPTY; /* version mismatch */
@@ -2322,7 +2347,12 @@
 
             for (x = x0; x < x1; x++)
               {
-                uint8_t flags = *data++;
+                uint8_t flags;
+
+                if (data + 7 >= end)
+                  XSRETURN_EMPTY;
+
+                flags = *data++;
 
                 if (flags)
                   {
@@ -2335,7 +2365,8 @@
 
                     if (cell->darkness == 0)
                       {
-                        cell->darkness = 0;
+                        /*cell->darkness = 0;*/
+                        EXTEND (SP, 3);
 
                         for (z = 0; z <= 2; z++)
                           {
@@ -2343,7 +2374,7 @@
 
                             if (t >= self->texs || (t && !self->tex [t].name))
                               {
-                                XPUSHs (sv_2mortal (newSViv (t)));
+                                PUSHs (sv_2mortal (newSViv (t)));
                                 need_texid (self, t);
                               }