--- deliantra/Deliantra-Client/Client.xs	2007/07/15 21:42:02	1.198
+++ deliantra/Deliantra-Client/Client.xs	2007/07/17 16:02:13	1.200
@@ -589,6 +589,9 @@
         opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
 }
 
+char *
+SDL_GetError ()
+
 int
 SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
 
@@ -596,22 +599,22 @@
 SDL_Quit ()
 
 void
-SDL_ListModes ()
+SDL_ListModes (int rgb, int alpha)
 	PPCODE:
 {
 	SDL_Rect **m;
 	
-        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_RED_SIZE  , rgb);
+        SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
+        SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
+        SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
 
         SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
-        SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
+        SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE ,  0);
 
-        SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
+        SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE  , 0);
         SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
-        SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
+        SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
         SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
 
         SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
@@ -620,42 +623,51 @@
         SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
 #endif
 
-        SDL_EnableUNICODE (1);
-        SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
-
 	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
 
         if (m && m != (SDL_Rect **)-1)
           while (*m)
             {
-              AV *av = newAV ();
-              av_push (av, newSViv ((*m)->w));
-              av_push (av, newSViv ((*m)->h));
-              XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
+              if ((*m)->w >= 640 && (*m)->h >= 480)
+                {
+                  AV *av = newAV ();
+                  av_push (av, newSViv ((*m)->w));
+                  av_push (av, newSViv ((*m)->h));
+                  av_push (av, newSViv (rgb));
+                  av_push (av, newSViv (alpha));
+                  XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
+                }
 
               ++m;
             }
 }
 
-char *
-SDL_GetError ()
-
 int
-SDL_SetVideoMode (int w, int h, int fullscreen)
+SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
 	CODE:
+{
+        SDL_EnableUNICODE (1);
+        SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+
+        SDL_GL_SetAttribute (SDL_GL_RED_SIZE  , rgb);
+        SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
+        SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
+        SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
+
         RETVAL = !!SDL_SetVideoMode (
           w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
         );
+
         if (RETVAL)
           {
             av_clear (texture_av);
 
             SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
-#           define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
-#           include "glfunc.h"
-#           undef GL_FUNC
-
+#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
+#include "glfunc.h"
+#undef GL_FUNC
           }
+}
 	OUTPUT:
         RETVAL
 
@@ -1244,6 +1256,8 @@
 
 MODULE = CFPlus	PACKAGE = CFPlus::Texture
 
+int minpot (int n)
+
 void
 pad2pot (SV *data_, SV *w_, SV *h_)
 	CODE:
@@ -1330,6 +1344,17 @@
           }
 }
 
+IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
+	CODE:
+{
+        GLint width;
+        glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
+        glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
+        RETVAL = width > 0;
+}
+	OUTPUT:
+        RETVAL
+
 MODULE = CFPlus	PACKAGE = CFPlus::Map
 
 CFPlus::Map
@@ -2207,6 +2232,9 @@
     IV iv;
   } *civ, const_iv[] = {
 #	define const_iv(name) { # name, (IV)name }
+        const_iv (GL_VENDOR),
+        const_iv (GL_VERSION),
+        const_iv (GL_EXTENSIONS),
 	const_iv (GL_COLOR_MATERIAL),
 	const_iv (GL_SMOOTH),
 	const_iv (GL_FLAT),
@@ -2243,6 +2271,8 @@
 	const_iv (GL_FLOAT),
 	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
 	const_iv (GL_COMPILE),
+	const_iv (GL_PROXY_TEXTURE_1D),
+	const_iv (GL_PROXY_TEXTURE_2D),
 	const_iv (GL_TEXTURE_1D),
 	const_iv (GL_TEXTURE_2D),
 	const_iv (GL_TEXTURE_ENV),
@@ -2318,6 +2348,20 @@
 	OUTPUT:
         RETVAL
 
+char *glGetString (GLenum pname)
+
+GLint glGetInteger (GLenum pname)
+	CODE:
+        glGetIntegerv (pname, &RETVAL);
+	OUTPUT:
+        RETVAL
+
+GLdouble glGetDouble (GLenum pname)
+	CODE:
+        glGetDoublev (pname, &RETVAL);
+	OUTPUT:
+        RETVAL
+
 int glGetError ()
 
 void glFinish ()
@@ -2449,6 +2493,8 @@
 
 void glDrawPixels (int width, int height, int format, int type, char *pixels)
 
+void glPixelZoom (float x, float y)
+
 void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
 
 int glGenTexture ()