--- deliantra/Deliantra-Client/Client.xs	2006/05/14 22:58:24	1.80
+++ deliantra/Deliantra-Client/Client.xs	2006/05/19 16:43:56	1.86
@@ -86,7 +86,11 @@
 substitute_func (FcPattern *pattern, gpointer data)
 {
   FcPatternAddBool (pattern, FC_HINTING , 1);
+#ifdef _WIN32
   FcPatternAddBool (pattern, FC_AUTOHINT, 1);
+#else
+  FcPatternAddBool (pattern, FC_AUTOHINT, 0);
+#endif
 }
 
 static void
@@ -439,7 +443,10 @@
         SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
         SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
         SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
-        SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
+        SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
+
+        SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
+        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);
@@ -447,8 +454,6 @@
         SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
 
         SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
-        SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
-        SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
 
         SDL_EnableUNICODE (1);
         SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
@@ -667,19 +672,17 @@
 void
 error (char *message)
 	CODE:
-#ifdef _WIN32
-        MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
-#else
         fprintf (stderr, "ERROR: %s\n", message);
+#ifdef _WIN32
+        MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
 #endif
 
 void
 fatal (char *message)
 	CODE:
-#ifdef _WIN32
-        MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
-#else
         fprintf (stderr, "FATAL: %s\n", message);
+#ifdef _WIN32
+        MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
 #endif
         exit (1);
 
@@ -801,6 +804,31 @@
         pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
 
 void
+set_indent (CFClient::Layout self, int indent)
+	CODE:
+        pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
+
+void
+set_spacing (CFClient::Layout self, int spacing)
+	CODE:
+        pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
+
+void
+set_ellipsise (CFClient::Layout self, int ellipsise)
+	CODE:
+        pango_layout_set_ellipsize (self->pl,
+            ellipsise == 1 ? PANGO_ELLIPSIZE_START
+          : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
+          : ellipsise == 3 ? PANGO_ELLIPSIZE_END
+          :                  PANGO_ELLIPSIZE_NONE
+        );
+
+void
+set_single_paragraph_mode (CFClient::Layout self, int spm)
+	CODE:
+        pango_layout_set_single_paragraph_mode (self->pl, !!spm);
+
+void
 size (CFClient::Layout self)
 	PPCODE:
 {
@@ -942,6 +970,8 @@
           {
             glEnable (GL_BLEND);
             glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+            glEnable (GL_ALPHA_TEST);
+            glAlphaFunc (GL_GREATER, 0.01f);
           }
 
         glBindTexture (GL_TEXTURE_2D, name);
@@ -960,7 +990,10 @@
         glEnd ();
 
         if (ix)
-          glDisable (GL_BLEND);
+          {
+            glDisable (GL_ALPHA_TEST);
+            glDisable (GL_BLEND);
+          }
 }
 
 MODULE = CFClient	PACKAGE = CFClient::Map
@@ -1493,7 +1526,9 @@
 	const_iv (GL_RGBA),
 	const_iv (GL_UNSIGNED_BYTE),
 	const_iv (GL_ALPHA),
+	const_iv (GL_INTENSITY),
 	const_iv (GL_LUMINANCE),
+	const_iv (GL_LUMINANCE_ALPHA),
 	const_iv (GL_FLOAT),
 	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
 	const_iv (GL_COMPILE),
@@ -1592,10 +1627,10 @@
 void glColor (float r, float g, float b, float a = 1.0)
 	PROTOTYPE: @
         CODE:
-        glColor4ub (MIN ((int)r * 256., 255),
-                    MIN ((int)g * 256., 255),
-                    MIN ((int)b * 256., 255),
-                    MIN ((int)a * 256., 255));
+        glColor4ub (MIN ((int)(r * 255.f), 255),
+                    MIN ((int)(g * 255.f), 255),
+                    MIN ((int)(b * 255.f), 255),
+                    MIN ((int)(a * 255.f), 255));
 
 void glVertex (float x, float y, float z = 0.)
         CODE: