--- deliantra/Deliantra-Client/Client.xs	2006/06/05 03:48:49	1.106
+++ deliantra/Deliantra-Client/Client.xs	2006/06/14 18:59:30	1.115
@@ -12,6 +12,7 @@
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <SDL.h>
 #include <SDL_endian.h>
@@ -87,7 +88,10 @@
 static void
 substitute_func (FcPattern *pattern, gpointer data)
 {
-  FcPatternAddBool (pattern, FC_HINTING , 1);
+  FcPatternAddBool (pattern, FC_HINTING, 1);
+#ifdef FC_HINT_STYLE
+  FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
+#endif
 #ifdef _WIN32
   FcPatternAddBool (pattern, FC_AUTOHINT, 1);
 #else
@@ -300,6 +304,23 @@
   SDL_PushEvent ((SDL_Event *)&ev);
 }
 
+static unsigned int
+minpot (unsigned int n)
+{
+  if (!n)
+    return 0;
+
+  --n;
+
+  n |= n >>  1;
+  n |= n >>  2;
+  n |= n >>  4;
+  n |= n >>  8;
+  n |= n >> 16;
+
+  return n + 1;
+}
+
 MODULE = CFClient	PACKAGE = CFClient
 
 PROTOTYPES: ENABLE
@@ -462,7 +483,7 @@
         SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
 
         SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
-        SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
+        SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
 
         SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
         SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
@@ -654,7 +675,7 @@
         SDL_LockSurface (surface2);
         PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
         SDL_UnlockSurface (surface2);
-        PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
+        PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA8 : GL_RGB8)));
         PUSHs (sv_2mortal (newSViv (GL_RGBA)));
         PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
 
@@ -702,7 +723,12 @@
 #ifdef _WIN32
         MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
 #endif
-        exit (1);
+        _exit (1);
+
+void
+_exit (int retval)
+	CODE:
+        _exit (retval);
 
 MODULE = CFClient	PACKAGE = CFClient::Font
 
@@ -786,7 +812,7 @@
 get_text (CFClient::Layout self)
 	CODE:
         RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
-        SvUTF8_on (RETVAL);
+        sv_utf8_decode (RETVAL);
 	OUTPUT:
         RETVAL
 
@@ -943,7 +969,7 @@
             PUSHs (sv_2mortal (newSViv (w)));
             PUSHs (sv_2mortal (newSViv (h)));
             PUSHs (sv_2mortal (retval));
-            PUSHs (sv_2mortal (newSViv (GL_RGBA)));
+            PUSHs (sv_2mortal (newSViv (GL_RGBA8)));
             PUSHs (sv_2mortal (newSViv (GL_RGBA)));
           }
         else
@@ -977,7 +1003,44 @@
 MODULE = CFClient	PACKAGE = CFClient::Texture
 
 void
-draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
+pad2pot (SV *data_, SV *w_, SV *h_)
+	CODE:
+{
+        int ow = SvIV (w_);
+        int oh = SvIV (h_);
+
+        if (ow && oh)
+          {
+            int nw = minpot (ow);
+            int nh = minpot (oh);
+
+            if (nw != ow || nh != oh)
+              {
+                if (SvOK (data_))
+                  {
+                    STRLEN datalen;
+                    char *data = SvPVbyte (data_, datalen);
+                    int bpp = datalen / (ow * oh);
+                    SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
+
+                    SvPOK_only (result_);
+                    SvCUR_set (result_, nw * nh * bpp);
+
+                    memset (SvPVX (result_), 0, nw * nh * bpp);
+                    while (oh--)
+                      memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
+
+                    sv_setsv (data_, result_);
+                  }
+
+                sv_setiv (w_, nw);
+                sv_setiv (h_, nh);
+              }
+          }
+}
+
+void
+draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
 	PROTOTYPE: $$$;$$
         ALIAS:
            draw_quad_alpha = 1
@@ -1052,6 +1115,7 @@
 {
         map_clear (self);
         Safefree (self->face);
+        Safefree (self->tex);
         Safefree (self);
 }
 
@@ -1576,6 +1640,9 @@
 	const_iv (GL_SRC_ALPHA_SATURATE),
 	const_iv (GL_RGB),
 	const_iv (GL_RGBA),
+	const_iv (GL_RGBA4),
+	const_iv (GL_RGBA8),
+	const_iv (GL_RGB5_A1),
 	const_iv (GL_UNSIGNED_BYTE),
 	const_iv (GL_UNSIGNED_SHORT),
 	const_iv (GL_UNSIGNED_INT),
@@ -1659,6 +1726,8 @@
 
 int glGetError ()
 
+void glFinish ()
+
 void glClear (int mask)
 
 void glClearColor (float r, float g, float b, float a = 1.0)