--- deliantra/Deliantra-Client/Client.xs	2007/07/17 13:53:02	1.199
+++ 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